Author: ArcRiley
Date: 2008-02-26 15:45:49 -0500 (Tue, 26 Feb 2008)
New Revision: 995

Modified:
   trunk/pysoy/src/_datatypes/VertexList.pxi
Log:
Ticket #936 :
  * fixed the _calculateTSLV function, no longer segfaults


Modified: trunk/pysoy/src/_datatypes/VertexList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/VertexList.pxi   2008-02-26 19:39:55 UTC (rev 
994)
+++ trunk/pysoy/src/_datatypes/VertexList.pxi   2008-02-26 20:45:49 UTC (rev 
995)
@@ -224,49 +224,43 @@
       _model_light_pos[0] = _inv_mm[0] * (_light._position[0] + _inv_mm[12]) \
                           + _inv_mm[4] * (_light._position[1] + _inv_mm[13]) \
                           + _inv_mm[8] * (_light._position[2] + _inv_mm[14]) 
-
       _model_light_pos[1] = _inv_mm[1] * (_light._position[0] + _inv_mm[12]) \
                           + _inv_mm[5] * (_light._position[1] + _inv_mm[13]) \
                           + _inv_mm[9] * (_light._position[2] + _inv_mm[14]) 
-
       _model_light_pos[2] = _inv_mm[2] * (_light._position[0] + _inv_mm[12]) \
                           + _inv_mm[6] * (_light._position[1] + _inv_mm[13]) \
                           + _inv_mm[10]* (_light._position[2] + _inv_mm[14])
-
+      #
+      # Assign values to each vertex in array
       for _i from 0 <= _i < self._arraySize:
         _vert_light_pos[0] = _model_light_pos[0] - self._array[_i].px
         _vert_light_pos[1] = _model_light_pos[1] - self._array[_i].py
         _vert_light_pos[2] = _model_light_pos[2] - self._array[_i].pz
-
+        #
         _lgt = stdlib.sqrtf( _vert_light_pos[0] * _vert_light_pos[0] \
                             +_vert_light_pos[1] * _vert_light_pos[1] \
                             +_vert_light_pos[2] * _vert_light_pos[2] )
-
+        #
         _vert_light_pos[0] = _vert_light_pos[0] / _lgt
         _vert_light_pos[1] = _vert_light_pos[1] / _lgt
         _vert_light_pos[2] = _vert_light_pos[2] / _lgt
-
+        #
         _binormal[0] = self._array[_i].tan_y * self._array[_i].nz - \
                        self._array[_i].tan_z * self._array[_i].ny
-
         _binormal[1] = self._array[_i].tan_z * self._array[_i].nx - \
                        self._array[_i].tan_x * self._array[_i].nz
-
         _binormal[2] = self._array[_i].tan_x * self._array[_i].ny - \
                        self._array[_i].tan_y * self._array[_i].nx
-              
-        self._tslvArray[3*i+0] = ( _vert_light_pos[0] * self._array[_i].tan_x \
-                                  +_vert_light_pos[1] * self._array[_i].tan_y \
-                                  +_vert_light_pos[2] * self._array[_i].tan_z )
-
-        self._tslvArray[3*i+1] = ( _vert_light_pos[0] * _binormal[0] \
-                                  +_vert_light_pos[1] * _binormal[1] \
-                                  +_vert_light_pos[2] * _binormal[2] )
-
-        self._tslvArray[3*i+2] = ( _vert_light_pos[0] * self._array[_i].nx \
-                                  +_vert_light_pos[1] * self._array[_i].ny \
-                                  +_vert_light_pos[2] * self._array[_i].nz )
-              
+        #              
+        self._tslvArray[3*_i+0] = ( _vert_light_pos[0] * self._array[_i].tan_x\
+                                   +_vert_light_pos[1] * self._array[_i].tan_y\
+                                   +_vert_light_pos[2] * self._array[_i].tan_z)
+        self._tslvArray[3*_i+1] = ( _vert_light_pos[0] * _binormal[0] \
+                                   +_vert_light_pos[1] * _binormal[1] \
+                                   +_vert_light_pos[2] * _binormal[2] )
+        self._tslvArray[3*_i+2] = ( _vert_light_pos[0] * self._array[_i].nx \
+                                   +_vert_light_pos[1] * self._array[_i].ny \
+                                   +_vert_light_pos[2] * self._array[_i].nz )
         #self._tslvArray[3*_i + 0] = 0
         #self._tslvArray[3*_i + 1] = 0
         #self._tslvArray[3*_i + 2] = 1

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

Reply via email to