Merge pull request #48 from luizrenault/devel

Devel

Author: luizrenault

.gitignore

@@ -1 +1,2 @@
 Dev
+Textures/A-29B

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "cSpell.ignoreWords": [
+        "ccip",
+        "ccrp",
+        "cmfd",
+        "eicas",
+        "refactory",
+        "ufcp"
+    ]
+}

A-29B.lua

@@ -27,6 +27,8 @@ pages =
 	 },
 }
 
+dofile(LockOn_Options.common_script_path.."ViewportHandling.lua") 
+try_find_assigned_viewport("A29B_BFI")
 
 -- update_screenspace_diplacement(SelfWidth/SelfHeight,false)
 -- dedicated_viewport_arcade = dedicated_viewport

Cockpit/Scripts/BFI/init.lua

@@ -7,22 +7,25 @@ dofile(LockOn_Options.script_path.."CMFD/CMFD_init_COMMON.lua")
 
 init_pageID = PAGE_ID
 
-dofile(LockOn_Options.common_script_path.."ViewportHandling.lua")
+-- dofile(LockOn_Options.common_script_path.."ViewportHandling.lua")
 
--- MFCD position in HUD only view
--- MFCD_set_screenspace_displacement(3/4, -1, 0.8)
-local w = LockOn_Options.screen.width;
-local h = LockOn_Options.screen.height;
+-- -- -- MFCD position in HUD only view
+-- -- -- MFCD_set_screenspace_displacement(3/4, -1, 0.8)
+-- -- local w = LockOn_Options.screen.width;
+-- -- local h = LockOn_Options.screen.height;
 
-local hud_only_view_position = best_fit_rect(0, h * (1 - 50/120), w/3 , h * 50/120, Viewport_Align.left, Viewport_Align.vcenter, MFCD_aspect)
-dedicated_viewport           = hud_only_view_position
-dedicated_viewport_arcade    = hud_only_view_position
+-- -- local hud_only_view_position = best_fit_rect(0, h * (1 - 50/120), w/3 , h * 50/120, Viewport_Align.left, Viewport_Align.vcenter, MFCD_aspect)
+-- -- dedicated_viewport           = hud_only_view_position
+-- -- dedicated_viewport_arcade    = hud_only_view_position
 
 
-local default_viewport = try_find_assigned_viewport('A29B_LEFT_MFCD', 'LEFT_MFCD')
-if default_viewport then
-    dedicated_viewport = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
-    dedicated_viewport_arcade = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
-    purposes                  = {render_purpose.GENERAL, render_purpose.SCREENSPACE_INSIDE_COCKPIT, render_purpose.HUD_ONLY_VIEW}
-    render_target_always      = true
-end
+-- -- local default_viewport = try_find_assigned_viewport('A29B_LEFT_MFCD', 'LEFT_MFCD')
+-- -- if default_viewport then
+-- --     dedicated_viewport = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
+-- --     dedicated_viewport_arcade = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
+-- --     purposes                  = {render_purpose.GENERAL, render_purpose.SCREENSPACE_INSIDE_COCKPIT, render_purpose.HUD_ONLY_VIEW}
+-- --     render_target_always      = true
+-- -- end
+
+dofile(LockOn_Options.common_script_path.."ViewportHandling.lua") 
+try_find_assigned_viewport("A29B_LEFT_MFCD")

Cockpit/Scripts/CMFD/CMFD_Left_init.lua

@@ -7,22 +7,24 @@ dofile(LockOn_Options.script_path.."CMFD/CMFD_init_COMMON.lua")
 
 init_pageID = PAGE_ID
 
-dofile(LockOn_Options.common_script_path.."ViewportHandling.lua")
-
--- MFCD position in HUD only view
--- MFCD_set_screenspace_displacement(3/4, -1, 0.8)
-local w = LockOn_Options.screen.width;
-local h = LockOn_Options.screen.height;
-
-local hud_only_view_position = best_fit_rect(0, h * (1 - 50/120), w/3 , h * 50/120, Viewport_Align.left, Viewport_Align.vcenter, CMFD_aspect)
-dedicated_viewport           = hud_only_view_position
-dedicated_viewport_arcade    = hud_only_view_position
-
-local default_viewport = try_find_assigned_viewport('A29B_RIGHT_MFCD', 'RIGHT_MFCD')
-if default_viewport then
-    dedicated_viewport = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
-    dedicated_viewport_arcade = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
-    purposes                  = {render_purpose.GENERAL, render_purpose.SCREENSPACE_INSIDE_COCKPIT, render_purpose.HUD_ONLY_VIEW}
-    render_target_always      = true
-end
-
+-- dofile(LockOn_Options.common_script_path.."ViewportHandling.lua")
+
+-- -- MFCD position in HUD only view
+-- -- MFCD_set_screenspace_displacement(3/4, -1, 0.8)
+-- local w = LockOn_Options.screen.width;
+-- local h = LockOn_Options.screen.height;
+
+-- local hud_only_view_position = best_fit_rect(0, h * (1 - 50/120), w/3 , h * 50/120, Viewport_Align.left, Viewport_Align.vcenter, CMFD_aspect)
+-- dedicated_viewport           = hud_only_view_position
+-- dedicated_viewport_arcade    = hud_only_view_position
+
+-- local default_viewport = try_find_assigned_viewport('A29B_RIGHT_MFCD', 'RIGHT_MFCD')
+-- if default_viewport then
+--     dedicated_viewport = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
+--     dedicated_viewport_arcade = {default_viewport.x, default_viewport.y, default_viewport.width, default_viewport.height}
+--     purposes                  = {render_purpose.GENERAL, render_purpose.SCREENSPACE_INSIDE_COCKPIT, render_purpose.HUD_ONLY_VIEW}
+--     render_target_always      = true
+-- end
+
+dofile(LockOn_Options.common_script_path.."ViewportHandling.lua") 
+try_find_assigned_viewport("A29B_RIGHT_MFCD")