Skip to content

Commit

Permalink
SU5 Update
Browse files Browse the repository at this point in the history
Fixes most stuff.  RPM knob is still an issue in not updating the "set rpm".
  • Loading branch information
TalonHawke committed Jul 30, 2021
1 parent 64f852f commit c74ce38
Show file tree
Hide file tree
Showing 38 changed files with 584 additions and 514 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SubCategory ="Pilot"
SubCategoryItem ="DefaultPilot"
PitchPanRate =20
HeadingPanRate =60
InitialXyz = 0, 0, -0.7
InitialXyz = 0, 0, -0.85
InitialPbh = 0, 0, 0
NodesToHide =""
ClipMode ="Normal"
Expand Down Expand Up @@ -72,7 +72,7 @@ SubCategory ="Pilot"
SubCategoryItem ="ClosePilot"
PitchPanRate =20
HeadingPanRate =60
InitialXyz = 0, -0.02, -0.5
InitialXyz = 0, -0.02, -0.65
InitialPbh = -5, 0, 0
NodesToHide =""
ClipMode ="Normal"
Expand Down Expand Up @@ -113,7 +113,7 @@ SubCategory ="Pilot"
SubCategoryItem ="LandingPilot"
PitchPanRate =20
HeadingPanRate =60
InitialXyz = 0, 0.05, -0.5
InitialXyz = 0, 0.05, -0.65
InitialPbh = -5, 0, 0
NodesToHide =""
ClipMode ="Normal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,3 +351,9 @@ flaps_level_3 = 0
slats_level_full = 0
flaps_level_full = 0

[MISC]
vcockpit_hud = 1

