From 180c097129803651e9e5ab9f30238b32bb5b238b Mon Sep 17 00:00:00 2001
From: Brian Caine <brian@mephistopheles.(none)>
Date: Mon, 17 Dec 2007 17:57:10 -0500
Subject: [PATCH] I created the new branch that will use PyOSG.

I stripped out all the plain OpenGL.
---
 demo/Engine.py               | 66 --------------------------------------------
 demo/Entity.py               | 32 ---------------------
 demo/pack_out/scripts/cam.py | 40 ++++-----------------------
 3 files changed, 6 insertions(+), 132 deletions(-)
 rewrite demo/pack_out/scripts/cam.py (85%)

diff --git a/demo/Engine.py b/demo/Engine.py
index bcec573..dd1ec38 100644
--- a/demo/Engine.py
+++ b/demo/Engine.py
@@ -19,16 +19,6 @@ import lamina
 
 from DerGUI import GUISystem
 
-import OpenGL
-import OpenGL.GL
-from OpenGL.GL import *
-import OpenGL.GLU
-from OpenGL.GLU import *
-
-import Dice3DS
-from Dice3DS import dom3ds, util
-from Dice3DS.example import glmodel, gltexture
-
 from zipfile import *
 
 import copy
@@ -36,7 +26,6 @@ import copy
 from xml.dom.minidom import parse, parseString
 
 from experimental import *
-from Transform import Transformation
 from ThreadQueue import ThreadQueue
 
 from Entity import *
@@ -77,18 +66,6 @@ class Engine:
             except:
                 print "Engine.__init__(): Error in eval(), using default background color of", BACKGROUND_COLOR
 
-        glShadeModel(GL_SMOOTH)
-        glClearColor(background_color[0],
-                     background_color[1],
-                     background_color[2],
-                     background_color[3])
-        glClearDepth(1.0)
-        glEnable(GL_DEPTH_TEST)
-        glDepthFunc(GL_LEQUAL)
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST)
-
-        self.camera_pos = Transformation()
-
         # more stuff
 
         if self.config.has_key('window_title'):
@@ -223,29 +200,6 @@ class Engine:
         assert filename in self.filelist.keys()
         return eval(self.filelist[filename])
 
-    def loadTexture(self, filename):
-
-        if self.texcache.has_key(filename):
-            return texcache[filename]
-
-        tex = None
-
-        try:
-            data = self.readZipfile(filename)
-        except:
-            print "Engine.loadTexture(): No file", filename
-            return tex
-
-        try:
-            tex = gltexture.Texture(data)
-        except:
-            print "Engine.loadTexture(): Error making texture from", filename
-            return tex
-
-        self.texcache[filename] = tex
-
-        return tex
-
     def run(self):
 
         if self.event_queue == None:
@@ -289,26 +243,6 @@ class Engine:
 
     def draw(self):
 
-        glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
-        glMatrixMode(GL_MODELVIEW)
-
-        # something temporary
-        glColor3f(1.0, 0, 0)
-
-        glLoadIdentity()
-        self.camera_pos.transform()
-
-        for obj in self.objects:
-            obj.draw(self)
-
-        # also temp
-        d()
-
-        glLoadIdentity()
-        if self.change:
-            self.lamina_screen.clear()
-            self.gui_system.draw(self.lamina_screen.surf)
-            self.lamina_screen.refresh()
         self.lamina_screen.display()
 
         return
diff --git a/demo/Entity.py b/demo/Entity.py
index 7e3ab47..f4caa58 100644
--- a/demo/Entity.py
+++ b/demo/Entity.py
@@ -1,12 +1,6 @@
 #!/usr/bin/python
 # this is the Entity class
 
-import Dice3DS
-from Dice3DS import dom3ds, util
-from Dice3DS.example import glmodel, gltexture
-
-from Transform import Transformation
-
 def main():
     print "Entity class...more documentation to come"
 
@@ -31,37 +25,11 @@ class Entity:
         self.data = None
         self.model = None
 
-        if specs.has_key('model'):
-            try:
-                self.data = dom3ds.read_3ds_mem(engine.readZipfile(specs['model']),1, 1)
-                self.model = glmodel.GLModel(self.data,
-                                             engine.loadTexture,
-                                             util.calculate_normals_no_smoothing)
-            except:
-                print "Entity.__init__(): Error reading model"
-
-        self.position = Transformation()
-        if specs.has_key('pos'):
-            try:
-                self.position.pos = eval(specs['pos'])
-            except:
-                print "Entity.__init__(): Error setting initial position of Entity, using default of", self.position.pos
-
-        if specs.has_key('rot'):
-            try:
-                self.position.rot = eval(specs['rot'])
-            except:
-                print "Entity__init__(): Error setting initial rotation of Entity, using default of", self.position.rot
-
     def draw(self, engine):
 
         if self.data == None:
             return
 
-        self.position.transform()
-        self.model.render()
-        self.position.negate_transform()
-
         return
 
     def event(self, event, data):
diff --git a/demo/pack_out/scripts/cam.py b/demo/pack_out/scripts/cam.py
dissimilarity index 85%
index 7cd99fc..d8765c1 100644
--- a/demo/pack_out/scripts/cam.py
+++ b/demo/pack_out/scripts/cam.py
@@ -1,34 +1,6 @@
-#!/usr/bin/python
-
-def key_down(me, params):
-    print "the params are", params
-
-    if params['key'] == 273:
-        me.engine.camera_pos.pos[2] += 1
-
-    if params['key'] == 275:
-        me.engine.camera_pos.pos[0] -= 1
-
-    if params['key'] == 276:
-        me.engine.camera_pos.pos[2] -= 1
-
-    if params['key'] == 274:
-        me.engine.camera_pos.pos[0] += 1
-
-    if params['key'] == 280:
-        me.engine.camera_pos.pos[1] += 1
-
-    if params['key'] == 281:
-        me.engine.camera_pos.pos[1] -= 1
-
-    if params['key'] == 97:
-        me.engine.camera_pos.rot[1] -= 45
-
-    if params['key'] == 100:
-        me.engine.camera_pos.rot[1] += 45
-
-    if params['key'] == 13:
-        del me.engine.camera_pos
-        me.engine.camera_pos = Transformation()
-
-self.functions['KEYDOWN'] = key_down
+#!/usr/bin/python
+
+def key_down(me, params):
+    print "the params are", params
+
+self.functions['KEYDOWN'] = key_down
-- 
2.11.4.GIT