further work on vertical layout

This commit is contained in:
Piotr 'pwh' Hanusiak
2022-03-16 14:05:35 +01:00
parent fb020e22c7
commit ac48a42903
3 changed files with 19 additions and 21 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
"license": "SEE LICENSE IN LICENSE.txt", "license": "SEE LICENSE IN LICENSE.txt",
"devDependencies": { "devDependencies": {
"@geprog/vite-plugin-env-config": "^4.0.0", "@geprog/vite-plugin-env-config": "^4.0.0",
"@home-based-studio/phaser3-utils": "0.3.0", "@home-based-studio/phaser3-utils": "0.3.2",
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.36", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.36",
"@tsconfig/svelte": "^1.0.10", "@tsconfig/svelte": "^1.0.10",
"@types/google-protobuf": "^3.7.3", "@types/google-protobuf": "^3.7.3",
+14 -16
View File
@@ -140,12 +140,6 @@ export class CustomizeScene extends AbstractCharacterScene {
}, },
}); });
for (let i = 0; i < 50; i += 1) {
this.bodyPartsDraggableGrid.addItem(
new WokaBodyPartSlot(this, 0, 0, this.getDefaultWokaBodyPartSlotConfig(isVertical))
);
}
this.bodyPartsSlots = { this.bodyPartsSlots = {
[CustomWokaBodyPart.Hair]: new WokaBodyPartSlot( [CustomWokaBodyPart.Hair]: new WokaBodyPartSlot(
this, this,
@@ -218,7 +212,7 @@ export class CustomizeScene extends AbstractCharacterScene {
} }
public onResize(): void { public onResize(): void {
const isVertical = this.cameras.main.height > this.cameras.main.width; const isVertical = this.cameras.main.width / this.cameras.main.height < 0.75;
this.moveLayers(); this.moveLayers();
this.Rectangle.x = this.cameras.main.worldView.x + this.cameras.main.width / 2; this.Rectangle.x = this.cameras.main.worldView.x + this.cameras.main.width / 2;
@@ -257,7 +251,9 @@ export class CustomizeScene extends AbstractCharacterScene {
} }
private handleCustomWokaPreviewerOnResize(isVertical: boolean): void { private handleCustomWokaPreviewerOnResize(isVertical: boolean): void {
const boxDimension = Math.min(innerWidth * 0.3, innerHeight * 0.3) / waScaleManager.getActualZoom(); const boxDimension =
Math.min(innerWidth * (isVertical ? 0.4 : 0.3), innerHeight * (isVertical ? 0.4 : 0.3)) /
waScaleManager.getActualZoom();
const boxScale = boxDimension / this.customWokaPreviewer.SIZE; const boxScale = boxDimension / this.customWokaPreviewer.SIZE;
this.customWokaPreviewer.setScale(boxScale); this.customWokaPreviewer.setScale(boxScale);
@@ -266,7 +262,9 @@ export class CustomizeScene extends AbstractCharacterScene {
} }
private handleBodyPartSlotsOnResize(isVertical: boolean): void { private handleBodyPartSlotsOnResize(isVertical: boolean): void {
const slotDimension = Math.min(innerWidth * 0.15, innerHeight * 0.15) / waScaleManager.getActualZoom(); const slotDimension =
Math.min(innerWidth * (isVertical ? 0.2 : 0.15), innerHeight * (isVertical ? 0.2 : 0.15)) /
waScaleManager.getActualZoom();
const slotScale = slotDimension / this.customWokaPreviewer.SIZE; const slotScale = slotDimension / this.customWokaPreviewer.SIZE;
for (const part in this.bodyPartsSlots) { for (const part in this.bodyPartsSlots) {
@@ -276,11 +274,11 @@ export class CustomizeScene extends AbstractCharacterScene {
const slotSize = this.bodyPartsSlots.Accessory.displayHeight; const slotSize = this.bodyPartsSlots.Accessory.displayHeight;
if (isVertical) { if (isVertical) {
const left = this.customWokaPreviewer.x - this.customWokaPreviewer.displayWidth * 0.5;
const right = this.customWokaPreviewer.x + this.customWokaPreviewer.displayWidth * 0.5;
const middle = this.customWokaPreviewer.x; const middle = this.customWokaPreviewer.x;
const top = this.customWokaPreviewer.y + this.customWokaPreviewer.displayHeight * 0.5; const left = middle - slotSize - 10;
const bottom = top + slotSize; const right = middle + slotSize + 10;
const top = this.customWokaPreviewer.y + this.customWokaPreviewer.displayHeight * 0.5 + slotSize * 0.5 + 10;
const bottom = top + slotSize + 10;
this.bodyPartsSlots.Hair.setPosition(left, top); this.bodyPartsSlots.Hair.setPosition(left, top);
this.bodyPartsSlots.Hat.setPosition(middle, top); this.bodyPartsSlots.Hat.setPosition(middle, top);
@@ -307,8 +305,8 @@ export class CustomizeScene extends AbstractCharacterScene {
} }
private handleBodyPartsDraggableGridOnResize(isVertical: boolean): void { private handleBodyPartsDraggableGridOnResize(isVertical: boolean): void {
const gridHeight = (innerHeight * 0.35) / waScaleManager.getActualZoom(); const gridHeight = (innerHeight * (isVertical ? 0.3 : 0.35)) / waScaleManager.getActualZoom();
const gridWidth = (innerWidth * 0.7) / waScaleManager.getActualZoom(); const gridWidth = (innerWidth * (isVertical ? 0.9 : 0.8)) / waScaleManager.getActualZoom();
const gridPos = { const gridPos = {
x: this.cameras.main.worldView.x + this.cameras.main.width / 2, x: this.cameras.main.worldView.x + this.cameras.main.width / 2,
y: this.cameras.main.worldView.y + this.cameras.main.height - gridHeight * 0.5 - 10, y: this.cameras.main.worldView.y + this.cameras.main.height - gridHeight * 0.5 - 10,
@@ -316,7 +314,7 @@ export class CustomizeScene extends AbstractCharacterScene {
this.bodyPartsDraggableGrid.changeDraggableSpacePosAndSize(gridPos, { x: gridWidth, y: gridHeight }, gridPos); this.bodyPartsDraggableGrid.changeDraggableSpacePosAndSize(gridPos, { x: gridWidth, y: gridHeight }, gridPos);
const slotDimension = Math.min(innerWidth * 0.15, innerHeight * 0.15) / waScaleManager.getActualZoom(); const slotDimension = (innerHeight * (isVertical ? 0.125 : 0.15)) / waScaleManager.getActualZoom();
const slotScale = slotDimension / this.customWokaPreviewer.SIZE; const slotScale = slotDimension / this.customWokaPreviewer.SIZE;
this.bodyPartsDraggableGrid.clearAllItems(); this.bodyPartsDraggableGrid.clearAllItems();
+4 -4
View File
@@ -98,10 +98,10 @@
resolved "https://registry.yarnpkg.com/@geprog/vite-plugin-env-config/-/vite-plugin-env-config-4.0.0.tgz#989d95f23fbab5eae7c4c96d04a18abdc289b81e" resolved "https://registry.yarnpkg.com/@geprog/vite-plugin-env-config/-/vite-plugin-env-config-4.0.0.tgz#989d95f23fbab5eae7c4c96d04a18abdc289b81e"
integrity sha512-25ZMNdpssqkyv1sxfa6gBhmL8yCxCqjRRc1c05GJfhPkqD6Cn9dnG6xnHHHfJaEqrDFCViD0Bcnr+tgs76OZ2Q== integrity sha512-25ZMNdpssqkyv1sxfa6gBhmL8yCxCqjRRc1c05GJfhPkqD6Cn9dnG6xnHHHfJaEqrDFCViD0Bcnr+tgs76OZ2Q==
"@home-based-studio/phaser3-utils@0.3.0": "@home-based-studio/phaser3-utils@0.3.2":
version "0.3.0" version "0.3.2"
resolved "https://registry.yarnpkg.com/@home-based-studio/phaser3-utils/-/phaser3-utils-0.3.0.tgz#e23337162252e9cb5db0dc0b4f3393e95369f254" resolved "https://registry.yarnpkg.com/@home-based-studio/phaser3-utils/-/phaser3-utils-0.3.2.tgz#2240819473fbdb66123cee4b37b3d18be03d1dbe"
integrity sha512-p7FQKyLP2xjQsGxgQwAhlghLE3vdkSCLPSFvYohrNwglkUigbSJrpv7iq6oxK/0Uvmby8S6fU2Sv1BIbDysKoA== integrity sha512-qbv2H2IOSCyG+8hzBsZHPx4HWvlH1G4AfXuc3DyorI4QQMlvcVq5sZIjVaz6RIzeC7czivXOWsW5bApVhGa55A==
dependencies: dependencies:
phaser "3.55.1" phaser "3.55.1"