Skip to content

Commit ded5ee2

Browse files
author
luizrenault
authored
Merge pull request #62 from luizrenault/devel
Devel to main
2 parents be29a76 + 00f4e51 commit ded5ee2

File tree

114 files changed

+3944
-799
lines changed

Some content is hidden

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

114 files changed

+3944
-799
lines changed

‎A-29B.lua‎

Lines changed: 233 additions & 91 deletions
Large diffs are not rendered by default.

‎Cockpit/Scripts/BFI/indication_page.lua‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ BFI_origin.vertices = {{-GetHalfWidth(), GetHalfHeight()}, { GetHalfWidth(), G
111111
BFI_origin.indices = default_box_indices
112112
BFI_origin.element_params = {"BFI_brightness", "ELEC_EMERGENCY_RESERVE_OK"}
113113
BFI_origin.controllers = {{"parameter_compare_with_number",1,1}}
114+
BFI_origin.use_mipfilter = true
114115
Add(BFI_origin)
115116

116117

@@ -135,12 +136,14 @@ BFI_Horiz_origin.controllers = {{"parameter_in_range",0,0.95,1.05},{"rotate_us
135136
BFI_Horiz_origin.parent_element = "BFI_origin"
136137
BFI_Horiz_origin.level = DISPLAY_DEFAULT_LEVEL+1
137138
BFI_Horiz_origin.h_clip_relation = h_clip_relations.COMPARE
139+
BFI_Horiz_origin.use_mipfilter = true
140+
138141
Add(BFI_Horiz_origin)
139142

140143

141144
local BFIhorizon = CreateElement "ceTexPoly"
142145
BFIhorizon.name = "BFIhorizon"
143-
BFIhorizon.material = "BFI_Horizon"
146+
BFIhorizon.material = "BFI_Horizon"
144147
BFIhorizon.vertices = {{-GetHalfWidth(), 5*GetHalfHeight()}, { GetHalfWidth(), 5*GetHalfHeight()}, { GetHalfWidth(),-5*GetHalfHeight()}, {-GetHalfWidth(),-5*GetHalfHeight()}}
145148
BFIhorizon.indices = default_box_indices
146149
BFIhorizon.tex_coords = {{0,0},{1,0},{1,1},{0,1}}
@@ -170,6 +173,7 @@ BFIbank.parent_element = "BFI_Horiz_origin"
170173
BFIbank.level = DISPLAY_DEFAULT_LEVEL
171174
BFIbank.element_params = {"BFI_brightness"}
172175
BFIbank.controllers = {{"opacity_using_parameter", 0}}
176+
BFIbank.use_mipfilter = true
173177
Add(BFIbank)
174178

175179

@@ -189,6 +193,7 @@ HDD001_PFD.h_clip_relation = h_clip_relations.REWRITE_LEVEL
189193
HDD001_PFD.parent_element = "BFI_origin"
190194
HDD001_PFD.element_params = {"BFI_brightness"}
191195
-- HDD001_PFD.controllers = {{"opacity_using_parameter", 0}}
196+
HDD001_PFD.use_mipfilter = true
192197
Add(HDD001_PFD)
193198

194199
local BFIias = CreateElement "ceTexPoly"

‎Cockpit/Scripts/CMFD/Indicator/CMFD_ADHSI.lua‎

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1
322322
-- DTK
323323
object = addStrokeText("HSI_DTK_text", "DTK\n270`\n27.5", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0.892,-0.95}, nil, nil, {"DTK\n%03.0f`\n", "%2.1f"})
324324
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "ADHSI_DTK_HDG", "ADHSI_DTK_DIST"}
325-
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_in_range", -0.05, 360.05}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}}
325+
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_in_range",1 , -0.05, 360.05}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}}
326326

327327
object = addStrokeText("HSI_NODTK_text", "DTK\nXXX`\nX.X", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0.892,-0.95})
328328
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "ADHSI_DTK_HDG", "ADHSI_DTK_DIST"}
@@ -453,12 +453,12 @@ object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "ADHSI_CDI_SHOW"}
453453
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, 1}}
454454

455455

