🐛 Fix bleeding edge on pet

Change log: - Fix bleeding edge on pet - Change fps to 30 - Limit scale min 0.1 max 1
SeakMengs · Oct 8, 2023 · 434eeef · 434eeef
1 parent 773004f
commit 434eeef
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/src-tauri/src/app/default/settings.json b/src-tauri/src/app/default/settings.json
@@ -3,7 +3,7 @@
     "language": "en",
     "allowPetAboveTaskbar": false,
     "allowPetInteraction": true,
-    "allowOverridePetScale": true,
     "allowAutoStartUp": false,
-    "petScale": 1
+    "allowOverridePetScale": true,
+    "petScale": 0.7
 }
diff --git a/src/PhaserWrapper.tsx b/src/PhaserWrapper.tsx
@@ -28,10 +28,12 @@ function PhaserWrapper() {
         appWindow.setIgnoreCursorEvents(true);
 
         const phaserConfig: Phaser.Types.Core.GameConfig = {
-            type: Phaser.CANVAS,
+            type: Phaser.AUTO,
             parent: phaserDom.current,
             backgroundColor: '#ffffff0',
             transparent: true,
+            roundPixels: true,
+            antialias: true,
             scale: {
                 mode: Phaser.Scale.ScaleModes.RESIZE,
                 width: screenWidth,
@@ -45,7 +47,7 @@ function PhaserWrapper() {
                 },
             },
             fps: {
-                target: 144,
+                target: 30,
                 min: 30,
                 smoothStep: true,
             },

diff --git a/src/hooks/useSettingStore.tsx b/src/hooks/useSettingStore.tsx
@@ -30,7 +30,7 @@ export const useSettingStore = create<ISettingStoreState>()((set) => ({
     setAllowOverridePetScale: (newBoolean) => {
         set({allowOverridePetScale: newBoolean})
     },
-    petScale: defaultSettings.petScale ?? 1,
+    petScale: defaultSettings.petScale ?? 0.7,
     setPetScale: (petScale) => {
         set({petScale: petScale})
     },

diff --git a/src/scenes/Pets.ts b/src/scenes/Pets.ts
@@ -221,7 +221,8 @@ export default class Pets extends Phaser.Scene {
                 case DispatchType.OverridePetScale:
                     this.allowOverridePetScale = event.payload.value as boolean;
                     this.allowOverridePetScale ?
-                        this.scaleAllPets(this.petScale) : this.scaleAllPets(1);
+                        this.scaleAllPets(this.petScale) :
+                        this.scaleAllPets(defaultSettings.petScale);
                     break;
                 case DispatchType.ChangePetScale:
                     this.petScale = event.payload.value as number;
@@ -434,7 +435,7 @@ export default class Pets extends Phaser.Scene {
 
     scalePet(pet: IPet, scaleValue: number): void {
         const scaleX = pet.scaleX > 0 ? scaleValue : -scaleValue;
-        const scaleY = scaleValue > 0 ? scaleValue : -scaleValue;
+        const scaleY = pet.scaleY > 0 ? scaleValue : -scaleValue;
         pet.setScale(scaleX, scaleY);
     }
 

diff --git a/src/ui/components/PhaserCanvas.tsx b/src/ui/components/PhaserCanvas.tsx
@@ -13,6 +13,8 @@ function PhaserCanvas({ pet, playState }: PhaserCanvasProps) {
             type: Phaser.CANVAS,
             parent: phaserDom.current,
             transparent: true,
+            roundPixels: true,
+            antialias: true,
             scale: {
                 // mode: Phaser.Scale.ScaleModes.RESIZE,
                 width: CanvasSize,
@@ -26,7 +28,7 @@ function PhaserCanvas({ pet, playState }: PhaserCanvasProps) {
                 },
             },
             fps: {
-                target: 144,
+                target: 30,
                 min: 30,
                 smoothStep: true,
             },

diff --git a/src/ui/setting_tabs/Settings.tsx b/src/ui/setting_tabs/Settings.tsx
@@ -41,7 +41,7 @@ function Settings() {
             checked: allowOverridePetScale,
             dispatchType: DispatchType.OverridePetScale,
             component: allowOverridePetScale &&
-                <Slider min={0.1} max={2} defaultValue={petScale} my={"md"} step={0.1} onChangeEnd={(value) => handleSettingChange(DispatchType.ChangePetScale, value)} />,
+                <Slider min={0.1} max={1} defaultValue={petScale} my={"sm"} step={0.1} onChangeEnd={(value) => handleSettingChange(DispatchType.ChangePetScale, value)} />,
         }
     ];