Merge pull request c172p-team#1470 from hbeni/Issue1469_VSI-Jumpy

Issue1469 vsi jumpy
Murmur79 · Nov 21, 2023 · eefa953 · eefa953
2 parents ee7d25c + 80de20c
commit eefa953
Show file tree

Hide file tree

Showing 14 changed files with 1,529 additions and 1,043 deletions.
diff --git a/Models/Interior/Panel/Instruments/VSI/VSI.xml b/Models/Interior/Panel/Instruments/VSI/VSI.xml
@@ -40,7 +40,7 @@
         <type>rotate</type>
         <object-name>PointerCentre</object-name>
         <object-name>PointerTip</object-name>
-        <property>instrumentation/vertical-speed-indicator/indicated-speed-fpm</property>
+        <property>instrumentation/vertical-speed-indicator/indicated-speed-fpm-final</property>
         <interpolation>
             <entry>
                 <ind>-2000</ind>

diff --git a/Models/Interior/Panel/Instruments/mag-compass/compass-correction-card.png b/Models/Interior/Panel/Instruments/mag-compass/compass-correction-card.png
diff --git a/Models/Interior/Panel/Instruments/mag-compass/mag-compass-fg1000.xml b/Models/Interior/Panel/Instruments/mag-compass/mag-compass-fg1000.xml
@@ -10,6 +10,8 @@
         <object-name>Casing</object-name>
         <object-name>Interior</object-name>
         <object-name>Needle</object-name>
+        <object-name>Deviation</object-name>
+        <object-name>Deviation-Card</object-name>
     </effect>
 
     <effect>
@@ -134,4 +136,34 @@
         </hovered>
     </animation>
 
+    <animation>
+        <type>pick</type>
+        <object-name>Deviation</object-name>
+        <object-name>Deviation-Card</object-name>
+        <visible>true</visible>
+        <action>
+            <button>0</button>
+            <repeatable>false</repeatable>
+            <binding>
+                <command>property-toggle</command>
+                <property>sim/model/c172p/cockpit/view-deviation-card</property>
+            </binding>
+        </action>
+        <hovered>
+            <binding>
+                <command>set-tooltip</command>
+                <tooltip-id>deviation</tooltip-id>
+                <label>Show Deviation Card</label>
+            </binding>
+        </hovered>
+    </animation>
+
+    <animation>
+        <type>select</type>
+        <object-name>Deviation-Card</object-name>
+        <condition>
+            <property>sim/model/c172p/cockpit/view-deviation-card</property>
+        </condition>
+    </animation>
+
 </PropertyList>
diff --git a/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float-fg1000.xml b/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float-fg1000.xml
@@ -10,6 +10,8 @@
         <object-name>Casing</object-name>
         <object-name>Interior</object-name>
         <object-name>Needle</object-name>
+        <object-name>Deviation</object-name>
+        <object-name>Deviation-Card</object-name>
     </effect>
 
     <effect>
@@ -23,14 +25,14 @@
         <object-name>Needle</object-name>
         <condition>
             <or>
-				<not>
-					<property>sim/rendering/shaders/skydome</property>
-				</not>
-				<equals>
-					<property>sim/rendering/shaders/model</property>
-					<value>0</value>
-				</equals>
-			</or>
+                <not>
+                    <property>sim/rendering/shaders/skydome</property>
+                </not>
+                <equals>
+                    <property>sim/rendering/shaders/model</property>
+                    <value>0</value>
+                </equals>
+            </or>
         </condition>
         <emission>
             <red-prop>/sim/model/material/instruments/default-red-combined-factor</red-prop>
@@ -45,14 +47,14 @@
         <object-name>Interior</object-name>
         <condition>
             <or>
-				<not>
-					<property>sim/rendering/shaders/skydome</property>
-				</not>
-				<equals>
-					<property>sim/rendering/shaders/model</property>
-					<value>0</value>
-				</equals>
-			</or>
+                <not>
+                    <property>sim/rendering/shaders/skydome</property>
+                </not>
+                <equals>
+                    <property>sim/rendering/shaders/model</property>
+                    <value>0</value>
+                </equals>
+            </or>
         </condition>
         <emission>
             <red-prop>/sim/model/c172p/lighting/rgb-ra-r-factor</red-prop>
@@ -112,4 +114,34 @@
         </hovered>
     </animation>
 
+    <animation>
+        <type>pick</type>
+        <object-name>Deviation</object-name>
+        <object-name>Deviation-Card</object-name>
+        <visible>true</visible>
+        <action>
+            <button>0</button>
+            <repeatable>false</repeatable>
+            <binding>
+                <command>property-toggle</command>
+                <property>sim/model/c172p/cockpit/view-deviation-card</property>
+            </binding>
+        </action>
+        <hovered>
+            <binding>
+                <command>set-tooltip</command>
+                <tooltip-id>deviation</tooltip-id>
+                <label>Show Deviation Card</label>
+            </binding>
+        </hovered>
+    </animation>
+
+    <animation>
+        <type>select</type>
+        <object-name>Deviation-Card</object-name>
+        <condition>
+            <property>sim/model/c172p/cockpit/view-deviation-card</property>
+        </condition>
+    </animation>
+
 </PropertyList>