Skip to content

Commit 30bd7b4

Browse files
Eran61Eran61
authored
Merge pull request #26 from Navigraph/fix/2024-sample-project-fixes
Emissive fix, 2024 wasm module removal and doc update
2 parents 1358fb4 + b27abec commit 30bd7b4

File tree

56 files changed

+280
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+280
-71
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _PackageInt
44
.rollup.cache
55
tsconfig.tsbuildinfo
66
.vs
7-
examples/aircraft/NavigationDataInterfaceAircraftProject.xml.user
7+
example/aircraft/NavigationDataInterfaceAircraftProject.xml.user
88
example/aircraft/PackageSources/html_ui/Pages/VCockpit/Instruments/Navigraph/NavigationDataInterfaceSample
99
example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/panel/msfs_navigation_data_interface.wasm
1010

‎Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ RUN cargo install --git https://github.com/navigraph/cargo-msfs
2222
# Cache bust arg to re-install both SDKs
2323
ARG CACHEBUST
2424

25-
# Install MSFS2020 and MSFS2024 SDK
26-
RUN cargo-msfs install msfs2020 && \
27-
cargo-msfs install msfs2024
25+
# Install MSFS2020 SDK
26+
RUN cargo-msfs install msfs2020
2827

2928
# Needed when running in CI/CD to avoid dubious ownership errors
3029
RUN git config --global --add safe.directory /workspace

‎README.md‎

Lines changed: 25 additions & 13 deletions

‎example/aircraft/PackageDefinitions/navigraph-aircraft-navigation-data-interface-sample.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,42 @@
1010
<VisibleInStore>true</VisibleInStore>
1111
<CanBeReferenced>true</CanBeReferenced>
1212
</Flags>
13+
<PackageOrderHint>CUSTOM_SIMOBJECTS</PackageOrderHint>
1314
<AssetGroups>
1415
<AssetGroup Name="ContentInfo">
15-
<Type>Copy</Type>
16+
<Type Version="0">Copy</Type>
1617
<Flags>
1718
<FSXCompatibility>false</FSXCompatibility>
1819
</Flags>
1920
<AssetDir>PackageDefinitions\navigraph-aircraft-navigation-data-interface-sample\ContentInfo\</AssetDir>
2021
<OutputDir>ContentInfo\navigraph-aircraft-navigation-data-interface-sample\</OutputDir>
2122
</AssetGroup>
2223
<AssetGroup Name="Data">
23-
<Type>Copy</Type>
24+
<Type Version="0">Copy</Type>
2425
<Flags>
2526
<FSXCompatibility>false</FSXCompatibility>
2627
</Flags>
2728
<AssetDir>PackageSources\Data\</AssetDir>
2829
<OutputDir>Data\</OutputDir>
2930
</AssetGroup>
3031
<AssetGroup Name="Navigraph">
31-
<Type>Copy</Type>
32+
<Type Version="0">Copy</Type>
3233
<Flags>
3334
<FSXCompatibility>false</FSXCompatibility>
3435
</Flags>
3536
<AssetDir>PackageSources\Navigraph\</AssetDir>
3637
<OutputDir>Navigraph\</OutputDir>
3738
</AssetGroup>
3839
<AssetGroup Name="SimObject">
39-
<Type>SimObject</Type>
40+
<Type Version="1">SimObject</Type>
4041
<Flags>
4142
<FSXCompatibility>false</FSXCompatibility>
4243
</Flags>
4344
<AssetDir>PackageSources\SimObjects\Airplanes\Navigraph_Navigation_Data_Interface_Aircraft\</AssetDir>
4445
<OutputDir>SimObjects\Airplanes\Navigraph_Navigation_Data_Interface_Aircraft\</OutputDir>
4546
</AssetGroup>
4647
<AssetGroup Name="html_ui">
47-
<Type>Copy</Type>
48+
<Type Version="0">Copy</Type>
4849
<Flags>
4950
<FSXCompatibility>false</FSXCompatibility>
5051
</Flags>
@@ -53,3 +54,4 @@
5354
</AssetGroup>
5455
</AssetGroups>
5556
</AssetPackage>
57+

‎example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/model/GaugeAircraft_Interior.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,15 @@
1313
<LOD minSize="1" ModelFile="GaugeAircraft_Interior_LOD04.gltf"/>
1414
</LODS>
1515

16+
<Behaviors>
17+
<Include ModelBehaviorFile="Asobo\Common.xml"/>
18+
19+
<Component ID="SCREEN" Node="Screens">
20+
<UseTemplate Name="ASOBO_GT_Emissive_Gauge">
21+
<PART_ID>SCREEN</PART_ID>
22+
<EMISSIVE_CODE>1</EMISSIVE_CODE>
23+
</UseTemplate>
24+
</Component>
25+
</Behaviors>
1626

1727
</ModelInfo>

‎example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/texture.01/GaugeAircraft_FUSELAGE_albd_000.png.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<BitmapConfiguration>
2+
<BitmapSlot>MTL_BITMAP_DECAL0</BitmapSlot>
3+
</BitmapConfiguration>
4+

‎example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/texture.01/GaugeAircraft_WINGS_albd_000.png.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<BitmapConfiguration>
2+
<BitmapSlot>MTL_BITMAP_DECAL0</BitmapSlot>
3+
</BitmapConfiguration>
4+

‎example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/texture.02/GaugeAircraft_FUSELAGE_albd_000.png.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<BitmapConfiguration>
2+
<BitmapSlot>MTL_BITMAP_DECAL0</BitmapSlot>
3+
</BitmapConfiguration>
4+

‎example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/texture.02/GaugeAircraft_WINGS_albd_000.png.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<BitmapConfiguration>
2+
<BitmapSlot>MTL_BITMAP_DECAL0</BitmapSlot>
3+
</BitmapConfiguration>
4+

‎example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/texture.base/Pilot_ARMS_albd.png.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<BitmapConfiguration>
2+
<BitmapSlot>MTL_BITMAP_DECAL0</BitmapSlot>
3+
</BitmapConfiguration>
4+

0 commit comments

Comments
 (0)