Skip to content

Commit b0f524a

Browse files
author
Luiz Renault
committed
UFCP e NAV
1 parent 0576473 commit b0f524a

Some content is hidden

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

61 files changed

+1636
-188
lines changed

‎A-29B.lua‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -468,15 +468,14 @@ A_29B = {
468468
typeng = 3, -- E_TURBOJET = 0, E_TURBOJET_AB = 1, E_PISTON = 2, E_TURBOPROP = 3, E_TURBOFAN = 4, E_TURBOSHAFT = 5
469469
hMaxEng = 19.5, -- maximum operating altitude for the engine in km -- typically higher than service ceiling of the aircraft
470470
dcx_eng = 0.0114, -- drag coefficient for the engine -- no correlation found -- most common values are 0.0085 and 0.0144
471-
cemax = 0.13, -- kg / sec - fuel consumption for a single engine in dry configuration
472-
cefor = 0.13, -- kg / sec - fuel consumption for a single engine in afterburner configuration
471+
cemax = 0.097, -- kg / sec - fuel consumption for a single engine in dry configuration
472+
cefor = 0.097, -- kg / sec - fuel consumption for a single engine in afterburner configuration
473473
dpdh_m = 1800, -- altitude coefficient for max thrust -- altitude effects to thrust -- The best recommendation at this point is to start with these values between 2000 and 3000 and adjust as needed after initial flight testing
474474
dpdh_f = 1800, -- altitude coefficient for AB thrust ???? or altitude effects to fuel rate -- The best recommendation at this point is to start with these values between 2000 and 3000 and adjust as needed after initial flight testing
475475
table_data = {
476476
-- Pmax - total thrust in Newtons (kN * 1000) for all engines
477477
-- Pfor - total thrust in Newtons (kN * 1000) for all engines
478478
-- M Pmax Pfor
479-
{-0.1, 16620.0},
480479
{0.0, 16620.0},
481480
{0.1, 15600.0},
482481
{0.2, 14340.0},
@@ -554,18 +553,20 @@ A_29B = {
554553
weightWhenOn = -80,
555554
wCtrl = 150,
556555
},
557-
{
558-
id = 'PropellorType',
559-
control = 'comboList',
560-
label ="Propellor Movement",
561-
defValue = 20,
562-
arg = 324,
563-
values = {
564-
{id = 0, dispName = "Stopped"},
565-
{id = 20, dispName = "Rotating"},
566-
},
567-
wCtrl = 150,
568-
},
556+
-- {
557+
-- id = 'PropellorType',
558+
-- control = 'comboList',
559+
-- label ="Propellor Movement",
560+
-- defValue = 20,
561+
-- arg = 324,
562+
-- values = {
563+
-- {id = 0, dispName = "Stopped"},
564+
-- {id = 1, dispName = "Rotating"},
565+
-- },
566+
-- wCtrl = 150,
567+
-- },
568+
{ id = "RotatingProp" , control = 'checkbox', label = 'Rotating propellor', defValue = true, weight = 0, arg = 324},
569+
569570
},
570571
--damage , index meaning see in Scripts\Aircrafts\_Common\Damage.lua
571572
Damage = {

Cockpit/Scripts/BFI/Resources/BFI_Background.png renamed to Cockpit/Scripts/BFI/Resources/a29b_BFI_Background.png

File renamed without changes.

Cockpit/Scripts/BFI/Resources/BFI_Bank.png renamed to Cockpit/Scripts/BFI/Resources/a29b_BFI_Bank.png

File renamed without changes.

Cockpit/Scripts/BFI/Resources/BFI_Horizon.bmp renamed to Cockpit/Scripts/BFI/Resources/a29b_BFI_Horizon.bmp

File renamed without changes.

Cockpit/Scripts/BFI/Resources/BFI_Ias.bmp renamed to Cockpit/Scripts/BFI/Resources/a29b_BFI_Ias.bmp

File renamed without changes.

‎Cockpit/Scripts/CMFD/CMFD_init_COMMON.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ mat_tbl = {
102102
"cmfd_font_wy",
103103
"cmfd_font_d",
104104
"cmfd_font_r",
105+
"ufcp_font_def",
105106
}
106107

107108
-- MFCD Colors
@@ -134,6 +135,7 @@ color_sensitive_materials = {
134135
"cmfd_wpn_font_def",
135136
"cmfd_wpn_font_g",
136137
--"cmfd_wpn_svg_font_def",
138+
"ufcp_font_def",
137139
}
138140

139141
is_colored = true

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

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

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

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ object = addStrokeText(nil, "TOFT 00:00:00", CMFD_STRINGDEFS_DEF_X1, "LeftCenter
8282
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_HOURS", "CMFD_NAV_FYT_MINS", "CMFD_NAV_FYT_SECS"}
8383
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}, {"text_using_parameter", 3, 2}}
8484

85-
object = addStrokeText(nil, "N 41`52.20'", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, 0.305}, CMFD_NAV_FYT_origin.name, nil, {"N %02.0f`", "%05.2f'"})
86-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_LAT_DEG", "CMFD_NAV_FYT_LAT_MIN"}
87-
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}}
85+
object = addStrokeText(nil, "N 41`52.20'", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, 0.305}, CMFD_NAV_FYT_origin.name, nil, {"%s", " %02.0f`", "%05.2f'"})
86+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_LAT_HEMIS", "CMFD_NAV_FYT_LAT_DEG", "CMFD_NAV_FYT_LAT_MIN"}
87+
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}, {"text_using_parameter", 3, 2}}
8888