[TAKEOFF_SPEEDS]
take_off_speed_min_val = 38
take_off_speed_max_val = 60
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ until then some are disable to avoid any possible conflicts between the old and
<!-- minimum display size in % (should be bounding sphere vertical screen size, sphere will often be slightly larger than you expect) -->
<!-- default minSize is 0 -->
<LOD minSize="150" ModelFile="VL3_LOD00.gltf"/>
<LOD minSize="110" ModelFile="VL3_LOD01.gltf"/>
<LOD minSize="75" ModelFile="VL3_LOD02.gltf"/>
<LOD minSize="30" ModelFile="VL3_LOD03.gltf"/>
<LOD minSize="15" ModelFile="VL3_LOD04.gltf"/>
<LOD minSize="3" ModelFile="VL3_LOD05.gltf"/>
<LOD minSize="90" ModelFile="VL3_LOD01.gltf"/>
<LOD minSize="60" ModelFile="VL3_LOD02.gltf"/>
<LOD minSize="35" ModelFile="VL3_LOD03.gltf"/>
<LOD minSize="12" ModelFile="VL3_LOD04.gltf"/>
<LOD minSize="6" ModelFile="VL3_LOD05.gltf"/>
<LOD minSize="1" ModelFile="VL3_LOD06.gltf"/>
</LODS>
<Behaviors>
<!-- Includes ###################################### -->
<Include ModelBehaviorFile="Asobo\Common.xml"/>
<Include ModelBehaviorFile="Asobo\Exterior.xml"/>
<Include ModelBehaviorFile="Asobo\Generic\FX.xml"/>
<!-- ###################################### -->
<Component ID="HANDLING">
<UseTemplate Name="ASOBO_HANDLING_Elevator_Template">
Expand Down Expand Up @@ -81,5 +82,8 @@ until then some are disable to avoid any possible conflicts between the old and
<NODE_ID_BLURRED>RIGHT_WHEEL_BLURRED</NODE_ID_BLURRED>
</UseTemplate>
</Component>
<Component ID="LANDING_FX">
<UseTemplate Name="ASOBO_LANDING_FX"/>
</Component>
</Behaviors>
</ModelInfo>
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"accessors":[{"bufferView":0,"componentType":5126,"count":101,"min":[-4.202510833740234,-0.9786112308502197,-3.6343815326690676],"max":[4.202510833740234,0.5748421549797058,2.303337574005127],"type":"VEC3","name":"x6_fuselage_vertices#0_POSITION"},{"bufferView":0,"byteOffset":12,"componentType":5120,"count":101,"type":"VEC4","name":"x6_fuselage_vertices#0_TANGENT"},{"bufferView":0,"byteOffset":16,"componentType":5120,"count":101,"type":"VEC4","name":"x6_fuselage_vertices#0_NORMAL"},{"bufferView":0,"byteOffset":20,"componentType":5122,"count":101,"type":"VEC2","name":"x6_fuselage_vertices#0_TEXCOORD_0"},{"bufferView":0,"byteOffset":24,"componentType":5122,"count":101,"type":"VEC2","name":"x6_fuselage_vertices#0_TEXCOORD_1"},{"bufferView":0,"byteOffset":28,"componentType":5123,"count":101,"type":"VEC4","name":"x6_fuselage_vertices#0_COLOR_0"},{"bufferView":1,"componentType":5123,"count":192,"type":"SCALAR","name":"x6_fuselage_indices#0"}],"asset":{"generator":"babylon.js glTF exporter for 3dsmax 2019 v1.0.7611.18261","version":"2.0","extensions":{"ASOBO_asset_optimized":{"BoundingBoxMax":[4.202510833740234,0.5748421549797058,2.303337574005127],"BoundingBoxMin":[-4.202510833740234,-0.9786112308502197,-3.6343815326690676],"MajorVersion":4,"MinorVersion":2},"ASOBO_normal_map_convention":{"tangent_space_convention":"DirectX"}}},"bufferViews":[{"buffer":0,"byteLength":3636,"byteStride":36,"target":34962,"name":"BufferViewVertexND"},{"buffer":0,"byteLength":384,"byteOffset":3636,"target":34963,"name":"BufferViewIndex"}],"extensionsUsed":["ASOBO_normal_map_convention","MSFT_texture_dds","ASOBO_asset_optimized"],"extensionsRequired":["MSFT_texture_dds"],"materials":[{"name":"LOD_x6","alphaMode":"BLEND","occlusionTexture":{"index":1},"pbrMetallicRoughness":{"metallicFactor":0.0,"roughnessFactor":0.0,"baseColorTexture":{"index":0},"metallicRoughnessTexture":{"index":1}}}],"meshes":[{"primitives":[{"attributes":{"COLOR_0":5,"NORMAL":2,"POSITION":0,"TANGENT":1,"TEXCOORD_0":3,"TEXCOORD_1":4},"indices":6,"material":0,"mode":4,"extras":{"ASOBO_primitive":{"PrimitiveCount":64,"VertexType":"VTX","VertexVersion":2}}}],"name":"x6_fuselage"}],"nodes":[{"translation":[5.96046448e-8,0.443891346,-0.630051732],"rotation":[0.0,0.0,0.0,1.0],"scale":[1.0,1.0,1.0],"mesh":0,"name":"fuselage"}],"scene":0,"scenes":[{"nodes":[0]}],"textures":[{"extensions":{"MSFT_texture_dds":{"source":0}}},{"extensions":{"MSFT_texture_dds":{"source":1}}}],"buffers":[{"byteLength":4020,"uri":"VL3_LOD06.bin"}],"images":[{"uri":"JMB_VL3_AIRFRAME_X6_ALBD.PNG.DDS","extras":"ASOBO_image_converted_meta"},{"uri":"JMB_VL3_AIRFRAME_X6_COMP.PNG.DDS","extras":"ASOBO_image_converted_meta"}]}
{"accessors":[{"bufferView":0,"componentType":5126,"count":101,"min":[-4.202510833740234,-0.9786112308502197,-3.6343815326690676],"max":[4.202510833740234,0.5748421549797058,2.303337574005127],"type":"VEC3","name":"x6_fuselage_vertices#0_POSITION"},{"bufferView":0,"byteOffset":12,"componentType":5120,"count":101,"type":"VEC4","name":"x6_fuselage_vertices#0_TANGENT"},{"bufferView":0,"byteOffset":16,"componentType":5120,"count":101,"type":"VEC4","name":"x6_fuselage_vertices#0_NORMAL"},{"bufferView":0,"byteOffset":20,"componentType":5122,"count":101,"type":"VEC2","name":"x6_fuselage_vertices#0_TEXCOORD_0"},{"bufferView":0,"byteOffset":24,"componentType":5122,"count":101,"type":"VEC2","name":"x6_fuselage_vertices#0_TEXCOORD_1"},{"bufferView":0,"byteOffset":28,"componentType":5123,"count":101,"type":"VEC4","name":"x6_fuselage_vertices#0_COLOR_0"},{"bufferView":1,"componentType":5123,"count":192,"type":"SCALAR","name":"x6_fuselage_indices#0"}],"asset":{"generator":"babylon.js glTF exporter for 3dsmax 2019 v1.0.7822.29912","version":"2.0","extensions":{"ASOBO_asset_optimized":{"BoundingBoxMax":[4.202510833740234,0.5748421549797058,2.303337574005127],"BoundingBoxMin":[-4.202510833740234,-0.9786112308502197,-3.6343815326690676],"MajorVersion":4,"MinorVersion":3,"UseCheckerboardMaterialForMissingTextures":true},"ASOBO_normal_map_convention":{"tangent_space_convention":"DirectX"}}},"bufferViews":[{"buffer":0,"byteLength":3636,"byteStride":36,"target":34962,"name":"BufferViewVertexND"},{"buffer":0,"byteLength":384,"byteOffset":3636,"target":34963,"name":"BufferViewIndex"}],"extensionsRequired":["MSFT_texture_dds"],"materials":[{"name":"LOD6_OFFICIAL","occlusionTexture":{"index":1},"pbrMetallicRoughness":{"baseColorTexture":{"index":0},"metallicRoughnessTexture":{"index":1}}}],"meshes":[{"primitives":[{"attributes":{"COLOR_0":5,"NORMAL":2,"POSITION":0,"TANGENT":1,"TEXCOORD_0":3,"TEXCOORD_1":4},"indices":6,"material":0,"mode":4,"extras":{"ASOBO_primitive":{"PrimitiveCount":64,"VertexType":"VTX","VertexVersion":2}}}],"name":"x6_fuselage"}],"nodes":[{"translation":[5.96046448e-8,0.443891346,-0.630051732],"mesh":0,"extensions":{"ASOBO_unique_id":{"id":"x6_fuselage_3330"}},"name":"fuselage"}],"scene":0,"scenes":[{"nodes":[0]}],"textures":[{"extensions":{"MSFT_texture_dds":{"source":0}}},{"extensions":{"MSFT_texture_dds":{"source":1}}}],"extensionsUsed":["ASOBO_normal_map_convention","ASOBO_unique_id","MSFT_texture_dds","ASOBO_asset_optimized"],"buffers":[{"byteLength":4020,"uri":"VL3_LOD06.bin"}],"images":[{"uri":"JMB_VL3_AIRFRAME_X6_ALBD.PNG.DDS","extras":"ASOBO_image_converted_meta"},{"uri":"JMB_VL3_AIRFRAME_X6_COMP.PNG.DDS","extras":"ASOBO_image_converted_meta"}]}
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<LOD minSize="150" ModelFile="VL3_cockpit_lod0.gltf"/>
<LOD minSize="110" ModelFile="VL3_cockpit_lod1.gltf"/>
<LOD minSize="75" ModelFile="VL3_cockpit_lod2.gltf"/>
<LOD minSize="35" ModelFile="VL3_cockpit_lod3.gltf"/>
<LOD minSize="15" ModelFile="VL3_cockpit_lod4.gltf"/>
<LOD minSize="1" ModelFile="VL3_cockpit_lod5.gltf"/>
<LOD minSize="30" ModelFile="VL3_cockpit_lod3.gltf"/>
<LOD minSize="3.14" ModelFile="VL3_cockpit_lod4.gltf"/>
<LOD minSize="1" ModelFile="VL3_cockpit_lod6.gltf"/>
</LODS>
<Behaviors>