456-
-- FYT Arrow
456+
-- FYT DTK Arrow
457457
stroke_thickness = 1.5 --0.25
458458
stroke_fuzziness = 0.6
459459
local HSI_FYT_Origin = addPlaceholder(nil, {0,0}, HSI_Origin_Rot.name)
460-
HSI_FYT_Origin.element_params = {"CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT_OAP_BRG", "AVIONICS_ANS_MODE", "ADHSI_DTK"}
461-
HSI_FYT_Origin.controllers = {{"rotate_using_parameter", 1, -math.rad(1)}, {"parameter_compare_with_number", 0, 1}, {"parameter_compare_with_number", 3, 0}, {"parameter_in_range", 2, AVIONICS_ANS_MODE_IDS.EGI-0.05, AVIONICS_ANS_MODE_IDS.GPS + 0.05}}
460+
HSI_FYT_Origin.element_params = {"CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT_DTK_BRG", "AVIONICS_ANS_MODE"}
461+
HSI_FYT_Origin.controllers = {{"rotate_using_parameter", 1, -math.rad(1)}, {"parameter_compare_with_number", 0, 1}, {"parameter_in_range", 2, AVIONICS_ANS_MODE_IDS.EGI-0.05, AVIONICS_ANS_MODE_IDS.GPS + 0.05}}
462462
object = addStrokeBox(nil, 0.03, 0.05, "CenterCenter", {0,-HSI_radius - 2.3* HSI_tick_lenght}, HSI_FYT_Origin.name, nil, "CMFD_IND_MAGENTA")
463463
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT"}
464464
object.controllers = {{"opacity_using_parameter", 0}}
@@ -475,7 +475,7 @@ object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "ADHSI_FYT_DTK_DIS
475475
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_in_range", 1, -0.05, 1.299999}, {"move_up_down_using_parameter", 1, 0.075 * HSI_radius}}
476476

477477
object = addStrokeText(nil, "", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0,0}, HSI_FYT_Origin.name, nil, {" %02.0f"}, CMFD_FONT_MAGENTA)
478-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT", "CMFD_NAV_FYT_OAP_BRG", "AVIONICS_HDG", "ADHSI_FYT_DTK_DIST"}
478+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT", "CMFD_NAV_FYT_DTK_BRG", "AVIONICS_HDG", "ADHSI_FYT_DTK_DIST"}
479479
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"move_up_down_using_parameter", 4, 0.075 * HSI_radius}, {"rotate_using_parameter", 2, math.rad(1)}, {"rotate_using_parameter", 3, -math.rad(1)}, }
480480

481481
object = addStrokeCircle(nil, 0.02, {0, 1.3 * HSI_radius}, HSI_FYT_Origin.name, nil, nil, 0.5, 0.5, true, "CMFD_IND_MAGENTA")
@@ -485,34 +485,19 @@ object.thickness = 0.05
485485

486486
-- FYT DATA
487487
object = addStrokeText("HSI_FYT_DTK_text", "", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0.412,-0.086}, nil, nil, {"FT %02.0f\n", "%03.0f`\n", "%2.1f\n", "%02.0f:", "%02.0f"}, CMFD_FONT_MAGENTA)
488-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT", "CMFD_NAV_FYT_OAP_BRG_TEXT", "CMFD_NAV_FYT_OAP_DIST", "CMFD_NAV_FYT_OAP_MINS", "CMFD_NAV_FYT_OAP_SECS", "ADHSI_DTK"}
488+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT", "CMFD_NAV_FYT_DTK_BRG_TEXT", "CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT_DTK_MINS", "CMFD_NAV_FYT_DTK_SECS", "ADHSI_DTK"}
489489
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, 1}, {"parameter_compare_with_number", 7, 0}, {"text_using_parameter", 2, 0}, {"text_using_parameter", 3, 1}, {"text_using_parameter", 4, 2}, {"text_using_parameter", 5, 3}, {"text_using_parameter", 6, 4}}
490490
object = addStrokeText("HSI_NO_FYT_DTK_text", "", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0.412,-0.086}, nil, nil, {"FT %02.0f\nXXX`\nX.X\nXX:XX"}, CMFD_FONT_MAGENTA)
491491
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT", "ADHSI_DTK"}
492492
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, -0}, {"parameter_compare_with_number", 3, 0}, {"text_using_parameter", 2, 0}}
493493

