diff --git a/Models/Geometry/Nimitz/Models/cut.xml b/Models/Geometry/Nimitz/Models/cut.xml index 29b1c74b3..f2cb773af 100644 --- a/Models/Geometry/Nimitz/Models/cut.xml +++ b/Models/Geometry/Nimitz/Models/cut.xml @@ -20,6 +20,16 @@ <alpha-factor>0.001</alpha-factor> </animation> + <animation> + <type>select</type> + <object-name>Cut</object-name> + <condition> + <not> + <property>/sim/rendering/shaders/skydome</property> + </not> + </condition> + </animation> + <animation> <type>scale</type> <object-name>Cut</object-name> @@ -40,4 +50,17 @@ <max-m>5000</max-m> </animation> + <!-- ALS procedural light --> + <model> + <path>Models/Geometry/Nimitz/Models/datum-proc.xml</path> + <condition> + <property>/sim/rendering/shaders/skydome</property> + </condition> + <offsets> + <x-m>0.100</x-m> + <y-m>0.000</y-m> + <z-m>0.000</z-m> + </offsets> + </model> + </PropertyList> diff --git a/Models/Geometry/Nimitz/Models/datum.xml b/Models/Geometry/Nimitz/Models/datum.xml index ebe11d919..587df60d0 100644 --- a/Models/Geometry/Nimitz/Models/datum.xml +++ b/Models/Geometry/Nimitz/Models/datum.xml @@ -14,6 +14,16 @@ <alpha-factor>0.01</alpha-factor> </animation> + <animation> + <type>select</type> + <object-name>Datum</object-name> + <condition> + <not> + <property>/sim/rendering/shaders/skydome</property> + </not> + </condition> + </animation> + <animation> <type>scale</type> <object-name>Datum</object-name> @@ -34,4 +44,17 @@ <max-m>5000</max-m> </animation> + <!-- ALS procedural light --> + <model> + <path>Models/Geometry/Nimitz/Models/datum-proc.xml</path> + <condition> + <property>/sim/rendering/shaders/skydome</property> + </condition> + <offsets> + <x-m>0.100</x-m> + <y-m>0.000</y-m> + <z-m>0.000</z-m> + </offsets> + </model> + </PropertyList> diff --git a/Models/Geometry/Nimitz/Models/flols.xml b/Models/Geometry/Nimitz/Models/flols.xml index 097fdcf72..00c74fc2d 100644 --- a/Models/Geometry/Nimitz/Models/flols.xml +++ b/Models/Geometry/Nimitz/Models/flols.xml @@ -375,6 +375,34 @@ <object-name>Wave-Off-72</object-name> </animation> + + <!-- ALS procedural lights for red and orange --> + + <!-- ALS procedural lights --> + <model> + <path>Models/Geometry/Nimitz/Models/source-orange-proc.xml</path> + <condition> + <property>/sim/rendering/shaders/skydome</property> + </condition> + <offsets> + <x-m>0.1</x-m> + <y-m>0.0</y-m> + <z-m>0.0</z-m> + </offsets> + </model> + + <model> + <path>Models/Geometry/Nimitz/Models/source-red-proc.xml</path> + <condition> + <property>/sim/rendering/shaders/skydome</property> + </condition> + <offsets> + <x-m>0.1</x-m> + <y-m>0.0</y-m> + <z-m>0.0</z-m> + </offsets> + </model> + <animation> <type>alpha-test</type> <object-name>Source-Orange</object-name> @@ -424,6 +452,9 @@ <property>controls/flols/angle-degs</property> <value>3.075</value> </greater-than> + <not> + <property>/sim/rendering/shaders/skydome</property> + </not> </and> </condition> </animation> @@ -440,6 +471,9 @@ <property>controls/flols/angle-degs</property> <value>2.65</value> </greater-than-equals> + <not> + <property>/sim/rendering/shaders/skydome</property> + </not> </and> </condition> </animation> diff --git a/Models/Geometry/Nimitz/Models/wave-off.xml b/Models/Geometry/Nimitz/Models/wave-off.xml index 2a86618e2..7538dd28c 100644 --- a/Models/Geometry/Nimitz/Models/wave-off.xml +++ b/Models/Geometry/Nimitz/Models/wave-off.xml @@ -26,6 +26,16 @@ <z-factor>0.01</z-factor> </animation> + <animation> + <type>select</type> + <object-name>Wave-Off</object-name> + <condition> + <not> + <property>/sim/rendering/shaders/skydome</property> + </not> + </condition> + </animation> + <!-- *** LoD *** --> <animation> <type>range</type> @@ -34,4 +44,17 @@ <max-m>5000</max-m> </animation> + <!-- ALS procedural light --> + <model> + <path>Models/Geometry/Nimitz/Models/wave-off-proc.xml</path> + <condition> + <property>/sim/rendering/shaders/skydome</property> + </condition> + <offsets> + <x-m>0.100</x-m> + <y-m>0.000</y-m> + <z-m>0.000</z-m> + </offsets> + </model> + </PropertyList>