Author: ArcRiley Date: 2008-03-08 19:58:21 -0500 (Sat, 08 Mar 2008) New Revision: 1107
Added: trunk/pysoy/src/bodies/soy.bodies.pxd trunk/pysoy/src/bodies/soy.bodies.pyx trunk/pysoy/src/fields/soy.fields.pxd trunk/pysoy/src/fields/soy.fields.pyx Removed: trunk/pysoy/src/bodies/soy.bodies._bodies.pxd trunk/pysoy/src/bodies/soy.bodies._bodies.pyx trunk/pysoy/src/fields/soy.bodies.fields.pxd trunk/pysoy/src/fields/soy.bodies.fields.pyx Modified: trunk/pysoy/src/bodies/ trunk/pysoy/src/fields/ Log: Ticket #943 : * moving .pyx and .pxd files * updated svn:ignore properties Property changes on: trunk/pysoy/src/bodies ___________________________________________________________________ Name: svn:ignore - soy.bodies._bodies.c + soy.bodies.c Deleted: trunk/pysoy/src/bodies/soy.bodies._bodies.pxd =================================================================== --- trunk/pysoy/src/bodies/soy.bodies._bodies.pxd 2008-03-09 00:54:43 UTC (rev 1106) +++ trunk/pysoy/src/bodies/soy.bodies._bodies.pxd 2008-03-09 00:58:21 UTC (rev 1107) @@ -1,64 +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 ode -cimport soy._datatypes - -cdef class Body : - cdef ode.dBodyID _bodyID - cdef void* _scene - cdef void* _model - cdef void* _shape - cdef soy._datatypes.HashTable _tags - # for loading/saving - cdef ode.dMass _mass - cdef ode.dReal* _position - cdef ode.dReal* _rotation - cdef ode.dReal* _quaternion - cdef ode.dReal* _linearVel - cdef ode.dReal* _angularVel - # C functions - cdef void _create ( self ) - cdef void _destroy ( self ) - cdef void _append ( self ) - cdef void _remove ( self ) - cdef void _copyTo ( self, ode.dReal* ) - cdef void _copySet ( self, ode.dReal* ) - cdef void _copyFrom ( self, ode.dReal* ) - cdef void poke ( self, vector ) - cdef void _render ( self ) - cdef void _coreCreateVertFogCoords ( self ) - cdef void _coreGetModelview ( self, float* ) - cdef void _coreGetModelviewInv ( self, float* ) - - -cdef class Camera (Body) : - cdef int _wire - cdef float _fovy - cdef int _rpt - cdef double _rtimes[16] - cdef void _project ( self ) - - -cdef class Light (Body) : - cdef object _ambient - cdef object _diffuse - cdef object _specular - cdef void _on ( self, int ) - cdef void _off ( self, int ) Deleted: trunk/pysoy/src/bodies/soy.bodies._bodies.pyx =================================================================== --- trunk/pysoy/src/bodies/soy.bodies._bodies.pyx 2008-03-09 00:54:43 UTC (rev 1106) +++ trunk/pysoy/src/bodies/soy.bodies._bodies.pyx 2008-03-09 00:58:21 UTC (rev 1107) @@ -1,46 +0,0 @@ -'''Body Classes - -This is a collection of classes that exist in 3d space. Each body exists -within a soy.scenes.Scene. Every body has mass, velocity, and rotational velocity. - -Rendering of a Body is done by setting the .mesh property to a soy.mesh -object. - -Similarly, collision and other contact behaviour is governed by -the .shape property, which can be set to a soy.shape. - -Bodies' motions can be limited and guided by using soy.joints. -''' -__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]+')' - -cimport gl -cimport py -cimport stdio -cimport soy._internals -cimport soy.colors -cimport soy.models -cimport soy.scenes -cimport soy.shapes - -include "Body.pxi" -include "Camera.pxi" -include "Light.pxi" Copied: trunk/pysoy/src/bodies/soy.bodies.pxd (from rev 1106, trunk/pysoy/src/bodies/soy.bodies._bodies.pxd) =================================================================== --- trunk/pysoy/src/bodies/soy.bodies.pxd (rev 0) +++ trunk/pysoy/src/bodies/soy.bodies.pxd 2008-03-09 00:58:21 UTC (rev 1107) @@ -0,0 +1,64 @@ +# 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 ode +cimport soy._datatypes + +cdef class Body : + cdef ode.dBodyID _bodyID + cdef void* _scene + cdef void* _model + cdef void* _shape + cdef soy._datatypes.HashTable _tags + # for loading/saving + cdef ode.dMass _mass + cdef ode.dReal* _position + cdef ode.dReal* _rotation + cdef ode.dReal* _quaternion + cdef ode.dReal* _linearVel + cdef ode.dReal* _angularVel + # C functions + cdef void _create ( self ) + cdef void _destroy ( self ) + cdef void _append ( self ) + cdef void _remove ( self ) + cdef void _copyTo ( self, ode.dReal* ) + cdef void _copySet ( self, ode.dReal* ) + cdef void _copyFrom ( self, ode.dReal* ) + cdef void poke ( self, vector ) + cdef void _render ( self ) + cdef void _coreCreateVertFogCoords ( self ) + cdef void _coreGetModelview ( self, float* ) + cdef void _coreGetModelviewInv ( self, float* ) + + +cdef class Camera (Body) : + cdef int _wire + cdef float _fovy + cdef int _rpt + cdef double _rtimes[16] + cdef void _project ( self ) + + +cdef class Light (Body) : + cdef object _ambient + cdef object _diffuse + cdef object _specular + cdef void _on ( self, int ) + cdef void _off ( self, int ) Copied: trunk/pysoy/src/bodies/soy.bodies.pyx (from rev 1106, trunk/pysoy/src/bodies/soy.bodies._bodies.pyx) =================================================================== --- trunk/pysoy/src/bodies/soy.bodies.pyx (rev 0) +++ trunk/pysoy/src/bodies/soy.bodies.pyx 2008-03-09 00:58:21 UTC (rev 1107) @@ -0,0 +1,46 @@ +'''Body Classes + +This is a collection of classes that exist in 3d space. Each body exists +within a soy.scenes.Scene. Every body has mass, velocity, and rotational velocity. + +Rendering of a Body is done by setting the .mesh property to a soy.mesh +object. + +Similarly, collision and other contact behaviour is governed by +the .shape property, which can be set to a soy.shape. + +Bodies' motions can be limited and guided by using soy.joints. +''' +__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]+')' + +cimport gl +cimport py +cimport stdio +cimport soy._internals +cimport soy.colors +cimport soy.models +cimport soy.scenes +cimport soy.shapes + +include "Body.pxi" +include "Camera.pxi" +include "Light.pxi" Property changes on: trunk/pysoy/src/fields ___________________________________________________________________ Name: svn:ignore - soy.bodies.fields.c + soy.fields.c Deleted: trunk/pysoy/src/fields/soy.bodies.fields.pxd =================================================================== --- trunk/pysoy/src/fields/soy.bodies.fields.pxd 2008-03-09 00:54:43 UTC (rev 1106) +++ trunk/pysoy/src/fields/soy.bodies.fields.pxd 2008-03-09 00:58:21 UTC (rev 1107) @@ -1,58 +0,0 @@ -# PySoy Forces 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 ode -cimport stdio -cimport soy._internals -cimport soy.bodies._bodies - -cdef class Field(soy.bodies._bodies.Body) : - cdef void _give(self, int ccyle) - cdef int _apply(self) - cdef int _exert(self, soy.bodies._bodies.Body other) - cdef void _commit(self) - cdef void _render(self) - -cdef class Monopole(soy.bodies.fields.Field) : - cdef soy._internals.Children _affected - cdef float _multiplier - -cdef class Wind(soy.bodies.fields.Field) : - cdef float _density - cdef float _vx - cdef float _vy - cdef float _vz - -cdef class Shockwave(soy.bodies.fields.Field) : - cdef ode.dSpaceID _space - cdef float _radius - cdef double _t0 - cdef double _inner - cdef double _outer - cdef float _velocity - cdef float _length - cdef float _energy - -cdef class Buoyancy(soy.bodies.fields.Field) : - cdef soy._internals.Children _affected - cdef float _density - -cdef extern from "math.h" : - float powf (float x, float y) Deleted: trunk/pysoy/src/fields/soy.bodies.fields.pyx =================================================================== --- trunk/pysoy/src/fields/soy.bodies.fields.pyx 2008-03-09 00:54:43 UTC (rev 1106) +++ trunk/pysoy/src/fields/soy.bodies.fields.pyx 2008-03-09 00:58:21 UTC (rev 1107) @@ -1,35 +0,0 @@ -'''Field Classes - -This is a collection of classes that apply forces to other bodies. - -''' -__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]+')' - -cimport soy.scenes -cimport soy.shapes -import soy.shapes - -include "Field.pxi" -include "Monopole.pxi" -include "Wind.pxi" -include "Shockwave.pxi" -include "Buoyancy.pxi" Copied: trunk/pysoy/src/fields/soy.fields.pxd (from rev 1106, trunk/pysoy/src/fields/soy.bodies.fields.pxd) =================================================================== --- trunk/pysoy/src/fields/soy.fields.pxd (rev 0) +++ trunk/pysoy/src/fields/soy.fields.pxd 2008-03-09 00:58:21 UTC (rev 1107) @@ -0,0 +1,58 @@ +# PySoy Forces 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 ode +cimport stdio +cimport soy._internals +cimport soy.bodies._bodies + +cdef class Field(soy.bodies._bodies.Body) : + cdef void _give(self, int ccyle) + cdef int _apply(self) + cdef int _exert(self, soy.bodies._bodies.Body other) + cdef void _commit(self) + cdef void _render(self) + +cdef class Monopole(soy.bodies.fields.Field) : + cdef soy._internals.Children _affected + cdef float _multiplier + +cdef class Wind(soy.bodies.fields.Field) : + cdef float _density + cdef float _vx + cdef float _vy + cdef float _vz + +cdef class Shockwave(soy.bodies.fields.Field) : + cdef ode.dSpaceID _space + cdef float _radius + cdef double _t0 + cdef double _inner + cdef double _outer + cdef float _velocity + cdef float _length + cdef float _energy + +cdef class Buoyancy(soy.bodies.fields.Field) : + cdef soy._internals.Children _affected + cdef float _density + +cdef extern from "math.h" : + float powf (float x, float y) Copied: trunk/pysoy/src/fields/soy.fields.pyx (from rev 1106, trunk/pysoy/src/fields/soy.bodies.fields.pyx) =================================================================== --- trunk/pysoy/src/fields/soy.fields.pyx (rev 0) +++ trunk/pysoy/src/fields/soy.fields.pyx 2008-03-09 00:58:21 UTC (rev 1107) @@ -0,0 +1,35 @@ +'''Field Classes + +This is a collection of classes that apply forces to other bodies. + +''' +__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]+')' + +cimport soy.scenes +cimport soy.shapes +import soy.shapes + +include "Field.pxi" +include "Monopole.pxi" +include "Wind.pxi" +include "Shockwave.pxi" +include "Buoyancy.pxi" _______________________________________________ PySoy-SVN mailing list PySoy-SVN@pysoy.org http://www.pysoy.org/mailman/listinfo/pysoy-svn