494-
-- DTK Arrow
495-
stroke_thickness = 1.5 --0.25
496-
stroke_fuzziness = 0.6
497-
local HSI_DTK_Origin = addPlaceholder("HSI_FYT_DTK_Origin", {0,0}, HSI_Origin_Rot.name)
498-
HSI_DTK_Origin.element_params = {"ADHSI_FYT_DTK_HDG", "AVIONICS_ANS_MODE"}
499-
HSI_DTK_Origin.controllers = {{"rotate_using_parameter", 0, -math.rad(1)}, {"parameter_in_range", 0, -0.05, 360,05}, {"parameter_in_range", 1, AVIONICS_ANS_MODE_IDS.EGI-0.05, AVIONICS_ANS_MODE_IDS.GPS + 0.05}}
500-
object = addStrokeBox("HSI_FYT_DTK_box", 0.03, 0.05, "CenterCenter", {0,-HSI_radius - 2.3* HSI_tick_lenght}, HSI_DTK_Origin.name, nil, "CMFD_IND_MAGENTA")
501-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT"}
502-
object.controllers = {{"opacity_using_parameter", 0}}
503-
object = addStrokeBox("HSI_FYT_DT_box_1", 0.02, 0.12, "CenterCenter", {0,HSI_radius + 2.3* HSI_tick_lenght}, HSI_DTK_Origin.name, nil, "CMFD_IND_MAGENTA")
504-
object.vertices = {{0,0.07}, {0.035, 0.02}, {0.015, 0.02}, {0.015,0}, {-0.015, 0}, {-0.015, 0.02}, {-0.035, 0.02}}
505-
object.indices = {0,1, 1,2, 2,3, 3,4, 4,5, 5,6, 6,0}
506-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT"}
507-
object.controllers = {{"opacity_using_parameter", 0}}
508-
509494
-- DTK DATA
510-
object = addStrokeText("HSI_FYT_DTK_text1", "", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0.412,-0.086}, nil, nil, {"D-\n%03.0f`\n", "%2.1f\n", "%02.0f:", "%02.0f"}, CMFD_FONT_MAGENTA)
511-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "ADHSI_DTK_HDG", "ADHSI_DTK_DIST", "ADHSI_DTK_MIN", "ADHSI_DTK_SEC", "ADHSI_DTK"}
512-
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_in_range", 1, -0.05, 360.05}, {"parameter_compare_with_number", 5, 1}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}, {"text_using_parameter", 3, 2}, {"text_using_parameter", 4, 3}}
513-
object = addStrokeText("HSI_FYT_DTK_text2", "D-\nXXX`\nX.X\nXX:XX", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0.412,-0.086}, nil, nil, nil, CMFD_FONT_MAGENTA)
514-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "ADHSI_DTK_HDG", "ADHSI_DTK"}
515-
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, -1 } , {"parameter_compare_with_number", 2, 1}}
495+
object = addStrokeText("HSI_FYT_DTK_text1", "", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0.412,-0.086}, nil, nil, {"D- %02.0f\n","%03.0f`\n", "%2.1f\n", "%02.0f:", "%02.0f"}, CMFD_FONT_MAGENTA)
496+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT", "CMFD_NAV_FYT_DTK_BRG_TEXT", "CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT_DTK_MINS", "CMFD_NAV_FYT_DTK_SECS", "ADHSI_DTK"}
497+
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, 1}, {"parameter_compare_with_number", 7, 1}, {"text_using_parameter", 2, 0}, {"text_using_parameter", 3, 1}, {"text_using_parameter", 4, 2}, {"text_using_parameter", 5, 3}, {"text_using_parameter", 6, 4}}
498+
object = addStrokeText("HSI_NO_FYT_DTK_text1", "", CMFD_STRINGDEFS_DEF_X08, "LeftCenter", {0.412,-0.086}, nil, nil, {"D- %02.0f\nXXX`\nX.X\nXX:XX"}, CMFD_FONT_MAGENTA)
499+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_VALID", "CMFD_NAV_FYT", "ADHSI_DTK"}
500+
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, 0}, {"parameter_compare_with_number", 3, 1}, {"text_using_parameter", 2, 0}}
516501

517502

518503
-- ADF

‎Cockpit/Scripts/CMFD/Indicator/CMFD_NAV.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1
8181
object = addStrokeText(nil, "OAP", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, -0.349}, CMFD_NAV_FYT_origin.name)
8282

8383
object = addStrokeText(nil, "BRG 350`", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, -0.448}, CMFD_NAV_FYT_origin.name, nil, {"BRG %03.0f`"})
84-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_OAP_BRG_TEXT"}
84+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_OAP_BRG"}
8585
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}}
8686

8787
object = addStrokeText(nil, "DIS 1300 FT", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, -0.543}, CMFD_NAV_FYT_origin.name, nil, {"DIS %5.1f NM"})

