commented out displacement rendering for now

Author: snake-biscuits

src/main/python/ui/viewport.py

@@ -204,29 +204,29 @@ def paintGL(self):
                 glVertex(-y, -x)
         glEnd()
 
-        print('-----')
+        # print('<<< -- start frame -- >>>')
         for shader, params in self.draw_calls.items(): # DRAW CALLS
-            index_map, vertex_format = params
-            start, length = index_map
+            # index_map, vertex_format = params
+            start, length = params # index_map
             glUseProgram(shader)
 
-            for a in vertex_format:
-                if a not in self.active_attribs:
-                    glEnableVertexAttribArray(a)
-                    self.active_attribs.append(a)
-                    print("added", a)
-            for a in self.active_attribs[::]:
-                if a not in vertex_format:
-                    glDisableVertexAttribArray(a)
-                    self.active_attribs.remove(a)
-                    print("removed", a)
+            # for a in vertex_format:
+            #     if a not in self.active_attribs:
+            #         glEnableVertexAttribArray(a)
+            #         self.active_attribs.append(a)
+            #         print("added", a)
+            # for a in self.active_attribs[::]:
+            #     if a not in vertex_format:
+            #         glDisableVertexAttribArray(a)
+            #         self.active_attribs.remove(a)
+            #         print("removed", a)
 
             if self.GLES_MODE == True:
                 # plug the MVP matrix into the current shader
                 glUniformMatrix4fv(self.uniforms[shader], 1, GL_FALSE, matrix)
 
             glDrawElements(GL_TRIANGLES, length, GL_UNSIGNED_INT, GLvoidp(start))
-            print("drew")
+            # print("<<< draw call done >>>")
 
 
     def resizeGL(self, width, height):

src/main/python/utilities/render.py

@@ -107,7 +107,6 @@ def vmf_setup(viewport, vmf_object, ctx):
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, INDEX_BUFFER)
     glBufferData(GL_ELEMENT_ARRAY_BUFFER, len(indices) * 4,
                  np.array(indices, dtype=np.uint32), GL_STATIC_DRAW)
-    print("buffers pushed to GPU")
     # Vertex Format
     max_attribs = glGetIntegerv(GL_MAX_VERTEX_ATTRIBS)
     glEnableVertexAttribArray(0) # vertex_position
@@ -121,22 +120,20 @@ def vmf_setup(viewport, vmf_object, ctx):
     glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 44, GLvoidp(24))
     glEnableVertexAttribArray(3) # editor_colour
     glVertexAttribPointer(3, 3, GL_FLOAT, GL_FALSE, 44, GLvoidp(32))
-    print("attribs assembled")
 
     # keep handles to the new GL objects
     # dictionaries might be more convenient
     viewport.buffers = [VERTEX_BUFFER, INDEX_BUFFER]
     viewport.programs = [program_flat_brush, program_flat_displacement,
                          program_stripey_brush]
     # brushes
-    brush_format = (0, 1, 2, 3)
-    viewport.draw_calls[viewport.programs[0]] = ((0, brush_len), brush_format)
+    # brush_format = (0, 1, 2, 3)
+    viewport.draw_calls[viewport.programs[0]] = (0, brush_len) #, brush_format)
     # displacements
-    disp_format = (0, 4, 2, 3)
-    viewport.draw_calls[viewport.programs[1]] = ((brush_len + 1, disp_len), disp_format)
-    viewport.GLES_MODE = GLES_MODE
+    # disp_format = (0, 4, 2, 3)
+    # viewport.draw_calls[viewport.programs[1]] = ((brush_len + 1, disp_len), disp_format)
+    # viewport.GLES_MODE = GLES_MODE
     if GLES_MODE:
         viewport.uniforms = {program_flat_brush: uniform_brush_matrix,
                              program_stripey_brush: uniform_stripey_matrix,
                              program_flat_displacement: uniform_displacement_matrix}
-    print("draw calls assembled")

src/main/python/utilities/solid.py

@@ -199,6 +199,10 @@ def __init__(self, solid_namespace): # THIS IS FOR IMPORTING FROM VMF
                     print(start)
                     print(quad)
                     raise RuntimeError("Couldn't find start of displacement! (side id {})".format(side.id))
+                    # this error seems to come from rounding errors
+                    # fix solids with vertices off grid by .1e-16
+                    # then this will catch poorly saved disps instead
+                    # .vmfs seem to stick to a .2f accuracy
                 side_dispverts = []
                 A, B, C, D = quad
                 DA = D - A