Author: ArcRiley Date: 2007-06-05 13:06:44 -0400 (Tue, 05 Jun 2007) New Revision: 137
Modified: trunk/pysoy/src/_core-all/Scene.pxi trunk/pysoy/src/_core-x11/soy._core.pyx trunk/pysoy/src/bodies.forces/Force.pxi trunk/pysoy/src/bodies.forces/soy.bodies.forces.pxd trunk/pysoy/src/joints/Joint.pxi trunk/pysoy/src/joints/soy.joints.pxd trunk/pysoy/src/widgets/soy.widgets.pxd Log: Finished moving (I hope) Modified: trunk/pysoy/src/_core-all/Scene.pxi =================================================================== --- trunk/pysoy/src/_core-all/Scene.pxi 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/_core-all/Scene.pxi 2007-06-05 17:06:44 UTC (rev 137) @@ -1,3 +1,24 @@ +# PySoy Scene Class +# +# Copyright (C) 2006,2007 Team PySoy +# +# 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 +# or write to the Free Software Foundation,Inc., 51 Franklin Street, +# Fifth Floor, Boston, MA 02110-1301 USA +# +# $Id$ + cdef class Scene : '''PySoy Scene @@ -39,7 +60,7 @@ cdef int i self._bodies.lock() for i from 0 <= i < self._bodies.current : - (<soy.bodies.Body> self._bodies.list[i])._render() + (<soy.bodies._bodies.Body> self._bodies.list[i])._render() self._bodies.unlock() property gravity : Modified: trunk/pysoy/src/_core-x11/soy._core.pyx =================================================================== --- trunk/pysoy/src/_core-x11/soy._core.pyx 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/_core-x11/soy._core.pyx 2007-06-05 17:06:44 UTC (rev 137) @@ -27,7 +27,7 @@ 'by '+'$Author$'[9:-2] __version__ = 'Trunk (r'+'$Rev$'[6:-2]+')' -cimport soy.bodies +cimport soy.bodies._bodies cimport soy.widgets import soy.colors Modified: trunk/pysoy/src/bodies.forces/Force.pxi =================================================================== --- trunk/pysoy/src/bodies.forces/Force.pxi 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/bodies.forces/Force.pxi 2007-06-05 17:06:44 UTC (rev 137) @@ -19,7 +19,7 @@ # # $Id$ -cdef class Force(soy.bodies.Body) : +cdef class Force(soy.bodies._bodies.Body) : '''PySoy Force Forces are optionally visible generic objects in 3d space that apply Modified: trunk/pysoy/src/bodies.forces/soy.bodies.forces.pxd =================================================================== --- trunk/pysoy/src/bodies.forces/soy.bodies.forces.pxd 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/bodies.forces/soy.bodies.forces.pxd 2007-06-05 17:06:44 UTC (rev 137) @@ -23,9 +23,9 @@ cimport ode cimport soy._core cimport soy._imports -cimport soy.bodies +cimport soy.bodies._bodies -cdef class Force(soy.bodies.Body) : +cdef class Force(soy.bodies._bodies.Body) : cdef void _render(self) cdef extern from "stdio.h" : Modified: trunk/pysoy/src/joints/Joint.pxi =================================================================== --- trunk/pysoy/src/joints/Joint.pxi 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/joints/Joint.pxi 2007-06-05 17:06:44 UTC (rev 137) @@ -25,8 +25,9 @@ This is the "Null" joint which all other joints inherit from ''' - def __new__(self, soy._core.Scene parent, soy.bodies.Body body1, - soy.bodies.Body body2, *args, **keywords) : + def __new__(self, soy._core.Scene parent, + soy.bodies._bodies.Body body1, soy.bodies._bodies.Body body2, + *args, **keywords) : self._scene = parent self._body1 = body1 self._body2 = body2 Modified: trunk/pysoy/src/joints/soy.joints.pxd =================================================================== --- trunk/pysoy/src/joints/soy.joints.pxd 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/joints/soy.joints.pxd 2007-06-05 17:06:44 UTC (rev 137) @@ -22,10 +22,10 @@ cimport ode cimport soy._core cimport soy._imports -cimport soy.bodies +cimport soy.bodies._bodies cdef class Joint : cdef soy._core.Scene _scene cdef ode.dJointID _jointID - cdef soy.bodies.Body _body1 - cdef soy.bodies.Body _body2 + cdef soy.bodies._bodies.Body _body1 + cdef soy.bodies._bodies.Body _body2 Modified: trunk/pysoy/src/widgets/soy.widgets.pxd =================================================================== --- trunk/pysoy/src/widgets/soy.widgets.pxd 2007-06-05 16:56:21 UTC (rev 136) +++ trunk/pysoy/src/widgets/soy.widgets.pxd 2007-06-05 17:06:44 UTC (rev 137) @@ -21,7 +21,7 @@ cimport gl cimport soy._core -cimport soy.bodies +cimport soy.bodies._bodies cimport soy.colors cimport soy._imports @@ -35,7 +35,7 @@ cdef void _resize(self) cdef class Projector(Widget) : - cdef soy.bodies.Camera _camera + cdef soy.bodies._bodies.Camera _camera cdef int _connected cdef float _znear cdef float _zfar _______________________________________________ PySoy-SVN mailing list PySoy-SVN@pysoy.org http://www.pysoy.org/mailman/listinfo/pysoy-svn
