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

PIXI Controls: Remove switch button

Browse source
This commit is contained in:
OleSTEEP 2024-02-04 12:09:19 +03:00
parent ec14489b9d
commit 040a56c09f
1 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -150,19 +150,15 @@ ONSControls.createBumpers = function() {
this._RBsprite = RBsprite; this._RBsprite = RBsprite;
} }
//============================================================================= //=============================================================================
// * Show/Switch Buttons // * Show Button
//============================================================================= //=============================================================================
ONSControls.createAdditionalButtons = function() { ONSControls.createAdditionalButtons = function() {
const showButton = new PIXI.Sprite.fromImage("js/porting/assets/omori_show_button.png"); const showButton = new PIXI.Sprite.fromImage("js/porting/assets/omori_show_button.png");
//const switchButton = new PIXI.Sprite.fromImage("js/porting/assets/omori_switch_button.png");
showButton.anchor.set(0.5); showButton.anchor.set(0.5);
showButton.interactive = true; showButton.interactive = true;
showButton.on("pointerdown", this.toggle) showButton.on("pointerdown", this.toggle)
// switchButton.anchor.set(0.5);
this._controlsCanvas.stage.addChild(showButton); this._controlsCanvas.stage.addChild(showButton);
// this._controlsCanvas.stage.addChild(switchButton);
this._showButton = showButton; this._showButton = showButton;
// this.SwitchButton = switchButton;
} }
//============================================================================= //=============================================================================
// * Check idle animation (spinning buttons) // * Check idle animation (spinning buttons)
@ -173,7 +169,6 @@ ONSControls.idleAnimation = function() {
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;
} }
//============================================================================= //=============================================================================
// * Check idle animation (spinning buttons) // * Check idle animation (spinning buttons)
@ -198,7 +193,6 @@ ONSControls.stopIdleAnimation = function() {
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;
} }
//============================================================================= //=============================================================================
// * Send event to virtual controller // * Send event to virtual controller
@ -271,14 +265,10 @@ ONSControls.updateButtons = function() {
// Update additional // Update additional
const showButton = this._showButton; const showButton = this._showButton;
// 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;
showButton.alpha = ConfigManager.ONSConfig.buttonsOpacity; showButton.alpha = ConfigManager.ONSConfig.buttonsOpacity;
// switchButton.position.set(ConfigManager.ONSConfig.switchX, ConfigManager.ONSConfig.switchY);
// switchButton.width = ConfigManager.ONSConfig.additonalSize;
// switchButton.height = ConfigManager.ONSConfig.additonalSize;
console.log("ONSControls: Controls updated"); console.log("ONSControls: Controls updated");
} }
//============================================================================= //=============================================================================
@ -415,8 +405,6 @@ 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.switchY ||= ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
//============================================================================= //=============================================================================
// * Restore defaults // * Restore defaults
//============================================================================= //=============================================================================
@ -450,8 +438,6 @@ ConfigManager.restoreDefaultConfig = function () {
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.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(); }
@ -482,8 +468,6 @@ ConfigManager.ONSConfig.updateData = function() {
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.switchY = ONSControls._controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ONSControls.updateButtons(); ONSControls.updateButtons();
} }
} }
@ -522,8 +506,6 @@ ConfigManager.makeData = function () {
config.ONSConfig.additonalSize = this.ONSConfig.additonalSize; config.ONSConfig.additonalSize = this.ONSConfig.additonalSize;
config.ONSConfig.showX = this.ONSConfig.showX; config.ONSConfig.showX = this.ONSConfig.showX;
config.ONSConfig.showY = this.ONSConfig.showY; config.ONSConfig.showY = this.ONSConfig.showY;
config.ONSConfig.switchX = this.ONSConfig.switchX;
config.ONSConfig.switchY = this.ONSConfig.switchY;
return config; return config;
} }
//============================================================================= //=============================================================================
@ -556,8 +538,6 @@ ConfigManager.applyData = function (config) {
this.ONSConfig.additonalSize = config.ONSConfig.additonalSize; this.ONSConfig.additonalSize = config.ONSConfig.additonalSize;
this.ONSConfig.showX = config.ONSConfig.showX; this.ONSConfig.showX = config.ONSConfig.showX;
this.ONSConfig.showY = config.ONSConfig.showY; this.ONSConfig.showY = config.ONSConfig.showY;
this.ONSConfig.switchX = config.ONSConfig.switchX;
this.ONSConfig.switchY = config.ONSConfig.switchY;
} }