Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Altered naming conventions

Browse Source
This commit is contained in:
SilentSpike 2015-07-20 22:45:11 +01:00
parent 0d94bfe8bd
commit 34d2ec1d5a
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/spectator/XEH_preInit.sqf
View File

@ -12,14 +12,14 @@ PREP(handleToolbar);
PREP(handleUnits);
PREP(moduleSpectatorSettings);
PREP(setSpectator);
PREP(updateCamera);
PREP(updateInterface);
PREP(transitionCamera);
PREP(toggleInterface);
PREP(updateUnits);
// Permanent variables
GVAR(camMode) = 0;
GVAR(camPan) = 0;
GVAR(camPos) = [worldSize * 0.5,worldSize * 0.5,0];
GVAR(camPos) = [worldSize * 0.5,worldSize * 0.5,20];
GVAR(camSpeed) = 1;
GVAR(camUnit) = objNull;
GVAR(camZoom) = 1.3;

25
addons/spectator/functions/fnc_handleInterface.sqf
View File

@ -29,7 +29,6 @@ switch (toLower _mode) do {
GVAR(camBank) = 0;
GVAR(camBoom) = [false,false];
GVAR(camDolly) = [false,false,false,false];
GVAR(camPos) set [2,20];
GVAR(camTilt) = -10;
GVAR(gunCam) = false;
@ -41,7 +40,7 @@ switch (toLower _mode) do {
// Initalize the camera view
GVAR(camera) = "Camera" camCreate GVAR(camPos);
GVAR(camera) setDir GVAR(camPan);
[] call FUNC(updateCamera);
[] call FUNC(transitionCamera);
// Create the dialog
createDialog QGVAR(interface);
@ -96,7 +95,7 @@ switch (toLower _mode) do {
};
// Always show interface and hide map upon opening
[_display,nil,nil,!GVAR(showInterface),GVAR(showMap)] call FUNC(updateInterface);
[_display,nil,nil,!GVAR(showInterface),GVAR(showMap)] call FUNC(toggleInterface);
// Keep unit tree up to date
[FUNC(handleUnits), 21, _display] call CBA_fnc_addPerFrameHandler;
@ -127,7 +126,7 @@ switch (toLower _mode) do {
if ((_button == 1) && (GVAR(camMode) == 1)) then {
// In first person toggle sights mode
GVAR(gunCam) = !GVAR(gunCam);
[] call FUNC(updateCamera);
[] call FUNC(transitionCamera);
};
};
case "onmousebuttonup": {
@ -159,16 +158,16 @@ switch (toLower _mode) do {
[player,false] call FUNC(setSpectator); // Handle esc menu goes here, currently closes for purposes of testing
};
case 2: { // 1
[_display,nil,nil,nil,nil,nil,true] call FUNC(updateInterface);
[_display,nil,nil,nil,nil,nil,true] call FUNC(toggleInterface);
};
case 3: { // 2
[_display,nil,nil,nil,nil,true] call FUNC(updateInterface);
[_display,nil,nil,nil,nil,true] call FUNC(toggleInterface);
};
case 4: { // 3
[_display,true] call FUNC(updateInterface);
[_display,true] call FUNC(toggleInterface);
};
case 14: { // Backspace
[_display,nil,nil,true] call FUNC(updateInterface);
[_display,nil,nil,true] call FUNC(toggleInterface);
};
case 16: { // Q
GVAR(camBoom) set [0,true];
@ -189,13 +188,13 @@ switch (toLower _mode) do {
GVAR(camDolly) set [3,true];
};
case 35: { // H
[_display,nil,true] call FUNC(updateInterface);
[_display,nil,true] call FUNC(toggleInterface);
};
case 44: { // Z
GVAR(camBoom) set [1,true];
};
case 50: { // M
[_display,nil,nil,nil,true] call FUNC(updateInterface);
[_display,nil,nil,nil,true] call FUNC(toggleInterface);
(_display displayCtrl IDC_MAP) ctrlMapAnimAdd [0, 0.5, [GVAR(camUnit),GVAR(camera)] select (GVAR(camMode) == 0)];
ctrlMapAnimCommit (_display displayCtrl IDC_MAP);
};
@ -203,7 +202,7 @@ switch (toLower _mode) do {
// Freecam attachment here, if in external then set cam pos and attach
};
case 200: { // Up arrow
[[2,0,1] select GVAR(camMode)] call FUNC(updateCamera);
[[2,0,1] select GVAR(camMode)] call FUNC(transitionCamera);
};
case 203: { // Left arrow
@ -212,7 +211,7 @@ switch (toLower _mode) do {
};
case 208: { // Down arrow
[[1,2,0] select GVAR(camMode)] call FUNC(updateCamera);
[[1,2,0] select GVAR(camMode)] call FUNC(transitionCamera);
};
};
@ -263,7 +262,7 @@ switch (toLower _mode) do {
_newMode = [2,2,1] select GVAR(camMode);
};
[_newMode,_newUnit] call FUNC(updateCamera);
[_newMode,_newUnit] call FUNC(transitionCamera);
};
};
case "onunitsupdate": {

2
addons/spectator/functions/fnc_handleUnits.sqf
View File

@ -28,7 +28,7 @@ if (isNull _display) exitWith { [_this select 1] call CBA_fnc_removePerFrameHand
// Camera shouldn't stay on unit that isn't in the list
if !(GVAR(camUnit) in GVAR(unitList)) then {
[0,objNull] call FUNC(updateCamera);
[0,objNull] call FUNC(transitionCamera);
};
// Reduce overhead when unit tree is hidden

2
addons/spectator/functions/fnc_updateInterface.sqf → addons/spectator/functions/fnc_toggleInterface.sqf
View File

@ -15,7 +15,7 @@
* None <NIL>
*
* Example:
* [] call ace_spectator_fnc_updateInterface
* [_dsiplay, nil, true] call ace_spectator_fnc_toggleInterface
*
* Public: No
*/

4
addons/spectator/functions/fnc_updateCamera.sqf → addons/spectator/functions/fnc_transitionCamera.sqf
View File

@ -1,6 +1,6 @@
/*
* Author: SilentSpike
* Updates the spectator camera view mode and unit
* Transitions the spectator camera view mode/unit
*
* Arguments:
* 0: Camera mode <NUMBER>
@ -13,7 +13,7 @@
* None <NIL>
*
* Example:
* [0,objNull] call ace_spectator_fnc_updateCamera
* [0,objNull] call ace_spectator_fnc_transitionCamera
*
* Public: No
*/