From f3e2d2e9ffc5fffe5fed77af5fbb108dfcbc62d7 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Wed, 29 May 2024 10:18:31 +0200 Subject: [PATCH] disable minimap lighting and wait for vertex-lighting feature --- app/content/system/dot/dot.gd | 19 ++++++++++--------- app/content/system/dot/dot.tscn | 5 ----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/content/system/dot/dot.gd b/app/content/system/dot/dot.gd index 7513f49..39fb996 100644 --- a/app/content/system/dot/dot.gd +++ b/app/content/system/dot/dot.gd @@ -10,7 +10,7 @@ const TOUCH_LONG = 400.0 @onready var collision = $CollisionShape3D @onready var area = $Area3D/CollisionShape3D2 @onready var snap_sound = $SnapSound -@onready var light = $OmniLight3D +# @onready var light: OmniLight3D = $OmniLight3D @onready var label = $Label3D var active = R.state(false) var disabled = null @@ -19,14 +19,15 @@ var moved_ran = false var touch_ran = false func _ready(): - if entity is Light: - R.effect(func(_arg): - light.light_energy=1 if entity.active.value else 0 - light.light_color=entity.color.value - ) - else: - remove_child(light) - light.queue_free() + # Wait until https://github.com/godotengine/godot/pull/83360 is merged for faster vertex lighting + # if entity is Light: + # R.effect(func(_arg): + # light.light_energy=1 if entity.active.value else 0 + # light.light_color=entity.color.value + # ) + # else: + # remove_child(light) + # light.queue_free() R.effect(func(_arg): label.text=entity.icon.value diff --git a/app/content/system/dot/dot.tscn b/app/content/system/dot/dot.tscn index a1cf0d9..efbc792 100644 --- a/app/content/system/dot/dot.tscn +++ b/app/content/system/dot/dot.tscn @@ -37,8 +37,3 @@ shape = SubResource("SphereShape3D_y1ne8") [node name="SnapSound" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_04fcm") volume_db = -20.0 - -[node name="OmniLight3D" type="OmniLight3D" parent="."] -layers = 2 -light_color = Color(0.537607, 0.0297858, 0.226152, 1) -omni_range = 0.5