Author: ArcRiley
Date: 2007-07-08 23:35:33 -0400 (Sun, 08 Jul 2007)
New Revision: 441
Added:
trunk/pysoy/tests/pyramid.py
Modified:
trunk/pysoy/src/meshes/Mesh.pxi
trunk/pysoy/tests/tex_pyramid.py
trunk/pysoy/tests/vid_pyramid.py
Log:
[440] made soy.meshes.Pyramid obsolete
Modified: trunk/pysoy/src/meshes/Mesh.pxi
===================================================================
--- trunk/pysoy/src/meshes/Mesh.pxi 2007-07-09 03:26:10 UTC (rev 440)
+++ trunk/pysoy/src/meshes/Mesh.pxi 2007-07-09 03:35:33 UTC (rev 441)
@@ -90,35 +90,3 @@
self._mates._renderBuffer()
else :
self._mates._renderArray()
-
-
-cdef class Pyramid(Mesh) :
- '''This is for testing only'''
- def __new__(self, tex=None, *args, **keywords) :
- cdef object a, b, c, d, e
- import soy.colors
- self.mat0 = soy.materials.Material(ambient=soy.colors.BlueViolet(),
- diffuse=soy.colors.Cyan())
- self.mat1 = soy.materials.Material(ambient=soy.colors.YellowGreen(),
- diffuse=soy.colors.GoldenRod())
- self.mat2 = soy.materials.Material(color=tex)
-
- #self._mates[0].offset = 0
- #self._mates[0].length = 2
- #self._mates[1].offset = 2
- #self._mates[1].length = 2
- #self._mates[2].offset = 4
- #self._mates[2].length = 2
-
- a = soy.atoms.Vertex(self,position=( 0, 1, 0), texcoord=(0,0,0))
- b = soy.atoms.Vertex(self,position=(-1,-1, 1), texcoord=(0,0,0))
- c = soy.atoms.Vertex(self,position=( 1,-1, 1), texcoord=(0,1,0))
- d = soy.atoms.Vertex(self,position=( 1,-1,-1), texcoord=(1,1,0))
- e = soy.atoms.Vertex(self,position=(-1,-1,-1), texcoord=(1,0,0))
-
- soy.atoms.Face(self, verts=(a,b,c), material=self.mat0)
- soy.atoms.Face(self, verts=(a,d,e), material=self.mat0)
- soy.atoms.Face(self, verts=(a,c,d), material=self.mat1)
- soy.atoms.Face(self, verts=(a,e,b), material=self.mat1)
- soy.atoms.Face(self, verts=(d,c,b), material=self.mat2)
- soy.atoms.Face(self, verts=(e,d,b), material=self.mat2)
Added: trunk/pysoy/tests/pyramid.py
===================================================================
--- trunk/pysoy/tests/pyramid.py (rev 0)
+++ trunk/pysoy/tests/pyramid.py 2007-07-09 03:35:33 UTC (rev 441)
@@ -0,0 +1,23 @@
+import soy
+
+class Pyramid (soy.meshes.Mesh) :
+ def __init__(self, tex=None) :
+ self.mat0 = soy.materials.Material(ambient=soy.colors.BlueViolet(),
+ diffuse=soy.colors.Cyan())
+ self.mat1 = soy.materials.Material(ambient=soy.colors.YellowGreen(),
+ diffuse=soy.colors.GoldenRod())
+ self.mat2 = soy.materials.Material(color=tex)
+
+ a = soy.atoms.Vertex(self,position=( 0, 1, 0), texcoord=(0,0,0))
+ b = soy.atoms.Vertex(self,position=(-1,-1, 1), texcoord=(0,0,0))
+ c = soy.atoms.Vertex(self,position=( 1,-1, 1), texcoord=(0,1,0))
+ d = soy.atoms.Vertex(self,position=( 1,-1,-1), texcoord=(1,1,0))
+ e = soy.atoms.Vertex(self,position=(-1,-1,-1), texcoord=(1,0,0))
+
+ soy.atoms.Face(self, verts=(a,b,c), material=self.mat0)
+ soy.atoms.Face(self, verts=(a,d,e), material=self.mat0)
+ soy.atoms.Face(self, verts=(a,c,d), material=self.mat1)
+ soy.atoms.Face(self, verts=(a,e,b), material=self.mat1)
+ soy.atoms.Face(self, verts=(d,c,b), material=self.mat2)
+ soy.atoms.Face(self, verts=(e,d,b), material=self.mat2)
+
Modified: trunk/pysoy/tests/tex_pyramid.py
===================================================================
--- trunk/pysoy/tests/tex_pyramid.py 2007-07-09 03:26:10 UTC (rev 440)
+++ trunk/pysoy/tests/tex_pyramid.py 2007-07-09 03:35:33 UTC (rev 441)
@@ -2,6 +2,7 @@
import Image
import soy
+import pyramid
from time import sleep
img = Image.open('lava.png')
@@ -9,7 +10,7 @@
img = Image.open('la.png')
luma = soy.textures.Image(img)
-pym = soy.meshes.Pyramid(luma)
+pym = pyramid.Pyramid(luma)
scr = soy.Screen()
win = soy.Window(scr, 'Textured Pyramid')
Modified: trunk/pysoy/tests/vid_pyramid.py
===================================================================
--- trunk/pysoy/tests/vid_pyramid.py 2007-07-09 03:26:10 UTC (rev 440)
+++ trunk/pysoy/tests/vid_pyramid.py 2007-07-09 03:35:33 UTC (rev 441)
@@ -2,6 +2,7 @@
import Image
import soy
+import pyramid
from time import sleep
img = Image.open('lava.png')
@@ -9,7 +10,7 @@
ogg = soy.transports.File('changeworld.ogg')
vido = ogg['video']
-pym = soy.meshes.Pyramid(vido)
+pym = pyramid.Pyramid(vido)
scr = soy.Screen()
win = soy.Window(scr, 'Textured Pyramid')
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