‎Cockpit/Scripts/HUD/Indicator/HUD_GRID.lua‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -800,15 +800,23 @@ object.controllers = {{"text_using_parameter", 0, 0}, {"opacity_using_parameter"
800800

801801
-- FTY distance indicator
802802
object = addStrokeText("HUD_FTI_Dist", "22.3>08", STROKE_FNT_DFLT_120, "CenterCenter", {80, -99}, nil, nil, {"%02.1f>","%02.0f"})
803-
object.element_params = {"CMFD_NAV_FYT_OAP_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT"}
804-
object.controllers = {{"text_using_parameter", 0, 0}, {"text_using_parameter", 1, 1}, {"parameter_in_range",0,-0.05, 99.94}, {"opacity_using_parameter", 2}}
803+
object.element_params = {"CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT", "ADHSI_DTK"}
804+
object.controllers = {{"text_using_parameter", 0, 0}, {"text_using_parameter", 1, 1}, {"parameter_in_range",0,-0.05, 99.94}, {"opacity_using_parameter", 2}, {"parameter_compare_with_number", 3,0}}
805805

806806
object = addStrokeText("HUD_FTI_Dist_100", "22.3>08", STROKE_FNT_DFLT_120, "CenterCenter", {80, -99}, nil, nil, {"%3.0f>","%02.0f"})
807-
object.element_params = {"CMFD_NAV_FYT_OAP_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT"}
808-
object.controllers = {{"text_using_parameter", 0, 0}, {"text_using_parameter", 1, 1}, {"parameter_in_range",0, 99.95, 999.5}, {"opacity_using_parameter", 2}}
807+
object.element_params = {"CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT", "ADHSI_DTK"}
808+
object.controllers = {{"text_using_parameter", 0, 0}, {"text_using_parameter", 1, 1}, {"parameter_in_range",0, 99.95, 999.5}, {"opacity_using_parameter", 2}, {"parameter_compare_with_number", 3,0}}
809+
810+
object = addStrokeText("HUD_DTK_Dist", "22.3>08", STROKE_FNT_DFLT_120, "CenterCenter", {80, -99}, nil, nil, {"%02.1f>D","%02.0f"})
811+
object.element_params = {"CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT", "ADHSI_DTK"}
812+
object.controllers = {{"text_using_parameter", 0, 0}, {"text_using_parameter", 1, 1}, {"parameter_in_range",0,-0.05, 99.94}, {"opacity_using_parameter", 2}, {"parameter_compare_with_number", 3, 1}}
813+
814+
object = addStrokeText("HUD_DTK_Dist_100", "22.3>08", STROKE_FNT_DFLT_120, "CenterCenter", {80, -99}, nil, nil, {"%3.0f>","%02.0f"})
815+
object.element_params = {"CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT", "ADHSI_DTK"}
816+
object.controllers = {{"text_using_parameter", 0, 0}, {"text_using_parameter", 1, 1}, {"parameter_in_range",0, 99.95, 999.5}, {"opacity_using_parameter", 2}, {"parameter_compare_with_number", 3, 1}}
809817

810818
object = addStrokeText("HUD_FTI_Dist_XXX", "22.3>08", STROKE_FNT_DFLT_120, "CenterCenter", {80, -99}, nil, nil, {"XXX>%02.0f"})
811-
object.element_params = {"CMFD_NAV_FYT_OAP_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT"}
819+
object.element_params = {"CMFD_NAV_FYT_DTK_DIST", "CMFD_NAV_FYT", "HUD_BRIGHT"}
812820
object.controllers = {{"text_using_parameter", 1, 0}, {"parameter_compare_with_number",0,-1}, {"opacity_using_parameter", 2}}
813821

814822
-- VOR
@@ -840,7 +848,7 @@ object = addStrokeText("HUD_EGIR_OFF", "OFF", STROKE_FNT_DFLT_120, "RightCenter"
840848
object.element_params = {"HUD_EGIR", "HUD_BRIGHT"}
841849
object.controllers = {{"parameter_compare_with_number", 0, 0}, {"opacity_using_parameter", 1}}
842850

843-
object = addStrokeText("HUD_EGIR_ALIGN", "ALIGN", STROKE_FNT_DFLT_120, "RightCenter", {-65, -93})
851+
object = addStrokeText("HUD_EGIR_ALIGN", "ALGN", STROKE_FNT_DFLT_120, "RightCenter", {-65, -93})
844852
object.element_params = {"HUD_EGIR", "HUD_BRIGHT"}
845853
object.controllers = {{"parameter_compare_with_number", 0, 1}, {"opacity_using_parameter", 1}}
846854

0 commit comments

Comments
 (0)