From 8182f63034b861b17ebf1cfd181909c1f3c61d4a Mon Sep 17 00:00:00 2001 From: Wolfger Schramm Date: Tue, 14 Nov 2023 16:28:31 +0100 Subject: [PATCH] fix lint issues --- .github/workflows/main.yml | 2 +- .../lookbook/public/assets/ball-patterns.json | 85 ++- apps/lookbook/public/assets/clouds-2.json | 130 +++-- .../public/assets/lab-walls-tiles.json | 514 +++++++++--------- apps/lookbook/src/layouts/Layout.astro | 11 +- apps/lookbook/src/layouts/ReactDemo.astro | 11 +- apps/lookbook/src/layouts/VanillaDemo.astro | 11 +- .../demos/textured-quads-from-tileset.astro | 4 +- .../src/pages/demos/textured-sprites.json | 10 +- packages/twopoint5d-elements/.eslintrc.json | 2 +- .../twopoint5d-elements/tsconfig.lib.json | 2 +- .../twopoint5d-r3f/src/hooks/useFrameLoop.ts | 4 +- 12 files changed, 390 insertions(+), 396 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11fdca24..0abfa695 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Build, test and deploy on: push: - branches: [ "main" ] + branches: ['main'] jobs: ci: diff --git a/apps/lookbook/public/assets/ball-patterns.json b/apps/lookbook/public/assets/ball-patterns.json index 16a4ef72..c069e02b 100644 --- a/apps/lookbook/public/assets/ball-patterns.json +++ b/apps/lookbook/public/assets/ball-patterns.json @@ -1,44 +1,41 @@ -{"frames": { - -"ball-pattern-blau": -{ - "frame": {"x":0,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128} -}, -"ball-pattern-dunkelrot": -{ - "frame": {"x":0,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128} -}, -"ball-pattern-pink": -{ - "frame": {"x":128,"y":0,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128} -}, -"ball-pattern-rot": -{ - "frame": {"x":128,"y":128,"w":128,"h":128}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, - "sourceSize": {"w":128,"h":128} -}}, -"meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "1.0", - "image": "ball-patterns.png", - "format": "RGBA8888", - "size": {"w":256,"h":256}, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:06958c18d5876f06bf65b28c7b9dbaed:232cdbf29625527ad2e0a2addbbce7c0:f66fa2de3c6f4fad08f432c1d772355e$" -} -} +{ + "frames": { + "ball-pattern-blau": { + "frame": {"x": 0, "y": 0, "w": 128, "h": 128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 128, "h": 128}, + "sourceSize": {"w": 128, "h": 128} + }, + "ball-pattern-dunkelrot": { + "frame": {"x": 0, "y": 128, "w": 128, "h": 128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 128, "h": 128}, + "sourceSize": {"w": 128, "h": 128} + }, + "ball-pattern-pink": { + "frame": {"x": 128, "y": 0, "w": 128, "h": 128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 128, "h": 128}, + "sourceSize": {"w": 128, "h": 128} + }, + "ball-pattern-rot": { + "frame": {"x": 128, "y": 128, "w": 128, "h": 128}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 128, "h": 128}, + "sourceSize": {"w": 128, "h": 128} + } + }, + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "1.0", + "image": "ball-patterns.png", + "format": "RGBA8888", + "size": {"w": 256, "h": 256}, + "scale": "1", + "smartupdate": "$TexturePacker:SmartUpdate:06958c18d5876f06bf65b28c7b9dbaed:232cdbf29625527ad2e0a2addbbce7c0:f66fa2de3c6f4fad08f432c1d772355e$" + } +} diff --git a/apps/lookbook/public/assets/clouds-2.json b/apps/lookbook/public/assets/clouds-2.json index e428fb6f..3d0649a4 100644 --- a/apps/lookbook/public/assets/clouds-2.json +++ b/apps/lookbook/public/assets/clouds-2.json @@ -1,68 +1,62 @@ -{"frames": { - -"cloud1": -{ - "frame": {"x":1,"y":720,"w":512,"h":301}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":512,"h":301}, - "sourceSize": {"w":512,"h":301} -}, -"cloud3": -{ - "frame": {"x":1,"y":1023,"w":512,"h":250}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":512,"h":250}, - "sourceSize": {"w":512,"h":250} -}, -"cloud4": -{ - "frame": {"x":1,"y":1,"w":512,"h":400}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":512,"h":400}, - "sourceSize": {"w":512,"h":400} -}, -"cloud6": -{ - "frame": {"x":1,"y":403,"w":512,"h":315}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":512,"h":315}, - "sourceSize": {"w":512,"h":315} -}, -"cloud8": -{ - "frame": {"x":1,"y":1438,"w":256,"h":229}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":256,"h":229}, - "sourceSize": {"w":256,"h":229} -}, -"cloud9": -{ - "frame": {"x":259,"y":1438,"w":256,"h":215}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":256,"h":215}, - "sourceSize": {"w":256,"h":215} -}, -"cloud10": -{ - "frame": {"x":1,"y":1275,"w":512,"h":161}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":512,"h":161}, - "sourceSize": {"w":512,"h":161} -}}, -"meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "1.0", - "image": "clouds-2.png", - "format": "RGBA8888", - "size": {"w":516,"h":1668}, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:96b34ceac3ae13e7281cce79c201a364:55d2b23d63d961ab0144620e8071813d:7b334da1987eb2f27b3c88a8a9cc3686$" -} -} +{ + "frames": { + "cloud1": { + "frame": {"x": 1, "y": 720, "w": 512, "h": 301}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 512, "h": 301}, + "sourceSize": {"w": 512, "h": 301} + }, + "cloud3": { + "frame": {"x": 1, "y": 1023, "w": 512, "h": 250}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 512, "h": 250}, + "sourceSize": {"w": 512, "h": 250} + }, + "cloud4": { + "frame": {"x": 1, "y": 1, "w": 512, "h": 400}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 512, "h": 400}, + "sourceSize": {"w": 512, "h": 400} + }, + "cloud6": { + "frame": {"x": 1, "y": 403, "w": 512, "h": 315}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 512, "h": 315}, + "sourceSize": {"w": 512, "h": 315} + }, + "cloud8": { + "frame": {"x": 1, "y": 1438, "w": 256, "h": 229}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 256, "h": 229}, + "sourceSize": {"w": 256, "h": 229} + }, + "cloud9": { + "frame": {"x": 259, "y": 1438, "w": 256, "h": 215}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 256, "h": 215}, + "sourceSize": {"w": 256, "h": 215} + }, + "cloud10": { + "frame": {"x": 1, "y": 1275, "w": 512, "h": 161}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 512, "h": 161}, + "sourceSize": {"w": 512, "h": 161} + } + }, + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "1.0", + "image": "clouds-2.png", + "format": "RGBA8888", + "size": {"w": 516, "h": 1668}, + "scale": "1", + "smartupdate": "$TexturePacker:SmartUpdate:96b34ceac3ae13e7281cce79c201a364:55d2b23d63d961ab0144620e8071813d:7b334da1987eb2f27b3c88a8a9cc3686$" + } +} diff --git a/apps/lookbook/public/assets/lab-walls-tiles.json b/apps/lookbook/public/assets/lab-walls-tiles.json index f4e385d8..79fd95a9 100644 --- a/apps/lookbook/public/assets/lab-walls-tiles.json +++ b/apps/lookbook/public/assets/lab-walls-tiles.json @@ -1,273 +1,245 @@ -{"frames": { - -"lab-walls-tiles_00": { - "frame": {"x":2,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_01": -{ - "frame": {"x":20,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_02": -{ - "frame": {"x":38,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_03": -{ - "frame": {"x":56,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_04": -{ - "frame": {"x":74,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_05": -{ - "frame": {"x":92,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_06": -{ - "frame": {"x":110,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_07": -{ - "frame": {"x":128,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_08": -{ - "frame": {"x":146,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_09": -{ - "frame": {"x":164,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_10": -{ - "frame": {"x":182,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_11": -{ - "frame": {"x":200,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_12": -{ - "frame": {"x":218,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_13": -{ - "frame": {"x":236,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_14": -{ - "frame": {"x":254,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_15": -{ - "frame": {"x":272,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_16": -{ - "frame": {"x":290,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_17": -{ - "frame": {"x":308,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"lab-walls-tiles_18": -{ - "frame": {"x":326,"y":36,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_01": -{ - "frame": {"x":2,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_02": -{ - "frame": {"x":36,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_03": -{ - "frame": {"x":70,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_04": -{ - "frame": {"x":104,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_05": -{ - "frame": {"x":138,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_06": -{ - "frame": {"x":172,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_07": -{ - "frame": {"x":206,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_08": -{ - "frame": {"x":240,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_09": -{ - "frame": {"x":274,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}, -"numbers32_10": -{ - "frame": {"x":308,"y":2,"w":32,"h":32}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, - "sourceSize": {"w":32,"h":32}, - "pivot": {"x":0.5,"y":0.5} -}}, -"meta": { - "app": "http://www.codeandweb.com/texturepacker", - "version": "1.0", - "image": "lab-walls-tiles.png", - "format": "RGBA8888", - "size": {"w":344,"h":54}, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:45225f24049fb4a08b1647e76520ee35:11e1e781f07753a351147c373b8991e4:e68e16dc5a6855e9138eab6206f6f2a3$" -} + "frames": { + "lab-walls-tiles_00": { + "frame": {"x": 2, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_01": { + "frame": {"x": 20, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_02": { + "frame": {"x": 38, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_03": { + "frame": {"x": 56, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_04": { + "frame": {"x": 74, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_05": { + "frame": {"x": 92, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_06": { + "frame": {"x": 110, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_07": { + "frame": {"x": 128, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_08": { + "frame": {"x": 146, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_09": { + "frame": {"x": 164, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_10": { + "frame": {"x": 182, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_11": { + "frame": {"x": 200, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_12": { + "frame": {"x": 218, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_13": { + "frame": {"x": 236, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_14": { + "frame": {"x": 254, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_15": { + "frame": {"x": 272, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_16": { + "frame": {"x": 290, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_17": { + "frame": {"x": 308, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "lab-walls-tiles_18": { + "frame": {"x": 326, "y": 36, "w": 16, "h": 16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 16, "h": 16}, + "sourceSize": {"w": 16, "h": 16}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_01": { + "frame": {"x": 2, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_02": { + "frame": {"x": 36, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_03": { + "frame": {"x": 70, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_04": { + "frame": {"x": 104, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_05": { + "frame": {"x": 138, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_06": { + "frame": {"x": 172, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_07": { + "frame": {"x": 206, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_08": { + "frame": {"x": 240, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_09": { + "frame": {"x": 274, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + }, + "numbers32_10": { + "frame": {"x": 308, "y": 2, "w": 32, "h": 32}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x": 0, "y": 0, "w": 32, "h": 32}, + "sourceSize": {"w": 32, "h": 32}, + "pivot": {"x": 0.5, "y": 0.5} + } + }, + "meta": { + "app": "http://www.codeandweb.com/texturepacker", + "version": "1.0", + "image": "lab-walls-tiles.png", + "format": "RGBA8888", + "size": {"w": 344, "h": 54}, + "scale": "1", + "smartupdate": "$TexturePacker:SmartUpdate:45225f24049fb4a08b1647e76520ee35:11e1e781f07753a351147c373b8991e4:e68e16dc5a6855e9138eab6206f6f2a3$" + } } diff --git a/apps/lookbook/src/layouts/Layout.astro b/apps/lookbook/src/layouts/Layout.astro index 1ae5b7e2..f5146d0a 100644 --- a/apps/lookbook/src/layouts/Layout.astro +++ b/apps/lookbook/src/layouts/Layout.astro @@ -6,7 +6,7 @@ export interface Props { const {title} = Astro.props; --- - + @@ -40,7 +40,14 @@ const {title} = Astro.props; background-color: var(--color-background); } code { - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, + font-family: + Menlo, + Monaco, + Lucida Console, + Liberation Mono, + DejaVu Sans Mono, + Bitstream Vera Sans Mono, + Courier New, monospace; } diff --git a/apps/lookbook/src/layouts/ReactDemo.astro b/apps/lookbook/src/layouts/ReactDemo.astro index a979f1ab..96a41f40 100644 --- a/apps/lookbook/src/layouts/ReactDemo.astro +++ b/apps/lookbook/src/layouts/ReactDemo.astro @@ -6,7 +6,7 @@ export interface Props { const {title} = Astro.props; --- - + @@ -25,7 +25,14 @@ const {title} = Astro.props; background-color: #232323; } code { - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, + font-family: + Menlo, + Monaco, + Lucida Console, + Liberation Mono, + DejaVu Sans Mono, + Bitstream Vera Sans Mono, + Courier New, monospace; } diff --git a/apps/lookbook/src/layouts/VanillaDemo.astro b/apps/lookbook/src/layouts/VanillaDemo.astro index a979f1ab..96a41f40 100644 --- a/apps/lookbook/src/layouts/VanillaDemo.astro +++ b/apps/lookbook/src/layouts/VanillaDemo.astro @@ -6,7 +6,7 @@ export interface Props { const {title} = Astro.props; --- - + @@ -25,7 +25,14 @@ const {title} = Astro.props; background-color: #232323; } code { - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, + font-family: + Menlo, + Monaco, + Lucida Console, + Liberation Mono, + DejaVu Sans Mono, + Bitstream Vera Sans Mono, + Courier New, monospace; } diff --git a/apps/lookbook/src/pages/demos/textured-quads-from-tileset.astro b/apps/lookbook/src/pages/demos/textured-quads-from-tileset.astro index 0f6ca79d..23432c33 100644 --- a/apps/lookbook/src/pages/demos/textured-quads-from-tileset.astro +++ b/apps/lookbook/src/pages/demos/textured-quads-from-tileset.astro @@ -46,7 +46,9 @@ import {title} from './textured-quads-from-tileset.json'; } .texture-preview:hover :global(canvas), .texture-preview:hover :global(img) { - box-shadow: 0 0 0 1px #fff, 0 0 10px rgba(255 255 255 / 80%); + box-shadow: + 0 0 0 1px #fff, + 0 0 10px rgba(255 255 255 / 80%); } .texture-preview :global(header) { position: absolute; diff --git a/apps/lookbook/src/pages/demos/textured-sprites.json b/apps/lookbook/src/pages/demos/textured-sprites.json index 0d9cb8ec..0105300f 100644 --- a/apps/lookbook/src/pages/demos/textured-sprites.json +++ b/apps/lookbook/src/pages/demos/textured-sprites.json @@ -2,6 +2,14 @@ "title": "textured sprites", "description": "A simple demo showing how to render textured 2d sprites with the TexturedSprites mesh", "url": "/demos/textured-sprites", - "tags": ["TexturedSprites", "TexturedSpritesGeometry", "TexturedSpritesMaterial", "TileSetLoader", "tilesets", "textures", "vanilla"], + "tags": [ + "TexturedSprites", + "TexturedSpritesGeometry", + "TexturedSpritesMaterial", + "TileSetLoader", + "tilesets", + "textures", + "vanilla" + ], "previewImage": "textured-sprites.png" } diff --git a/packages/twopoint5d-elements/.eslintrc.json b/packages/twopoint5d-elements/.eslintrc.json index 052a5874..13960908 100644 --- a/packages/twopoint5d-elements/.eslintrc.json +++ b/packages/twopoint5d-elements/.eslintrc.json @@ -1,4 +1,4 @@ { "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"] + "ignorePatterns": ["!**/*", "tests/**/*"] } diff --git a/packages/twopoint5d-elements/tsconfig.lib.json b/packages/twopoint5d-elements/tsconfig.lib.json index 62526577..37d1c803 100644 --- a/packages/twopoint5d-elements/tsconfig.lib.json +++ b/packages/twopoint5d-elements/tsconfig.lib.json @@ -4,6 +4,6 @@ "compilerOptions": { "noEmit": false, "outDir": "./dist", - "declarationDir": "./dist", + "declarationDir": "./dist" } } diff --git a/packages/twopoint5d-r3f/src/hooks/useFrameLoop.ts b/packages/twopoint5d-r3f/src/hooks/useFrameLoop.ts index 517f1305..5212d629 100644 --- a/packages/twopoint5d-r3f/src/hooks/useFrameLoop.ts +++ b/packages/twopoint5d-r3f/src/hooks/useFrameLoop.ts @@ -61,8 +61,8 @@ const constructArgs = (args: Params): No isForwardRefValue(value) ? value.current : (value as NullableValue)?.[isNullable$] - ? (value as NullableValue).value - : value, + ? (value as NullableValue).value + : value, ]), ) as NonNullParams;