Skip to content

Commit

Permalink
update(model): update cockpit model
Browse files Browse the repository at this point in the history
initial

fix textures

fix emissive stuff

fix wrong export

fix wrong export v2

update model, add new ecam button

better custom decals

small bugfix for custom decalstext

fix
  • Loading branch information
Revyn112 committed Oct 13, 2023
1 parent c8c63f1 commit 449b5c6
Show file tree
Hide file tree
Showing 9 changed files with 109,026 additions and 81,838 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -404,23 +404,33 @@
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_PRESS</TOOLTIPID>
</UseTemplate>

<!-- ECAM ELEC -->
<!-- ECAM ELEC AC -->
<UseTemplate Name="FBW_Anim_Interactions">
<ANIM_TYPE>BUTTON</ANIM_TYPE>
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>ELEC</BASE_NAME>
<PART_ID>ECAM_ELEC</PART_ID>
<BASE_NAME>ELECAC</BASE_NAME>
<PART_ID>ECAM_ELECAC</PART_ID>
<GROUP_INDEX>3</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_ELEC</TOOLTIPID>
</UseTemplate>

<!-- ECAM ELEC DC -->
<UseTemplate Name="FBW_Anim_Interactions">
<ANIM_TYPE>BUTTON</ANIM_TYPE>
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>ELECDC</BASE_NAME>
<PART_ID>ECAM_ELECDC</PART_ID>
<GROUP_INDEX>4</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_ELEC</TOOLTIPID>
</UseTemplate>

<!-- ECAM HYD -->
<UseTemplate Name="FBW_Anim_Interactions">
<ANIM_TYPE>BUTTON</ANIM_TYPE>
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>HYD</BASE_NAME>
<PART_ID>ECAM_HYD</PART_ID>
<GROUP_INDEX>4</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>5</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_HYD</TOOLTIPID>
</UseTemplate>

Expand All @@ -430,7 +440,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>FUEL</BASE_NAME>
<PART_ID>ECAM_FUEL</PART_ID>
<GROUP_INDEX>5</GROUP_INDEX>
<GROUP_INDEX>6</GROUP_INDEX>
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_FUEL</TOOLTIPID>
</UseTemplate>

Expand All @@ -440,7 +450,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>APU</BASE_NAME>
<PART_ID>ECAM_APU</PART_ID>
<GROUP_INDEX>6</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>7</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_APU</TOOLTIPID>
</UseTemplate>

Expand All @@ -450,7 +460,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>COND</BASE_NAME>
<PART_ID>ECAM_COND</PART_ID>
<GROUP_INDEX>7</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>8</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_COND</TOOLTIPID>
</UseTemplate>

Expand All @@ -460,7 +470,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>DOOR</BASE_NAME>
<PART_ID>ECAM_DOOR</PART_ID>
<GROUP_INDEX>8</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>9</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_DOOR</TOOLTIPID>
</UseTemplate>

Expand All @@ -470,7 +480,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>WHEEL</BASE_NAME>
<PART_ID>ECAM_WHEEL</PART_ID>
<GROUP_INDEX>9</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>10</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_WHEEL</TOOLTIPID>
</UseTemplate>

Expand All @@ -480,7 +490,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>FTCL</BASE_NAME>
<PART_ID>ECAM_FCTL</PART_ID>
<GROUP_INDEX>10</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>11</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.PUSH_ECAM_FCTL</TOOLTIPID>
</UseTemplate>

Expand All @@ -501,7 +511,7 @@
<ANIM_TEMPLATE>FBW_ECAM_PAGE_BUTTON_Template</ANIM_TEMPLATE>
<BASE_NAME>STS</BASE_NAME>
<Part_ID>STS</Part_ID>
<GROUP_INDEX>11</GROUP_INDEX> <!--Change to positive to activate-->
<GROUP_INDEX>12</GROUP_INDEX> <!--Change to positive to activate-->
<TOOLTIPID>Display STS informations on ECAM</TOOLTIPID>
</UseTemplate>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@
<!-- TODO: to be removed when MCDU is refactored. -->
<SIDE_NUMERIC>2</SIDE_NUMERIC>
</UseTemplate>
<UseTemplate Name="FBW_MULTI_FUNCTION_CONTROL_DISPLAY_UNIT_Template">
<SIDE>C</SIDE>
<DISPLAY_POWERED>(L:A32NX_ELEC_AC_2_BUS_IS_POWERED, Bool)</DISPLAY_POWERED>
<!-- annunciators powered by transformer 36LP via C/B 27LP -->
<ANNUNC_POWERED>(L:A32NX_ELEC_AC_2_BUS_IS_POWERED, Bool)</ANNUNC_POWERED>
<!-- TODO: to be removed when MCDU is refactored. -->
<SIDE_NUMERIC>2</SIDE_NUMERIC>
</UseTemplate>
</Component>

<!-- Integrated lighting -->
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Version":2,"SourceFileDate":133416749347901556,"Flags":["FL_BITMAP_COMPRESSION","FL_BITMAP_MIPMAP","FL_BITMAP_NO_GAMMA_CORRECTION","FL_BITMAP_METAL_ROUGH_AO_DATA"]}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Version":2,"SourceFileDate":133416749347891547,"Flags":["FL_BITMAP_COMPRESSION","FL_BITMAP_MIPMAP","FL_BITMAP_TANGENT_DXT5N","FL_BITMAP_NO_GAMMA_CORRECTION"]}
Binary file modified hdw-a339x/src/model/a330-interior/A330_NEO_INTERIOR_LOD00.bin
Binary file not shown.
Loading

0 comments on commit 449b5c6

Please sign in to comment.