Open glass and CUP doors #5226

Phyma · 2017-05-31T02:45:53Z

Will make sure that you can Ace slow open glass doors.
Also a bit flexible animation gathering instead of fixed strings.
CUP houses now works to incremental open!

The reason behind getGlassDoor is that if you do the regular door check you will get the hide and unhide of the glass pane. So you then need to find the closest doorobject because thats the door.

When merged this pull request will:

Describe what this pull request will do
Each change in a separate line
Include documentation if applicable
Respect the Development Guidelines

Fixed so glassdoor now works with ace slow open.

Made it more pretty with new file

BaerMitUmlaut · 2017-05-31T05:42:56Z

You need to use 4 spaces for indentation instead of tabs. If you use a text editor like Sublime Text, Atom or Notepad++ you should be able to change that in your settings.

jonpas · 2017-05-31T05:59:22Z

Or just install EditorConfig plugin for the editor you use and it will be automatic (we have configuration for it).

Replace tabs with spaces

Changes to go with code guidlines and extra check if door is empty

Fixed so CUP houses now works

Phyma · 2017-05-31T09:04:12Z

Changes to Pullrequest:
CUP houses now works to incremental open!

Phyma · 2017-05-31T09:17:51Z

Known issue when on CUP houses if you have a door that is both glass and door then if you aim on the glass it wont open. but if you aim on the doorframe then it works. it wont make a click sound when on the glass.

jonpas · 2017-05-31T12:11:55Z

Should use STRING find SUBSTRING != -1 instead of BI function.

commy2

I like this very much, but the code should be more precise with the usage of private variables. It helps a lot when trying to create clean SQF.

commy2 · 2017-05-31T12:13:01Z

addons/interaction/functions/fnc_getDoorAnimations.sqf

+private _lockedVariable = [];
+
+{
+    _animName = _x;


missing private

commy2 · 2017-05-31T12:13:22Z

addons/interaction/functions/fnc_getDoorAnimations.sqf

@@ -22,102 +22,19 @@ params ["_house", "_door"];

 private ["_index", "_animations", "_lockedVariable"];


delete this

commy2 · 2017-05-31T12:13:57Z

addons/interaction/functions/fnc_getDoor.sqf

+    _door = [_distance, _house, _door] call FUNC(getGlassDoor);   
+};
+
+if (isNil "_door") exitWith {systemChat "Wrong"; [_house, ""]};


debug doesn't use systemChat

commy2 · 2017-05-31T12:14:57Z

addons/interaction/functions/fnc_getGlassDoor.sqf

