Author: ArcRiley
Date: 2008-02-07 04:46:28 -0500 (Thu, 07 Feb 2008)
New Revision: 830
Modified:
trunk/pysoy/src/_core-common/_coreLoop.pxi
trunk/pysoy/src/_core-osx/Window.pxi
trunk/pysoy/src/_core-osx/soy._core.pxd
trunk/pysoy/src/_core-server/Screen.pxi
trunk/pysoy/src/_core-server/Window.pxi
trunk/pysoy/src/_core-server/soy._core.pxd
trunk/pysoy/src/_core-w32/Window.pxi
trunk/pysoy/src/_core-w32/soy._core.pxd
trunk/pysoy/src/_core-x11/Window.pxi
trunk/pysoy/src/_core-x11/soy._core.pxd
trunk/pysoy/src/_datatypes/FaceList.pxi
trunk/pysoy/src/_datatypes/MaterialList.pxi
trunk/pysoy/src/_datatypes/VertexList.pxi
trunk/pysoy/src/_datatypes/soy._datatypes.pxd
trunk/pysoy/src/bodies._bodies/Body.pxi
trunk/pysoy/src/bodies._bodies/Camera.pxi
trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd
trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd
trunk/pysoy/src/bodies.lights/Light.pxi
trunk/pysoy/src/meshes/Axis.pxi
trunk/pysoy/src/meshes/Billboard.pxi
trunk/pysoy/src/meshes/Camera.pxi
trunk/pysoy/src/meshes/Liquid.pxi
trunk/pysoy/src/meshes/Mesh.pxi
trunk/pysoy/src/meshes/Shape.pxi
trunk/pysoy/src/meshes/Sun.pxi
trunk/pysoy/src/meshes/soy.meshes.pxd
trunk/pysoy/src/scenes/
trunk/pysoy/src/scenes/Scene.pxi
trunk/pysoy/src/scenes/soy.scenes.pxd
trunk/pysoy/src/widgets/Canvas.pxi
trunk/pysoy/src/widgets/Projector.pxi
trunk/pysoy/src/widgets/Widget.pxi
trunk/pysoy/src/widgets/soy.widgets.pxd
Log:
#902 - renamed all _render to _coreRender
Modified: trunk/pysoy/src/_core-common/_coreLoop.pxi
===================================================================
--- trunk/pysoy/src/_core-common/_coreLoop.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-common/_coreLoop.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -37,7 +37,7 @@
_screens.unlock()
_windows.lock()
for i from 0 <= i < _windows.current :
- (<Window> _windows.list[i])._render()
+ (<Window> _windows.list[i])._coreRender()
_windows.unlock()
_scenes.lock()
_maxstep = 0
Modified: trunk/pysoy/src/_core-osx/Window.pxi
===================================================================
--- trunk/pysoy/src/_core-osx/Window.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-osx/Window.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -45,7 +45,7 @@
_windows.remove(<void *>self)
_windows.unlock()
- cdef void _render(self) :
+ cdef void _coreRender(self) :
cdef int i
#glx.glXMakeCurrent(_display, self._windowID, self._glxContext)
@@ -57,7 +57,7 @@
# Render each widget in order
self._widgets.lock()
for i from 0 <= i < self._widgets.current :
- (<soy.widgets.Widget> self._widgets.list[i])._render()
+ (<soy.widgets.Widget> self._widgets.list[i])._coreRender()
self._widgets.unlock()
gl.glFlush()
Modified: trunk/pysoy/src/_core-osx/soy._core.pxd
===================================================================
--- trunk/pysoy/src/_core-osx/soy._core.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-osx/soy._core.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -32,13 +32,13 @@
cdef ode.dSpaceID _spaceID
cdef ode.dReal _stepsize
cdef double _time
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _updateTime(self)
cdef class Screen :
cdef object _fullScreen
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef class Window :
cdef soy._internals.Children _widgets
@@ -48,5 +48,5 @@
cdef int _width
cdef int _height
# _coreloop methods
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _resize(self)
Modified: trunk/pysoy/src/_core-server/Screen.pxi
===================================================================
--- trunk/pysoy/src/_core-server/Screen.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-server/Screen.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -37,7 +37,7 @@
def __repr__(self) :
return '<Screen>'
- cdef void _render(self) :
+ cdef void _coreRender(self) :
return
property size :
Modified: trunk/pysoy/src/_core-server/Window.pxi
===================================================================
--- trunk/pysoy/src/_core-server/Window.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-server/Window.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -46,7 +46,7 @@
self._screen._windows.remove(<void *>self)
self._screen._windows.unlock()
- cdef void _render(self) :
+ cdef void _coreRender(self) :
return
cdef void _resize(self) :
Modified: trunk/pysoy/src/_core-server/soy._core.pxd
===================================================================
--- trunk/pysoy/src/_core-server/soy._core.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-server/soy._core.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -37,14 +37,14 @@
cdef ode.dSpaceID _spaceID
cdef ode.dReal _stepsize
cdef double _time
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _updateTime(self)
cdef class Screen :
cdef soy._internals.Children _windows
cdef object _fullScreen
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef class Window :
cdef Screen _screen
@@ -55,5 +55,5 @@
cdef int _ypos
cdef int _width
cdef int _height
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _resize(self)
Modified: trunk/pysoy/src/_core-w32/Window.pxi
===================================================================
--- trunk/pysoy/src/_core-w32/Window.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-w32/Window.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -158,7 +158,7 @@
raise SystemError("Could not unregister window class.")
_classRegistered = 0
- cdef void _render(self):
+ cdef void _coreRender(self):
cdef int i
if self._opened == -1:
@@ -202,7 +202,7 @@
# Render each widget in order
self._widgets.lock()
for i from 0 <= i < self._widgets.current :
- (<soy.widgets.Widget> self._widgets.list[i])._render()
+ (<soy.widgets.Widget> self._widgets.list[i])._coreRender()
self._widgets.unlock()
gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
Modified: trunk/pysoy/src/_core-w32/soy._core.pxd
===================================================================
--- trunk/pysoy/src/_core-w32/soy._core.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-w32/soy._core.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -67,6 +67,6 @@
# _coreloop methods
cdef void _create(self, int, int, int, int)
cdef void _destroy(self)
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _resize(self, int _width, int _height)
Modified: trunk/pysoy/src/_core-x11/Window.pxi
===================================================================
--- trunk/pysoy/src/_core-x11/Window.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-x11/Window.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -120,7 +120,7 @@
_windows.unlock()
- cdef void _render(self) :
+ cdef void _coreRender(self) :
cdef int i
if self._opened < 1 :
return
@@ -145,7 +145,7 @@
# Render each widget in order
self._widgets.lock()
for i from 0 <= i < self._widgets.current :
- (<soy.widgets.Widget> self._widgets.list[i])._render()
+ (<soy.widgets.Widget> self._widgets.list[i])._coreRender()
self._widgets.unlock()
gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
Modified: trunk/pysoy/src/_core-x11/soy._core.pxd
===================================================================
--- trunk/pysoy/src/_core-x11/soy._core.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_core-x11/soy._core.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -57,7 +57,7 @@
# _coreloop methods
cdef void _create(self, int, int, int, int)
cdef void _destroy(self)
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _resize(self, int _width, int _height)
cdef void _setProperties( self )
cdef void _eventKeyDown ( self, glx.Time,
Modified: trunk/pysoy/src/_datatypes/FaceList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/FaceList.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_datatypes/FaceList.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -69,19 +69,19 @@
return _face
- cdef void _renderArray(self, int _offset, int _length) :
+ cdef void _coreRenderArray(self, int _offset, int _length) :
gl.glDrawElements (gl.GL_TRIANGLES, _length*3,
gl.GL_UNSIGNED_SHORT, self._array + _offset)
- cdef void _renderBuffer(self, int _offset, int _length) :
+ cdef void _coreRenderBuffer(self, int _offset, int _length) :
gl.glDrawElements (gl.GL_TRIANGLES, _length*3,
gl.GL_UNSIGNED_SHORT, (<Face *> 0) + _offset)
- cdef void _renderArrayBumpPass (self, int a, int b):
+ cdef void _coreRenderArrayBumpPass (self, int a, int b):
pass
- cdef void _renderBufferBumpPass (self, int a , int b):
+ cdef void _coreRenderBufferBumpPass (self, int a , int b):
pass
Modified: trunk/pysoy/src/_datatypes/MaterialList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/MaterialList.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_datatypes/MaterialList.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -75,31 +75,31 @@
return _mat
- cdef void _renderArray(self, void* body) :
+ cdef void _coreRenderArray(self, void* body) :
cdef int i
cdef soy.meshes.Mesh _mesh
_mesh = <soy.meshes.Mesh> self._mesh
_mesh._verts._calculateTSLV(body)
- _mesh._verts._renderArrayBumpPass()
+ _mesh._verts._coreRenderArrayBumpPass()
self._children.lock()
for i from 0 <= i < self._children.current :
(<soy.materials.Material> self._children.list[i])._bind()
- _mesh._faces._renderArray(self._ranges[i].offset, self._ranges[i].length)
+ _mesh._faces._coreRenderArray(self._ranges[i].offset,
self._ranges[i].length)
(<soy.materials.Material> self._children.list[i])._unbind()
self._children.unlock()
- _mesh._verts._renderArray()
+ _mesh._verts._coreRenderArray()
self._children.lock()
for i from 0 <= i < self._children.current :
(<soy.materials.Material> self._children.list[i])._bind()
- _mesh._faces._renderArray(self._ranges[i].offset, self._ranges[i].length)
+ _mesh._faces._coreRenderArray(self._ranges[i].offset,
self._ranges[i].length)
(<soy.materials.Material> self._children.list[i])._unbind()
self._children.unlock()
- cdef void _renderBuffer(self, void* body) :
+ cdef void _coreRenderBuffer(self, void* body) :
cdef int i
cdef soy.meshes.Mesh _mesh
if self._children.current == 0 :
@@ -113,21 +113,21 @@
_mesh._faces._sendUpdated()
- _mesh._verts._renderBufferBumpPass()
+ _mesh._verts._coreRenderBufferBumpPass()
self._children.lock()
for i from 0 <= i < self._children.current :
if (<soy.materials.Material> self._children.list[i])._has_bumpmap():
(<soy.materials.Material> self._children.list[i])._bindBumpPass()
- _mesh._faces._renderBuffer(self._ranges[i].offset,
self._ranges[i].length)
+ _mesh._faces._coreRenderBuffer(self._ranges[i].offset,
self._ranges[i].length)
(<soy.materials.Material> self._children.list[i])._unbindBumpPass()
self._children.unlock()
- _mesh._verts._renderBuffer()
+ _mesh._verts._coreRenderBuffer()
self._children.lock()
for i from 0 <= i < self._children.current :
(<soy.materials.Material> self._children.list[i])._bind()
- _mesh._faces._renderBuffer(self._ranges[i].offset,
self._ranges[i].length)
+ _mesh._faces._coreRenderBuffer(self._ranges[i].offset,
self._ranges[i].length)
(<soy.materials.Material> self._children.list[i])._unbind()
self._children.unlock()
Modified: trunk/pysoy/src/_datatypes/VertexList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/VertexList.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/_datatypes/VertexList.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -90,14 +90,14 @@
return _vert
- cdef void _renderArray(self) :
+ cdef void _coreRenderArray(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)
gl.glFogCoordPointerEXT( gl.GL_FLOAT, 0, self._fogArray)
- cdef void _renderBuffer(self) :
+ cdef void _coreRenderBuffer(self) :
gl.glClientActiveTexture(gl.GL_TEXTURE1)
gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY)
gl.glClientActiveTexture(gl.GL_TEXTURE0)
@@ -110,7 +110,7 @@
gl.glVertexPointer (3, gl.GL_FLOAT, sizeof(Vert), <float*> 0)
gl.glFogCoordPointerEXT( gl.GL_FLOAT, 0, <float*> (sizeof(Vert) *
self._bufferAlloc))
- cdef void _renderArrayBumpPass (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)
@@ -121,7 +121,7 @@
gl.glTexCoordPointer(3, gl.GL_FLOAT, 0, self._tslvArray)
gl.glClientActiveTexture(gl.GL_TEXTURE0)
- cdef void _renderBufferBumpPass (self):
+ cdef void _coreRenderBufferBumpPass (self):
gl.glBindBufferARB (gl.GL_ARRAY_BUFFER_ARB, self._buffer)
self._sendUpdated()
Modified: trunk/pysoy/src/_datatypes/soy._datatypes.pxd
===================================================================
--- trunk/pysoy/src/_datatypes/soy._datatypes.pxd 2008-02-07 09:08:51 UTC
(rev 829)
+++ trunk/pysoy/src/_datatypes/soy._datatypes.pxd 2008-02-07 09:46:28 UTC
(rev 830)
@@ -67,8 +67,8 @@
cdef Range *_ranges
cdef int _rangesAlloc
cdef void _allocRanges (self, int)
- cdef void _renderArray (self, void*)
- cdef void _renderBuffer (self, void*)
+ cdef void _coreRenderArray (self, void*)
+ cdef void _coreRenderBuffer (self, void*)
cdef class FaceList (Datatype) :
@@ -82,10 +82,10 @@
cdef int _bufferAlloc
cdef Range _updateRange
cdef void _allocArray (self, int)
- cdef void _renderArray (self, int, int)
- cdef void _renderBuffer (self, int, int)
- cdef void _renderArrayBumpPass (self, int, int)
- cdef void _renderBufferBumpPass (self, int, int)
+ cdef void _coreRenderArray (self, int, int)
+ cdef void _coreRenderBuffer (self, int, int)
+ cdef void _coreRenderArrayBumpPass (self, int, int)
+ cdef void _coreRenderBufferBumpPass (self, int, int)
cdef void _createBuffer (self)
cdef void _sendUpdated (self)
cdef void _flagUpdated (self, int, int)
@@ -105,10 +105,10 @@
cdef int _bufferAlloc
cdef Range _updateRange
cdef void _allocArray (self, int)
- cdef void _renderArray (self)
- cdef void _renderBuffer (self)
- cdef void _renderArrayBumpPass (self)
- cdef void _renderBufferBumpPass (self)
+ cdef void _coreRenderArray (self)
+ cdef void _coreRenderBuffer (self)
+ cdef void _coreRenderArrayBumpPass (self)
+ cdef void _coreRenderBufferBumpPass (self)
cdef void _createBuffer (self)
cdef void _sendUpdated (self)
cdef void _flagUpdated (self, int)
Modified: trunk/pysoy/src/bodies._bodies/Body.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -302,7 +302,7 @@
return 1
- cdef void _render(self) :
+ cdef void _coreRender(self) :
if not self._mesh :
return
@@ -313,7 +313,7 @@
gl.glPushMatrix()
gl.glMultMatrixf(mtx)
- (<soy.meshes.Mesh> self._mesh)._render(<void *> self)
+ (<soy.meshes.Mesh> self._mesh)._coreRender(<void *> self)
gl.glPopMatrix()
Modified: trunk/pysoy/src/bodies._bodies/Camera.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Camera.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/bodies._bodies/Camera.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -69,7 +69,7 @@
mtx[15] = 1.0
gl.glLoadMatrixf(mtx)
gl.glTranslatef(-pos[0], -pos[1], -pos[2])
- self._scene._render()
+ self._scene._coreRender()
self._rpt = (self._rpt + 1) % 16
self._rtimes[self._rpt] = _time()
Modified: trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd
===================================================================
--- trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd 2008-02-07
09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd 2008-02-07
09:46:28 UTC (rev 830)
@@ -42,7 +42,7 @@
cdef void _create(self)
cdef void _destroy(self)
cdef int _isActive(self)
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _createVerticalFogCoords(self)
cdef void poke(self, vector)
cdef void _get_modelview (self, float*)
Modified: trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd
===================================================================
--- trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd 2008-02-07 09:08:51 UTC
(rev 829)
+++ trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd 2008-02-07 09:46:28 UTC
(rev 830)
@@ -29,7 +29,7 @@
cdef int _apply(self)
cdef int _exert(self, soy.bodies._bodies.Body other)
cdef void _commit(self)
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef class Monopole(soy.bodies.fields.Field) :
cdef soy._internals.Children _affected
Modified: trunk/pysoy/src/bodies.lights/Light.pxi
===================================================================
--- trunk/pysoy/src/bodies.lights/Light.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/bodies.lights/Light.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -56,7 +56,7 @@
gl.glDisable(id)
- cdef void _render(self) :
+ cdef void _coreRender(self) :
return
Modified: trunk/pysoy/src/meshes/Axis.pxi
===================================================================
--- trunk/pysoy/src/meshes/Axis.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/meshes/Axis.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -20,7 +20,7 @@
cdef class Axis (Mesh):
def __cinit__(self,*args, **keywords) :
pass
- cdef void _render (self,void* _body):
+ cdef void _coreRender (self,void* _body):
gl.glPushMatrix()
gl.glDisable(gl.GL_CULL_FACE)
gl.glDisable(gl.GL_DEPTH_TEST)
Modified: trunk/pysoy/src/meshes/Billboard.pxi
===================================================================
--- trunk/pysoy/src/meshes/Billboard.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/meshes/Billboard.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -26,7 +26,7 @@
self._material = material
self._size[0] = size[0]
self._size[1] = size[1]
- cdef void _render(self, void* _body):
+ cdef void _coreRender(self, void* _body):
cdef float mmat[16]
self._material._bind()
Modified: trunk/pysoy/src/meshes/Camera.pxi
===================================================================
--- trunk/pysoy/src/meshes/Camera.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/meshes/Camera.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -1,7 +1,7 @@
cdef class Camera(Mesh) :
def __cinit__(self,*arg,**keywords):
pass
- cdef void _render ( self, void* _body):
+ cdef void _coreRender ( self, void* _body):
gl.glPushMatrix()
gl.glScalef(0.1,0.1,0.1)
gl.glDisable(gl.GL_CULL_FACE)
Modified: trunk/pysoy/src/meshes/Liquid.pxi
===================================================================
--- trunk/pysoy/src/meshes/Liquid.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/meshes/Liquid.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -14,7 +14,7 @@
self._fog_color = fog_color
- cdef void _render_surf(self):
+ cdef void _coreRender_surf(self):
cdef float half_size[3]
half_size[0] = self._liquid_size[0]/2.0
half_size[1] = self._liquid_size[1]/2.0
@@ -40,7 +40,7 @@
gl.glEnd()
- cdef void _render_bottom(self):
+ cdef void _coreRender_bottom(self):
cdef float half_size[3]
cdef gl.GLfloat _diffuse[4]
@@ -69,7 +69,7 @@
gl.glEnable(gl.GL_LIGHTING)
- cdef void _render(self, void* body):
+ cdef void _coreRender(self, void* body):
cdef soy.scenes.Scene _scene
cdef int i
cdef ode.dReal *pos
@@ -89,14 +89,14 @@
gl.glStencilFunc(gl.GL_NEVER, 0, 0)
gl.glStencilOp(gl.GL_INCR, gl.GL_INCR, gl.GL_INCR)
- self._render_surf()
+ self._coreRender_surf()
gl.glStencilFunc(gl.GL_EQUAL, 1, 1)
gl.glStencilOp(gl.GL_KEEP, gl.GL_KEEP, gl.GL_KEEP)
gl.glDisable(gl.GL_DEPTH_TEST)
- self._render_bottom()
+ self._coreRender_bottom()
gl.glEnable(gl.GL_DEPTH_TEST)
#RENDER BODIES
@@ -117,7 +117,7 @@
for i from 0 <= i < _scene._bodies.current:
if body != (<void*> _scene._bodies.list[i]):
(<soy.bodies._bodies.Body>
_scene._bodies.list[i])._createVerticalFogCoords()
- (<soy.bodies._bodies.Body> _scene._bodies.list[i])._render()
+ (<soy.bodies._bodies.Body>
_scene._bodies.list[i])._coreRender()
gl.glPopMatrix()
gl.glDisableClientState(gl.GL_FOG_COORDINATE_ARRAY_EXT)
@@ -126,7 +126,7 @@
#RENDER SURFACE
self._liquid_mat._bind()
- self._render_surf()
+ self._coreRender_surf()
self._liquid_mat._unbind()
gl.glDisable(gl.GL_STENCIL_TEST)
Modified: trunk/pysoy/src/meshes/Mesh.pxi
===================================================================
--- trunk/pysoy/src/meshes/Mesh.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/meshes/Mesh.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -85,8 +85,8 @@
# and in both VA and VBO this is transformed to the body's location and
# then rendered.
- cdef void _render(self, void* _body) :
+ cdef void _coreRender(self, void* _body) :
if gl.GLEW_ARB_vertex_buffer_object :
- self._mates._renderBuffer(_body)
+ self._mates._coreRenderBuffer(_body)
else :
- self._mates._renderArray(_body)
+ self._mates._coreRenderArray(_body)
Modified: trunk/pysoy/src/meshes/Shape.pxi
===================================================================
--- trunk/pysoy/src/meshes/Shape.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/meshes/Shape.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -29,7 +29,7 @@
def __cinit__(self, material, *args, **keywords) :
self.material = material
- cdef void _render(self, void* _body) :
+ cdef void _coreRender(self, void* _body) :
cdef soy.shapes.Shape _shape
cdef int _shapeclass
#
@@ -42,18 +42,18 @@
#
# Render the specific shape
if _shapeclass == ode.dSphereClass :
- self._renderSphere(_shape)
+ self._coreRenderSphere(_shape)
elif _shapeclass == ode.dCapsuleClass :
- self._renderCapsule(_shape)
+ self._coreRenderCapsule(_shape)
elif _shapeclass == ode.dBoxClass :
- self._renderBox(_shape)
+ self._coreRenderBox(_shape)
elif _shapeclass == ode.dRayClass :
- self._renderRay(_shape)
+ self._coreRenderRay(_shape)
#
# Unbind the material
self._material._unbind()
- cdef void _renderSphere(self, soy.shapes.Shape _shape) :
+ cdef void _coreRenderSphere(self, soy.shapes.Shape _shape) :
cdef gl.GLUquadricObj* _quadric
_quadric = gl.gluNewQuadric()
gl.gluQuadricNormals(_quadric, gl.GLU_SMOOTH)
@@ -61,7 +61,7 @@
gl.gluSphere(_quadric, _shape._radius(), 32, 32)
gl.gluDeleteQuadric(_quadric)
- cdef void _renderCapsule(self, soy.shapes.Shape _shape) :
+ cdef void _coreRenderCapsule(self, soy.shapes.Shape _shape) :
cdef ode.dReal r, l
cdef gl.GLUquadricObj* _quadric
ode.dGeomCapsuleGetParams(_shape._geomID, &r, &l)
@@ -79,7 +79,7 @@
gl.glPopMatrix()
gl.gluDeleteQuadric(_quadric)
- cdef void _renderBox(self, soy.shapes.Shape _shape) :
+ cdef void _coreRenderBox(self, soy.shapes.Shape _shape) :
cdef ode.dVector3 _xyz
ode.dGeomBoxGetLengths(_shape._geomID, _xyz)
gl.glPushMatrix()
@@ -118,7 +118,7 @@
gl.glEnd()
gl.glPopMatrix()
- cdef void _renderRay(self, soy.shapes.Shape _shape) :
+ cdef void _coreRenderRay(self, soy.shapes.Shape _shape) :
cdef ode.dVector3 s, d
cdef float l
ode.dGeomRayGet(_shape._geomID, s, d)
Modified: trunk/pysoy/src/meshes/Sun.pxi
===================================================================
--- trunk/pysoy/src/meshes/Sun.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/meshes/Sun.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -47,7 +47,7 @@
self._spike_size = 4
- cdef void _render(self, void* body):
+ cdef void _coreRender(self, void* body):
cdef float mmat[16]
cdef float x_ssize
cdef float y_ssize
Modified: trunk/pysoy/src/meshes/soy.meshes.pxd
===================================================================
--- trunk/pysoy/src/meshes/soy.meshes.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/meshes/soy.meshes.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -31,25 +31,25 @@
cdef soy._datatypes.MaterialList _mates
cdef soy._datatypes.FaceList _faces
cdef soy._datatypes.VertexList _verts
- cdef void _render ( self, void* )
+ cdef void _coreRender ( self, void* )
cdef class Shape (Mesh) :
cdef soy.materials.Material _material
- cdef void _renderSphere ( self, soy.shapes.Shape )
- cdef void _renderCapsule ( self, soy.shapes.Shape )
- cdef void _renderBox ( self, soy.shapes.Shape )
- cdef void _renderRay ( self, soy.shapes.Shape )
+ cdef void _coreRenderSphere ( self, soy.shapes.Shape )
+ cdef void _coreRenderCapsule ( self, soy.shapes.Shape )
+ cdef void _coreRenderBox ( self, soy.shapes.Shape )
+ cdef void _coreRenderRay ( self, soy.shapes.Shape )
cdef class Axis(Mesh) :
- cdef void _render ( self, void* )
+ cdef void _coreRender ( self, void* )
cdef class Camera(Mesh) :
- cdef void _render ( self, void* )
+ cdef void _coreRender ( self, void* )
cdef class Billboard(Mesh):
cdef soy.materials.Material _material
cdef float _size[2]
- cdef void _render (self, void* )
+ cdef void _coreRender (self, void* )
cdef class Sun (Mesh) :
cdef soy.materials.Material _center_mat
@@ -63,14 +63,14 @@
cdef float _aura_size[2]
cdef float _spike_size
- cdef void _render(self, void*)
+ cdef void _coreRender(self, void*)
cdef class Liquid(Mesh):
cdef soy.materials.Material _liquid_mat
cdef float _liquid_size[3]
cdef soy.colors.Color _fog_color
- cdef void _render(self, void*)
- cdef void _render_surf(self)
- cdef void _render_bottom(self)
+ cdef void _coreRender(self, void*)
+ cdef void _coreRender_surf(self)
+ cdef void _coreRender_bottom(self)
Property changes on: trunk/pysoy/src/scenes
___________________________________________________________________
Name: svn:ignore
+ soy.scenes.c
Modified: trunk/pysoy/src/scenes/Scene.pxi
===================================================================
--- trunk/pysoy/src/scenes/Scene.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/scenes/Scene.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -69,7 +69,7 @@
else : return '<Scene with %s>' % ', '.join(report)
- cdef void _render(self) :
+ cdef void _coreRender(self) :
cdef int i
cdef float _ambientLight[4]
@@ -83,7 +83,7 @@
self._lights.unlock()
self._bodies.lock()
for i from 0 <= i < self._bodies.current :
- (<soy.bodies._bodies.Body> self._bodies.list[i])._render()
+ (<soy.bodies._bodies.Body> self._bodies.list[i])._coreRender()
self._bodies.unlock()
self._lights.lock()
for i from 0 <= i < self._lights.current :
Modified: trunk/pysoy/src/scenes/soy.scenes.pxd
===================================================================
--- trunk/pysoy/src/scenes/soy.scenes.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/scenes/soy.scenes.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -38,6 +38,6 @@
cdef double _prevTime
cdef double _time
# _coreloop methods
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef int _steps(self)
cdef void _updateTime(self)
Modified: trunk/pysoy/src/widgets/Canvas.pxi
===================================================================
--- trunk/pysoy/src/widgets/Canvas.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/widgets/Canvas.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -71,7 +71,7 @@
def __del__(self) :
self._texture = None
- cdef void _render(self) :
+ cdef void _coreRender(self) :
if not self._texture :
return
(<soy.textures.Texture> self._texture)._bind()
Modified: trunk/pysoy/src/widgets/Projector.pxi
===================================================================
--- trunk/pysoy/src/widgets/Projector.pxi 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/widgets/Projector.pxi 2008-02-07 09:46:28 UTC (rev
830)
@@ -40,7 +40,7 @@
self._zfar = 100.0
- cdef void _render(self) :
+ cdef void _coreRender(self) :
cdef float _aspect
if not self._connected :
return
Modified: trunk/pysoy/src/widgets/Widget.pxi
===================================================================
--- trunk/pysoy/src/widgets/Widget.pxi 2008-02-07 09:08:51 UTC (rev 829)
+++ trunk/pysoy/src/widgets/Widget.pxi 2008-02-07 09:46:28 UTC (rev 830)
@@ -96,7 +96,7 @@
return 1
- cdef void _render(self) :
+ cdef void _coreRender(self) :
return
Modified: trunk/pysoy/src/widgets/soy.widgets.pxd
===================================================================
--- trunk/pysoy/src/widgets/soy.widgets.pxd 2008-02-07 09:08:51 UTC (rev
829)
+++ trunk/pysoy/src/widgets/soy.widgets.pxd 2008-02-07 09:46:28 UTC (rev
830)
@@ -44,7 +44,7 @@
# Helper Functions
cdef int _setMargin(self, object)
# _coreLoop Functions
- cdef void _render(self)
+ cdef void _coreRender(self)
cdef void _resize(self, int, int, int, int)
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
