3 files changed, 70 insertions, 41 deletions

@@ -9,6 +9,8 @@ var cell_left
 var cell_top
 var cell_right
 var cell_bottom
+var cell_width
+var cell_height
 var center_x_min
 var center_x_max
 var center_y_min
@@ -18,7 +20,7 @@ var center_y_max
 func _ready():
         player = get_tree().get_root().get_node("scene/player")
 
-        var svc = SubViewportContainer.new()
+        var svc = PanelContainer.new()
         svc.anchor_left = 1.0
         svc.anchor_top = 1.0
         svc.anchor_right = 1.0
@@ -27,13 +29,9 @@ func _ready():
         svc.offset_top = -320.0
         svc.offset_right = -64.0
         svc.offset_bottom = -64.0
+        svc.clip_contents = true
         add_child(svc)
 
-        var sv = SubViewport.new()
-        sv.size = Vector2i(256, 256)
-        sv.disable_3d = true
-        svc.add_child(sv)
-
         var background_color = Color.WHITE
 
         var world_env = get_tree().get_root().get_node("scene/WorldEnvironment")
@@ -51,18 +49,12 @@ func _ready():
                         elif sky is ProceduralSkyMaterial:
                                 background_color = sky.sky_top_color
 
-        var background_image = Image.create_empty(256, 256, false, Image.FORMAT_RGBA8)
-        background_image.fill(background_color)
-
-        var background_texture = ImageTexture.create_from_image(background_image)
-        var background = Sprite2D.new()
-        background.texture = background_texture
-        background.texture_filter = CanvasItem.TEXTURE_FILTER_NEAREST
-        background.centered = false
-        sv.add_child(background)
+        var stylebox = StyleBoxFlat.new()
+        stylebox.bg_color = Color(background_color, 0.6)
+        svc.add_theme_stylebox_override("panel", stylebox)
 
         drawer = Node2D.new()
-        sv.add_child(drawer)
+        svc.add_child(drawer)
 
         var gridmap = get_tree().get_root().get_node("scene/GridMap")
         if gridmap == null:
@@ -84,28 +76,10 @@ func _ready():
                 if pos.z > cell_bottom:
                         cell_bottom = pos.z
 
-        var cell_width = cell_right - cell_left + 1
-        var cell_height = cell_bottom - cell_top + 1
-
-        var heights = {}
-
-        var rendered = Image.create_empty(cell_width, cell_height, false, Image.FORMAT_RGBA8)
-        rendered.fill(Color.TRANSPARENT)
-
-        for pos in gridmap.get_used_cells():
-                var in_plane = Vector2i(pos.x, pos.z)
-
-                if in_plane in heights and heights[in_plane] > pos.y:
-                        continue
+        cell_width = cell_right - cell_left + 1
+        cell_height = cell_bottom - cell_top + 1
 
-                heights[in_plane] = pos.y
-
-                var cell_item = gridmap.get_cell_item(pos)
-                var mesh = gridmap.mesh_library.get_item_mesh(cell_item)
-                var material = mesh.surface_get_material(0)
-                var color = material.albedo_color
-
-                rendered.set_pixel(pos.x - cell_left, pos.z - cell_top, color)
+        var rendered = _renderMap(gridmap)
 
         var image_texture = ImageTexture.create_from_image(rendered)
         sprite = Sprite2D.new()
@@ -121,10 +95,10 @@ func _ready():
         label.text = "@"
         drawer.add_child(label)
 
-        var local_tl = gridmap.map_to_local(Vector3i(cell_left, 0, cell_top))
-        var local_br = gridmap.map_to_local(Vector3i(cell_right, 0, cell_bottom))
-        var global_tl = gridmap.to_global(local_tl)
-        var global_br = gridmap.to_global(local_br)
+        #var local_tl = gridmap.map_to_local(Vector3i(cell_left, 0, cell_top))
+        #var global_tl = gridmap.to_global(local_tl)
+        #var local_br = gridmap.map_to_local(Vector3i(cell_right, 0, cell_bottom))
+        #var global_br = gridmap.to_global(local_br)
 
         center_x_min = 0
         center_x_max = cell_width - 128
@@ -149,3 +123,53 @@ func _process(_delta):
 
         label.position.x = (player.position.x - cell_left) * 2 - 16
         label.position.y = (player.position.z - cell_top) * 2 - 16
+
+
+func _renderMap(gridmap):
+        var heights = {}
+
+        var rendered = Image.create_empty(cell_width, cell_height, false, Image.FORMAT_RGBA8)
+        rendered.fill(Color.TRANSPARENT)
+
+        var meshes_node = get_tree().get_root().get_node("scene/Meshes")
+        if meshes_node != null:
+                _renderMeshNode(gridmap, meshes_node, rendered)
+
+        for pos in gridmap.get_used_cells():
+                var in_plane = Vector2i(pos.x, pos.z)
+
+                if in_plane in heights and heights[in_plane] > pos.y:
+                        continue
+
+                heights[in_plane] = pos.y
+
+                var cell_item = gridmap.get_cell_item(pos)
+                var mesh = gridmap.mesh_library.get_item_mesh(cell_item)
+                var material = mesh.surface_get_material(0)
+                var color = material.albedo_color
+
+                rendered.set_pixel(pos.x - cell_left, pos.z - cell_top, color)
+
+        return rendered
+
+
+func _renderMeshNode(gridmap, mesh, rendered):
+        if mesh is MeshInstance3D:
+                var local_tl = gridmap.map_to_local(Vector3i(cell_left, 0, cell_top))
+                var global_tl = gridmap.to_global(local_tl)
+                var mesh_material = mesh.get_surface_override_material(0)
+                if mesh_material != null:
+                        var mesh_color = mesh_material.albedo_color
+
+                        for y in range(
+                                max(mesh.position.z - mesh.scale.z / 2 - global_tl.z, 0),
+                                min(mesh.position.z + mesh.scale.z / 2 - global_tl.z, cell_height)
+                        ):
+                                for x in range(
+                                        max(mesh.position.x - mesh.scale.x / 2 - global_tl.x, 0),
+                                        min(mesh.position.x + mesh.scale.x / 2 - global_tl.x, cell_width)
+                                ):
+                                        rendered.set_pixel(x, y, mesh_color)
+
+        for child in mesh.get_children():
+                _renderMeshNode(gridmap, child, rendered)
@@ -24,6 +24,9 @@ var compass
 func _ready():
         var khl_script = load("res://scripts/nodes/keyHolderListener.gd")
 
+        var pause_menu = get_node("pause_menu")
+        pause_menu.layer = 3
+
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
 
@@ -16,6 +16,8 @@ func _ready():
         # data packages.
         ProjectSettings.set_setting("network/limits/websocket_client/max_in_buffer_kb", 8192)
 
+        switcher.layer = 4
+
         # Create the global AP manager, if it doesn't already exist.
         if not global.has_node("Archipelago"):
                 var ap_script = ResourceLoader.load("user://maps/Archipelago/manager.gd")