Author: ArcRiley
Date: 2008-02-07 04:08:51 -0500 (Thu, 07 Feb 2008)
New Revision: 829
Modified:
trunk/pysoy/examples/broken/buoyant.py
trunk/pysoy/examples/broken/tex_cairo.py
trunk/pysoy/src/bodies._bodies/Body.pxi
trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pyx
trunk/pysoy/src/bodies.lights/Light.pxi
trunk/pysoy/tests/blocks.py
trunk/pysoy/tests/buoyant.py
trunk/pysoy/tests/collide_blocks.py
trunk/pysoy/tests/collide_field.py
trunk/pysoy/tests/crash.py
trunk/pysoy/tests/double.py
trunk/pysoy/tests/explode.py
trunk/pysoy/tests/gravity_pyramids.py
trunk/pysoy/tests/pyramid.py
trunk/pysoy/tests/shapes.py
trunk/pysoy/tests/wind.py
Log:
This should finish #903
Modified: trunk/pysoy/examples/broken/buoyant.py
===================================================================
--- trunk/pysoy/examples/broken/buoyant.py 2008-02-07 08:57:44 UTC (rev
828)
+++ trunk/pysoy/examples/broken/buoyant.py 2008-02-07 09:08:51 UTC (rev
829)
@@ -4,7 +4,7 @@
from time import sleep
from random import random
-sce = soy.Scene()
+sce = soy.scenes.Scene()
cam = soy.bodies.Camera(sce)
cam.position = (0.0, 0.0, 15.0)
Modified: trunk/pysoy/examples/broken/tex_cairo.py
===================================================================
--- trunk/pysoy/examples/broken/tex_cairo.py 2008-02-07 08:57:44 UTC (rev
828)
+++ trunk/pysoy/examples/broken/tex_cairo.py 2008-02-07 09:08:51 UTC (rev
829)
@@ -62,7 +62,7 @@
scr = soy.Screen()
win = soy.Window(scr, 'Textured Pyramid')
-sce = soy.Scene()
+sce = soy.scenes.Scene()
cam = soy.bodies.Camera(sce)
cam.position = (0.0, 0.0, 5.0)
Modified: trunk/pysoy/src/bodies._bodies/Body.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-07 08:57:44 UTC (rev
828)
+++ trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-07 09:08:51 UTC (rev
829)
@@ -103,7 +103,7 @@
return None
def __set__(self, newscene) :
if not (isinstance(newscene, soy.scenes.Scene) or newscene==None) :
- raise TypeError('not an instance of soy.Scene')
+ raise TypeError('not an instance of soy.scenes.Scene')
if self._isActive() :
self._scene._bodies.lock()
self._scene._bodies.remove(<void *>self)
Modified: trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pyx
===================================================================
--- trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pyx 2008-02-07
08:57:44 UTC (rev 828)
+++ trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pyx 2008-02-07
09:08:51 UTC (rev 829)
@@ -1,7 +1,7 @@
'''Body Classes
This is a collection of classes that exist in 3d space. Each body exists
-within a soy.Scene. Every body has mass, velocity, and rotational velocity.
+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.
Modified: trunk/pysoy/src/bodies.lights/Light.pxi
===================================================================
--- trunk/pysoy/src/bodies.lights/Light.pxi 2008-02-07 08:57:44 UTC (rev
828)
+++ trunk/pysoy/src/bodies.lights/Light.pxi 2008-02-07 09:08:51 UTC (rev
829)
@@ -75,7 +75,7 @@
return None
def __set__(self, newscene) :
if not (isinstance(newscene, soy.scenes.Scene) or newscene==None) :
- raise TypeError('not an instance of soy.Scene')
+ raise TypeError('not an instance of soy.scenes.Scene')
if self._isActive() :
self._scene._bodies.lock()
self._scene._lights.lock()
Modified: trunk/pysoy/tests/blocks.py
===================================================================
--- trunk/pysoy/tests/blocks.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/blocks.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -82,7 +82,7 @@
cname = ('aqua','teal','rose','jade','gold','grey','plum','pink')
bmesh = {}
blocks = {}
-sce = soy.Scene()
+sce = soy.scenes.Scene()
for color in colors :
diffuse = soy.colors.Color(floats=colors[color][0])
Modified: trunk/pysoy/tests/buoyant.py
===================================================================
--- trunk/pysoy/tests/buoyant.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/buoyant.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -82,7 +82,7 @@
cname = ('aqua','teal','rose','jade','gold','grey','plum','pink')
bmesh = {}
blocks = {}
-sce = soy.Scene()
+sce = soy.scenes.Scene()
for color in colors :
diffuse = soy.colors.Color(floats=colors[color][0])
Modified: trunk/pysoy/tests/collide_blocks.py
===================================================================
--- trunk/pysoy/tests/collide_blocks.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/collide_blocks.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -91,7 +91,7 @@
cname = ('aqua','teal','rose','jade','gold','grey','plum','pink')
bmesh = {}
blocks = {}
-sce = soy.Scene()
+sce = soy.scenes.Scene()
for color in colors :
diffuse = soy.colors.Color(floats=colors[color][0])
Modified: trunk/pysoy/tests/collide_field.py
===================================================================
--- trunk/pysoy/tests/collide_field.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/collide_field.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from time import sleep
import soy
-sce = soy.Scene()
+sce = soy.scenes.Scene()
cam = soy.bodies.Camera(sce)
cam.position = (0,0,13)
py1 = soy.bodies.Pyramid(sce)
Modified: trunk/pysoy/tests/crash.py
===================================================================
--- trunk/pysoy/tests/crash.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/crash.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -70,7 +70,7 @@
return random()-.5
blocks = []
-sce = soy.Scene()
+sce = soy.scenes.Scene()
scr = soy.Screen()
win = soy.Window(scr, 'Colored Blocks')
Modified: trunk/pysoy/tests/double.py
===================================================================
--- trunk/pysoy/tests/double.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/double.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -83,8 +83,8 @@
cname = ('aqua','teal','rose','jade','gold','grey','plum','pink')
bmesh = {}
blocks = {}
-sce = soy.Scene()
-sce2 =soy.Scene()
+sce = soy.scenes.Scene()
+sce2 =soy.scenes.Scene()
for color in colors :
diffuse = soy.colors.Color(floats=colors[color][0])
Modified: trunk/pysoy/tests/explode.py
===================================================================
--- trunk/pysoy/tests/explode.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/explode.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -71,7 +71,7 @@
bmesh = {}
blocks = {}
-sce = soy.Scene()
+sce = soy.scenes.Scene()
i = 0
for x in (-1,0,1) :
Modified: trunk/pysoy/tests/gravity_pyramids.py
===================================================================
--- trunk/pysoy/tests/gravity_pyramids.py 2008-02-07 08:57:44 UTC (rev
828)
+++ trunk/pysoy/tests/gravity_pyramids.py 2008-02-07 09:08:51 UTC (rev
829)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import time
import soy
-sce = soy.Scene()
+sce = soy.scenes.Scene()
cam = soy.bodies.Camera(sce)
cam.position = (0,0,10)
py1 = soy.bodies.Pyramid(sce)
Modified: trunk/pysoy/tests/pyramid.py
===================================================================
--- trunk/pysoy/tests/pyramid.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/pyramid.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -21,7 +21,7 @@
soy.atoms.Face(self, verts=(d,c,b), material=mat2)
soy.atoms.Face(self, verts=(e,d,b), material=mat2)
if __name__ == "__main__":
- sce = soy.Scene()
+ sce = soy.scenes.Scene()
lava = soy.transports.File('media/lava.soy')['gimp']
a = Pyramid(lava)
scr = soy.Screen()
Modified: trunk/pysoy/tests/shapes.py
===================================================================
--- trunk/pysoy/tests/shapes.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/shapes.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -3,7 +3,7 @@
from time import sleep
from random import random
-sce = soy.Scene()
+sce = soy.scenes.Scene()
scr = soy.Screen()
win = soy.Window(scr, 'Mesh shape test')
cam = soy.bodies.Camera(sce)
Modified: trunk/pysoy/tests/wind.py
===================================================================
--- trunk/pysoy/tests/wind.py 2008-02-07 08:57:44 UTC (rev 828)
+++ trunk/pysoy/tests/wind.py 2008-02-07 09:08:51 UTC (rev 829)
@@ -82,7 +82,7 @@
cname = ('aqua','teal','rose','jade','gold','grey','plum','pink')
bmesh = {}
blocks = {}
-sce = soy.Scene()
+sce = soy.scenes.Scene()
for color in colors :
diffuse = soy.colors.Color(floats=colors[color][0])
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
