Fix ONSControls parameters aplying on start

This commit is contained in:
OleSTEEP 2024-03-08 21:21:52 +03:00
parent 50572ef322
commit 52588249f1
2 changed files with 44 additions and 44 deletions

View file

@ -573,28 +573,28 @@ ONSControls.configManager = function() {
//=============================================================================
// * Class Variables
//=============================================================================
ConfigManager.ONSConfig = (typeof x === 'undefined') ? {} : ConfigManager.ONSConfig;
ConfigManager.ONSConfig.customPos = (typeof x === 'undefined') ? false : ConfigManager.ONSConfig.customPos;
ConfigManager.ONSConfig.buttonsScale = (typeof x === 'undefined') ? ONSControls.options.buttonsScale : ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.buttonsOpacity = (typeof x === 'undefined') ? ONSControls.options.buttonsOpacity : ConfigManager.ONSConfig.buttonsOpacity;
ConfigManager.ONSConfig.safeArea = (typeof x === 'undefined') ? 1 : ConfigManager.ONSConfig.safeArea;
ConfigManager.ONSConfig.buttonsSize = (typeof x === 'undefined') ? ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.buttonsSize;
ConfigManager.ONSConfig.buttonsX = (typeof x === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsX;
ConfigManager.ONSConfig.buttonsY = (typeof x === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsY;
ConfigManager.ONSConfig.dPadSize = (typeof x === 'undefined') ? ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.dPadSize;
ConfigManager.ONSConfig.dPadX = (typeof x === 'undefined') ? ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadX;
ConfigManager.ONSConfig.dPadY = (typeof x === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadY;
ConfigManager.ONSConfig.bumpersOffsetX = (typeof x === 'undefined') ? 16 : ConfigManager.ONSConfig.bumpersOffsetX;
ConfigManager.ONSConfig.bumpersOffsetY = (typeof x === 'undefined') ? ONSControls._controlsCanvas.vh(0.30) : ConfigManager.ONSConfig.bumpersOffsetY;
ConfigManager.ONSConfig.bumpersWidth = (typeof x === 'undefined') ? ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersWidth;
ConfigManager.ONSConfig.bumpersHeight = (typeof x === 'undefined') ? ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersHeight;
ConfigManager.ONSConfig.LBX = (typeof x === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.LBX;
ConfigManager.ONSConfig.LBY = (typeof x === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.LBY;
ConfigManager.ONSConfig.RBX = (typeof x === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.RBX;
ConfigManager.ONSConfig.RBY = (typeof x === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.RBY;
ConfigManager.ONSConfig.additonalSize = (typeof x === 'undefined') ? ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.additonalSize;
ConfigManager.ONSConfig.showX = (typeof x === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showX;
ConfigManager.ONSConfig.showY = (typeof x === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showY;
ConfigManager.ONSConfig = (typeof ConfigManager.ONSConfig === 'undefined') ? {} : ConfigManager.ONSConfig;
ConfigManager.ONSConfig.customPos = (typeof ConfigManager.ONSConfig.customPos === 'undefined') ? false : ConfigManager.ONSConfig.customPos;
ConfigManager.ONSConfig.buttonsScale = (typeof ConfigManager.ONSConfig.buttonsScale === 'undefined') ? ONSControls.options.buttonsScale : ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.buttonsOpacity = (typeof ConfigManager.ONSConfig.buttonsOpacity === 'undefined') ? ONSControls.options.buttonsOpacity : ConfigManager.ONSConfig.buttonsOpacity;
ConfigManager.ONSConfig.safeArea = (typeof ConfigManager.ONSConfig.safeArea === 'undefined') ? 1 : ConfigManager.ONSConfig.safeArea;
ConfigManager.ONSConfig.buttonsSize = (typeof ConfigManager.ONSConfig.buttonsSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.buttonsSize;
ConfigManager.ONSConfig.buttonsX = (typeof ConfigManager.ONSConfig.buttonsX === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsX;
ConfigManager.ONSConfig.buttonsY = (typeof ConfigManager.ONSConfig.buttonsY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsY;
ConfigManager.ONSConfig.dPadSize = (typeof ConfigManager.ONSConfig.dPadSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.dPadSize;
ConfigManager.ONSConfig.dPadX = (typeof ConfigManager.ONSConfig.dPadX === 'undefined') ? ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadX;
ConfigManager.ONSConfig.dPadY = (typeof ConfigManager.ONSConfig.dPadY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadY;
ConfigManager.ONSConfig.bumpersOffsetX = (typeof ConfigManager.ONSConfig.bumpersOffsetX === 'undefined') ? 16 : ConfigManager.ONSConfig.bumpersOffsetX;
ConfigManager.ONSConfig.bumpersOffsetY = (typeof ConfigManager.ONSConfig.bumpersOffsetY === 'undefined') ? ONSControls._controlsCanvas.vh(0.30) : ConfigManager.ONSConfig.bumpersOffsetY;
ConfigManager.ONSConfig.bumpersWidth = (typeof ConfigManager.ONSConfig.bumpersWidth === 'undefined') ? ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersWidth;
ConfigManager.ONSConfig.bumpersHeight = (typeof ConfigManager.ONSConfig.bumpersHeight === 'undefined') ? ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersHeight;
ConfigManager.ONSConfig.LBX = (typeof ConfigManager.ONSConfig.LBX === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.LBX;
ConfigManager.ONSConfig.LBY = (typeof ConfigManager.ONSConfig.LBY === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.LBY;
ConfigManager.ONSConfig.RBX = (typeof ConfigManager.ONSConfig.RBX === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.RBX;
ConfigManager.ONSConfig.RBY = (typeof ConfigManager.ONSConfig.RBY === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.RBY;
ConfigManager.ONSConfig.additonalSize = (typeof ConfigManager.ONSConfig.additonalSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.additonalSize;
ConfigManager.ONSConfig.showX = (typeof ConfigManager.ONSConfig.showX === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showX;
ConfigManager.ONSConfig.showY = (typeof ConfigManager.ONSConfig.showY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showY;
//=============================================================================
// * Restore defaults
//=============================================================================