CBATeam · commy2 · Apr 14, 2019 · Apr 14, 2019 · Apr 14, 2019
diff --git a/addons/2doptics/$PBOPREFIX$ b/addons/2doptics/$PBOPREFIX$
diff --git a/addons/2doptics/cba_optic_big_pip.p3d b/addons/2doptics/cba_optic_big_pip.p3d
diff --git a/addons/2doptics/cba_optic_small_pip.p3d b/addons/2doptics/cba_optic_small_pip.p3d
diff --git a/addons/2doptics/stringtable.xml b/addons/2doptics/stringtable.xml
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
@@ -32,7 +32,7 @@ class CfgPatches {
             "cba_jam",
             "cba_ui",
             "cba_versioning",
-            "cba_2doptics"
+            "cba_optics"
         };
         versionDesc = "C.B.A.";
         VERSION_CONFIG;

diff --git a/addons/optics/$PBOPREFIX$ b/addons/optics/$PBOPREFIX$
@@ -0,0 +1 @@
+x\cba\addons\optics
diff --git a/addons/2doptics/CfgCarryHandleTypes.hpp → addons/optics/CfgCarryHandleTypes.hpp b/addons/2doptics/CfgCarryHandleTypes.hpp → addons/optics/CfgCarryHandleTypes.hpp
diff --git a/addons/2doptics/CfgEventHandlers.hpp → addons/optics/CfgEventHandlers.hpp b/addons/2doptics/CfgEventHandlers.hpp → addons/optics/CfgEventHandlers.hpp
diff --git a/addons/2doptics/CfgOpticsEffect.hpp → addons/optics/CfgOpticsEffect.hpp b/addons/2doptics/CfgOpticsEffect.hpp → addons/optics/CfgOpticsEffect.hpp
diff --git a/addons/2doptics/CfgPIPItems.hpp → addons/optics/CfgPIPItems.hpp b/addons/2doptics/CfgPIPItems.hpp → addons/optics/CfgPIPItems.hpp
diff --git a/addons/2doptics/RscInGameUI.hpp → addons/optics/RscInGameUI.hpp b/addons/2doptics/RscInGameUI.hpp → addons/optics/RscInGameUI.hpp
diff --git a/addons/2doptics/XEH_PREP.sqf → addons/optics/XEH_PREP.sqf b/addons/2doptics/XEH_PREP.sqf → addons/optics/XEH_PREP.sqf
diff --git a/addons/2doptics/XEH_preInit.sqf → addons/optics/XEH_preInit.sqf b/addons/2doptics/XEH_preInit.sqf → addons/optics/XEH_preInit.sqf
diff --git a/addons/2doptics/XEH_preStart.sqf → addons/optics/XEH_preStart.sqf b/addons/2doptics/XEH_preStart.sqf → addons/optics/XEH_preStart.sqf
diff --git a/addons/2doptics/cba_optic_big_100.p3d → addons/optics/cba_optic_big_100.p3d b/addons/2doptics/cba_optic_big_100.p3d → addons/optics/cba_optic_big_100.p3d
diff --git a/addons/2doptics/cba_optic_big_70.p3d → addons/optics/cba_optic_big_70.p3d b/addons/2doptics/cba_optic_big_70.p3d → addons/optics/cba_optic_big_70.p3d
diff --git a/addons/2doptics/cba_optic_big_80.p3d → addons/optics/cba_optic_big_80.p3d b/addons/2doptics/cba_optic_big_80.p3d → addons/optics/cba_optic_big_80.p3d
diff --git a/addons/2doptics/cba_optic_big_90.p3d → addons/optics/cba_optic_big_90.p3d b/addons/2doptics/cba_optic_big_90.p3d → addons/optics/cba_optic_big_90.p3d
diff --git a/addons/optics/cba_optic_big_pip.p3d b/addons/optics/cba_optic_big_pip.p3d
diff --git a/addons/2doptics/cba_optic_small_100.p3d → addons/optics/cba_optic_small_100.p3d b/addons/2doptics/cba_optic_small_100.p3d → addons/optics/cba_optic_small_100.p3d
diff --git a/addons/2doptics/cba_optic_small_70.p3d → addons/optics/cba_optic_small_70.p3d b/addons/2doptics/cba_optic_small_70.p3d → addons/optics/cba_optic_small_70.p3d
diff --git a/addons/2doptics/cba_optic_small_80.p3d → addons/optics/cba_optic_small_80.p3d b/addons/2doptics/cba_optic_small_80.p3d → addons/optics/cba_optic_small_80.p3d
diff --git a/addons/2doptics/cba_optic_small_90.p3d → addons/optics/cba_optic_small_90.p3d b/addons/2doptics/cba_optic_small_90.p3d → addons/optics/cba_optic_small_90.p3d
diff --git a/addons/optics/cba_optic_small_pip.p3d b/addons/optics/cba_optic_small_pip.p3d
diff --git a/addons/2doptics/config.cpp → addons/optics/config.cpp b/addons/2doptics/config.cpp → addons/optics/config.cpp
diff --git a/addons/2doptics/fnc_animateScriptedOptic.sqf → addons/optics/fnc_animateScriptedOptic.sqf b/addons/2doptics/fnc_animateScriptedOptic.sqf → addons/optics/fnc_animateScriptedOptic.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_animateScriptedOptic
+Internal Function: cba_optics_fnc_animateScriptedOptic
 
 Description:
     Executed every draw frame to update the scripted weapon info display.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        _weaponInfoDisplay call cba_2doptics_fnc_animateScriptedOptic;
