Extended Vehicle Customization #387

Kexanone · 2020-05-21T17:09:13Z

When merged this pull request will:

Provide zen_garage_fnc_defineCustomTexture as API function for defining custom textures for the garage.
Unlock hidden vanilla textures for the garage (see BIF thread).
Unlock additional animation sources for the garage (e.g. vehicle doors).
Add support for the extended customization to deep copy/paste, custom compositions and SQF exporter.
Sort animations and textures in garage in alphabetical order.
Fixes Compositions do not retain Object Specific changes made to entities. #444.

…nitVehicle

mharis001 · 2020-08-08T19:31:53Z

I am unsure about showing animations that would normally be hidden. For example, for the Prowler (HMG), you have ones such as "mainMuzzle rot" and "mainMuzzle reload" listed. And ones that are meant to be shown such as "Hide left front door" are hidden.

Kexanone · 2021-01-07T23:51:36Z

I am unsure about showing animations that would normally be hidden. For example, for the Prowler (HMG), you have ones such as "mainMuzzle rot" and "mainMuzzle reload" listed. And ones that are meant to be shown such as "Hide left front door" are hidden.

There are some neat animations like hiding turrets of APCs and door animations. The "hide door" animations disappeared due to a bug fixed in ba3d0a3.

addons/garage/functions/fnc_defineCustomTexture.sqf

Co-authored-by: NeilZar <[email protected]>

Kexanone · 2021-01-13T17:58:37Z

Still need to test how adequately the blacklist is for different mod sets.
Do we have some guideline what mods we usually want to check?

mharis001 · 2021-01-16T11:18:52Z

I'd say CUP, RHS, 3CB, and Project OPFOR are the main asset mods.

addons/garage/functions/fnc_onTextureSelect.sqf

addons/garage/functions/fnc_defineCustomTexture.sqf

…ehicle-customization

mharis001 · 2021-01-24T04:15:28Z

addons/garage/functions/fnc_populateLists.sqf

+        case "door": {
+            _vehicle doorPhase _configName;
+        };
+        case "user": {
+            _vehicle animationSourcePhase _configName;
+        };
+        default {
+            _vehicle animationPhase _configName;
+        };


_vehicle is not defined in this function. Works currently because its called openGarage function.

mharis001 · 2021-01-24T04:16:16Z

addons/garage/functions/fnc_populateLists.sqf

+    private _textures = if (_variant isEqualType "") then {
+         getArray (_sourcesConfig >> _variant >> "textures");
+    } else {
+        _variant;
+    };


No semicolon for return values of code blocks.

mharis001 · 2021-01-24T04:17:10Z

docs/user_guide/garage.md

@@ -15,3 +15,32 @@ In order to easily apply the same customization to multiple vehicles, all vehicl
 - <kbd>BACKSPACE</kbd> : Toggle interface visibility.
 - <kbd>LMB</kbd> : Show hidden interface.
 - <kbd>RMB</kbd> : Toggle interface (when not panning).
+
+### Register a Texture


Put this under frameworks section in a new page.

mharis001 · 2021-01-24T04:17:30Z

addons/garage/functions/fnc_getVehicleData.sqf