Expand All @@ -34,8 +34,8 @@
(A:LIGHT NAV ON:1, bool) 0 != if{ 1 (&gt;K:TOGGLE_NAV_LIGHTS) }
}
</ON_TOGGLE_MASTER_BATTERY>
<ANIMTIP_0>TT:COCKPIT.TOOLTIPS.MASTER_SWITCH_TURN_ON</ANIMTIP_0>
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.MASTER_SWITCH_TURN_OFF</ANIMTIP_1>
<TT_ICON>MOVE_Y</TT_ICON>
</UseTemplate>
<UseTemplate Name="ASOBO_GT_Update">
<UPDATE_CODE>
Expand All @@ -51,15 +51,16 @@
<AVIONICS_CIRCUIT_ID>14</AVIONICS_CIRCUIT_ID>
<NODE_ID>ELECTRICAL_Switch_Avionics_Master</NODE_ID>
<ANIM_NAME>ELECTRICAL_Switch_Avionics_Master</ANIM_NAME>
<ANIMTIP_0>TT:COCKPIT.TOOLTIPS.AVIONICS_MASTER_SWITCH_OFF</ANIMTIP_0>
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.AVIONICS_MASTER_SWITCH_ON</ANIMTIP_1>
</UseTemplate>
<UseTemplate Name="ASOBO_ELECTRICAL_Switch_Battery_Master_Template">
<ID>2</ID>
<NODE_ID>ELECTRICAL_Switch_Battery_STBY</NODE_ID>
<ANIM_NAME>ELECTRICAL_Switch_Battery_STBY</ANIM_NAME>
<ANIMTIP_0>TT:COCKPIT.TOOLTIPS.BATTERY_STBY_ARM</ANIMTIP_0>
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.BATTERY_STBY_OFF</ANIMTIP_1>
<TT_ICON>PUSH</TT_ICON>
</UseTemplate>
<UseTemplate Name="ASOBO_ELECTRICAL_Switch_Magneto_Template">
<ANIM_NAME>ELECTRICAL_Switch_Magneto</ANIM_NAME>
Expand Down Expand Up @@ -95,21 +96,31 @@
<UseTemplate Name="ASOBO_ENGINE_Lever_Propeller_Template">
<INTERACTION_TYPE>KNOB</INTERACTION_TYPE>
<ANIM_WRAP>False</ANIM_WRAP>
</UseTemplate>
</UseTemplate>
<UseTemplate Name="ASOBO_ASPropeller_Template">
<KNOB_INC_DEC_NODE_ID>ENGINE_Lever_Propeller_1</KNOB_INC_DEC_NODE_ID>
<KNOB_INC_DEC_ANIM_NAME>ENGINE_Lever_Propeller_1</KNOB_INC_DEC_ANIM_NAME>
<SWITCH_INC_DEC_NODE_ID>ENGINE_Switch_Propeller_RPM</SWITCH_INC_DEC_NODE_ID>
<SWITCH_INC_DEC_ANIM_NAME>ENGINE_Switch_Propeller_RPM</SWITCH_INC_DEC_ANIM_NAME>
<MIN_EMISSIVE_NODE_ID>ASProppeller_Emissive_Pitch_Min</MIN_EMISSIVE_NODE_ID>
<MAX_EMISSIVE_NODE_ID>ASProppeller_Emissive_Pitch_Max</MAX_EMISSIVE_NODE_ID>
<SCREEN_NODE_ID>prop_screen</SCREEN_NODE_ID>
</UseTemplate>
</Component>

