some basic cleanup to split up universe and remove it as a dependency

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()

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
+	
+g_universe = None
 
-universe = universe.test_universe()
 
 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()

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()

universe.py

@@ -20,33 +20,6 @@ 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):
 		pass
@@ -56,3 +29,4 @@ class tiled_universe(base_universe):
 		
 	def frame(self):
 		pass
+