+        private _configName = configName _x;
+        private _displayName = getText (_x >> "displayName");
+        if (_displayName isEqualTo "") then {
+            _displayName = (_configName splitString "_") joinString " ";


Unnecessary parentheses.

mharis001 · 2021-01-24T04:18:18Z

addons/garage/functions/fnc_getVehicleData.sqf

+        if (_displayName isEqualTo "") then {
+            _displayName = (_configName splitString "_") joinString " ";
+        };


Would prefer a blank lines before and after the if block.

mharis001 · 2021-01-24T04:19:22Z

addons/common/functions/fnc_getVehicleCustomization.sqf

+        // Some sources will return negative values
+        if (_phase >= 0) then {
+            _animations append [_configName, _phase];
+        }


Missing semicolon.

mharis001 · 2021-01-24T04:19:47Z

addons/common/functions/fnc_getVehicleCustomization.sqf

+private _vehicleType = typeOf _vehicle;
+private _vehicleConfig = configFile >> "CfgVehicles" >> _vehicleType;


Can use configOf command.

mharis001 · 2021-01-24T04:20:02Z

addons/common/functions/fnc_getVehicleCustomization.sqf

+    private _configName = toLower configName _config;
+    private _source = toLower getText (_config >> "source");
+
+    if (_source in WHITELIST_ANIMATION_SOURCES && {BLACKLIST_ANIMATION_INNAMES findIf {_x in _configName} == -1 && {BLACKLIST_ANIMATION_ATTRIBUTES findIf {isClass (_config >> _x)} == -1}}) then {


Multi-line:

if ( _source in // ... && {} && {} ) then {

mharis001 · 2021-01-24T04:22:47Z

addons/common/functions/fnc_customizeVehicle.sqf

+    [_vehicle, _texture, nil, _mass] call BIS_fnc_initVehicle;
+};
+
+nil


Unnecessary when function has return value of "None".

mharis001 · 2021-01-24T04:33:18Z

addons/garage/functions/fnc_defineCustomTexture.sqf

+ * Public: Yes
+ */
+
+params ["_baseVehicleType", "_variantName", "_texture"];


Since this function is public, should do type checking in params.

neilzar · 2021-02-22T12:27:13Z

addons/common/functions/fnc_customizeVehicle.sqf

+if (_animation isEqualType []) then {
+    for "_i" from 0 to (count _animation - 2) step 2 do {
+        private _configName = _animation select _i;
+        private _source = getText (configFile >> "CfgVehicles" >> _vehicleType >> "animationSources" >> _configName >> "source");


Use configOf

neilzar · 2021-02-22T12:27:39Z

addons/common/functions/fnc_customizeVehicle.sqf

+};
+
+if (_texture isEqualType [] && {count _texture < 2 || {(_texture select 1) isEqualType ""}}) then {
+    [_vehicle, nil, nil, _mass] call BIS_fnc_initVehicle;


Requires targetEvent #558

neilzar · 2021-02-22T12:27:48Z

addons/common/functions/fnc_customizeVehicle.sqf

+        _vehicle setObjectTextureGlobal [_forEachIndex, _x];
+    } forEach _texture;
+} else {
+    [_vehicle, _texture, nil, _mass] call BIS_fnc_initVehicle;


Comment above

neilzar · 2021-02-22T12:31:44Z

addons/garage/functions/fnc_populateLists.sqf

 };

 // Add items to animations list
 private _ctrlListAnimations = _display displayCtrl IDC_LIST_ANIMATIONS;
 {
    _x params ["_configName", "_displayName"];

-    private _isChecked = GVAR(center) animationPhase _configName;
+    private _source = getText (configFile >> "CfgVehicles" >> _vehicleType >> "animationSources" >> _configName >> "source");


Use configOf

Kexanone added 5 commits May 21, 2020 18:17

API function for adding custom textures

896a469

Vehicle customization helper functions

3edf0f7

Extend customization for garage

07cf73d

Support of extend customization for export SQF and deep copy/paste

7dfdb96

Add hidden textures as new variants

7be56dd

Kexanone added the enhancement Improves an existing feature label May 21, 2020

Kexanone mentioned this pull request May 22, 2020

Old Man Features #389

Open

7 tasks

Make zen_common_fnc_customizeVehicle backward compatible to bis_fnc_i…

0dc5c1f

…nitVehicle

mharis001 added this to the 1.9.0 milestone May 29, 2020

mharis001 modified the milestones: 1.9.0, 1.10.0 Aug 10, 2020

neilzar and others added 3 commits November 10, 2020 00:39

Merge branch 'master' into vehicle-customization

ea29cb3

Extend source blacklist

e78a3de

Fix hide door animation

ba3d0a3

neilzar requested changes Jan 13, 2021

View reviewed changes

addons/garage/functions/fnc_defineCustomTexture.sqf Outdated Show resolved Hide resolved

Update addons/garage/functions/fnc_defineCustomTexture.sqf

7e7cc65

Co-authored-by: NeilZar <[email protected]>

Kexanone mentioned this pull request Jan 13, 2021

Add Faction Filter #504

Merged

neilzar approved these changes Jan 14, 2021

View reviewed changes

Update documentation

b35d0e1

mharis001 reviewed Jan 16, 2021

View reviewed changes

addons/garage/functions/fnc_onTextureSelect.sqf Outdated Show resolved Hide resolved

addons/garage/functions/fnc_defineCustomTexture.sqf Outdated Show resolved Hide resolved

Kexanone added 5 commits January 16, 2021 20:07

Clear vehicleDataCache for real

3c398b0

Serialize customization of statics

724e143

Generalize handling of animations

f2bae4e

Merge branch 'vehicle-customization' of github-kex:zen-mod/ZEN into v…

23bc0cf

…ehicle-customization

Store data with setVariable

474ecfd

Kexanone requested a review from mharis001 January 23, 2021 16:57

Kexanone requested a review from neilzar January 23, 2021 16:58

Kexanone added 5 commits January 23, 2021 21:20

Instant animation for serialization

216044c

Refactoring

c2dc516

Handle textures with no display name

2ee77ac

Don't convert data to string anymore

ef5bf7e

Refine animation black- and whitelits

0caa83e

mharis001 reviewed Jan 24, 2021

View reviewed changes

mharis001 modified the milestones: 1.10.0, 1.11.0 Feb 3, 2021

neilzar requested changes Feb 22, 2021

View reviewed changes

mharis001 modified the milestones: 1.11.0, 1.12.0 May 25, 2021

mharis001 modified the milestones: 1.12.0, 1.13.0 Sep 3, 2021

mharis001 modified the milestones: 1.13.0, Backlog Apr 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extended Vehicle Customization #387

Extended Vehicle Customization #387

Kexanone commented May 21, 2020 •

edited

Loading

mharis001 commented Aug 8, 2020

Kexanone commented Jan 7, 2021

Kexanone commented Jan 13, 2021

mharis001 commented Jan 16, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

mharis001 Jan 24, 2021

neilzar Feb 22, 2021

neilzar Feb 22, 2021

neilzar Feb 22, 2021

neilzar Feb 22, 2021

		private _vehicleType = typeOf _vehicle;
		private _vehicleConfig = configFile >> "CfgVehicles" >> _vehicleType;

Extended Vehicle Customization #387

Are you sure you want to change the base?

Extended Vehicle Customization #387

Conversation

Kexanone commented May 21, 2020 • edited Loading

mharis001 commented Aug 8, 2020

Kexanone commented Jan 7, 2021

Kexanone commented Jan 13, 2021

mharis001 commented Jan 16, 2021

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

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

Kexanone commented May 21, 2020 •

edited

Loading