<!-- FUEL ############################# -->
<Component ID="FUEL">
<UseTemplate Name="ASOBO_FUEL_Switch_Pump_Template">
<TT_ICON>PUSH</TT_ICON>
</UseTemplate>
<UseTemplate Name="ASOBO_FUEL_Switch_Selector_Template">
<ARROW_TYPE>Curved</ARROW_TYPE>
<ANIMTIP_0>TT:COCKPIT.TOOLTIPS.FUEL_SELECTOR_L_TANK</ANIMTIP_0>
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.FUEL_SELECTOR_R_TANK</ANIMTIP_1>
<ANIMTIP_2>TT:COCKPIT.TOOLTIPS.FUEL_SHUTOFF_VALVE_ON</ANIMTIP_2>
<ANIMTIP_0_ON_PERCENT>0</ANIMTIP_0_ON_PERCENT>
<ANIMTIP_1_ON_PERCENT>.5</ANIMTIP_1_ON_PERCENT>
<ANIMTIP_2_ON_PERCENT>1</ANIMTIP_2_ON_PERCENT>
<UseTemplate Name="ASOBO_FUEL_Knob_Selector_Template">
<ANIM_NAME>FUEL_Switch_Selector</ANIM_NAME>
<NODE_ID>FUEL_Switch_Selector</NODE_ID>
<!-- selector positions -->
<SELECTOR_STATE_0>LEFT</SELECTOR_STATE_0>
<SELECTOR_STATE_1>RIGHT</SELECTOR_STATE_1>
<SELECTOR_STATE_2>OFF</SELECTOR_STATE_2>
</UseTemplate>
</Component>

