Optics - Convert Optics to use CBA Optics (acemod#7273)

* convert ace_optics to use cba_optics * convert ace optics to cba optics * Remove duplicate * Add PIP config * Use optics index * Fix pboProject build * Update CfgWeapons.hpp * Correct SOS, adjust sizes and fix build issues * Update addons/optics/script_component.hpp * Corrected sizes again * Made the scripted optics the first optics mode, fixed PIP SOS not being able to use irons * Remove unused test object * Readd AI stuff visionMode is already set * Updated some info on binos forceOptics also already set * Overhaul of magnifications * Adjusted MOS & Nightforce * Maybe this time the optics sizes will be fine... surely? * Replace heavy optics blur with CBA one * Added PIP names back --------- Co-authored-by: johnb432 <[email protected]> Co-authored-by: PabstMirror <[email protected]>
blake8090 · Aug 18, 2024 · 30432f8 · 30432f8
1 parent 70cc8f5
commit 30432f8
Show file tree

Hide file tree

Showing 31 changed files with 165 additions and 750 deletions.
diff --git a/addons/optics/CfgEventHandlers.hpp b/addons/optics/CfgEventHandlers.hpp
diff --git a/addons/optics/CfgOpticsEffect.hpp b/addons/optics/CfgOpticsEffect.hpp
diff --git a/addons/optics/CfgPreloadTextures.hpp b/addons/optics/CfgPreloadTextures.hpp
@@ -1,49 +1,38 @@
-#define MACRO_PRELOAD \
-    GVAR(BodyDay) = "*"; \
-    GVAR(BodyNight) = "*"; \
-    GVAR(ReticleDay) = "*"; \
-    GVAR(ReticleNight) = "*"
-
 class PreloadTextures {
     class CfgWeapons {
         class ACE_optic_Hamr_2D {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
-
         class ACE_optic_Hamr_PIP {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
 
         class ACE_optic_Arco_2D {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
-
         class ACE_optic_Arco_PIP {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
 
         class ACE_optic_MRCO_2D {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
-
         class ACE_optic_MRCO_PIP {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
 
         class ACE_optic_SOS_2D {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
-
         class ACE_optic_SOS_PIP {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
 
         class ACE_optic_LRPS_2D {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
-
         class ACE_optic_LRPS_PIP {
-            MACRO_PRELOAD;
+            PRELOAD;
         };
     };
 };
diff --git a/addons/optics/CfgRscTitles.hpp b/addons/optics/CfgRscTitles.hpp
diff --git a/addons/optics/CfgVehicles.hpp b/addons/optics/CfgVehicles.hpp
@@ -3,16 +3,10 @@ class CfgVehicles {
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
             MACRO_ADDITEM(ACE_optic_Hamr_2D,2);
-            MACRO_ADDITEM(ACE_optic_Hamr_PIP,2);
             MACRO_ADDITEM(ACE_optic_Arco_2D,2);
-            MACRO_ADDITEM(ACE_optic_Arco_PIP,2);
             MACRO_ADDITEM(ACE_optic_MRCO_2D,2);
-            //MACRO_ADDITEM(ACE_optic_MRCO_PIP,2);
             MACRO_ADDITEM(ACE_optic_SOS_2D,2);
-            MACRO_ADDITEM(ACE_optic_SOS_PIP,2);
             MACRO_ADDITEM(ACE_optic_LRPS_2D,2);
-            MACRO_ADDITEM(ACE_optic_LRPS_PIP,2);
-            //MACRO_ADDITEM(ACE_optic_DMS,2);
         };
     };
 };