+private _glassPos = (_house selectionPosition [(_glassDoor select 0) + "_" + (_glassDoor select 1) + "_effects", "Memory"]);     
+// Calculate all animation names so we know what is there   
+{           
+    _animName = _x;


private here. The variable is not used outside this scope

commy2 · 2017-05-31T12:15:40Z

addons/interaction/functions/fnc_getGlassDoor.sqf

+{           
+    _animName = _x;
+    if ((["door", _animName] call BIS_fnc_inString) && !(["locked", _animName] call BIS_fnc_inString) && !(["disabled", _animName] call BIS_fnc_inString) && !(["handle", _animName] call BIS_fnc_inString)) then {         
+        _splitStr = _animName splitString "_";             


private here. The variable is not used outside this scope

commy2 · 2017-05-31T12:17:09Z

addons/interaction/functions/fnc_getGlassDoor.sqf

+        //Need to set the value in the beginning
+        if (_lowestDistance == 0) then {
+            _lowestDistance = _objDist;
+            _newString = (_doorParts select _forEachIndex) splitString "_";         


private here. The variable is not used outside this scope. No reason not to reuse the same identifier for a temporary value as _splitStr uses a few blocks before this one.

changed _newString to _splitStr and decaled private ["_splitStr"]; just over if (_objDist <= _distance) then {. Okey?
Will try so everything works later will push after tested.

Just use private _splitStr = here and in the if block below, as well as in L32 above.
They are unrelated and only temporary, so there is no need for them to be set to the same scope. Yet the concept is the same so they should use the same identifier.

commy2 · 2017-05-31T12:18:26Z

addons/interaction/functions/fnc_getGlassDoor.sqf

+
+params ["_distance", "_house", "_door"]; 
+
+private ["_animName", "_splitStr", "_newString", "_objDist", "_animate"];


delete this
_objDist and _animate are already set to private in their scopes.

PabstMirror · 2017-06-01T04:48:43Z

This seems to be working pretty good

opening altis/stratis glass doors
(except the sliding ones on the airport terminal, but I think they are extra weird)
working on CUP_Terrain buildings

commy2 · 2017-06-01T12:19:07Z

addons/interaction/functions/fnc_getDoor.sqf

+
+//Check if door is glass because then we need to find the proper location of the door so we can use it
+if ((_door find "glass") != -1) then {
+    _door = [_distance, _house, _door] call FUNC(getGlassDoor);   


white space

commy2 · 2017-06-01T12:19:42Z

addons/interaction/functions/fnc_getDoorAnimations.sqf

+
+{
+    private _animName = toLower _x;    
+    if ((_animName find (toLower _door)) != -1) then {        


white space

commy2 · 2017-06-01T12:21:40Z

addons/interaction/functions/fnc_getGlassDoor.sqf

+if ((isNil "_door") || ((_door find "glass") != -1)) exitWith {};
+
+_door
+


many lines with white space in this file
Sublime Text 3 is the best editor

Well white lines are nice for readability. Segmenting the code, there is not a single white line in a segment. A segment could be a forEach and it wont affect the performance of the code. So I'm hesitating to do this change.

Commy means spaces (literally) after text. There are a few lines in this file that have that.

I suggest you install EditorConfig plugin for your editor, it will automatically clean that up. Otherwise you can probably also manually set it.

Some text editors let you visualize whitespace,

Notepad++: View -> Show Symbol -> Show White Space and Tab
Sublimb Text: "draw_white_space": "all"
I think Atom is "Show Invisables"

EditorConfig should also clean these up automatically and prevent things like tabs from being saved

Okey I fixed sublime with EditorConfig and all that setup so should not be a problem now. It should say something about this in the Developer wiki.

could be added somewhere to:
https://ace3mod.com/wiki/development/coding-guidelines.html

commy2

lgtm
Thank you for the contribution and for having the patience to satisfy my OCD. :)

Phyma added 4 commits May 31, 2017 04:16

Fixed glassdoor

a964c03

Fixed so glassdoor now works with ace slow open.

Made it more pretty with new file

998b242

Made it more pretty with new file

Tidy up a bit

aec5ed5

Removed white space

fce2b9c

Phyma mentioned this pull request May 31, 2017

Cant slow open glassdoors #5225

Closed

Phyma added 5 commits May 31, 2017 09:34

Replace tabs with spaces

de84521

Replace tabs with spaces

Simplified and added comments

e9625be

Changes + was stupid was commit

f41fce7

Changes to go with code guidlines and extra check if door is empty

Tabs to spaces

bcca866

Small fixes + Fixed so CUP houses now works

2218de4

Fixed so CUP houses now works

Phyma changed the title ~~Open glass doors~~ Open glass and CUP doors May 31, 2017

Phyma mentioned this pull request May 31, 2017

Opening doors non-vanilla building using ACE3 key shortcut. #5199

Closed

Remove todo

0bb4f14

commy2 suggested changes May 31, 2017

View reviewed changes

commy2 self-assigned this May 31, 2017

Fixed requested changes

d6124c6

PabstMirror added this to the 3.10.0 milestone Jun 1, 2017

PabstMirror added kind/bug-fix Release Notes: **FIXED:** kind/enhancement Release Notes: **IMPROVED:** labels Jun 1, 2017

commy2 reviewed Jun 1, 2017

View reviewed changes

Removed whitespaces

0e5f0a4

commy2 approved these changes Jun 2, 2017

View reviewed changes

PabstMirror merged commit 288f956 into acemod:master Jun 2, 2017

Phyma deleted the opendoor-custom branch June 8, 2017 18:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Open glass and CUP doors #5226

Open glass and CUP doors #5226

Phyma commented May 31, 2017 •

edited

Loading

BaerMitUmlaut commented May 31, 2017

jonpas commented May 31, 2017

Phyma commented May 31, 2017

Phyma commented May 31, 2017

jonpas commented May 31, 2017

commy2 left a comment

commy2 May 31, 2017

commy2 May 31, 2017

commy2 May 31, 2017

commy2 May 31, 2017

commy2 May 31, 2017

commy2 May 31, 2017

Phyma May 31, 2017

commy2 May 31, 2017

commy2 May 31, 2017

PabstMirror commented Jun 1, 2017

commy2 Jun 1, 2017

commy2 Jun 1, 2017

commy2 Jun 1, 2017 •

edited

Loading

Phyma Jun 1, 2017

jonpas Jun 1, 2017

PabstMirror Jun 1, 2017 •

edited

Loading

Phyma Jun 1, 2017

bux Jun 1, 2017

commy2 left a comment

		@@ -22,102 +22,19 @@ params ["_house", "_door"];

		private ["_index", "_animations", "_lockedVariable"];


		params ["_distance", "_house", "_door"];

		private ["_animName", "_splitStr", "_newString", "_objDist", "_animate"];

		if ((isNil "_door") \|\| ((_door find "glass") != -1)) exitWith {};

		_door

Open glass and CUP doors #5226

Open glass and CUP doors #5226

Conversation

Phyma commented May 31, 2017 • edited Loading

BaerMitUmlaut commented May 31, 2017

jonpas commented May 31, 2017

Phyma commented May 31, 2017

Phyma commented May 31, 2017

jonpas commented May 31, 2017

commy2 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PabstMirror commented Jun 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 Jun 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PabstMirror Jun 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 left a comment

Choose a reason for hiding this comment

Phyma commented May 31, 2017 •

edited

Loading

commy2 Jun 1, 2017 •

edited

Loading

PabstMirror Jun 1, 2017 •

edited

Loading