Merge branch 'master' of github.com:Ultimaker/Cura into feature_multi_materialsnozzles

plugins/CuraEngineBackend/ProcessSlicedLayersJob.py

@@ -12,7 +12,7 @@ from UM.i18n import i18nCatalog
 
 from UM.Math.Vector import Vector
 
-from cura import LayerData
+from cura import LayerDataBuilder
 from cura import LayerDataDecorator
 
 import numpy
@@ -63,7 +63,7 @@ class ProcessSlicedLayersJob(Job):
                 return
 
         mesh = MeshData()
-        layer_data = LayerData.LayerData()
+        layer_data = LayerDataBuilder.LayerDataBuilder()
         layer_count = len(self._layers)
 
         # Find the minimum layer number
@@ -115,7 +115,7 @@ class ProcessSlicedLayersJob(Job):
                 self._progress.setProgress(progress)
 
         # We are done processing all the layers we got from the engine, now create a mesh out of the data
-        layer_data.build()
+        layer_mesh = layer_data.build()
 
         if self._abort_requested:
             if self._progress:
@@ -124,7 +124,7 @@ class ProcessSlicedLayersJob(Job):
 
         # Add LayerDataDecorator to scene node to indicate that the node has layer data
         decorator = LayerDataDecorator.LayerDataDecorator()
-        decorator.setLayerData(layer_data)
+        decorator.setLayerData(layer_mesh)
         new_node.addDecorator(decorator)
 
         new_node.setMeshData(mesh)

plugins/ImageReader/ImageReader.py

@@ -7,7 +7,7 @@ from PyQt5.QtGui import QImage, qRed, qGreen, qBlue
 from PyQt5.QtCore import Qt
 
 from UM.Mesh.MeshReader import MeshReader
-from UM.Mesh.MeshData import MeshData
+from UM.Mesh.MeshBuilder import MeshBuilder
 from UM.Scene.SceneNode import SceneNode
 from UM.Math.Vector import Vector
 from UM.Job import Job
@@ -48,13 +48,9 @@ class ImageReader(MeshReader):
         return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.image_color_invert)
 
     def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, image_color_invert):
-        mesh = None # TODO: @UnusedVariable
-        scene_node = None # TODO: @UnusedVariable
-
         scene_node = SceneNode()
 
-        mesh = MeshData()
-        scene_node.setMeshData(mesh)
+        mesh = MeshBuilder()
 
         img = QImage(file_name)
 
@@ -76,9 +72,9 @@ class ImageReader(MeshReader):
         scale_vector = Vector(xz_size, peak_height, xz_size)
 
         if width > height:
-            scale_vector.setZ(scale_vector.z * aspect)
+            scale_vector = scale_vector.set(z=scale_vector.z * aspect)
         elif height > width:
-            scale_vector.setX(scale_vector.x / aspect)
+            scale_vector = scale_vector.set(x=scale_vector.x / aspect)
 
         if width > max_size or height > max_size:
             scale_factor = max_size / width
@@ -173,8 +169,8 @@ class ImageReader(MeshReader):
         geo_height = height_minus_one * texel_height
 
         # bottom
-        mesh.addFace(0, 0, 0, 0, 0, geo_height, geo_width, 0, geo_height)
-        mesh.addFace(geo_width, 0, geo_height, geo_width, 0, 0, 0, 0, 0)
+        mesh.addFaceByPoints(0, 0, 0, 0, 0, geo_height, geo_width, 0, geo_height)
+        mesh.addFaceByPoints(geo_width, 0, geo_height, geo_width, 0, 0, 0, 0, 0)
 
         # north and south walls
         for n in range(0, width_minus_one):
@@ -187,11 +183,11 @@ class ImageReader(MeshReader):
             hs0 = height_data[height_minus_one, n]
             hs1 = height_data[height_minus_one, n + 1]
 
-            mesh.addFace(x, 0, 0, nx, 0, 0, nx, hn1, 0)
-            mesh.addFace(nx, hn1, 0, x, hn0, 0, x, 0, 0)
+            mesh.addFaceByPoints(x, 0, 0, nx, 0, 0, nx, hn1, 0)
+            mesh.addFaceByPoints(nx, hn1, 0, x, hn0, 0, x, 0, 0)
 
-            mesh.addFace(x, 0, geo_height, nx, 0, geo_height, nx, hs1, geo_height)
-            mesh.addFace(nx, hs1, geo_height, x, hs0, geo_height, x, 0, geo_height)
+            mesh.addFaceByPoints(x, 0, geo_height, nx, 0, geo_height, nx, hs1, geo_height)
+            mesh.addFaceByPoints(nx, hs1, geo_height, x, hs0, geo_height, x, 0, geo_height)
 
         # west and east walls
         for n in range(0, height_minus_one):
@@ -204,12 +200,14 @@ class ImageReader(MeshReader):
             he0 = height_data[n, width_minus_one]
             he1 = height_data[n + 1, width_minus_one]
 
-            mesh.addFace(0, 0, y, 0, 0, ny, 0, hw1, ny)
-            mesh.addFace(0, hw1, ny, 0, hw0, y, 0, 0, y)
+            mesh.addFaceByPoints(0, 0, y, 0, 0, ny, 0, hw1, ny)
+            mesh.addFaceByPoints(0, hw1, ny, 0, hw0, y, 0, 0, y)
 
-            mesh.addFace(geo_width, 0, y, geo_width, 0, ny, geo_width, he1, ny)
-            mesh.addFace(geo_width, he1, ny, geo_width, he0, y, geo_width, 0, y)
+            mesh.addFaceByPoints(geo_width, 0, y, geo_width, 0, ny, geo_width, he1, ny)
+            mesh.addFaceByPoints(geo_width, he1, ny, geo_width, he0, y, geo_width, 0, y)
 
         mesh.calculateNormals(fast=True)
 
+        scene_node.setMeshData(mesh.build())
+
         return scene_node

plugins/LayerView/LayerView.py

@@ -8,7 +8,7 @@ from UM.Event import Event, KeyEvent
 from UM.Signal import Signal
 from UM.Scene.Selection import Selection
 from UM.Math.Color import Color
-from UM.Mesh.MeshData import MeshData
+from UM.Mesh.MeshBuilder import MeshBuilder
 from UM.Job import Job
 from UM.Preferences import Preferences
 
@@ -240,7 +240,7 @@ class _CreateTopLayersJob(Job):
         if self._cancel or not layer_data:
             return
 
-        layer_mesh = MeshData()
+        layer_mesh = MeshBuilder()
         for i in range(self._solid_layers):
             layer_number = self._layer_number - i
             if layer_number < 0:
@@ -275,7 +275,7 @@ class _CreateTopLayersJob(Job):
         if not jump_mesh or jump_mesh.getVertices() is None:
             jump_mesh = None
 
-        self.setResult({ "layers": layer_mesh, "jumps": jump_mesh })
+        self.setResult({ "layers": layer_mesh.build(), "jumps": jump_mesh })
 
     def cancel(self):
         self._cancel = True