89-
object = addStrokeText(nil, "N 047`39.51'", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, 0.206}, CMFD_NAV_FYT_origin.name, nil, {"E %03.0f`", "%05.2f'"})
90-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_LON_DEG", "CMFD_NAV_FYT_LON_MIN"}
91-
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}}
89+
object = addStrokeText(nil, "N 047`39.51'", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, 0.206}, CMFD_NAV_FYT_origin.name, nil, {"%s", " %03.0f`", "%05.2f'"})
90+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_LON_HEMIS", "CMFD_NAV_FYT_LON_DEG", "CMFD_NAV_FYT_LON_MIN"}
91+
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}, {"text_using_parameter", 3, 2}}
9292

9393
object = addStrokeText(nil, "ELV 120 FT", CMFD_STRINGDEFS_DEF_X1, "LeftCenter", {-0.41, 0.02}, CMFD_NAV_FYT_origin.name, nil, {"ELV %5.0f FT"})
9494
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_FYT_ELV"}
@@ -115,15 +115,55 @@ object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1
115115
object = addOSSArrow(27, 1, CMFD_NAV_FYT_origin.name)
116116
object = addOSSArrow(26, 0, CMFD_NAV_FYT_origin.name)
117117

118+
object = addOSSArrow(2, 0, nil)
119+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_PG_NEXT"}
120+
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, 1}}
121+
122+
object = addOSSArrow(3, 1, nil)
123+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_PG_PREV"}
124+
object.controllers = {{"opacity_using_parameter", 0}, {"parameter_compare_with_number", 1, 1}}
125+
118126

119127
local CMFD_NAV_ROUT_origin = addPlaceholder(nil, {0,0}, page_root.name)
120128
CMFD_NAV_ROUT_origin.element_params = {"CMFD_NAV_FORMAT"}
121129
CMFD_NAV_ROUT_origin.controllers = {{"parameter_compare_with_number", 0, CMFD_NAV_FORMAT_IDS.ROUT}}
122130

123-
object = addStrokeText(nil, "", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0, -0.1}, CMFD_NAV_ROUT_origin.name, nil, {"%s"})
124-
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_ROUT_TEXT"}
125-
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}}
131+
object = addStrokeText(nil, "", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0, -0.1}, CMFD_NAV_ROUT_origin.name, nil, {"%s", "%s", "%s"})
132+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_ROUT_TEXT", "CMFD_NAV_ROUT_TEXT1", "CMFD_NAV_ROUT_TEXT2"}
133+
object.controllers = {{"opacity_using_parameter", 0}, {"text_using_parameter", 1, 0}, {"text_using_parameter", 2, 1}, {"text_using_parameter", 3, 2}}
126134

