diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-09-15 01:26:13 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-09-15 01:38:34 +0200 |
| commit | 676d4dcb6c439677b91b1b5cbc0bf08f98e2dd9d (patch) | |
| tree | 5cd83591e230833735fbdacf41df5c1d69dd8c0e /client/map/tiles | |
| parent | 4e196b83a42b9b217e3b7107b55a14cb1a005b84 (diff) | |
| download | hurrycurry-676d4dcb6c439677b91b1b5cbc0bf08f98e2dd9d.tar hurrycurry-676d4dcb6c439677b91b1b5cbc0bf08f98e2dd9d.tar.bz2 hurrycurry-676d4dcb6c439677b91b1b5cbc0bf08f98e2dd9d.tar.zst | |
Refactor settings; store as JSON; input settings now broken
Diffstat (limited to 'client/map/tiles')
| -rw-r--r-- | client/map/tiles/exterior_tree.gd | 2 | ||||
| -rw-r--r-- | client/map/tiles/grass_mesher.gd | 4 | ||||
| -rw-r--r-- | client/map/tiles/light_tile.gd | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/client/map/tiles/exterior_tree.gd b/client/map/tiles/exterior_tree.gd index 84aa8f3c..fe9eeaf8 100644 --- a/client/map/tiles/exterior_tree.gd +++ b/client/map/tiles/exterior_tree.gd @@ -27,7 +27,7 @@ func _init(ctx: TileFactory.TileCC): var trunk: Mesh = load("res://map/tiles/tree/trunk_%d.res" % tree) var leaves: Mesh = load("res://map/tiles/tree/leaves_%d_%s.res" % [ tree, - "lq" if Global.get_setting("graphics.lq_trees") else "hq" + "lq" if Settings.read("graphics.lq_trees") else "hq" ]) var trunk_instance: MeshInstance3D = MeshInstance3D.new() trunk_instance.mesh = trunk diff --git a/client/map/tiles/grass_mesher.gd b/client/map/tiles/grass_mesher.gd index fd2892a8..466c3c1e 100644 --- a/client/map/tiles/grass_mesher.gd +++ b/client/map/tiles/grass_mesher.gd @@ -31,10 +31,10 @@ func flush() -> void: var multimesh := MultiMesh.new() multimesh.mesh = GRASS_MESH multimesh.transform_format = MultiMesh.TRANSFORM_3D - multimesh.instance_count = tiles.size() * Global.get_setting("graphics.grass_amount") + multimesh.instance_count = tiles.size() * Settings.read("graphics.grass_amount") var t := tiles.values() for i in multimesh.instance_count: - var p = t[i / Global.get_setting("graphics.grass_amount")] + var p = t[i / Settings.read("graphics.grass_amount")] var origin := Vector3(random.randf_range(-.5, .5), 0.25, random.randf_range(-.5, .5)) + Vector3(p.x + 0.5, 0.0, p.y + 0.5) var basis_ := (Basis(Vector3(0, 1, 0), random.randf_range(0, PI)) * Basis(Vector3(1, 0, 0), PI/2)).scaled(Vector3(0.75, 0.5, 0.75)) multimesh.set_instance_transform(i, Transform3D(basis_, origin)) diff --git a/client/map/tiles/light_tile.gd b/client/map/tiles/light_tile.gd index 5776645a..2476d8eb 100644 --- a/client/map/tiles/light_tile.gd +++ b/client/map/tiles/light_tile.gd @@ -19,4 +19,4 @@ extends Node3D func _ready(): # TODO hook settings - for l in lights: l.shadow_enabled = Global.get_setting("graphics.shadows") + for l in lights: l.shadow_enabled = Settings.read("graphics.shadows") |