Author: JonNeal
Date: 2008-02-27 19:52:04 -0500 (Wed, 27 Feb 2008)
New Revision: 1006
Modified:
trunk/pysoy/src/scenes/Planar.pxi
Log:
Ticket #928 : Cleaned up a bit of the code and changed one of the error
messages.
Modified: trunk/pysoy/src/scenes/Planar.pxi
===================================================================
--- trunk/pysoy/src/scenes/Planar.pxi 2008-02-28 00:29:39 UTC (rev 1005)
+++ trunk/pysoy/src/scenes/Planar.pxi 2008-02-28 00:52:04 UTC (rev 1006)
@@ -20,7 +20,9 @@
DEF GeomBody = 2
DEF GeomField = 4
DEF GeomLight = 8
+
cimport soy.materials
+
cdef Vert midpoint(Vert a,Vert b):
X = 0.5*(a.px+b.px)
Y = 0.5*(a.py+b.py)
@@ -93,40 +95,42 @@
elif material == None:
self._material = soy.materials.Material()
else:
- raise TypeError("Thats not a material!")
+ raise TypeError('Must provide an instance of soy.materials.Material')
def __delalloc__(self) :
ode.dGeomDestroy(self._planeID)
cdef void _coreRender(self) :
#gl.glDisable(gl.GL_DEPTH_BUFFER)
- #stdio.printf("Testing\n")
self._material._coreBind()
gl.glEnableClientState( gl.GL_VERTEX_ARRAY )
gl.glVertexPointer (3, gl.GL_FLOAT, 48, &self._verts[0].px)
gl.glNormalPointer ( gl.GL_FLOAT, 48, &self._verts[0].nx)
gl.glTexCoordPointer(3, gl.GL_FLOAT, 48, &self._verts[0].tx)
- #if (<soy.textures.Texture> self._texture)._chans & 1:
- # gl.glDisable(gl.GL_BLEND)
- #else:
- # gl.glEnable(gl.GL_BLEND)
- # gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA)
#cdef gl.GLfloat mtx[16]
#self._coreGetModelview(mtx)
#gl.glPushMatrix()
#gl.glMultMatrixf(mtx)
#(<soy.meshes.Mesh> self._mesh)._coreRender(<void *> self)#Faces go here?
#
- #gl.glTranslatef(0,0,1)
gl.glDrawElements (gl.GL_TRIANGLES, 60, gl.GL_UNSIGNED_SHORT,
<unsigned short *> self._faces)
#gl.glPopMatrix()
self._material._coreUnBind()
+
Scene._coreRender(self)
gl.glDisableClientState( gl.GL_VERTEX_ARRAY )
#gl.glEnable(gl.GL_DEPTH_BUFFER)
+ property material :
+ def __get__(self) :
+ return self._material
+ def __set__(self, value) :
+ if not isinstance(value, soy.materials.Material) :
+ raise TypeError('Must provide an instance of soy.materials.Material')
+ self._material = value
+
property gravity :
'''Scene gravity
@@ -155,3 +159,4 @@
ode.dGeomSetCategoryBits(self._planeID,GeomScene)
ode.dGeomSetData(self._planeID, <void*> self)
ode.dWorldSetGravity(self._worldID, value[0], value[1], value[2])
+
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