135+
local CMFD_NAV_AC_origin = addPlaceholder(nil, {0,0}, page_root.name)
136+
CMFD_NAV_AC_origin.element_params = {"CMFD_NAV_FORMAT"}
137+
CMFD_NAV_AC_origin.controllers = {{"parameter_compare_with_number", 0, CMFD_NAV_FORMAT_IDS.AC}}
138+
139+
object = addStrokeText(nil, "", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0, -0.1}, CMFD_NAV_AC_origin.name, nil, {"%s", "%s", "%s"})
140+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_AC_TEXT", "CMFD_NAV_AC_TEXT1", "CMFD_NAV_AC_TEXT2"}
141+
object.controllers = {
142+
{"opacity_using_parameter", 0},
143+
{"text_using_parameter", 1, 0},
144+
}
145+
146+
local CMFD_NAV_AFLD_origin = addPlaceholder(nil, {0,0}, page_root.name)
147+
CMFD_NAV_AFLD_origin.element_params = {"CMFD_NAV_FORMAT"}
148+
CMFD_NAV_AFLD_origin.controllers = {{"parameter_compare_with_number", 0, CMFD_NAV_FORMAT_IDS.AFLD}}
149+
150+
object = addStrokeText(nil, "", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0, -0.1}, CMFD_NAV_AFLD_origin.name, nil, {"%s"})
151+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_AFLD_TEXT"}
152+
object.controllers = {
153+
{"opacity_using_parameter", 0},
154+
{"text_using_parameter", 1, 0},
155+
}
156+
157+
local CMFD_NAV_MARK_origin = addPlaceholder(nil, {0,0}, page_root.name)
158+
CMFD_NAV_MARK_origin.element_params = {"CMFD_NAV_FORMAT"}
159+
CMFD_NAV_MARK_origin.controllers = {{"parameter_compare_with_number", 0, CMFD_NAV_FORMAT_IDS.MARK}}
160+
161+
object = addStrokeText(nil, "", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {0, -0.1}, CMFD_NAV_MARK_origin.name, nil, {"%s"})
162+
object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "CMFD_NAV_MARK_TEXT"}
163+
object.controllers = {
164+
{"opacity_using_parameter", 0},
165+
{"text_using_parameter", 1, 0},
166+
}
127167

128168
-- object = addStrokeText("SMS_GUNS_L", "100", CMFD_STRINGDEFS_DEF_X08, "CenterCenter", {-0.134, 0.85}, nil, nil,{"%03.0f"})
129169
-- object.element_params = {"CMFD"..tostring(CMFDNu).."_BRIGHT", "WPN_GUNS_L"}

Cockpit/Scripts/CMFD/Resources/font_CMFD.dds renamed to Cockpit/Scripts/CMFD/Resources/a29b_font_CMFD.dds

File renamed without changes.

