Author: ArcRiley
Date: 2008-03-07 16:11:34 -0500 (Fri, 07 Mar 2008)
New Revision: 1092
Removed:
trunk/pysoy/src/models/soy.meshes.pxd
trunk/pysoy/src/models/soy.meshes.pyx
Modified:
trunk/pysoy/src/_core/Window-w32.pxi
trunk/pysoy/src/_core/Window-x11.pxi
trunk/pysoy/src/_core/_coreLoop.pxi
trunk/pysoy/src/_core/soy._core.pxd
trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd
trunk/pysoy/src/models/
trunk/pysoy/src/models/soy.models.pxd
trunk/pysoy/src/models/soy.models.pyx
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
trunk/pysoy/src/windows/Window-x11.pxi
Log:
Ticket #941 :
* fixing last commit, which had a bizarre hiccup
Modified: trunk/pysoy/src/_core/Window-w32.pxi
===================================================================
--- trunk/pysoy/src/_core/Window-w32.pxi 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/_core/Window-w32.pxi 2008-03-07 21:11:34 UTC (rev
1092)
@@ -175,7 +175,7 @@
_classRegistered = 0
- cdef void _coreRender(self) :
+ cdef void _render(self) :
cdef int _i
#
if self._opened == -1 :
@@ -224,7 +224,7 @@
# Render each widget in order
self._widgets._iterStart()
for _i from 0 <= _i < self._widgets._current :
- (<soy.widgets.Widget> self._widgets._list[_i])._coreRender()
+ (<soy.widgets.Widget> self._widgets._list[_i])._render()
self._widgets._iterDone()
#
# Reset states
Modified: trunk/pysoy/src/_core/Window-x11.pxi
===================================================================
--- trunk/pysoy/src/_core/Window-x11.pxi 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/_core/Window-x11.pxi 2008-03-07 21:11:34 UTC (rev
1092)
@@ -72,7 +72,7 @@
cdef void _create(self, int _x, int _y, int _width, int _height) :
#
# Since the CoreLoop thread must handle X traffic, we set self._opened
- # flag to OpReadyCreate which instructs _coreRender to _coreCreate.
+ # flag to OpReadyCreate which instructs _render to _coreCreate.
#
# This command will wait patiently for the CoreLoop thread to set the
# self._opened parameter to OpReadyRender
@@ -88,7 +88,7 @@
cdef void _destroy(self) :
#
# Since the CoreLoop thread must handle X traffic, we set self._opened
- # flag to OpReadyUnmap which instructs _coreRender to XUnmapWindow.
+ # flag to OpReadyUnmap which instructs _render to XUnmapWindow.
# That should, in turn, generate an UnmapNotify event upon success which
# then issues the XDestroyWindow command and deletes the window.
#
@@ -153,7 +153,7 @@
glx.XFlush(_display)
- cdef void _coreRender(self) :
+ cdef void _render(self) :
cdef int _i
cdef glx.Display *_display
_display = glx.DisplayOfScreen(self._screen._screen)
@@ -179,7 +179,7 @@
gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
gl.glEnableClientState(gl.GL_NORMAL_ARRAY)
gl.glEnableClientState(gl.GL_TEXTURE_COORD_ARRAY)
- (<soy.widgets.Canvas> self._iconCanvas)._coreRender()
+ (<soy.widgets.Canvas> self._iconCanvas)._render()
gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
gl.glDisableClientState(gl.GL_NORMAL_ARRAY)
gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY)
@@ -204,7 +204,7 @@
# Render each widget in order
self._widgets._iterStart()
for _i from 0 <= _i < self._widgets._current :
- (<soy.widgets.Widget> self._widgets._list[_i])._coreRender()
+ (<soy.widgets.Widget> self._widgets._list[_i])._render()
self._widgets._iterDone()
#
# Disable states and swap :
Modified: trunk/pysoy/src/_core/_coreLoop.pxi
===================================================================
--- trunk/pysoy/src/_core/_coreLoop.pxi 2008-03-07 21:02:29 UTC (rev 1091)
+++ trunk/pysoy/src/_core/_coreLoop.pxi 2008-03-07 21:11:34 UTC (rev 1092)
@@ -27,6 +27,6 @@
#
_windows._iterStart()
for _i from 0 <= _i < _windows._current :
- (<Window> _windows._list[_i])._coreRender()
+ (<Window> _windows._list[_i])._render()
_windows._iterDone()
soy._internals._sleep(1)
Modified: trunk/pysoy/src/_core/soy._core.pxd
===================================================================
--- trunk/pysoy/src/_core/soy._core.pxd 2008-03-07 21:02:29 UTC (rev 1091)
+++ trunk/pysoy/src/_core/soy._core.pxd 2008-03-07 21:11:34 UTC (rev 1092)
@@ -108,4 +108,4 @@
cdef void _create(self, int, int, int, int)
cdef void _destroy(self)
cdef void _resize(self, int _width, int _height)
- cdef void _coreRender(self)
+ cdef void _render(self)
Modified: trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd
===================================================================
--- trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd 2008-03-07 21:02:29 UTC
(rev 1091)
+++ trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd 2008-03-07 21:11:34 UTC
(rev 1092)
@@ -28,7 +28,7 @@
cdef int _apply(self)
cdef int _exert(self, soy.bodies._bodies.Body other)
cdef void _commit(self)
- cdef void _coreRender(self)
+ cdef void _render(self)
cdef class Monopole(soy.bodies.fields.Field) :
cdef soy._internals.Children _affected
Property changes on: trunk/pysoy/src/models
___________________________________________________________________
Name: svn:ignore
- soy.meshes.c
+ soy.models.c
Deleted: trunk/pysoy/src/models/soy.meshes.pxd
===================================================================
--- trunk/pysoy/src/models/soy.meshes.pxd 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/models/soy.meshes.pxd 2008-03-07 21:11:34 UTC (rev
1092)
@@ -1,77 +0,0 @@
-# PySoy bodies declarations
-#
-# Copyright (C) 2006,2007,2008 PySoy Group
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see http://www.gnu.org/licenses
-#
-# $Id$
-
-cimport gl
-cimport py
-cimport stdio
-cimport stdlib
-cimport soy._datatypes
-cimport soy._internals
-cimport soy.materials
-cimport soy.textures
-cimport soy.shapes
-
-cdef class Mesh :
- cdef void* _mutex
- cdef soy._datatypes.MaterialList _mates
- cdef soy._datatypes.FaceList _faces
- cdef soy._datatypes.VertexList _verts
- cdef void _coreRender ( self, void* )
-
-cdef class Shape (Mesh) :
- cdef soy.materials.Material _material
- 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 _coreRender ( self, void* )
-
-cdef class Camera(Mesh) :
- cdef void _coreRender ( self, void* )
-
-cdef class Billboard(Mesh):
- cdef soy.materials.Material _material
- cdef float _size[2]
- cdef void _coreRender (self, void* )
-
-cdef class Sun (Mesh) :
- cdef soy.materials.Material _center_mat
- cdef soy.materials.Material _aura_mat
- cdef soy.materials.Material _spike_mat
-
- cdef int _num_spikes
- cdef int _circle_verts
-
- cdef float _center_size[2]
- cdef float _aura_size[2]
- cdef float _spike_size
-
- 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 _coreRender(self, void*)
- cdef void _coreRender_surf(self)
- cdef void _coreRender_bottom(self)
-
Deleted: trunk/pysoy/src/models/soy.meshes.pyx
===================================================================
--- trunk/pysoy/src/models/soy.meshes.pyx 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/models/soy.meshes.pyx 2008-03-07 21:11:34 UTC (rev
1092)
@@ -1,33 +0,0 @@
-'''PySoy's meshes
-
- These are our "renderable" classes
-'''
-__credits__ = '''Copyright (C) 2006,2007,2008 PySoy Group
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see http://www.gnu.org/licenses
-'''
-__author__ = 'PySoy Group'
-__date__ = 'Last change on '+ \
- '$Date$'[7:-20]+ \
- 'by '+'$Author$'[9:-2]
-__version__ = 'Trunk (r'+'$Rev$'[6:-2]+')'
-
-include "Mesh.pxi"
-include "Shape.pxi"
-include "Axis.pxi"
-include "Camera.pxi"
-include "Billboard.pxi"
-include "Sun.pxi"
-include "Liquid.pxi"
-
Modified: trunk/pysoy/src/models/soy.models.pxd
===================================================================
--- trunk/pysoy/src/models/soy.models.pxd 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/models/soy.models.pxd 2008-03-07 21:11:34 UTC (rev
1092)
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see http://www.gnu.org/licenses
#
-# $Id$
+# $Id: soy.models.pxd 1090 2008-03-07 17:07:46Z ArcRiley $
cimport gl
cimport py
Modified: trunk/pysoy/src/models/soy.models.pyx
===================================================================
--- trunk/pysoy/src/models/soy.models.pyx 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/models/soy.models.pyx 2008-03-07 21:11:34 UTC (rev
1092)
@@ -19,9 +19,9 @@
'''
__author__ = 'PySoy Group'
__date__ = 'Last change on '+ \
- '$Date$'[7:-20]+ \
- 'by '+'$Author$'[9:-2]
-__version__ = 'Trunk (r'+'$Rev$'[6:-2]+')'
+ '$Date: 2008-03-07 12:07:46 -0500 (Fri, 07 Mar 2008) $'[7:-20]+ \
+ 'by '+'$Author: ArcRiley $'[9:-2]
+__version__ = 'Trunk (r'+'$Rev: 1090 $'[6:-2]+')'
cimport ode
cimport soy.bodies._bodies
Modified: trunk/pysoy/src/widgets/Canvas.pxi
===================================================================
--- trunk/pysoy/src/widgets/Canvas.pxi 2008-03-07 21:02:29 UTC (rev 1091)
+++ trunk/pysoy/src/widgets/Canvas.pxi 2008-03-07 21:11:34 UTC (rev 1092)
@@ -71,7 +71,7 @@
def __del__(self) :
self._texture = None
- cdef void _coreRender(self) :
+ cdef void _render(self) :
if not self._texture :
return
(<soy.textures.Texture> self._texture)._coreBind()
Modified: trunk/pysoy/src/widgets/Projector.pxi
===================================================================
--- trunk/pysoy/src/widgets/Projector.pxi 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/widgets/Projector.pxi 2008-03-07 21:11:34 UTC (rev
1092)
@@ -40,7 +40,7 @@
self._zfar = 100.0
- cdef void _coreRender(self) :
+ cdef void _render(self) :
cdef float _aspect
if not self._connected :
return
Modified: trunk/pysoy/src/widgets/Widget.pxi
===================================================================
--- trunk/pysoy/src/widgets/Widget.pxi 2008-03-07 21:02:29 UTC (rev 1091)
+++ trunk/pysoy/src/widgets/Widget.pxi 2008-03-07 21:11:34 UTC (rev 1092)
@@ -99,7 +99,7 @@
return 1
- cdef void _coreRender(self) :
+ cdef void _render(self) :
return
Modified: trunk/pysoy/src/widgets/soy.widgets.pxd
===================================================================
--- trunk/pysoy/src/widgets/soy.widgets.pxd 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/widgets/soy.widgets.pxd 2008-03-07 21:11:34 UTC (rev
1092)
@@ -44,7 +44,7 @@
# Helper Functions
cdef int _setMargin(self, object)
# _coreLoop Functions
- cdef void _coreRender(self)
+ cdef void _render(self)
cdef void _resize(self, int, int, int, int)
Modified: trunk/pysoy/src/windows/Window-x11.pxi
===================================================================
--- trunk/pysoy/src/windows/Window-x11.pxi 2008-03-07 21:02:29 UTC (rev
1091)
+++ trunk/pysoy/src/windows/Window-x11.pxi 2008-03-07 21:11:34 UTC (rev
1092)
@@ -78,7 +78,7 @@
cdef void _create(self, int _x, int _y, int _width, int _height) :
#
# Since the CoreLoop thread must handle X traffic, we set self._opened
- # flag to OpReadyCreate which instructs _coreRender to _coreCreate.
+ # flag to OpReadyCreate which instructs _render to _coreCreate.
#
# This command will wait patiently for the CoreLoop thread to set the
# self._opened parameter to OpReadyRender
@@ -94,7 +94,7 @@
cdef void _destroy(self) :
#
# Since the CoreLoop thread must handle X traffic, we set self._opened
- # flag to OpReadyUnmap which instructs _coreRender to XUnmapWindow.
+ # flag to OpReadyUnmap which instructs _render to XUnmapWindow.
# That should, in turn, generate an UnmapNotify event upon success which
# then issues the XDestroyWindow command and deletes the window.
#
@@ -159,7 +159,7 @@
glx.XFlush(_display)
- cdef void _coreRender(self) :
+ cdef void _render(self) :
cdef int i
cdef glx.Display *_display
_display = glx.DisplayOfScreen(self._screen._screen)
@@ -185,7 +185,7 @@
gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
gl.glEnableClientState(gl.GL_NORMAL_ARRAY)
gl.glEnableClientState(gl.GL_TEXTURE_COORD_ARRAY)
- (<soy.widgets.Canvas> self._iconCanvas)._coreRender()
+ (<soy.widgets.Canvas> self._iconCanvas)._render()
gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
gl.glDisableClientState(gl.GL_NORMAL_ARRAY)
gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY)
@@ -210,7 +210,7 @@
# Render each widget in order
self._widgets.lock()
for i from 0 <= i < self._widgets.current :
- (<soy.widgets.Widget> self._widgets.list[i])._coreRender()
+ (<soy.widgets.Widget> self._widgets.list[i])._render()
self._widgets.unlock()
gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
