Author: ArcRiley
Date: 2008-03-07 16:15:24 -0500 (Fri, 07 Mar 2008)
New Revision: 1093
Modified:
trunk/pysoy/src/atoms/Face.pxi
trunk/pysoy/src/atoms/Vertex.pxi
trunk/pysoy/src/atoms/soy.atoms.pxd
Log:
Ticket #941 :
* even more fixes due to svn problem
Modified: trunk/pysoy/src/atoms/Face.pxi
===================================================================
--- trunk/pysoy/src/atoms/Face.pxi 2008-03-07 21:11:34 UTC (rev 1092)
+++ trunk/pysoy/src/atoms/Face.pxi 2008-03-07 21:15:24 UTC (rev 1093)
@@ -22,7 +22,7 @@
An element of FaceList with .verts property
'''
- def __cinit__(self, soy.meshes.Mesh mesh,
+ def __cinit__(self, soy.models.Mesh mesh,
verts=None, material=None,
index=-1, *args, **keywords) :
cdef int i, _mindex
@@ -91,7 +91,7 @@
cdef float a, b, c
cdef object t
cdef soy._datatypes.VertexList _verts
- _verts = (<soy.meshes.Mesh> self._list._mesh)._verts
+ _verts = (<soy.models.Mesh> self._list._mesh)._verts
py.PyThread_acquire_lock(self._mutex, 1)
t = (_verts[self._list._array[self._index].a],
_verts[self._list._array[self._index].b],
@@ -121,7 +121,7 @@
cdef soy.materials.Material material
cdef soy._datatypes.MaterialList mlist
cdef soy._datatypes.Face _face
- mlist = (<soy.meshes.Mesh> self._list._mesh)._mates
+ mlist = (<soy.models.Mesh> self._list._mesh)._mates
py.PyThread_acquire_lock(self._mutex, 1)
for i from 0 <= i < mlist._children._current :
if self._index >= mlist._ranges[i].offset and \
@@ -137,7 +137,7 @@
cdef int i, _mindex, _oldindex
cdef soy._datatypes.Face _face
cdef soy._datatypes.MaterialList mlist
- mlist = (<soy.meshes.Mesh> self._list._mesh)._mates
+ mlist = (<soy.models.Mesh> self._list._mesh)._mates
py.PyThread_acquire_lock(self._mutex, 1)
_mindex = -1
_oldindex = self._index
Modified: trunk/pysoy/src/atoms/Vertex.pxi
===================================================================
--- trunk/pysoy/src/atoms/Vertex.pxi 2008-03-07 21:11:34 UTC (rev 1092)
+++ trunk/pysoy/src/atoms/Vertex.pxi 2008-03-07 21:15:24 UTC (rev 1093)
@@ -22,7 +22,7 @@
An element of VertexList with .position .normal and .texcoord properties
'''
- def __cinit__(self, soy.meshes.Mesh mesh,
+ def __cinit__(self, soy.models.Mesh mesh,
position=None, normal=None, texcoord=None, tangent=None,
index=-1, *args, **keywords) :
self._index = -1
Modified: trunk/pysoy/src/atoms/soy.atoms.pxd
===================================================================
--- trunk/pysoy/src/atoms/soy.atoms.pxd 2008-03-07 21:11:34 UTC (rev 1092)
+++ trunk/pysoy/src/atoms/soy.atoms.pxd 2008-03-07 21:15:24 UTC (rev 1093)
@@ -20,7 +20,7 @@
cimport py
cimport stdio
cimport soy._internals
-cimport soy.meshes
+cimport soy.models
cimport soy.materials
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