+        _weaponInfoDisplay call cba_optics_fnc_animateScriptedOptic;
     (end)
 
 Author:

diff --git a/...optics/fnc_animateScriptedOpticRecoil.sqf → ...optics/fnc_animateScriptedOpticRecoil.sqf b/...optics/fnc_animateScriptedOpticRecoil.sqf → ...optics/fnc_animateScriptedOpticRecoil.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_animateScriptedOpticRecoil
+Internal Function: cba_optics_fnc_animateScriptedOpticRecoil
 
 Description:
     Animates the 2D optic when firing.
@@ -14,7 +14,7 @@ Returns:
 
 Examples:
     (begin example)
-        [player, currentWeapon player] call cba_2doptics_fnc_animateScriptedOpticRecoil;
+        [player, currentWeapon player] call cba_optics_fnc_animateScriptedOpticRecoil;
     (end)
 
 Author:

diff --git a/...ptics/fnc_changeCarryHandleOpticClass.sqf → ...ptics/fnc_changeCarryHandleOpticClass.sqf b/...ptics/fnc_changeCarryHandleOpticClass.sqf → ...ptics/fnc_changeCarryHandleOpticClass.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_changeCarryHandleOpticClass
+Internal Function: cba_optics_fnc_changeCarryHandleOpticClass
 
 Description:
     Switch scripted optic class to class with integrated carry handle optic.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        player call cba_2doptics_fnc_changeCarryHandleOpticClass;
+        player call cba_optics_fnc_changeCarryHandleOpticClass;
     (end)
 
 Author:

diff --git a/addons/2doptics/fnc_changePIPOpticClass.sqf → addons/optics/fnc_changePIPOpticClass.sqf b/addons/2doptics/fnc_changePIPOpticClass.sqf → addons/optics/fnc_changePIPOpticClass.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_changePIPOpticClass
+Internal Function: cba_optics_fnc_changePIPOpticClass
 
 Description:
     Switch scripted optic class to PIP class.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        player call cba_2doptics_fnc_changePIPOpticClass;
+        player call cba_optics_fnc_changePIPOpticClass;
     (end)
 
 Author:
@@ -173,7 +173,7 @@ if (GVAR(usePipOptics) && {!GVAR(inArsenal)}) then {
         INFO_2("Switched %1 to %2.",_pistol,_normalPistol);
     };
 
