VienDesuPorting/OMORI_Android
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PIXI Controls: Change some global vars names

Browse source
This commit is contained in:
OleSTEEP 2024-02-02 16:54:22 +03:00
parent 6c86125e37
commit fc098ef830
1 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

152
www.rus/js/plugins/VND_ONSControls.js
View file

@ -38,7 +38,7 @@ ONSControls.createCanvas = function() {
canvas.vh = (persent) => { canvas.vh = (persent) => {
return canvas.screen.height * persent; return canvas.screen.height * persent;
} }
this.controlsCanvas = canvas; this._controlsCanvas = canvas;
} }
//============================================================================= //=============================================================================
// * A/B/X/Y Buttons // * A/B/X/Y Buttons
@ -63,8 +63,8 @@ ONSControls.createButtons = function() {
btn.anchor.set(0.5); btn.anchor.set(0.5);
container.addChild(btn); container.addChild(btn);
} }
this.controlsCanvas.stage.addChild(container); this._controlsCanvas.stage.addChild(container);
this.ButtonsContainer = container; this._buttonsContainer = container;
} }
//============================================================================= //=============================================================================
// * DPad Buttons // * DPad Buttons
@ -89,8 +89,8 @@ ONSControls.createDPad = function() {
.on("pointerup", (event) => {this.sendEvent(event, "DPAD_UP")}); .on("pointerup", (event) => {this.sendEvent(event, "DPAD_UP")});
directions[3].on("pointerdown", (event) => {this.sendEvent(event, "DPAD_LEFT")}) directions[3].on("pointerdown", (event) => {this.sendEvent(event, "DPAD_LEFT")})
.on("pointerup", (event) => {this.sendEvent(event, "DPAD_LEFT")}); .on("pointerup", (event) => {this.sendEvent(event, "DPAD_LEFT")});
this.controlsCanvas.stage.addChild(container); this._controlsCanvas.stage.addChild(container);
this.DPadContainer = container; this._dPadContainer = container;
} }
//============================================================================= //=============================================================================
// * LB/RB Buttons // * LB/RB Buttons
@ -106,10 +106,10 @@ ONSControls.createBumpers = function() {
RBsprite.interactive = true; RBsprite.interactive = true;
RBsprite.on("pointerdown", (event) => {this.sendEvent(event, "BUTTON_RB")}) RBsprite.on("pointerdown", (event) => {this.sendEvent(event, "BUTTON_RB")})
.on("pointerup", (event) => {this.sendEvent(event, "BUTTON_RB")}) .on("pointerup", (event) => {this.sendEvent(event, "BUTTON_RB")})
this.controlsCanvas.stage.addChild(LBsprite); this._controlsCanvas.stage.addChild(LBsprite);
this.controlsCanvas.stage.addChild(RBsprite); this._controlsCanvas.stage.addChild(RBsprite);
this.LBsprite = LBsprite; this._LBsprite = LBsprite;
this.RBsprite = RBsprite; this._RBsprite = RBsprite;
} }
//============================================================================= //=============================================================================
// * Show/Switch Buttons // * Show/Switch Buttons
@ -121,21 +121,21 @@ ONSControls.createAdditionalButtons = function() {
showButton.interactive = true; showButton.interactive = true;
showButton.on("pointerdown", this.toggle) showButton.on("pointerdown", this.toggle)
// switchButton.anchor.set(0.5); // switchButton.anchor.set(0.5);
this.controlsCanvas.stage.addChild(showButton); this._controlsCanvas.stage.addChild(showButton);
// this.controlsCanvas.stage.addChild(switchButton); // this._controlsCanvas.stage.addChild(switchButton);
this.ShowButton = showButton; this._showButton = showButton;
// this.SwitchButton = switchButton; // this.SwitchButton = switchButton;
} }
//============================================================================= //=============================================================================
// * Check idle animation (spinning buttons) // * Check idle animation (spinning buttons)
//============================================================================= //=============================================================================
ONSControls.idleAnimation = function() { ONSControls.idleAnimation = function() {
ONSControls.ButtonsContainer.rotation -= 0.1; ONSControls._buttonsContainer.rotation -= 0.1;
ONSControls.DPadContainer.rotation += 0.1; ONSControls._dPadContainer.rotation += 0.1;
ONSControls.LBsprite.rotation += 0.1; ONSControls._LBsprite.rotation += 0.1;
ONSControls.RBsprite.rotation -= 0.1; ONSControls._RBsprite.rotation -= 0.1;
ONSControls.ShowButton.rotation += 0.1; ONSControls._showButton.rotation += 0.1;
//ONSControls.SwitchButton.rotation -= 0.1; //ONSControls._switchButton.rotation -= 0.1;
} }
//============================================================================= //=============================================================================
// * Check idle animation (spinning buttons) // * Check idle animation (spinning buttons)
@ -147,20 +147,20 @@ ONSControls.isIdlePlaying = false;
ONSControls.playIdleAnimation = function() { ONSControls.playIdleAnimation = function() {
if (!ONSControls.isIdlePlaying) { if (!ONSControls.isIdlePlaying) {
ONSControls.isIdlePlaying = true; ONSControls.isIdlePlaying = true;
ONSControls.controlsCanvas.ticker.add(ONSControls.idleAnimation); ONSControls._controlsCanvas.ticker.add(ONSControls.idleAnimation);
} }
} }
//============================================================================= //=============================================================================
// * Stop idle animation (spinning buttons) // * Stop idle animation (spinning buttons)
//============================================================================= //=============================================================================
ONSControls.stopIdleAnimation = function() { ONSControls.stopIdleAnimation = function() {
ONSControls.controlsCanvas.ticker.remove(ONSControls.idleAnimation); ONSControls._controlsCanvas.ticker.remove(ONSControls.idleAnimation);
ONSControls.ButtonsContainer.rotation = 0; ONSControls._buttonsContainer.rotation = 0;
ONSControls.DPadContainer.rotation = 0; ONSControls._dPadContainer.rotation = 0;
ONSControls.LBsprite.rotation = 0; ONSControls._LBsprite.rotation = 0;
ONSControls.RBsprite.rotation = 0; ONSControls._RBsprite.rotation = 0;
ONSControls.ShowButton.rotation = 0; ONSControls._showButton.rotation = 0;
//ONSControls.SwitchButton.rotation = 0; //ONSControls._switchButton.rotation = 0;
} }
//============================================================================= //=============================================================================
// * Send event to virtual controller // * Send event to virtual controller
@ -177,8 +177,8 @@ ONSControls.sendEvent = function(event, button) {
//============================================================================= //=============================================================================
ONSControls.toggle = function() { ONSControls.toggle = function() {
const elements = [ const elements = [
ONSControls.ButtonsContainer, ONSControls.DPadContainer, ONSControls._buttonsContainer, ONSControls._dPadContainer,
ONSControls.LBsprite, ONSControls.RBsprite ONSControls._LBsprite, ONSControls._RBsprite
] ]
for (elem of elements) { for (elem of elements) {
if (elem.visible) { if (elem.visible) {
@ -195,7 +195,7 @@ ONSControls.updateButtons = function() {
// Update A/B/X/Y // Update A/B/X/Y
const buttonsSize = ConfigManager.ONSConfig.buttonsSize; const buttonsSize = ConfigManager.ONSConfig.buttonsSize;
const container = this.ButtonsContainer; const container = this._buttonsContainer;
const buttons = container.children; const buttons = container.children;
for (btn of buttons) { for (btn of buttons) {
btn.width = buttonsSize; btn.width = buttonsSize;
@ -212,14 +212,14 @@ ONSControls.updateButtons = function() {
// Update DPAD // Update DPAD
const dPadSize = ConfigManager.ONSConfig.dPadSize; const dPadSize = ConfigManager.ONSConfig.dPadSize;
const dpadContainer = this.DPadContainer; const dpadContainer = this._dPadContainer;
const directions = dpadContainer.children; const directions = dpadContainer.children;
dpadContainer.width = dPadSize; dpadContainer.width = dPadSize;
dpadContainer.height = dPadSize; dpadContainer.height = dPadSize;
dpadContainer.position.set(ConfigManager.ONSConfig.dPadX, ConfigManager.ONSConfig.dPadY); dpadContainer.position.set(ConfigManager.ONSConfig.dPadX, ConfigManager.ONSConfig.dPadY);
for (elem of directions) { for (elem of directions) {
elem.width = this.controlsCanvas.vh(0.12); elem.width = this._controlsCanvas.vh(0.12);
elem.height = this.controlsCanvas.vh(0.12); elem.height = this._controlsCanvas.vh(0.12);
elem.cursor = 'pointer'; elem.cursor = 'pointer';
} }
directions[0].x = directions[0].width; directions[0].x = directions[0].width;
@ -228,8 +228,8 @@ ONSControls.updateButtons = function() {
directions[3].x = -directions[3].width; directions[3].x = -directions[3].width;
// Update LB/RB // Update LB/RB
const LBsprite = this.LBsprite const LBsprite = this._LBsprite;
const RBsprite = this.RBsprite const RBsprite = this._RBsprite;
LBsprite.position.set(ConfigManager.ONSConfig.LBX, ConfigManager.ONSConfig.LBY); LBsprite.position.set(ConfigManager.ONSConfig.LBX, ConfigManager.ONSConfig.LBY);
LBsprite.width = ConfigManager.ONSConfig.bumpersWidth; LBsprite.width = ConfigManager.ONSConfig.bumpersWidth;
LBsprite.height = ConfigManager.ONSConfig.bumpersHeight; LBsprite.height = ConfigManager.ONSConfig.bumpersHeight;
@ -238,8 +238,8 @@ ONSControls.updateButtons = function() {
RBsprite.height = ConfigManager.ONSConfig.bumpersHeight; RBsprite.height = ConfigManager.ONSConfig.bumpersHeight;
// Update additional // Update additional
const showButton = this.ShowButton; const showButton = this._showButton;
// const switchButton = this.switchButton; // const switchButton = this._switchButton;
showButton.position.set(ConfigManager.ONSConfig.showX, ConfigManager.ONSConfig.showY); showButton.position.set(ConfigManager.ONSConfig.showX, ConfigManager.ONSConfig.showY);
showButton.width = ConfigManager.ONSConfig.additonalSize; showButton.width = ConfigManager.ONSConfig.additonalSize;
showButton.height = ConfigManager.ONSConfig.additonalSize; showButton.height = ConfigManager.ONSConfig.additonalSize;
@ -363,26 +363,26 @@ ConfigManager.ONSConfig ||= {};
ConfigManager.ONSConfig.buttonsScale ||= 1; ConfigManager.ONSConfig.buttonsScale ||= 1;
ConfigManager.ONSConfig.controlsOffsetX ||= 32; ConfigManager.ONSConfig.controlsOffsetX ||= 32;
ConfigManager.ONSConfig.controlsOffsetY ||= 16; ConfigManager.ONSConfig.controlsOffsetY ||= 16;
ConfigManager.ONSConfig.buttonsSize ||= ONSControls.controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.buttonsSize ||= ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.buttonsX ||= ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetX);; ConfigManager.ONSConfig.buttonsX ||= ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetX);;
ConfigManager.ONSConfig.buttonsY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY); ConfigManager.ONSConfig.buttonsY ||= ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.dPadSize ||= ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.dPadSize ||= ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.dPadX ||= ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetX; ConfigManager.ONSConfig.dPadX ||= ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetX;
ConfigManager.ONSConfig.dPadY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetY); ConfigManager.ONSConfig.dPadY ||= ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.bumpersOffsetX ||= 16; ConfigManager.ONSConfig.bumpersOffsetX ||= 16;
ConfigManager.ONSConfig.bumpersOffsetY ||= ONSControls.controlsCanvas.vh(0.30); ConfigManager.ONSConfig.bumpersOffsetY ||= ONSControls._controlsCanvas.vh(0.30);
ConfigManager.ONSConfig.bumpersWidth ||= ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.bumpersWidth ||= ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersHeight ||= ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.bumpersHeight ||= ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.LBX ||= ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; ConfigManager.ONSConfig.LBX ||= ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2;
ConfigManager.ONSConfig.LBY ||= (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2); ConfigManager.ONSConfig.LBY ||= (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.RBX ||= ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2); ConfigManager.ONSConfig.RBX ||= ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2);
ConfigManager.ONSConfig.RBY ||= (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2); ConfigManager.ONSConfig.RBY ||= (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.additionalOffset ||= ONSControls.controlsCanvas.vh(0.03); ConfigManager.ONSConfig.additionalOffset ||= ONSControls._controlsCanvas.vh(0.03);
ConfigManager.ONSConfig.additonalSize ||= ONSControls.controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.additonalSize ||= ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.showX ||= ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.showX ||= ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.showY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.showY ||= ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.switchX ||= ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset; ConfigManager.ONSConfig.switchX ||= ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset;
ConfigManager.ONSConfig.switchY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.switchY ||= ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
//============================================================================= //=============================================================================
// * Original functions // * Original functions
//============================================================================= //=============================================================================
@ -467,26 +467,26 @@ ConfigManager.restoreDefaultConfig = function () {
ConfigManager.ONSConfig.buttonsScale = 1; ConfigManager.ONSConfig.buttonsScale = 1;
ConfigManager.ONSConfig.controlsOffsetX = 32; ConfigManager.ONSConfig.controlsOffsetX = 32;
ConfigManager.ONSConfig.controlsOffsetY = 16; ConfigManager.ONSConfig.controlsOffsetY = 16;
ConfigManager.ONSConfig.buttonsSize = ONSControls.controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.buttonsSize = ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.buttonsX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetX);; ConfigManager.ONSConfig.buttonsX = ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetX);;
ConfigManager.ONSConfig.buttonsY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY); ConfigManager.ONSConfig.buttonsY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.dPadSize = ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.dPadSize = ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.dPadX = ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetX; ConfigManager.ONSConfig.dPadX = ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetX;
ConfigManager.ONSConfig.dPadY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetY); ConfigManager.ONSConfig.dPadY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.bumpersOffsetX = 16; ConfigManager.ONSConfig.bumpersOffsetX = 16;
ConfigManager.ONSConfig.bumpersOffsetY = ONSControls.controlsCanvas.vh(0.30); ConfigManager.ONSConfig.bumpersOffsetY = ONSControls._controlsCanvas.vh(0.30);
ConfigManager.ONSConfig.bumpersWidth = ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.bumpersWidth = ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersHeight = ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.bumpersHeight = ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2;
ConfigManager.ONSConfig.LBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2); ConfigManager.ONSConfig.LBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.RBX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2); ConfigManager.ONSConfig.RBX = ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2);
ConfigManager.ONSConfig.RBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2); ConfigManager.ONSConfig.RBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.additionalOffset = ONSControls.controlsCanvas.vh(0.03); ConfigManager.ONSConfig.additionalOffset = ONSControls._controlsCanvas.vh(0.03);
ConfigManager.ONSConfig.additonalSize = ONSControls.controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.additonalSize = ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.showX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.showX = ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.showY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.showY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.switchX = ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset; ConfigManager.ONSConfig.switchX = ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset;
ConfigManager.ONSConfig.switchY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.switchY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.applyData(ConfigManager); ConfigManager.applyData(ConfigManager);
let needsRestore = confirm(LanguageManager.languageData().text.System.plugins.optionsMenu.alertMessages["restoreGeneral"]); let needsRestore = confirm(LanguageManager.languageData().text.System.plugins.optionsMenu.alertMessages["restoreGeneral"]);
if (!!needsRestore) { DataManager._restoreGlobalInfo(); } if (!!needsRestore) { DataManager._restoreGlobalInfo(); }
@ -498,26 +498,26 @@ ConfigManager.ONSConfig.updateData = function() {
ConfigManager.ONSConfig.buttonsScale = ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.buttonsScale = ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.controlsOffsetX = ConfigManager.ONSConfig.controlsOffsetX; ConfigManager.ONSConfig.controlsOffsetX = ConfigManager.ONSConfig.controlsOffsetX;
ConfigManager.ONSConfig.controlsOffsetY = ConfigManager.ONSConfig.controlsOffsetY; ConfigManager.ONSConfig.controlsOffsetY = ConfigManager.ONSConfig.controlsOffsetY;
ConfigManager.ONSConfig.buttonsSize = ONSControls.controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.buttonsSize = ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.buttonsX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetX);; ConfigManager.ONSConfig.buttonsX = ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetX);;
ConfigManager.ONSConfig.buttonsY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY); ConfigManager.ONSConfig.buttonsY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.dPadSize = ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.dPadSize = ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.dPadX = ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetX; ConfigManager.ONSConfig.dPadX = ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetX;
ConfigManager.ONSConfig.dPadY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetY); ConfigManager.ONSConfig.dPadY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.dPadSize / 2 + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.bumpersOffsetX = ConfigManager.ONSConfig.bumpersOffsetX; ConfigManager.ONSConfig.bumpersOffsetX = ConfigManager.ONSConfig.bumpersOffsetX;
ConfigManager.ONSConfig.bumpersOffsetY = ConfigManager.ONSConfig.bumpersOffsetY; ConfigManager.ONSConfig.bumpersOffsetY = ConfigManager.ONSConfig.bumpersOffsetY;
ConfigManager.ONSConfig.bumpersWidth = ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.bumpersWidth = ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersHeight = ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.bumpersHeight = ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2;
ConfigManager.ONSConfig.LBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2); ConfigManager.ONSConfig.LBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.RBX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2); ConfigManager.ONSConfig.RBX = ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2);
ConfigManager.ONSConfig.RBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2); ConfigManager.ONSConfig.RBY = (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.additionalOffset = ConfigManager.ONSConfig.additionalOffset; ConfigManager.ONSConfig.additionalOffset = ConfigManager.ONSConfig.additionalOffset;
ConfigManager.ONSConfig.additonalSize = ONSControls.controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale; ConfigManager.ONSConfig.additonalSize = ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.showX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.showX = ONSControls._controlsCanvas.screen.width - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.showY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.showY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.switchX = ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset; ConfigManager.ONSConfig.switchX = ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset;
ConfigManager.ONSConfig.switchY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset); ConfigManager.ONSConfig.switchY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ONSControls.updateButtons(); ONSControls.updateButtons();
} }
} }