Expand All @@ -119,18 +130,22 @@
<ANIM_NEVER_FAILS>True</ANIM_NEVER_FAILS>
</DefaultTemplateParameters>
<Component ID="AS3X_Touch">
<UseTemplate Name="ASOBO_AS3X_Touch">
<UseTemplate Name="ASOBO_AS3X_Touch_Template">
<ID>1</ID>
</UseTemplate>
<UseTemplate Name="ASOBO_AS3X_Touch">
<UseTemplate Name="ASOBO_AS3X_Touch_Template">
<ID>2</ID>
</UseTemplate>
</Component>
<UseTemplate Name="ASOBO_AS92_Template">
<FAILURE>(A:CIRCUIT AVIONICS ON, Bool) (A:COM VOLUME:1, Percent) 0 &gt; and</FAILURE>
</UseTemplate>
<UseTemplate Name="ASOBO_AS92_Template"/>
<UseTemplate Name="ASOBO_AS21_Template">
<FAILURE>(A:CIRCUIT AVIONICS ON, Bool)</FAILURE>
<TRANSPONDER_INDEX>2</TRANSPONDER_INDEX>
</UseTemplate>
<UseTemplate Name="ASOBO_GT_Update">
<UPDATE_ONCE>True</UPDATE_ONCE>
<UPDATE_CODE>(A:TRANSPONDER STATE:1, Enum) (&gt;A:TRANSPONDER STATE:2, Enum)</UPDATE_CODE>
</UseTemplate>
<Component ID="Prop_Screen" Node="Prop_Screen">
<UseTemplate Name="ASOBO_GT_Emissive_Gauge">
Expand Down Expand Up @@ -162,6 +177,7 @@
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.FLAPS_LEVER_15</ANIMTIP_1>
<ANIMTIP_2>TT:COCKPIT.TOOLTIPS.FLAPS_LEVER_38</ANIMTIP_2>
<ANIMTIP_3>TT:COCKPIT.TOOLTIPS.FLAPS_LEVER_55</ANIMTIP_3>
<TT_ICON>MOVE_Y</TT_ICON>
</UseTemplate>
<Component ID="HANDLING_Light_Flaps">
<DefaultTemplateParameters>
Expand Down Expand Up @@ -192,7 +208,7 @@
<UseTemplate Name="ASOBO_HANDLING_Wheel_ElevatorTrim_Template">
<USE_TRAJECTORY_DRAG_MODE>True</USE_TRAJECTORY_DRAG_MODE>
<INVERT_IM_DRAG_INPUT_SCALAR>True</INVERT_IM_DRAG_INPUT_SCALAR>
<DRAG_SCALAR>0.01</DRAG_SCALAR>
<TT_ICON>MOVE_AXIS_Y</TT_ICON>
</UseTemplate>
</Component>

