initial high level lights api on railvehicle3d

Author: marcinn

addons/libmaszyna/e3d/e3d_model_instance.gd

@@ -32,7 +32,7 @@ var _current_editable: bool = false
 @export var lights_state: Dictionary[String, bool] = {}:
     set(x):
         lights_state = x
-        if is_inside_tree():
+        if is_inside_tree() and e3d_loaded:
             _current_instancer.sync_lights(self)
 
 
@@ -139,9 +139,7 @@ func _ready() -> void:
 
 
 func _enter_tree() -> void:
-    if _model and _current_instancer:
-        _current_instancer.instantiate(self, _model, _current_editable)
-
+    pass
 
 func _exit_tree() -> void:
     if _current_instancer:

addons/libmaszyna/e3d/e3d_nodes_instancer.gd

@@ -151,7 +151,7 @@ func _create_submodel_instance(target_node: E3DModelInstance, submodel: E3DSubMo
             obj.light_color = submodel.diffuse_color
             obj.light_color.a = 1.0
             #obj.light_energy = submodel.visibility_light  # ????
-            obj.light_energy = 10.0  # FIXME: guessing
+            obj.light_energy = 1.0 # FIXME: guessing
             obj.light_volumetric_fog_energy = 4.0  # FIXME: guessing
             obj.shadow_enabled = true
             obj.distance_fade_enabled = true

addons/libmaszyna/rail_vehicle_3d.gd

@@ -2,7 +2,25 @@
 extends Node3D
 class_name RailVehicle3D
 
+const EMPTY_LIGHTS:Dictionary[String, bool] = {}
+
 # FIXME: Head Display implementation is experimental and only for demo purposes
+@export_node_path("E3DModelInstance") var model_instance_path:NodePath = NodePath(""):
+    set(x):
+        if not x == model_instance_path:
+            model_instance_path = x
+            lights = {}
+            if is_inside_tree() and model_instance_path:
+                _model_node = get_node_or_null(model_instance_path)
+                lights = _model_node.lights_state if _model_node else EMPTY_LIGHTS
+            _dirty = true
+
+@export var lights:Dictionary[String, bool] = EMPTY_LIGHTS:
+    set(x):
+        if not x == lights:
+            lights = x
+            if is_inside_tree() and _model_node:
+                _model_node.lights_state = lights
 
 @export_node_path("TrainController") var controller_path:NodePath = NodePath(""):
     set(x):
@@ -40,6 +58,7 @@ var _head_display_e3d:E3DModelInstance
 var _cabin:Cabin3D
 var _camera:FreeCamera3D
 var _controller:TrainController
+var _model_node:E3DModelInstance
 var _t:float = 0.0
 
 
@@ -163,8 +182,11 @@ func _process(delta):
             if _head_display_e3d:
                 _head_display_e3d.e3d_loaded.connect(func(): _needs_head_display_update = true)
 
-        if controller_path and is_inside_tree():
-            _controller = get_node(controller_path)
+        if is_inside_tree():
+            if controller_path:
+                _controller = get_node_or_null(controller_path)
+            if model_instance_path:
+                _model_node = get_node_or_null(model_instance_path)
 
     _t += delta
     if _t > 0.25 and _needs_head_display_update:
@@ -184,3 +206,7 @@ func _ready() -> void:
 
     for instance:E3DModelInstance in find_children("", "E3DModelInstance", true, false):
         instance.e3d_loaded.connect(_schedule_head_display_update)
+
+    var model_node = get_node_or_null(model_instance_path)
+    if model_node:
+        model_node.lights_state = lights

demo/demo_3d.tscn

@@ -102,7 +102,6 @@ script = ExtResource("1_ut343")
 [node name="DebugMenuFPS" parent="." unique_id=28357571 instance=ExtResource("2_qg2pq")]
 
 [node name="TopBar" type="Container" parent="." unique_id=1102380660]
-top_level = true
 clip_contents = true
 anchors_preset = 10
 anchor_right = 1.0
@@ -264,6 +263,18 @@ environment = SubResource("Environment_jrns0")
 
 [node name="SM42-099" parent="." unique_id=1125812614 instance=ExtResource("11_8gidn")]
 transform = Transform3D(-0.9996828, 0, 0.02518662, 0, 1, 0, -0.02518662, 0, -0.9996828, -25.735577, 0.16, 180.73814)
+lights = Dictionary[String, bool]({
+"endsignal12": false,
+"endsignal13": false,
+"endsignal22": true,
+"endsignal23": true,
+"headlamp11": true,
+"headlamp12": true,
+"headlamp13": true,
+"headlamp21": false,
+"headlamp22": false,
+"headlamp23": false
+})
 
 [node name="Impuls" parent="." unique_id=2111644575 instance=ExtResource("12_hsov8")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.021647027, -0.019251347, -4.3020163)

demo/vehicles/sm42/sm_42.tscn

@@ -11,6 +11,7 @@ size = Vector3(4.5332, 4.72223, 17.0549)
 [node name="SM42-099" type="Node3D" unique_id=1967816975]
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 script = ExtResource("1_iiqbf")
+model_instance_path = NodePath("SM42-099")
 controller_path = NodePath("SM42v1")
 cabin_scene = ExtResource("2_htu7b")
 low_poly_cabin_path = NodePath("SM42-099-LowPolyCab")