Changeset 87

Timestamp:

03/01/08 19:48:24 (10 months ago)

Author:

jkyllo

Message:

scenegraph.py:

• Added Orthographic and Perspective GLTransforms for splitting up a UI.
  
• Added Line, GLUTSolidCube, and GLUTWireCube.
  

controllers.py:

• Added some pieces for looking at 2D UI drawing.
  

Files:

• trunk/cube/controllers.py (modified) (1 diff)
• trunk/cube/scenegraph.py (modified) (4 diffs)

trunk/cube/controllers.py

@@ -298 +298 @@
-
-        # Add the grapher to the context
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def spin_cb(self, section, option, value):

trunk/cube/scenegraph.py

@@ -129 +129 @@
-        glLoadIdentity()
-
+class Orthographic(GLTransform):
+    """A GLTransform that sets the projection matrix to Orthographic."""
+    def __init__(self, left=-1, right=1, bottom=-1, top=1, near=-1, far=1):
+        self.left = left
+        self.right = right
+        self.bottom = bottom
+        self.top = top
+        self.near = near
+        self.far = far
+
+    def apply(self):
+        glMatrixMode(GL_PROJECTION)
+        glLoadIdentity()
+        glOrtho(self.left, self.right, self.bottom, self.top, self.near, self.far)
+        glMatrixMode(GL_MODELVIEW)
+
+class Perspective(GLTransform):
+    def __init__(self, fov=45.0, aspect=(4.0/3.0), near=0.1, far=100.0):
+        self.fov = fov
+        self.aspect = aspect
+        self.near = near
+        self.far = far
+
+    def apply(self):
+        glMatrixMode(GL_PROJECTION)
+        glLoadIdentity()
+        gluPerspective(fov, aspect, near, far)
+
-class GLObject(object):
-    """An object in an OpenGL scene.  This object can have GLTransforms added
@@ -170 +198 @@
-        """This method pushes the current GL matrix and applies this object's
-        transforms.  It is called just before this object is rendered."""
+        glMatrixMode(GL_PROJECTION)
+        glPushMatrix()
+
+        glMatrixMode(GL_MODELVIEW)
-        glPushMatrix()
-        for t in self.transforms:
@@ -177 +209 @@
-        """This method pops the current GL matrix.  It is called just after
-        this object is rendered."""
+        glMatrixMode(GL_MODELVIEW)
-        glPopMatrix()
+
+        glMatrixMode(GL_PROJECTION)
+        glPopMatrix()
+
-
-    def render(self):
@@ -292 +329 @@
-        self.renderY()
-        self.renderZ()
+
+        self._postrender()
+
+class Line(GLObject):
+    def __init__(self, origin=(0, 0, 0), vect=(1, 1, 1)):
+        self.o = origin
+        self.v = vect
+
+    def render(self):
+        glBegin(GL_LINES)
+        glVertex3f(*self.o)
+        glVertex3f(*self.v)
+        glEnd()
+
+class GLUTSolidCube(GLObject):
+    def __init__(self, side=1.0):
+        GLObject.__init__(self)
+        self.side = side
+
+    def render(self):
+        self._prerender()
+
+        glutSolidCube(self.side)
+
+        self._postrender()
+
+class GLUTWireCube(GLObject):
+    def __init__(self, side=1.0):
+        GLObject.__init__(self)
+        self.side = side
+
+    def render(self):
+        self._prerender()
+
+        glutWireCube(self.side)
-
-        self._postrender()