Author: ArcRiley
Date: 2008-03-06 11:10:18 -0500 (Thu, 06 Mar 2008)
New Revision: 1063

Modified:
   trunk/pysoy/src/_datatypes/VertexList.pxi
   trunk/pysoy/src/atoms/Face.pxi
Log:
Ticket #901 :
  * cleaned for Children API (.current -> ._current, .remove > ._remove)
  * cleaned up other formatting


Modified: trunk/pysoy/src/_datatypes/VertexList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/VertexList.pxi   2008-03-06 15:58:45 UTC (rev 
1062)
+++ trunk/pysoy/src/_datatypes/VertexList.pxi   2008-03-06 16:10:18 UTC (rev 
1063)
@@ -115,7 +115,7 @@
     gl.glVertexPointer  (3,  gl.GL_FLOAT, sizeof(Vert), <float*>  0)
     gl.glFogCoordPointerEXT( gl.GL_FLOAT,  0, <float*> (sizeof(Vert) * 
self._bufferAlloc))
 
-  cdef void _coreRenderArrayBumpPass  (self):
+  cdef void _coreRenderArrayBumpPass  (self) :
     gl.glVertexPointer  (3,  gl.GL_FLOAT, sizeof(Vert), &self._array[0].px)
     gl.glNormalPointer  (    gl.GL_FLOAT, sizeof(Vert), &self._array[0].nx)
     gl.glTexCoordPointer(3,  gl.GL_FLOAT, sizeof(Vert), &self._array[0].tx)
@@ -126,7 +126,7 @@
     gl.glTexCoordPointer(3, gl.GL_FLOAT, 0, self._tslvArray)
     gl.glClientActiveTexture(gl.GL_TEXTURE0)
 
-  cdef void _coreRenderBufferBumpPass (self):
+  cdef void _coreRenderBufferBumpPass (self) :
     gl.glBindBufferARB  (gl.GL_ARRAY_BUFFER_ARB, self._buffer)
     self._sendUpdated()
 
@@ -178,26 +178,24 @@
     self._children._stepUnlock()
 
 
-  cdef void _allocArray(self, int num) :
+  cdef void _allocArray(self, int _num) :
     cdef soy.meshes.Mesh _mesh
     _mesh = <soy.meshes.Mesh> self._mesh
-    self._array = <Vert *> self._alloc(num, &self._arrayAlloc, 
-                                       self._array, sizeof(Vert))
-
-    self._fogArray = <float*> self._alloc(num, &self._fogSize,
+    self._array = <Vert*> self._alloc(_num, &self._arrayAlloc, 
+                                      self._array, sizeof(Vert))
+    self._fogArray = <float*> self._alloc(_num, &self._fogSize,
             self._fogArray, sizeof(float))
-
-    self._tslvArray = <float*> self._alloc(num, &self._tslvSize,
+    self._tslvArray = <float*> self._alloc(_num, &self._tslvSize,
             self._tslvArray, 3*sizeof(float))
 
-  cdef void _uploadFogCoord(self, float y_coord):
-    cdef int i
+  cdef void _uploadFogCoord(self, float _yCoord) :
+    cdef int _i
     #cdef float* fog_coord_array
     #fog_coord_array = ( <float*> stdlib.malloc(4 * self._bufferAlloc) )
-
-    for i from 0 <= i < self._fogSize:
-      self._fogArray[i] = y_coord + self._array[i].py
-      
+    #
+    for _i from 0 <= _i < self._fogSize:
+      self._fogArray[_i] = _yCoord + self._array[_i].py
+    #
     if self._bufferAlloc:
       gl.glBindBufferARB   (gl.GL_ARRAY_BUFFER_ARB, self._buffer)
       gl.glBufferSubDataARB(gl.GL_ARRAY_BUFFER_ARB, 
@@ -205,7 +203,7 @@
                             4 * self._bufferAlloc, self._fogArray)
     #stdlib.free( fog_coord_array)
 
-  cdef void _calculateTSLV(self, void* __body):
+  cdef void _calculateTSLV(self, void* __body) :
     cdef soy.bodies._bodies.Body _body
     cdef soy.scenes.Scene        _scene
     cdef soy.bodies.lights.Light _light
@@ -219,7 +217,7 @@
     _body = <soy.bodies._bodies.Body> __body
     _scene = _body._scene
 
-    if _scene._lights.current > 0:
+    if _scene._lights._current > 0 :
       _light = <soy.bodies.lights.Light> _scene._lights.list[0]
       _body._coreGetModelviewInv(_inv_mm)
       #

Modified: trunk/pysoy/src/atoms/Face.pxi
===================================================================
--- trunk/pysoy/src/atoms/Face.pxi      2008-03-06 15:58:45 UTC (rev 1062)
+++ trunk/pysoy/src/atoms/Face.pxi      2008-03-06 16:10:18 UTC (rev 1063)
@@ -184,7 +184,7 @@
           for i from _mindex < i < mlist._children._current :
             mlist._ranges[i-1] = mlist._ranges[i]
           py.Py_DECREF(<object> mlist._children.list[_mindex])
-          mlist._children.remove(mlist._children.list[_mindex])
+          mlist._children._remove(mlist._children.list[_mindex])
         #else :
         #  mlist._ranges[_mindex].offset = mlist._ranges[_mindex].offset + 1
       _mindex = -1

_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn

Reply via email to