@@ -34,6 +34,10 @@ var current_cue: Cue = null
3434var last_cue : Cue = null
3535var next_cue : Cue = null
3636
37+
38+ ## Allowed parameters to changed when setting function intencity
39+ const _allowed_intensity_parameters : Array [String ] = ["Dimmer" ]
40+
3741## The current mode of this cuelist. When in loop mode the cuelist will not reset fixtures to 0-value when looping back to the start
3842enum MODE {NORMAL , LOOP }
3943var _mode : int = MODE .NORMAL
@@ -71,6 +75,7 @@ var last_triggered_keyframe: int = -1
7175## Used to determin if a force reload from the start should happen, used when a cue is added, removed, moved, or edited
7276var force_reload : bool = false
7377
78+ ## Autoplay state
7479var _autoplay : bool = false
7580
7681
@@ -320,7 +325,7 @@ func _reset_animated_fixtures(animator: Animator, accumulated_animated_data: Dic
320325 animating_fixture .fixture .set_parameter (
321326 animating_fixture .parameter ,
322327 animating_fixture .function ,
323- new_value * _intensity ,
328+ new_value * ( _intensity if animating_fixture . parameter in _allowed_intensity_parameters else 1.0 ) ,
324329 uuid ,
325330 animating_fixture .zone
326331 ),
@@ -360,27 +365,22 @@ func _accumulate_state(cue: Cue, accumulated_animated_data: Dictionary, animator
360365 var value_config : Dictionary = fixture_data [fixture ][zone ][parameter ]
361366 var from_value : float = fixture .get_current_value (zone , parameter , uuid , value_config .function )
362367 var to_value : Variant = value_config .value
363- if parameter == "Zoom" :
364- print (from_value )
365- print (to_value )
366- print ()
367368
368369 var animation_id : String = fixture .uuid + zone + parameter
369370 accumulated_animated_data [animation_id ] = {
370371 "method" : func (new_value : Variant ) -> void :
371372 _current_animated_fixtures [animation_id ].current_value = new_value
372- if parameter == "Zoom" :
373- print (new_value * _intensity )
373+
374374 fixture .set_parameter (
375375 parameter ,
376376 value_config .function ,
377- new_value * _intensity ,
377+ new_value * ( _intensity if parameter in _allowed_intensity_parameters else 1.0 ) ,
378378 uuid ,
379379 zone
380380 ),
381- "from" : from_value * (2 - _intensity ),
381+ "from" : from_value * (2 - ( _intensity if parameter in _allowed_intensity_parameters else 1.0 ) ),
382382 "to" : to_value ,
383- "current" : from_value * (2 - _intensity ),
383+ "current" : from_value * (2 - ( _intensity if parameter in _allowed_intensity_parameters else 1.0 ) ),
384384 "can_fade" : value_config .can_fade ,
385385 "start" : value_config .start ,
386386 "stop" : value_config .stop ,
@@ -551,7 +551,7 @@ func set_intensity(p_intensity: float) -> void:
551551
552552 if _index != - 1 :
553553 for animated_fixture : Dictionary in _current_animated_fixtures .values ():
554- if not is_instance_valid (animated_fixture .animator ) and animated_fixture .has ("current_value" ):
554+ if not is_instance_valid (animated_fixture .animator ) and animated_fixture .has ("current_value" ) and animated_fixture . parameter in _allowed_intensity_parameters :
555555 var fixture : Fixture = animated_fixture .fixture
556556
557557 if fixture .function_can_fade (animated_fixture .zone , animated_fixture .parameter , animated_fixture .function ):
0 commit comments