Cambios menores

CC3501 · May 3, 2019 · 78af87f · 78af87f
1 parent 2e34d94
commit 78af87f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/aux6/cilindro.py b/aux6/cilindro.py
@@ -216,7 +216,7 @@ def on_key(window_obj, key, scancode, action, mods):
         obj_axis.draw(view, projection, mode=GL_LINES)
         obj_cylinder.draw(view, projection)
 
-        # Once the drawing is rendered, buffers are swap so an uncomplete drawing is never seen.
+        # Once the drawing is rendered, buffers are swap so an uncomplete drawing is never seen
         glfw.swap_buffers(window)
 
     glfw.terminate()
diff --git a/aux6/curvas.py b/aux6/curvas.py
@@ -187,7 +187,7 @@ def on_key(window_obj, key, scancode, action, mods):
         obj_planeS.draw(view, projection)
         obj_planeB.draw(view, projection)
 
-        # Once the drawing is rendered, buffers are swap so an uncomplete drawing is never seen.
+        # Once the drawing is rendered, buffers are swap so an uncomplete drawing is never seen
         glfw.swap_buffers(window)
 
     glfw.terminate()
diff --git a/aux6/graficador.py b/aux6/graficador.py
@@ -231,7 +231,7 @@ def f(x, y, fun):
         obj_axis.draw(view, projection, mode=GL_LINES)
         obj_main.draw(view, projection)
 
-        # Once the drawing is rendered, buffers are swap so an uncomplete drawing is never seen.
+        # Once the drawing is rendered, buffers are swap so an uncomplete drawing is never seen
         glfw.swap_buffers(window)
 
     glfw.terminate()
diff --git a/aux6/lib/basic_shapes_extended.py b/aux6/lib/basic_shapes_extended.py
@@ -165,8 +165,8 @@ def draw(self, view, projection, mode=_GL_TRIANGLES, shader=None, usemodel=True)
         _glUseProgram(shader.shaderProgram)
         if usemodel:
             _glUniformMatrix4fv(_glGetUniformLocation(shader.shaderProgram, 'model'), 1, _GL_TRUE, self._model)
-        _glUniformMatrix4fv(_glGetUniformLocation(shader.shaderProgram, "projection"), 1, _GL_TRUE, projection)
-        _glUniformMatrix4fv(_glGetUniformLocation(shader.shaderProgram, "view"), 1, _GL_TRUE, view)
+        _glUniformMatrix4fv(_glGetUniformLocation(shader.shaderProgram, 'projection'), 1, _GL_TRUE, projection)
+        _glUniformMatrix4fv(_glGetUniformLocation(shader.shaderProgram, 'view'), 1, _GL_TRUE, view)
         for i in self._shapes:
             shader.drawShape(i, mode)
         if self._modelPrev is not None:
@@ -367,7 +367,7 @@ def create4VertexColor(p1, p2, p3, p4, r, g, b):
         x1, y1, z1, r, g, b,
         x2, y2, z2, r, g, b,
         x3, y3, z3, r, g, b,
-        x4, y4, z4, r, g, b,
+        x4, y4, z4, r, g, b
     ]
 
     # Defining connections among vertices
@@ -449,7 +449,7 @@ def createTriangleTexture(image_filename, p1, p2, p3, nx=1, ny=1):
         # X, Y,  Z,   U,   V
         x1, y1, z1, (nx + ny) / 2, nx,
         x2, y2, z2, 0.0, 0.0,
-        x3, y3, z3, ny, 0.0,
+        x3, y3, z3, ny, 0.0
     ]
 
     # Defining connections among vertices
@@ -567,7 +567,7 @@ def createTriangleColorNormal(p1, p2, p3, r, g, b):
         # X, Y,  Z, R, G, B,
         x1, y1, z1, r, g, b, normal.get_x(), normal.get_y(), normal.get_z(),
         x2, y2, z2, r, g, b, normal.get_x(), normal.get_y(), normal.get_z(),
-        x3, y3, z3, r, g, b, normal.get_x(), normal.get_y(), normal.get_z(),
+        x3, y3, z3, r, g, b, normal.get_x(), normal.get_y(), normal.get_z()
     ]
 
     # Defining connections among vertices