Added diagonal ramps

2025-11-19 15:40:37 -06:00
parent bd5a67676b
commit c32df89490
20 changed files with 256 additions and 173 deletions
--- a/tools/editortool/map/tile.py
+++ b/tools/editortool/map/tile.py
@@ -1,10 +1,12 @@
 from OpenGL.GL import *
-from editortool.map.mapdefs import (
-    TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH,
-    CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH,
-    TILE_SHAPE_NULL, TILE_SHAPE_FLOOR,
-    TILE_SHAPE_RAMP_NORTH, TILE_SHAPE_RAMP_SOUTH,
-    TILE_SHAPE_RAMP_EAST, TILE_SHAPE_RAMP_WEST
+from dusk.defs import (
+  TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH,
+  CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH,
+  TILE_SHAPE_NULL, TILE_SHAPE_FLOOR,
+  TILE_SHAPE_RAMP_NORTH, TILE_SHAPE_RAMP_SOUTH,
+  TILE_SHAPE_RAMP_EAST, TILE_SHAPE_RAMP_WEST,
+  TILE_SHAPE_RAMP_SOUTHWEST, TILE_SHAPE_RAMP_SOUTHEAST,
+  TILE_SHAPE_RAMP_NORTHWEST, TILE_SHAPE_RAMP_NORTHEAST
 )

 def getItem(arr, index, default):
@@ -39,79 +41,138 @@ class Tile:
    self.chunk.onChunkData.invoke(self.chunk)

  def getBaseTileModel(self):
-        vertices = []
-        indices = []
-        uvs = []
-        colors = [] 
+    vertices = []
+    indices = []
+    uvs = []
+    colors = [] 

-        if self.shape == TILE_SHAPE_NULL:
-            pass
+    if self.shape == TILE_SHAPE_NULL:
+      pass

-        elif self.shape == TILE_SHAPE_FLOOR:
-            vertices = [
-                (self.posX, self.posY, self.posZ),
-                (self.posX + TILE_WIDTH, self.posY, self.posZ),
-                (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
-                (self.posX, self.posY + TILE_HEIGHT, self.posZ)
-            ]
-            indices = [0, 1, 2, 0, 2, 3]
-            uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
-            colors = [ (255, 255, 255, 255) ] * 4
+    elif self.shape == TILE_SHAPE_FLOOR:
+      vertices = [
+        (self.posX, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (255, 255, 255, 255) ] * 4

-        elif self.shape == TILE_SHAPE_RAMP_NORTH:
-            vertices = [
-                (self.posX, self.posY, self.posZ + TILE_DEPTH),
-                (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
-                (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
-                (self.posX, self.posY + TILE_HEIGHT, self.posZ)
-            ]
-            indices = [0, 1, 2, 0, 2, 3]
-            uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
-            colors = [ (255, 0, 0, 255) ] * 4
+    elif self.shape == TILE_SHAPE_RAMP_NORTH:
+      vertices = [
+        (self.posX, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (255, 0, 0, 255) ] * 4

-        elif self.shape == TILE_SHAPE_RAMP_SOUTH:
-            vertices = [
-                (self.posX, self.posY, self.posZ),
-                (self.posX + TILE_WIDTH, self.posY, self.posZ),
-                (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
-                (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
-            ]
-            indices = [0, 1, 2, 0, 2, 3]
-            uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
-            colors = [ (0, 255, 0, 255) ] * 4
+    elif self.shape == TILE_SHAPE_RAMP_SOUTH:
+      vertices = [
+        (self.posX, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (0, 255, 0, 255) ] * 4

-        elif self.shape == TILE_SHAPE_RAMP_EAST:
-            vertices = [
-                (self.posX, self.posY, self.posZ),
-                (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
-                (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
-                (self.posX, self.posY + TILE_HEIGHT, self.posZ)
-            ]
-            indices = [0, 1, 2, 0, 2, 3]
-            uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
-            colors = [ (0, 0, 255, 255) ] * 4
+    elif self.shape == TILE_SHAPE_RAMP_EAST:
+      vertices = [
+        (self.posX, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (0, 0, 255, 255) ] * 4

-        elif self.shape == TILE_SHAPE_RAMP_WEST:
-            vertices = [
-                (self.posX, self.posY, self.posZ + TILE_DEPTH),
-                (self.posX + TILE_WIDTH, self.posY, self.posZ),
-                (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
-                (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
-            ]
-            indices = [0, 1, 2, 0, 2, 3]
-            uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
-            colors = [ (255, 255, 0, 255) ] * 4
+    elif self.shape == TILE_SHAPE_RAMP_WEST:
+      vertices = [
+        (self.posX, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (255, 255, 0, 255) ] * 4
+    
+    elif self.shape == TILE_SHAPE_RAMP_SOUTHWEST:
+      vertices = [
+        (self.posX, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (255, 128, 0, 255) ] * 4

-        else:
-            print("Unknown tile shape:", self.shape)
-            pass
+    elif self.shape == TILE_SHAPE_RAMP_NORTHWEST:
+      vertices = [
+        (self.posX, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (128, 255, 0, 255) ] * 4

-        return {
-            'vertices': vertices,
-            'indices': indices,
-            'uvs': uvs,
-            'colors': colors
-        }
+    elif self.shape == TILE_SHAPE_RAMP_NORTHEAST:
+      vertices = [
+        (self.posX, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (0, 255, 128, 255) ] * 4
+      
+    elif self.shape == TILE_SHAPE_RAMP_SOUTHEAST:
+      vertices = [
+        (self.posX, self.posY, self.posZ),
+        (self.posX + TILE_WIDTH, self.posY, self.posZ + TILE_DEPTH),
+        (self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH),
+        (self.posX, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH)
+      ]
+      indices = [0, 1, 2, 0, 2, 3]
+      uvs = [ (0, 0), (1, 0), (1, 1), (0, 1) ]
+      colors = [ (255, 128, 255, 255) ] * 4
+
+    else:
+      # Solid black cube for unknown shape
+      x0, y0, z0 = self.posX, self.posY, self.posZ
+      x1, y1, z1 = self.posX + TILE_WIDTH, self.posY + TILE_HEIGHT, self.posZ + TILE_DEPTH
+      vertices = [
+        (x0, y0, z0), (x1, y0, z0), (x1, y1, z0), (x0, y1, z0), # bottom
+        (x0, y0, z1), (x1, y0, z1), (x1, y1, z1), (x0, y1, z1)  # top
+      ]
+      indices = [
+        0,1,2, 0,2,3,   # bottom
+        4,5,6, 4,6,7,   # top
+        0,1,5, 0,5,4,   # front
+        2,3,7, 2,7,6,   # back
+        1,2,6, 1,6,5,   # right
+        3,0,4, 3,4,7    # left
+      ]
+      uvs = [ (0,0) ] * 8
+      colors = [ (0,0,0,255) ] * 8
+
+    return {
+      'vertices': vertices,
+      'indices': indices,
+      'uvs': uvs,
+      'colors': colors
+    }

  def buffer(self, vertexBuffer):
    if self.shape == TILE_SHAPE_NULL: