Fixed some stuff, procrastinating the real problem

tools/editortool/map/selectbox.py

@@ -1,46 +1,44 @@
 import OpenGL.GL as gl
 from dusk.defs import defs
 import colorsys
-from editortool.map.map import map
+from editortool.map.mapdefs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
 
-hue = [0.0]  # Mutable container for static hue
+class SelectBox:
+  def __init__(self, parent):
+    self.parent = parent
+    self.hue = 0.0
 
-def drawSelectBox():
-  w = float(defs.get('TILE_WIDTH'))
-  h = float(defs.get('TILE_HEIGHT'))
-  d = float(defs.get('TILE_DEPTH'))
-  position = [
-    map.position[0] * w - (w / 2.0),
-    map.position[1] * h - (h / 2.0),
-    map.position[2] * d - (d / 2.0)
-  ]
+  def draw(self):
+    position = [
+      self.parent.parent.map.position[0] * TILE_WIDTH - (TILE_WIDTH / 2.0),
+      self.parent.parent.map.position[1] * TILE_HEIGHT - (TILE_HEIGHT / 2.0),
+      self.parent.parent.map.position[2] * TILE_DEPTH - (TILE_DEPTH / 2.0)
+    ]
 
-  # Define the 8 vertices of the cube with w=h=d=1
-  vertices = [
-    (position[0], position[1], position[2]),      # 0: min corner
-    (position[0]+w, position[1], position[2]),      # 1
-    (position[0]+w, position[1]+h, position[2]),    # 2
-    (position[0], position[1]+h, position[2]),      # 3
-    (position[0], position[1], position[2]+d),      # 4
-    (position[0]+w, position[1], position[2]+d),    # 5
-    (position[0]+w, position[1]+h, position[2]+d),  # 6
-    (position[0], position[1]+h, position[2]+d)     # 7
-  ]
-  # List of edges as pairs of vertex indices
-  edges = [
-    (0, 1), (1, 2), (2, 3), (3, 0),  # bottom face
-    (4, 5), (5, 6), (6, 7), (7, 4),  # top face
-    (4, 5), (5, 6), (6, 7), (7, 4),  # top face
-    (0, 4), (1, 5), (2, 6), (3, 7)   # vertical edges
-  ]
+    vertices = [
+      (position[0], position[1], position[2]),
+      (position[0]+TILE_WIDTH, position[1], position[2]),
+      (position[0]+TILE_WIDTH, position[1]+TILE_HEIGHT, position[2]),
+      (position[0], position[1]+TILE_HEIGHT, position[2]),
+      (position[0], position[1], position[2]+TILE_DEPTH),
+      (position[0]+TILE_WIDTH, position[1], position[2]+TILE_DEPTH),
+      (position[0]+TILE_WIDTH, position[1]+TILE_HEIGHT, position[2]+TILE_DEPTH),
+      (position[0], position[1]+TILE_HEIGHT, position[2]+TILE_DEPTH)
+    ]
+    edges = [
+      (0, 1), (1, 2), (2, 3), (3, 0),  # bottom face
+      (4, 5), (5, 6), (6, 7), (7, 4),  # top face
+      (4, 5), (5, 6), (6, 7), (7, 4),  # top face
+      (0, 4), (1, 5), (2, 6), (3, 7)   # vertical edges
+    ]
 
-  # Cycle hue
-  hue[0] = (hue[0] + 0.01) % 1.0
-  r, g, b = colorsys.hsv_to_rgb(hue[0], 1.0, 1.0)
-  gl.glColor3f(r, g, b)
-  gl.glLineWidth(2.0)
-  gl.glBegin(gl.GL_LINES)
-  for edge in edges:
-    for vertex in edge:
+    # Cycle hue
+    self.hue = (self.hue + 0.01) % 1.0
+    r, g, b = colorsys.hsv_to_rgb(self.hue, 1.0, 1.0)
+    gl.glColor3f(r, g, b)
+    gl.glLineWidth(2.0)
+    gl.glBegin(gl.GL_LINES)
+    for edge in edges:
+      for vertex in edge:
         gl.glVertex3f(*vertices[vertex])
-  gl.glEnd()
+    gl.glEnd()