aboutsummaryrefslogtreecommitdiff
path: root/client/map
diff options
context:
space:
mode:
Diffstat (limited to 'client/map')
-rw-r--r--client/map/map.gd59
-rw-r--r--client/map/map.tscn49
-rw-r--r--client/map/progress.gd1
3 files changed, 71 insertions, 38 deletions
diff --git a/client/map/map.gd b/client/map/map.gd
new file mode 100644
index 00000000..af80d9ac
--- /dev/null
+++ b/client/map/map.gd
@@ -0,0 +1,59 @@
+class_name Map
+extends Node3D
+
+var tile_by_pos: Dictionary = {}
+var baking = false
+
+func get_tile_name(pos: Vector2i):
+ var e = tile_by_pos[str(pos)]
+ if e != null: return e[1]
+ else: return null
+func get_tile_instance(pos: Vector2i) -> Tile:
+ var e = tile_by_pos[str(pos)]
+ if e != null: return e[2]
+ else: return null
+
+func set_tile(pos: Vector2i, name_: String, neighbors: Array = [null,null,null,null]) -> Tile:
+ var tile = TileFactory.produce(name_, str(pos), neighbors)
+ add_child(tile)
+ tile.position = Vector3(pos.x, 0, pos.y)
+ tile_by_pos[str(pos)] = [pos, name_, tile, neighbors]
+ if not baking: voxelgi_timer.start(1)
+ return tile
+
+func remove_tile_if_exists(pos: Vector2i):
+ var tile = get_tile_instance(pos)
+ if tile == null: return
+ if tile.item != null: tile.item.queue_free()
+ tile_by_pos.erase(str(pos))
+ tile.name += "_queued_free"
+ tile.queue_free()
+
+@onready var voxelgi_timer: Timer = $Timer
+@onready var voxelgi: VoxelGI = $VoxelGI
+
+func _ready():
+ if baking: return
+ voxelgi_timer.connect("timeout", gi_bake)
+
+func gi_bake():
+ print("Map: Rebaking VoxelGI")
+ gi_bake_blocking()
+
+func gi_bake_blocking():
+ var extent_min = Vector2(0,0)
+ var extent_max = Vector2(0,0)
+ for e in tile_by_pos.values():
+ extent_min.x = min(extent_min.x, e[0].x)
+ extent_min.y = min(extent_min.y, e[0].y)
+ extent_max.x = max(extent_max.x, e[0].x)
+ extent_max.y = max(extent_max.y, e[0].y)
+
+ var center = (extent_max + extent_min) / 2
+ var size = extent_max - extent_min
+ voxelgi.position = Vector3(center.x, 2, center.y)
+ voxelgi.size = Vector3(size.x, 5., size.y)
+ print("Baking now!")
+ var start = Time.get_ticks_msec()
+ voxelgi.bake()
+ print("Bake done. elapsed=", Time.get_ticks_msec() - start)
diff --git a/client/map/map.tscn b/client/map/map.tscn
index 612729f4..cd08e416 100644
--- a/client/map/map.tscn
+++ b/client/map/map.tscn
@@ -1,44 +1,17 @@
-[gd_scene load_steps=2 format=3 uid="uid://duqkg22yre6ry"]
+[gd_scene load_steps=4 format=3 uid="uid://b4gone8fu53r7"]
-[sub_resource type="GDScript" id="GDScript_qftmc"]
-script/source = "# Undercooked - a game about cooking
-# Copyright 2024 nokoe
-# Copyright 2024 tpart
-# Copyright 2024 metamuffin
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name Map
-extends Node3D
+[ext_resource type="Script" path="res://map/map.gd" id="1_3en0a"]
-var tile_by_pos: Dictionary = {}
+[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_kwk4i"]
-func update(pos, tile_name, neighbors):
- var node_name = str(pos)
+[sub_resource type="VoxelGIData" id="VoxelGIData_m5j5n"]
- if has_node(node_name):
- queue_free_rename(get_node(node_name))
-
- var instance: Tile = TileFactory.produce(tile_name, node_name, neighbors)
-
- instance.position = Vector3(pos[0], 0, pos[1])
- tile_by_pos[str(Vector2i(pos[0], pos[1]))] = instance
- add_child(instance)
+[node name="Map" type="Node3D"]
+script = ExtResource("1_3en0a")
-func queue_free_rename(node: Node) -> void:
- node.name += \"_queued_free\"
- node.queue_free()
-"
+[node name="Timer" type="Timer" parent="."]
+one_shot = true
-[node name="Map" type="Node3D"]
-script = SubResource("GDScript_qftmc")
+[node name="VoxelGI" type="VoxelGI" parent="."]
+camera_attributes = SubResource("CameraAttributesPractical_kwk4i")
+data = SubResource("VoxelGIData_m5j5n")
diff --git a/client/map/progress.gd b/client/map/progress.gd
index 4d6494f6..dd855a36 100644
--- a/client/map/progress.gd
+++ b/client/map/progress.gd
@@ -20,3 +20,4 @@ func set_progress(progress: float, bad: bool):
var mat: ShaderMaterial = self.get_active_material(0)
mat.set_shader_parameter("progress", progress)
mat.set_shader_parameter("bad", bad)
+