q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vastly improve rendering time for complex models.

master
daid303 2012-10-04 12:04:04 +02:00
parent b772c0fd15
commit d32902bcef
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cura/gui/opengl.py
View File

@ -303,13 +303,24 @@ def DrawMesh(mesh):
glEnableClientState(GL_NORMAL_ARRAY);
glVertexPointer(3, GL_FLOAT, 0, mesh.vertexes)
glNormalPointer(GL_FLOAT, 0, mesh.normal)
#Odd, drawing in batchs is a LOT faster then drawing it all at once.
batchSize = 999 #Warning, batchSize needs to be dividable by 3
extraStartPos = int(mesh.vertexCount / batchSize) * batchSize
extraCount = mesh.vertexCount - extraStartPos
glCullFace(GL_BACK)
glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount)
for i in xrange(0, int(mesh.vertexCount / batchSize)):
glDrawArrays(GL_TRIANGLES, i*batchSize, batchSize)
glDrawArrays(GL_TRIANGLES, extraStartPos, extraCount)
glCullFace(GL_FRONT)
glNormalPointer(GL_FLOAT, 0, mesh.invNormal)
glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount)
for i in xrange(0, int(mesh.vertexCount / batchSize)):
glDrawArrays(GL_TRIANGLES, i*batchSize, batchSize)
extraStartPos = int(mesh.vertexCount / batchSize) * batchSize
extraCount = mesh.vertexCount - extraStartPos
glDrawArrays(GL_TRIANGLES, extraStartPos, extraCount)
glCullFace(GL_BACK)
glDisableClientState(GL_VERTEX_ARRAY)

12
Cura/util/mesh.py
View File

@ -19,8 +19,8 @@ class mesh(object):
def _prepareVertexCount(self, vertexNumber):
#Set the amount of faces before loading data in them. This way we can create the numpy arrays before we fill them.
self.origonalVertexes = numpy.zeros((vertexNumber, 3), float)
self.normal = numpy.zeros((vertexNumber, 3), float)
self.origonalVertexes = numpy.zeros((vertexNumber, 3), numpy.float32)
self.normal = numpy.zeros((vertexNumber, 3), numpy.float32)
self.vertexCount = 0
def _postProcessAfterLoad(self):
@ -56,11 +56,11 @@ class mesh(object):
mat10 = math.sin(rotate) * scaleX
mat11 = math.cos(rotate) * scaleY
mat = numpy.array([[mat00,mat10,0],[mat01,mat11,0],[0,0,scaleZ]], float)
mat = numpy.array([[mat00,mat10,0],[mat01,mat11,0],[0,0,scaleZ]], numpy.float32)
if swapXZ:
mat = numpy.array([mat[2],mat[1],mat[0]], float)
mat = numpy.array([mat[2],mat[1],mat[0]], numpy.float32)
if swapYZ:
mat = numpy.array([mat[0],mat[2],mat[1]], float)
mat = numpy.array([mat[0],mat[2],mat[1]], numpy.float32)
self.vertexes = (numpy.matrix(self.origonalVertexes, copy = False) * numpy.matrix(mat)).getA()
tris = self.vertexes.reshape(self.vertexCount / 3, 3, 3)
@ -70,7 +70,7 @@ class mesh(object):
normals[:,1] /= lens
normals[:,2] /= lens
n = numpy.zeros((self.vertexCount / 3, 9), float)
n = numpy.zeros((self.vertexCount / 3, 9), numpy.float32)
n[:,0:3] = normals
n[:,3:6] = normals
n[:,6:9] = normals