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

PIXI Controls: Common Scale

Browse source
This commit is contained in:
OleSTEEP 2024-02-02 15:34:04 +03:00
parent 0ddb740430
commit d81adca6f4
1 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,22 +366,19 @@ ConfigManager.ONSConfig.controlsOffsetY ||= 16;
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.buttonsY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.dPadScale ||= 1;
ConfigManager.ONSConfig.dPadSize ||= ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.dPadScale;
ConfigManager.ONSConfig.dPadSize ||= ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale;
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.bumpersScale ||= 1;
ConfigManager.ONSConfig.bumpersOffsetX ||= 16;
ConfigManager.ONSConfig.bumpersWidth ||= ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersHeight ||= ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersWidth ||= ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersHeight ||= ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersOffsetY ||= ONSControls.controlsCanvas.vh(0.56);
ConfigManager.ONSConfig.LBX ||= ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2;
ConfigManager.ONSConfig.LBY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.RBX ||= ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2);
ConfigManager.ONSConfig.RBY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.additionalScale ||= 1;
ConfigManager.ONSConfig.additionalOffset ||= ONSControls.controlsCanvas.vh(0.03);
ConfigManager.ONSConfig.additonalSize ||= ONSControls.controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.additionalScale;
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.showY ||= ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.switchX ||= ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset;
@ -402,8 +399,6 @@ ConfigManager.makeData = function () {
config.ONSConfig.controlsOffsetX = this.ONSConfig.controlsOffsetX;
config.ONSConfig.controlsOffsetY = this.ONSConfig.controlsOffsetY;
config.ONSConfig.buttonsScale = this.ONSConfig.buttonsScale;
config.ONSConfig.dPadScale = this.ONSConfig.dPadScale;
config.ONSConfig.bumpersScale = this.ONSConfig.bumpersScale;
config.ONSConfig.additionalOffset = this.ONSConfig.additionalOffset;
config.ONSConfig.buttonsSize = this.ONSConfig.buttonsSize;
config.ONSConfig.buttonsX = this.ONSConfig.buttonsX;
@ -419,7 +414,6 @@ ConfigManager.makeData = function () {
config.ONSConfig.LBY = this.ONSConfig.LBY;
config.ONSConfig.RBX = this.ONSConfig.RBX;
config.ONSConfig.RBY = this.ONSConfig.RBY;
config.ONSConfig.additionalScale = this.ONSConfig.additionalScale;
config.ONSConfig.additionalOffset = this.ONSConfig.additionalOffset;
config.ONSConfig.additonalSize = this.ONSConfig.additonalSize;
config.ONSConfig.showX = this.ONSConfig.showX;
@ -437,8 +431,6 @@ ConfigManager.applyData = function (config) {
this.ONSConfig.controlsOffsetX = config.ONSConfig.controlsOffsetX;
this.ONSConfig.controlsOffsetY = config.ONSConfig.controlsOffsetY;
this.ONSConfig.buttonsScale = config.ONSConfig.buttonsScale;
this.ONSConfig.dPadScale = config.ONSConfig.dPadScale;
this.ONSConfig.bumpersScale = config.ONSConfig.bumpersScale;
this.ONSConfig.additionalOffset = config.ONSConfig.additionalOffset;
this.ONSConfig.buttonsSize = config.ONSConfig.buttonsSize;
this.ONSConfig.buttonsX = config.ONSConfig.buttonsX;
@ -454,7 +446,6 @@ ConfigManager.applyData = function (config) {
this.ONSConfig.LBY = config.ONSConfig.LBY;
this.ONSConfig.RBX = config.ONSConfig.RBX;
this.ONSConfig.RBY = config.ONSConfig.RBY;
this.ONSConfig.additionalScale = config.ONSConfig.additionalScale;
this.ONSConfig.additionalOffset = config.ONSConfig.additionalOffset;
this.ONSConfig.additonalSize = config.ONSConfig.additonalSize;
this.ONSConfig.showX = config.ONSConfig.showX;
@ -479,22 +470,19 @@ ConfigManager.restoreDefaultConfig = function () {
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.buttonsY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.dPadScale = 1;
ConfigManager.ONSConfig.dPadSize = ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.dPadScale;
ConfigManager.ONSConfig.dPadSize = ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale;
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.bumpersScale = 1;
ConfigManager.ONSConfig.bumpersOffsetX = 16;
ConfigManager.ONSConfig.bumpersWidth = ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersHeight = ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersWidth = ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersHeight = ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersOffsetY = ONSControls.controlsCanvas.vh(0.56);
ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2;
ConfigManager.ONSConfig.LBY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.RBX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2);
ConfigManager.ONSConfig.RBY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.additionalScale = 1;
ConfigManager.ONSConfig.additionalOffset = ONSControls.controlsCanvas.vh(0.03);
ConfigManager.ONSConfig.additonalSize = ONSControls.controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.additionalScale;
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.showY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.switchX = ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset;
@ -513,22 +501,19 @@ ConfigManager.ONSConfig.updateData = function() {
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.buttonsY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.buttonsSize + ConfigManager.ONSConfig.controlsOffsetY);
ConfigManager.ONSConfig.dPadScale = ConfigManager.ONSConfig.dPadScale;
ConfigManager.ONSConfig.dPadSize = ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.dPadScale;
ConfigManager.ONSConfig.dPadSize = ONSControls.controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale;
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.bumpersScale = ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersOffsetX = ConfigManager.ONSConfig.bumpersOffsetX;
ConfigManager.ONSConfig.bumpersWidth = ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersHeight = ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.bumpersScale;
ConfigManager.ONSConfig.bumpersWidth = ONSControls.controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersHeight = ONSControls.controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale;
ConfigManager.ONSConfig.bumpersOffsetY = ONSControls.controlsCanvas.vh(0.56);
ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2;
ConfigManager.ONSConfig.LBY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.RBX = ONSControls.controlsCanvas.screen.width - (ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2);
ConfigManager.ONSConfig.RBY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2);
ConfigManager.ONSConfig.additionalScale = ConfigManager.ONSConfig.additionalScale;
ConfigManager.ONSConfig.additionalOffset = ONSControls.controlsCanvas.vh(0.03);
ConfigManager.ONSConfig.additonalSize = ONSControls.controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.additionalScale;
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.showY = ONSControls.controlsCanvas.screen.height - (ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset);
ConfigManager.ONSConfig.switchX = ConfigManager.ONSConfig.additonalSize / 2 + ConfigManager.ONSConfig.additionalOffset;