-    // Switch to normal / 2d optic attchments.
+    // Switch to normal optic attchments.
     {
         _x params ["_weapon", "", "", "_optic"];
 

diff --git a/addons/2doptics/fnc_currentOptic.sqf → addons/optics/fnc_currentOptic.sqf b/addons/2doptics/fnc_currentOptic.sqf → addons/optics/fnc_currentOptic.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_currentOptic
+Internal Function: cba_optics_fnc_currentOptic
 
 Description:
     Reports the currently selected optic classname of a person.
@@ -18,7 +18,7 @@ Returns:
 
 Examples:
     (begin example)
-        player call cba_2doptics_fnc_currentOptic
+        player call cba_optics_fnc_currentOptic
     (end)
 
 Author:

diff --git a/addons/2doptics/fnc_initDisplayInterrupt.sqf → addons/optics/fnc_initDisplayInterrupt.sqf b/addons/2doptics/fnc_initDisplayInterrupt.sqf → addons/optics/fnc_initDisplayInterrupt.sqf
diff --git a/addons/2doptics/fnc_loadScriptedOptic.sqf → addons/optics/fnc_loadScriptedOptic.sqf b/addons/2doptics/fnc_loadScriptedOptic.sqf → addons/optics/fnc_loadScriptedOptic.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_loadScriptedOptic
+Internal Function: cba_optics_fnc_loadScriptedOptic
 
 Description:
     Sets up the CBA_ScriptedOptic weapon info display and adds the draw script.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        _weaponInfoDisplay call cba_2doptics_fnc_loadScriptedOptic;
+        _weaponInfoDisplay call cba_optics_fnc_loadScriptedOptic;
     (end)
 
 Author:

diff --git a/addons/2doptics/fnc_restartCamera.sqf → addons/optics/fnc_restartCamera.sqf b/addons/2doptics/fnc_restartCamera.sqf → addons/optics/fnc_restartCamera.sqf
@@ -1,9 +1,9 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_restartCamera
+Internal Function: cba_optics_fnc_restartCamera
 
 Description:
-    Restarts the PIP camera for scripted 2D optics.
+    Restarts the PIP camera for scripted optics.
 
 Parameters:
     _unit  - The avatar <OBJECT>
@@ -14,7 +14,7 @@ Returns:
 
 Examples:
     (begin example)
-        player call cba_2doptics_fnc_restartCamera;
+        player call cba_optics_fnc_restartCamera;
     (end)
 
 Author:

diff --git a/...ns/2doptics/fnc_setOpticMagnification.sqf → addons/optics/fnc_setOpticMagnification.sqf b/...ns/2doptics/fnc_setOpticMagnification.sqf → addons/optics/fnc_setOpticMagnification.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Function: cba_2doptics_fnc_setOpticMagnification
+Function: cba_optics_fnc_setOpticMagnification
 
 Description:
     Set magnification of the current optic of the unit.
@@ -14,7 +14,7 @@ Returns:
 
 Examples:
     (begin example)
-        [player, 3] call cba_2doptics_fnc_setOpticMagnification;
+        [player, 3] call cba_optics_fnc_setOpticMagnification;
     (end)
 
 Author:

diff --git a/...ptics/fnc_setOpticMagnificationHelper.sqf → ...ptics/fnc_setOpticMagnificationHelper.sqf b/...ptics/fnc_setOpticMagnificationHelper.sqf → ...ptics/fnc_setOpticMagnificationHelper.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Function: cba_2doptics_fnc_setOpticMagnificationHelper
+Function: cba_optics_fnc_setOpticMagnificationHelper
 
 Description:
     Helper function used in config to set the magnification of a zooming optic.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        2 call (uiNamespace getVariable 'cba_2doptics_fnc_setOpticMagnificationHelper')
+        2 call (uiNamespace getVariable 'cba_optics_fnc_setOpticMagnificationHelper')
     (end)
 
 Author:

diff --git a/...nc_setOpticMagnificationHelperZeroing.sqf → ...nc_setOpticMagnificationHelperZeroing.sqf b/...nc_setOpticMagnificationHelperZeroing.sqf → ...nc_setOpticMagnificationHelperZeroing.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Function: cba_2doptics_fnc_setOpticMagnificationHelperZeroing
+Function: cba_optics_fnc_setOpticMagnificationHelperZeroing
 
 Description:
     Helper function used in config to remember the zeroing of a zooming optic.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        2 call (uiNamespace getVariable 'cba_2doptics_fnc_setOpticMagnificationHelperZeroing')
+        2 call (uiNamespace getVariable 'cba_optics_fnc_setOpticMagnificationHelperZeroing')
     (end)
 
 Author:

diff --git a/addons/2doptics/fnc_updateOpticInfo.sqf → addons/optics/fnc_updateOpticInfo.sqf b/addons/2doptics/fnc_updateOpticInfo.sqf → addons/optics/fnc_updateOpticInfo.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 /* ----------------------------------------------------------------------------
-Internal Function: cba_2doptics_fnc_updateOpticInfo
+Internal Function: cba_optics_fnc_updateOpticInfo
 
 Description:
     Caches the current optic's parameters in mission namespace variables.
@@ -13,7 +13,7 @@ Returns:
 
 Examples:
     (begin example)
-        player call cba_2doptics_fnc_updateOpticInfo;
+        player call cba_optics_fnc_updateOpticInfo;
     (end)
 
 Author:

diff --git a/addons/2doptics/initSettings.sqf → addons/optics/initSettings.sqf b/addons/2doptics/initSettings.sqf → addons/optics/initSettings.sqf
diff --git a/addons/2doptics/reticles/pip.rvmat → addons/optics/reticles/pip.rvmat b/addons/2doptics/reticles/pip.rvmat → addons/optics/reticles/pip.rvmat
diff --git a/addons/2doptics/reticles/scopeblack.rvmat → addons/optics/reticles/scopeblack.rvmat b/addons/2doptics/reticles/scopeblack.rvmat → addons/optics/reticles/scopeblack.rvmat
diff --git a/...optics/reticles/scopeblack_big_100_ca.paa → ...optics/reticles/scopeblack_big_100_ca.paa b/...optics/reticles/scopeblack_big_100_ca.paa → ...optics/reticles/scopeblack_big_100_ca.paa
diff --git a/...doptics/reticles/scopeblack_big_70_ca.paa → .../optics/reticles/scopeblack_big_70_ca.paa b/...doptics/reticles/scopeblack_big_70_ca.paa → .../optics/reticles/scopeblack_big_70_ca.paa
diff --git a/...doptics/reticles/scopeblack_big_80_ca.paa → .../optics/reticles/scopeblack_big_80_ca.paa b/...doptics/reticles/scopeblack_big_80_ca.paa → .../optics/reticles/scopeblack_big_80_ca.paa
diff --git a/...doptics/reticles/scopeblack_big_90_ca.paa → .../optics/reticles/scopeblack_big_90_ca.paa b/...doptics/reticles/scopeblack_big_90_ca.paa → .../optics/reticles/scopeblack_big_90_ca.paa
diff --git a/addons/2doptics/reticles/scopeblack_ca.paa → addons/optics/reticles/scopeblack_ca.paa b/addons/2doptics/reticles/scopeblack_ca.paa → addons/optics/reticles/scopeblack_ca.paa
diff --git a/...tics/reticles/scopeblack_small_100_ca.paa → ...tics/reticles/scopeblack_small_100_ca.paa b/...tics/reticles/scopeblack_small_100_ca.paa → ...tics/reticles/scopeblack_small_100_ca.paa
diff --git a/...ptics/reticles/scopeblack_small_70_ca.paa → ...ptics/reticles/scopeblack_small_70_ca.paa b/...ptics/reticles/scopeblack_small_70_ca.paa → ...ptics/reticles/scopeblack_small_70_ca.paa
diff --git a/...ptics/reticles/scopeblack_small_80_ca.paa → ...ptics/reticles/scopeblack_small_80_ca.paa b/...ptics/reticles/scopeblack_small_80_ca.paa → ...ptics/reticles/scopeblack_small_80_ca.paa
diff --git a/...ptics/reticles/scopeblack_small_90_ca.paa → ...ptics/reticles/scopeblack_small_90_ca.paa b/...ptics/reticles/scopeblack_small_90_ca.paa → ...ptics/reticles/scopeblack_small_90_ca.paa
diff --git a/addons/2doptics/script_component.hpp → addons/optics/script_component.hpp b/addons/2doptics/script_component.hpp → addons/optics/script_component.hpp
@@ -1,16 +1,16 @@
-#define COMPONENT 2doptics
+#define COMPONENT optics
 #include "\x\cba\addons\main\script_mod.hpp"
 
 //#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
-//#define DEBUG_ENABLED_2DOPTICS
+//#define DEBUG_ENABLED_OPTICS
 
-#ifdef DEBUG_ENABLED_2DOPTICS
+#ifdef DEBUG_ENABLED_OPTICS
     #define DEBUG_MODE_FULL
 #endif
 
-#ifdef DEBUG_SETTINGS_2DOPTICS
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_2DOPTICS
+#ifdef DEBUG_SETTINGS_OPTICS
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_OPTICS
 #endif
 
 #define DEBUG_MODE_NORMAL

diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="CBA_A3">
+    <Package name="Optics">
+        <Key ID="STR_cba_optics_Component">
+            <English>Community Base Addons - Optics</English>
+            <German>Community Base Addons - Optiken</German>
+            <Polish>Community Base Addons - Optyka</Polish>
+        </Key>
+        <Key ID="STR_cba_optics_Category">
+            <English>CBA Optics</English>
+            <German>CBA Optiken</German>
+            <Polish>CBA Optyka</Polish>
+        </Key>
+        <Key ID="STR_cba_optics_UsePIP">
+            <English>Use picture in picture optics</English>
+            <German>Bild in Bild-Optiken verwenden</German>
+            <Japanese>Picture in Picture 照準器を使う</Japanese>
+            <Polish>Używaj optyki typu Obraz w obrazie (PIP)</Polish>
+        </Key>
+    </Package>
+</Project>