From 1898b5ce497a54c3ef4ef03809ded0a1d8d43aff Mon Sep 17 00:00:00 2001
From: cecilkorik <cecilkorik-github@relay.eltanin.net>
Date: Sun, 16 Oct 2011 20:08:05 -0600
Subject: [PATCH] some basic cleanup to split up universe and remove it as a
 dependency

---
 models.py   |  1 -
 roc_main.py | 12 ++++++------
 roc_test.py | 28 ++++++++++++++++++++++++++++
 universe.py | 32 +++-----------------------------
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/models.py b/models.py
index 499bc4b..54cd33e 100755
--- a/models.py
+++ b/models.py
@@ -333,7 +333,6 @@ class RenderLayer(object):
 	def render(self):
 		self.material.bind()
 		glPushMatrix()
-		glTranslatef(500.0, 300.0, 0.0)
 		glScalef(*self.scale)
 		self.mesh.draw(self.material.texcoords)
 		glPopMatrix()
diff --git a/roc_main.py b/roc_main.py
index 98e4aba..e5629c7 100755
--- a/roc_main.py
+++ b/roc_main.py
@@ -6,18 +6,18 @@ import video
 import shader
 import inputs
 import models
-import universe
 from OpenGL.GL import *
 
 
 def set_universe(new_universe):
-	global universe
-	universe = new_universe
+	global g_universe
+	g_universe = new_universe
 	
-universe = universe.test_universe()
+g_universe = None
+
 
 def mainloop():
-	global universe
+	global g_universe
 
 	gametimer.start_loop()
 	while True:
@@ -42,6 +42,6 @@ def mainloop():
 		
 		video.predraw()
 
-		universe.frame()		
+		g_universe.frame()
 		
 		video.next_frame()
diff --git a/roc_test.py b/roc_test.py
index d61fffc..23a61a4 100755
--- a/roc_test.py
+++ b/roc_test.py
@@ -1,4 +1,32 @@
 import roc
 
+class test_universe(base_universe):
+	def frame(self):
+		# pink triangle
+		glBegin(GL_TRIANGLE_STRIP)
+		glNormal3f(0.0, 0.0, 1.0)
+		glColor4f(1.0, 0.0, 0.5, 1.0)
+		glVertex3f(  20.0,  50.0,  1.0)
+		glVertex3f(  20.0, 600.0,  1.0)
+		glVertex3f( 400.0,  50.0,  1.0)
+		glEnd()
+	
+		# yellow square
+		glBegin(GL_TRIANGLE_STRIP)
+		glNormal3f(0.0, 0.0, 1.0)
+		glColor4f(1.0, 1.0, 0.0, 1.0)
+		glVertex3f( 150.0,  20.0, -50.0)
+		glVertex3f( 150.0, 400.0, -50.0)
+		glVertex3f( 360.0,  20.0, -50.0)
+		glVertex3f( 360.0, 400.0, -50.0)
+		glEnd()
+	
+		# texture test
+		mdl = models.mgr.create("m_test")
+		mdl.render()
+
+
+
 roc.init2d()
+roc.set_universe(test_universe())
 roc.main()
\ No newline at end of file
diff --git a/universe.py b/universe.py
index 2635a5d..fac9d82 100755
--- a/universe.py
+++ b/universe.py
@@ -20,39 +20,13 @@ class base_universe(object):
 	def render(self):
 		pass
 		
-class test_universe(base_universe):
-	def frame(self):
-		# pink triangle
-		glBegin(GL_TRIANGLE_STRIP)
-		glNormal3f(0.0, 0.0, 1.0)
-		glColor4f(1.0, 0.0, 0.5, 1.0)
-		glVertex3f(  20.0,  50.0,  1.0)
-		glVertex3f(  20.0, 600.0,  1.0)
-		glVertex3f( 400.0,  50.0,  1.0)
-		glEnd()
-	
-		# yellow square
-		glBegin(GL_TRIANGLE_STRIP)
-		glNormal3f(0.0, 0.0, 1.0)
-		glColor4f(1.0, 1.0, 0.0, 1.0)
-		glVertex3f( 150.0,  20.0, -50.0)
-		glVertex3f( 150.0, 400.0, -50.0)
-		glVertex3f( 360.0,  20.0, -50.0)
-		glVertex3f( 360.0, 400.0, -50.0)
-		glEnd()
-	
-		# texture test
-		mdl = models.mgr.create("m_test")
-		mdl.render()
-
-
-	
 class tiled_universe(base_universe):
-	def __init__(self):		
+	def __init__(self):
 		pass
 		
 	def init(self):
 		pass
 		
 	def frame(self):
-		pass
\ No newline at end of file
+		pass
+