Expand Down Expand Up @@ -265,23 +281,32 @@
<!-- LIGHTS ############################# -->
<Component ID="LIGHTS">
<UseTemplate Name="ASOBO_LIGHTING_Switch_Light_Landing_Template">
<TT_DESCRIPTION_ID>@TT_Package.LIGHTING_SWITCH_LIGHT_LANDING_ACTION_SET</TT_DESCRIPTION_ID>
<TT_ICON>PUSH</TT_ICON>
</UseTemplate>
<UseTemplate Name="ASOBO_LIGHTING_Switch_Light_Strobe_Template">
<TT_DESCRIPTION_ID>@TT_Package.LIGHTING_SWITCH_LIGHT_STROBE_ACTION</TT_DESCRIPTION_ID>
<TOOLTIP_TITLE>@TT_Package.LIGHTING_SWITCH_LIGHT_STROBE_TITLE</TOOLTIP_TITLE>
<TT_ICON>PUSH</TT_ICON>
</UseTemplate>
</Component>

<!-- PASSENGERS ############################# -->
<Component ID="PASSENGERS">
<DefaultTemplateParameters>
<USE_DRAGGING_INTERACTION>True</USE_DRAGGING_INTERACTION>
<INVERT_INTERACTION>True</INVERT_INTERACTION><!-- MouseWheel inverted -->
</DefaultTemplateParameters>
<UseTemplate Name="ASOBO_PASSENGER_Switch_Cabin_Heat_Template">
<ANIMTIP_0>TT:COCKPIT.TOOLTIPS.CABIN_HEAT_2STATES_PUSHED</ANIMTIP_0>
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.CABIN_HEAT_2STATES_PULLED</ANIMTIP_1>
<Parameters Type="Override">
<INVERT_INTERACTION>True</INVERT_INTERACTION>
<INVERT_IM_DRAG_INPUT_SCALAR>True</INVERT_IM_DRAG_INPUT_SCALAR>
</Parameters>
<UseTemplate Name="ASOBO_PASSENGER_Lever_Cabin_Heat_Template">
<NODE_ID>PASSENGER_Switch_Cabin_Heat_1</NODE_ID>
<ANIM_NAME>PASSENGER_Switch_Cabin_Heat_1</ANIM_NAME>
</UseTemplate>
<UseTemplate Name="ASOBO_PASSENGER_Switch_Cabin_Air_Template">
<UseTemplate Name="ASOBO_PASSENGER_Lever_Cabin_Air_Template">
<NODE_ID>PASSENGER_Switch_Cabin_Ventilation_1</NODE_ID>
<ANIM_NAME>PASSENGER_Switch_Cabin_Ventilation_1</ANIM_NAME>
</UseTemplate>
Expand All @@ -290,6 +315,9 @@
<!-- SAFETY ############################# -->
<Component ID="SAFETY">
<UseTemplate Name="ASOBO_SAFETY_Switch_ELT_Template">
<NODE_ID>SAFETY_Switch_ELT</NODE_ID>
<ANIM_NAME>SAFETY_Switch_ELT</ANIM_NAME>
<EMISSIVE_NODE_ID>SAFETY_Switch_ELT_Text</EMISSIVE_NODE_ID>
</UseTemplate>
<Component ID="SAFETY_Fuel">
<UseTemplate Name="ASOBO_SAFETY_Indicator_LowFuel_Template">
Expand Down Expand Up @@ -319,15 +347,15 @@
<EMISSIVE_CODE>(A:ENG ON FIRE:1, Bool)</EMISSIVE_CODE>
</UseTemplate>
</Component>
<Component ID="TT_INOP">
<UseTemplate Name="ASOBO_GT_Interaction_Tooltip">
<NODE_ID>PASSENGER_Switch_Cabin_Ventilation_1</NODE_ID>
</UseTemplate>
<UseTemplate Name="ASOBO_GT_Interaction_Tooltip">
<NODE_ID>ENGINE_Lever_Choke</NODE_ID>
</UseTemplate>
</Component>

</Behaviors>
</ModelInfo>
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Loading

0 comments on commit c74ce38

Please sign in to comment.