2d with and without PIP

addons/common/CfgVehicles.hpp

@@ -100,7 +100,7 @@ class CfgVehicles {
     transportMaxWeapons = 9001;
     transportMaxMagazines = 9001;
     transportMaxItems = 9001;
-    maximumload = 2000;
+    maximumload = 9001;
 
     class TransportWeapons {};
     class TransportMagazines {};

addons/optics/CfgRscTitles.hpp

@@ -12,8 +12,6 @@ class RscInGameUI {
     class ACE_RscWeaponZeroing: RscWeaponZeroing {
         controls[] = {"CA_Zeroing","CA_FOVMode","ACE_DrawReticleHelper","ACE_ScriptedReticle"};
 
-        class CA_Zeroing: CA_Zeroing {};
-
         class CA_FOVMode: RscOpticsValue {  // idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used
             idc = 154;
             style = 2;
@@ -42,11 +40,24 @@ class RscInGameUI {
         };
     };
 
-    class ACE_RscWeaponZeroingPIP: ACE_RscWeaponZeroing {
+    class ACE_RscWeapon_base: RscWeaponZeroing {
         controls[] = {"CA_Zeroing","CA_FOVMode","ACE_DrawReticleHelper","ReticleDay","ReticleNight","BodyNight","BodyDay"}; // don't change this order
 
-        class ACE_DrawReticleHelper: ACE_DrawReticleHelper {
-            onDraw = QUOTE([ctrlParent (_this select 0)] call DFUNC(onDrawScopePIP));
+        class CA_FOVMode: RscOpticsValue {  // idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used
+            idc = 154;
+            style = 2;
+            colorText[] = {0,0,0,0};
+            x = 0;
+            y = 0;
+            w = 0;
+            h = 0;
+        };
+
+        class ACE_DrawReticleHelper: RscMapControl {
+            onDraw = QUOTE([ctrlParent (_this select 0)] call DFUNC(onDrawScope2D));
+            idc = -1;
+            w = 0;
+            h = 0;
         };
 
         #define SIZEX 0.76/(getResolution select 5)
@@ -55,7 +66,7 @@ class RscInGameUI {
             style = 48;
             size = 0;
             sizeEx = 1;
-            text = QUOTE(PATHTOF(reticles\hamr-reticle65_ca.paa));
+            text = "";
             colorText[] = {1,1,1,0};
             colorBackground[] = {0,0,0,0};
             x = safezoneX+0.5*safezoneW-0.5*SIZEX;
@@ -66,13 +77,13 @@ class RscInGameUI {
 
         class ReticleNight: ReticleDay {
             idc = 1713002;
-            text = QUOTE(PATHTOF(reticles\hamr-reticle65Illum_ca.paa));
+            text = "";
         };
 
         #define SIZEX 2*0.76/(getResolution select 5)
         class BodyDay: ReticleDay {
             idc = 1713005;
-            text = QUOTE(PATHTOF(reticles\hamr-body_ca.paa));
+            text = "";
             x = safezoneX+0.5*safezoneW-0.5*SIZEX;
             y = safezoneY+0.5*safezoneH-0.5*SIZEX*safezoneW/safezoneH;
             w = SIZEX;
@@ -81,9 +92,81 @@ class RscInGameUI {
 
         class BodyNight: BodyDay {
             idc = 1713006;
+            text = "";
+        };
+    };
+
+    class ACE_RscWeapon_Hamr: ACE_RscWeapon_base {
+        class ReticleDay: ReticleDay {
+            text = QUOTE(PATHTOF(reticles\hamr-reticle65_ca.paa));
+        };
+
+        class ReticleNight: ReticleNight {
+            text = QUOTE(PATHTOF(reticles\hamr-reticle65Illum_ca.paa));
+        };
+
+        class BodyDay: BodyDay {
+            text = QUOTE(PATHTOF(reticles\hamr-body_ca.paa));
+        };
+
+        class BodyNight: BodyNight {
             text = QUOTE(PATHTOF(reticles\hamr-bodyNight_ca.paa));
         };
     };
+
+    class ACE_RscWeapon_Arco: ACE_RscWeapon_base {
+        class ReticleDay: ReticleDay {
+            text = QUOTE(PATHTOF(reticles\arco-reticle65_ca.paa));
+        };
+
+        class ReticleNight: ReticleNight {
+            text = QUOTE(PATHTOF(reticles\arco-reticle65Illum_ca.paa));
+        };
+
+        class BodyDay: BodyDay {
+            text = QUOTE(PATHTOF(reticles\arco-body_ca.paa));
+        };
+
+        class BodyNight: BodyNight {
+            text = QUOTE(PATHTOF(reticles\arco-bodyNight_ca.paa));
+        };
+    };
+
+    class ACE_RscWeapon_MRCO: ACE_RscWeapon_base {
+        class ReticleDay: ReticleDay {
+            text = QUOTE(PATHTOF(reticles\mrco-reticle556_ca.paa));
+        };
+
+        class ReticleNight: ReticleNight {
+            text = QUOTE(PATHTOF(reticles\mrco-reticle556Illum_ca.paa));
+        };
+
+        class BodyDay: BodyDay {
+            text = QUOTE(PATHTOF(reticles\mrco-body_ca.paa));
+        };
+
+        class BodyNight: BodyNight {
+            text = QUOTE(PATHTOF(reticles\mrco-bodyNight_ca.paa));
+        };
+    };
+
+    class ACE_RscWeapon_SOS: ACE_RscWeapon_base {
+        class ReticleDay: ReticleDay {
+            text = QUOTE(PATHTOF(reticles\sos-reticleMLR_ca.paa));
+        };
+
+        class ReticleNight: ReticleNight {
+            text = QUOTE(PATHTOF(reticles\sos-reticleMLRIllum_ca.paa));
+        };
+
+        class BodyDay: BodyDay {
+            text = QUOTE(PATHTOF(reticles\sos-body_ca.paa));
+        };
+
+        class BodyNight: BodyNight {
+            text = QUOTE(PATHTOF(reticles\sos-bodyNight_ca.paa));
+        };
+    };
 };
 
 /*

addons/optics/CfgVehicles.hpp

@@ -0,0 +1,19 @@
+
+class CfgVehicles {
+    class Box_NATO_Support_F;
+    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);
+        };
+    };
+};

addons/optics/CfgWeapons.hpp

@@ -47,24 +47,20 @@ class CfgWeapons {
         };
     };
 
-    class ACE_optic_Hamr_PIP: optic_Hamr {
+    class ACE_optic_Hamr_2D: optic_Hamr {
         author = "$STR_ACE_Common_ACETeam";
-        _generalMacro = "ACE_optic_Hamr_PIP";
+        _generalMacro = "ACE_optic_Hamr_2D";
         displayName = "$STR_A3_cfgWeapons_optic_Hamr0";    //@todo
-        picture = "\A3\weapons_F\Data\UI\gear_acco_hamr_CA.paa";    //@todo
-        model = "\A3\weapons_f_beta\acc\acco_hamr_F";    //@todo
         descriptionShort = "$STR_A3_cfgWeapons_optic_Hamr1";    //@todo
-        weaponInfoType = "ACE_RscWeaponZeroingPIP";
+        weaponInfoType = "ACE_RscWeapon_Hamr";
 
         class ItemInfo: ItemInfo {
-            modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+            modelOptics = QUOTE(PATHTOF(models\ace_optics_reticle90.p3d));
 
             class OpticsModes: OpticsModes {
                 class Hamr2Collimator: Hamr2Collimator {};
 
                 class Hamr2Scope: Hamr2Scope {
-                    opticsDisplayName = "IHAMR"; // test??
-                    modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
                     useModelOptics = 1;
                     opticsZoomInit = 0.0872664626;
                     opticsZoomMax = 0.0872664626;
@@ -77,9 +73,201 @@ class CfgWeapons {
         };
     };
 
+    class ACE_optic_Hamr_PIP: ACE_optic_Hamr_2D {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_Hamr_PIP";
+
+        class ItemInfo: ItemInfo {
+            modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+        };
+    };
+
+    class optic_Arco: ItemCore {
+        class ItemInfo: InventoryOpticsItem_Base_F {
+            class OpticsModes {
+                class ARCO2collimator;
+                class ARCO2scope: ARCO2collimator {};
+            };
+        };
+    };
+
+    class ACE_optic_Arco_2D: optic_Arco {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_Arco_2D";
+        displayName = "$STR_A3_cfgWeapons_optic_Arco0";    //@todo
+        descriptionShort = "$STR_A3_cfgWeapons_optic_Arco1";    //@todo
+        weaponInfoType = "ACE_RscWeapon_Arco";
+
+        class ItemInfo: ItemInfo {
+            modelOptics = QUOTE(PATHTOF(models\ace_optics_reticle90.p3d));
+
+            class OpticsModes: OpticsModes {
+                class ARCO2collimator: ARCO2collimator {};
+                class ARCO2scope: ARCO2scope {
+                    useModelOptics = 1;
+                    opticsZoomInit = 0.0872664626;
+                    opticsZoomMax = 0.0872664626;
+                    opticsZoomMin = 0.0872664626;
+                    opticsPPEffects[] += {"ACE_OpticsRadBlur1"};
+                    opticsDisablePeripherialVision = 0;
+                    visionMode[] = {"Normal"};
+                };
+            };
+        };
+    };
+
+    class ACE_optic_Arco_PIP: ACE_optic_Arco_2D {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_Arco_PIP";
+
+        class ItemInfo: ItemInfo {
+            modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+        };
+    };
+
+    class optic_MRCO: ItemCore {
+        class ItemInfo: InventoryOpticsItem_Base_F {
+            class OpticsModes {
+                class MRCOcq;
+                class MRCOscope;
+            };
+        };
+    };
+
+    class ACE_optic_MRCO_2D: optic_MRCO {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_MRCO_2D";
+        displayName = "$STR_A3_cfgWeapons_optic_Valdada0"; //@todo
+        descriptionShort = "$STR_A3_cfgWeapons_optic_Valdada1";
+        weaponInfoType = "ACE_RscWeapon_MRCO";
+
+        class ItemInfo: ItemInfo {
+            modelOptics = QUOTE(PATHTOF(models\ace_optics_reticle90.p3d));
+
+            class OpticsModes: OpticsModes {
+                class MRCOcq: MRCOcq {};
+                class MRCOscope: MRCOscope {
+                    useModelOptics = 1;
+                    opticsZoomInit = 0.0872664626;
+                    opticsZoomMax = 0.0872664626;
+                    opticsZoomMin = 0.0872664626;
+                    opticsPPEffects[] += {"ACE_OpticsRadBlur1"};
+                    opticsDisablePeripherialVision = 0;
+                    visionMode[] = {"Normal"};
+                };
+            };
+        };
+    };
+
+    class ACE_optic_MRCO_PIP: ACE_optic_MRCO_2D {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_MRCO_PIP";
+
+        class ItemInfo: ItemInfo {
+            modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+        };
+    };
+
+    class optic_SOS: ItemCore {
+        class ItemInfo: InventoryOpticsItem_Base_F {
+            class OpticsModes {
+                class Snip;
+                class Iron;
+            };
+        };
+    };
+
+    class ACE_optic_SOS_2D: optic_SOS {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_SOS_2D";
+        displayName = "$STR_A3_cfgWeapons_optic_SOS0"; // @todo
+        descriptionShort = "$STR_A3_cfgWeapons_optic_SOS1";
+        weaponInfoType = "ACE_RscWeapon_SOS";
+
+        class ItemInfo: ItemInfo {
+            class OpticsModes: OpticsModes {
+                class Snip: Snip {
+                    modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_reticle90.p3d)),QUOTE(PATHTOF(models\ace_optics_reticle90.p3d))};
+                    opticsDisablePeripherialVision = 0;
+                };
+                class Iron: Iron {};
+            };
+        };
+    };
+
+    class ACE_optic_SOS_PIP: ACE_optic_SOS_2D {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_SOS_PIP";
+
+        class ItemInfo: ItemInfo {
+            class OpticsModes: OpticsModes {
+                class Snip: Snip {
+                    modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_pip.p3d)),QUOTE(PATHTOF(models\ace_optics_pip.p3d))};
+                };
+            };
+        };
+    };
+
+    class optic_LRPS: ItemCore {
+        class ItemInfo: InventoryOpticsItem_Base_F {
+            class OpticsModes {
+                class Snip;
+            };
+        };
+    };
+
+    class ACE_optic_LRPS_2D: optic_LRPS {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_LRPS_2D";
+        displayName = "$STR_A3_cfgWeapons_optic_LRPS0"; //@todo
+        picture = "\A3\Weapons_F_EPB\Acc\Data\UI\gear_acco_sniper02_CA.paa";
+        model = "\A3\Weapons_F_EPB\Acc\acco_sniper02_F.p3d";
+        descriptionShort = "$STR_A3_cfgWeapons_optic_LRPS1";
+        weaponInfoType = "ACE_RscWeapon_SOS";
+
+        class ItemInfo: ItemInfo {
+            class OpticsModes: OpticsModes {
+                class Snip: Snip {
+                    modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_reticle90.p3d)),QUOTE(PATHTOF(models\ace_optics_reticle90.p3d))};
+                    useModelOptics = 1;
+                    opticsZoomInit = 0.01234;
+                    opticsZoomMax = 0.04673;
+                    opticsZoomMin = 0.01234;
+                    discreteFOV[] = {};
+                    opticsPPEffects[] += {"ACE_OpticsRadBlur1"};
+                    opticsDisablePeripherialVision = 0;
+                };
+            };
+        };
+    };
+
+    class ACE_optic_LRPS_PIP: ACE_optic_LRPS_2D {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_optic_LRPS_PIP";
+
+        class ItemInfo: ItemInfo {
+            class OpticsModes: OpticsModes {
+                class Snip: Snip {
+                    modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_pip.p3d)),QUOTE(PATHTOF(models\ace_optics_pip.p3d))};
+                };
+            };
+        };
+    };
 };
 
 class SlotInfo;
 class CowsSlot: SlotInfo {
-    compatibleItems[] += {"ACE_optic_DMS","ACE_optic_Hamr_PIP"};
+    compatibleItems[] += {
+        "ACE_optic_Hamr_2D",
+        "ACE_optic_Hamr_PIP",
+        "ACE_optic_Arco_2D",
+        "ACE_optic_Arco_PIP",
+        "ACE_optic_MRCO_2D",
+        "ACE_optic_MRCO_PIP",
+        "ACE_optic_SOS_2D",
+        "ACE_optic_SOS_PIP",
+        "ACE_optic_LRPS_2D",
+        "ACE_optic_LRPS_PIP",
+        "ACE_optic_DMS"
+    };
 };

addons/optics/XEH_preInit.sqf

@@ -4,6 +4,6 @@ ADDON = false;
 
 PREP(handleFired);
 PREP(onDrawScope);
-PREP(onDrawScopePIP);
+PREP(onDrawScope2D);
 
 ADDON = true;

addons/optics/config.cpp

@@ -3,11 +3,23 @@
 class CfgPatches {
     class ADDON {
         units[] = {};
-        weapons[] = {"ACE_optic_DMS","ACE_optic_Hamr_PIP"};
+        weapons[] = {
+            "ACE_optic_Hamr_2D",
+            "ACE_optic_Hamr_PIP",
+            "ACE_optic_Arco_2D",
+            "ACE_optic_Arco_PIP",
+            "ACE_optic_MRCO_2D",
+            "ACE_optic_MRCO_PIP",
+            "ACE_optic_SOS_2D",
+            "ACE_optic_SOS_PIP",
+            "ACE_optic_LRPS_2D",
+            "ACE_optic_LRPS_PIP",
+            "ACE_optic_DMS"
+        };
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
-        author[] = {""};
-        authorUrl = "";
+        author[] = {"Taosenai","KoffeinFlummi","commy2"};
+        authorUrl = "http://www.ryanschultz.org/tmr/";
         VERSION_CONFIG;
     };
 };
@@ -16,4 +28,5 @@ class CfgPatches {
 
 #include "CfgOpticsEffect.hpp"
 #include "CfgRscTitles.hpp"
+#include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"

addons/optics/reticles/black.rvmat

@@ -0,0 +1,8 @@
+ambient[]={0,0,0,0.89999998};
+diffuse[]={0,0,0,0.89999998};
+forcedDiffuse[]={0,0,0,1};
+emmisive[]={0,0,0,1};
+specular[]={0,0,0,0};
+specularPower=1;
+PixelShaderID="Normal";
+VertexShaderID="Basic";