‎Cockpit/Scripts/CMFD/materials.lua‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ textures["hud_tex_ind2_y"] = {IND_TEX_PATH .. "Indication_HUD_2.dds", mate
8383
-- textures["hud_mesh_base1"] = {nil, materials["HUD_IND_BASE1"]}
8484
-- textures["hud_mesh_base2"] = {nil, materials["HUD_IND_BASE2"]}
8585

86-
-- textures["hud_line_dashed_def"] = {IND_TEX_PATH .. "Indication_Line_Dashed.dds", materials["HUD_IND_DEF"]}
86+
-- textures["hud_line_dashed_def"] = {IND_TEX_PATH .. "a29b_Indication_line_Dashed.dds", materials["HUD_IND_DEF"]}
8787

8888
-- -- UFCP
8989
-- textures["ufcd_mesh_def"] = {nil, materials["UFCP_IND_DEF"]}
@@ -137,10 +137,10 @@ textures["cmfd_tex_eicas"] = {IND_TEX_PATH .. "a29b_cmfd.png", materials[
137137
-- textures["cmfd_tex_ind5_y"] = {IND_TEX_PATH .. "Indication_CMFD_5.dds", materials["CMFD_IND_YELLOW"]}
138138
-- textures["cmfd_tex_ind5_r"] = {IND_TEX_PATH .. "Indication_CMFD_5.dds", materials["CMFD_IND_RED"]}
139139

140-
-- textures["cmfd_line_dashed_def"] = {IND_TEX_PATH .. "Indication_Line_Dashed.dds", materials["CMFD_IND_DEF"]}
141-
-- textures["cmfd_line_dashed_r"] = {IND_TEX_PATH .. "Indication_Line_Dashed.dds", materials["CMFD_IND_RED"]}
142-
-- textures["cmfd_line_dashed_w"] = {IND_TEX_PATH .. "Indication_Line_Dashed.dds", materials["CMFD_IND_WHITE"]}
143-
-- textures["cmfd_line_dashed_y"] = {IND_TEX_PATH .. "Indication_Line_Dashed.dds", materials["CMFD_IND_YELLOW"]}
140+
-- textures["cmfd_line_dashed_def"] = {IND_TEX_PATH .. "a29b_Indication_line_Dashed.dds", materials["CMFD_IND_DEF"]}
141+
-- textures["cmfd_line_dashed_r"] = {IND_TEX_PATH .. "a29b_Indication_line_Dashed.dds", materials["CMFD_IND_RED"]}
142+
-- textures["cmfd_line_dashed_w"] = {IND_TEX_PATH .. "a29b_Indication_line_Dashed.dds", materials["CMFD_IND_WHITE"]}
143+
-- textures["cmfd_line_dashed_y"] = {IND_TEX_PATH .. "a29b_Indication_line_Dashed.dds", materials["CMFD_IND_YELLOW"]}
144144

145145

146146
textures["cmfd_mesh_def"] = {nil, materials["CMFD_IND_DEF"]}
@@ -168,11 +168,11 @@ textures["cmfd_mesh_whitebase"] = {nil, materials["CMFD_IND_W_BASE"]}
168168
-- --fonts["font_hints_kneeboard"] = {fontdescription["font_general_loc"], 10, {100,0,100,255}}
169169

170170
-- -- HUD
171-
-- fonts["hud_font_def"] = {fontdescription["font_HUD"], 10, materials["HUD_IND_DEF"]}
172-
-- fonts["hud_font_g"] = {fontdescription["font_HUD"], 10, materials["HUD_IND_GREEN"]}
173-
-- fonts["hud_font_b"] = {fontdescription["font_HUD"], 10, materials["HUD_IND_BLUE"]}
174-
-- fonts["hud_font_w"] = {fontdescription["font_HUD"], 10, materials["HUD_IND_WHITE"]}
175-
-- fonts["hud_font_r"] = {fontdescription["font_HUD"], 10, materials["HUD_IND_RED"]}
171+
-- fonts["hud_font_def"] = {fontdescription["a29b_font_hud"], 10, materials["HUD_IND_DEF"]}
172+
-- fonts["hud_font_g"] = {fontdescription["a29b_font_hud"], 10, materials["HUD_IND_GREEN"]}
173+
-- fonts["hud_font_b"] = {fontdescription["a29b_font_hud"], 10, materials["HUD_IND_BLUE"]}
174+
-- fonts["hud_font_w"] = {fontdescription["a29b_font_hud"], 10, materials["HUD_IND_WHITE"]}
175+
-- fonts["hud_font_r"] = {fontdescription["a29b_font_hud"], 10, materials["HUD_IND_RED"]}
176176

177177
-- CMPDs
178178
fonts["cmfd_font_def"] = {fontdescription["font_CMFD"], 10, materials["CMFD_IND_DEF"]}

0 commit comments

Comments
 (0)