Merge fix, and update to json file to get all engine settings in there.

This commit is contained in:
daid 2015-04-23 14:50:55 +02:00
commit 23e5bcc55b
2 changed files with 3 additions and 1 deletions

View File

@ -141,7 +141,7 @@ class CuraEngineBackend(Backend):
verts = numpy.array(mesh_data.getVertices(), copy=True) verts = numpy.array(mesh_data.getVertices(), copy=True)
verts[:,[1,2]] = verts[:,[2,1]] verts[:,[1,2]] = verts[:,[2,1]]
verts[:,[2]] *= -1 verts[:,1] *= -1
obj.vertices = verts.tostring() obj.vertices = verts.tostring()
#if meshData.hasNormals(): #if meshData.hasNormals():

View File

@ -45,6 +45,8 @@ class ProcessSlicedObjectListJob(Job):
points /= 1000 points /= 1000
points = numpy.insert(points, 1, layer.id * layerHeight, axis = 1) points = numpy.insert(points, 1, layer.id * layerHeight, axis = 1)
points[:,2] *= -1
#points = numpy.pad(points, ((0,0), (0,1)), 'constant', constant_values=(0.0, 1.0)) #points = numpy.pad(points, ((0,0), (0,1)), 'constant', constant_values=(0.0, 1.0))
#inverse = node.getWorldTransformation().getInverse().getData() #inverse = node.getWorldTransformation().getInverse().getData()
#points = points.dot(inverse) #points = points.dot(inverse)