75 files changed, 42 insertions(+), 617 deletions(-)
D assets/dist/spritesheet-125
D assets/dist/spritesheet-125.json
D assets/dist/spritesheet-125.png
D assets/dist/spritesheet-375
D assets/dist/spritesheet-375.json
D assets/dist/spritesheet-375.png
D assets/dist/spritesheet-full
D assets/dist/spritesheet-full.json
D assets/dist/spritesheet-full.png
D assets/final/125/autoplr_cfg.png
D assets/final/125/autoplr_error.png
D assets/final/125/autoplr_on.png
D assets/final/125/cargo_off.png
D assets/final/125/cargo_on.png
D assets/final/125/earth.png
D assets/final/125/ecothruster_on.png
D assets/final/125/hearty.png
D assets/final/125/hub_off.png
D assets/final/125/hub_on.png
D assets/final/125/landingleg.png
D assets/final/125/landingthruster_off.png
D assets/final/125/landingthruster_on.png
D assets/final/125/moon.png
D assets/final/125/powerhub_off.png
D assets/final/125/powerhub_on.png
D assets/final/125/starfield.png
D assets/final/125/superthruster_off.png
D assets/final/125/superthruster_on.png
D assets/final/125/thruster_off.png
D assets/final/125/thruster_on.png
D assets/final/375/autoplr_cfg.png
D assets/final/375/autoplr_error.png
D assets/final/375/autoplr_on.png
D assets/final/375/cargo_off.png
D assets/final/375/cargo_on.png
D assets/final/375/earth.png
D assets/final/375/ecothruster_on.png
D assets/final/375/hearty.png
D assets/final/375/hub_off.png
D assets/final/375/hub_on.png
D assets/final/375/landingleg.png
D assets/final/375/landingthruster_off.png
D assets/final/375/landingthruster_on.png
D assets/final/375/moon.png
D assets/final/375/powerhub_off.png
D assets/final/375/powerhub_on.png
D assets/final/375/starfield.png
D assets/final/375/superthruster_off.png
D assets/final/375/superthruster_on.png
D assets/final/375/thruster_off.png
D assets/final/375/thruster_on.png
D assets/final/full/autoplr_cfg.png
D assets/final/full/autoplr_error.png
D assets/final/full/autoplr_on.png
D assets/final/full/cargo_off.png
D assets/final/full/cargo_on.png
D assets/final/full/earth.png
D assets/final/full/ecothruster_on.png
D assets/final/full/hearty.png
D assets/final/full/hub_off.png
D assets/final/full/hub_on.png
D assets/final/full/landingleg.png
D assets/final/full/landingthruster_off.png
D assets/final/full/landingthruster_on.png
D assets/final/full/moon.png
D assets/final/full/powerhub_off.png
D assets/final/full/powerhub_on.png
D assets/final/full/starfield.png
D assets/final/full/superthruster_off.png
D assets/final/full/superthruster_on.png
D assets/final/full/thruster_off.png
D assets/final/full/thruster_on.png
M server/src/handler.rs
M server/src/manager.rs
M server/src/timer.rs
D assets/dist/spritesheet-125 => assets/dist/spritesheet-125 +0 -0
D assets/dist/spritesheet-125.json => assets/dist/spritesheet-125.json +0 -201
@@ 1,201 0,0 @@
-{
- "frames": {
- "starfield.png": {
- "frame": { "x": 0, "y": 0, "w": 256, "h": 256 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 256, "h": 256 },
- "sourceSize": { "w": 256, "h": 256 },
- "pivot": { "x": 128, "y": 128 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 256, "h": 256 }
- },
- "earth.png": {
- "frame": { "x": 0, "y": 256, "w": 256, "h": 256 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 256, "h": 256 },
- "sourceSize": { "w": 256, "h": 256 },
- "pivot": { "x": 128, "y": 128 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 256, "h": 256 }
- },
- "moon.png": {
- "frame": { "x": 0, "y": 512, "w": 256, "h": 256 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 256, "h": 256 },
- "sourceSize": { "w": 256, "h": 256 },
- "pivot": { "x": 128, "y": 128 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 256, "h": 256 }
- },
- "autoplr_error.png": {
- "frame": { "x": 0, "y": 768, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "autoplr_cfg.png": {
- "frame": { "x": 0, "y": 832, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "hearty.png": {
- "frame": { "x": 0, "y": 896, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "superthruster_on.png": {
- "frame": { "x": 0, "y": 960, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "ecothruster_on.png": {
- "frame": { "x": 0, "y": 1024, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "landingthruster_on.png": {
- "frame": { "x": 0, "y": 1088, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "thruster_on.png": {
- "frame": { "x": 0, "y": 1152, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "landingleg.png": {
- "frame": { "x": 0, "y": 1216, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "hub_on.png": {
- "frame": { "x": 0, "y": 1280, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "powerhub_on.png": {
- "frame": { "x": 0, "y": 1344, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "autoplr_on.png": {
- "frame": { "x": 0, "y": 1408, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "superthruster_off.png": {
- "frame": { "x": 0, "y": 1472, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "landingthruster_off.png": {
- "frame": { "x": 0, "y": 1536, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "thruster_off.png": {
- "frame": { "x": 0, "y": 1600, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "cargo_on.png": {
- "frame": { "x": 0, "y": 1664, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "cargo_off.png": {
- "frame": { "x": 0, "y": 1728, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "hub_off.png": {
- "frame": { "x": 0, "y": 1792, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- },
- "powerhub_off.png": {
- "frame": { "x": 0, "y": 1856, "w": 64, "h": 64 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
- "sourceSize": { "w": 64, "h": 64 },
- "pivot": { "x": 32, "y": 32 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 64, "h": 64 }
- }
- },
- "meta": {
- "app": "atlasify https://github.com/soimy/atlasify#readme",
- "version": "0.4.1",
- "image": "spritesheet-125.png",
- "format": "RGBA8888",
- "size": { "w": 8096, "h": 8096 },
- "scale": 1
- }
-}>
\ No newline at end of file
D assets/dist/spritesheet-125.png => assets/dist/spritesheet-125.png +0 -0
D assets/dist/spritesheet-375 => assets/dist/spritesheet-375 +0 -0
D assets/dist/spritesheet-375.json => assets/dist/spritesheet-375.json +0 -201
@@ 1,201 0,0 @@
-{
- "frames": {
- "starfield.png": {
- "frame": { "x": 0, "y": 0, "w": 768, "h": 768 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 768, "h": 768 },
- "sourceSize": { "w": 768, "h": 768 },
- "pivot": { "x": 384, "y": 384 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 768, "h": 768 }
- },
- "earth.png": {
- "frame": { "x": 0, "y": 768, "w": 768, "h": 768 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 768, "h": 768 },
- "sourceSize": { "w": 768, "h": 768 },
- "pivot": { "x": 384, "y": 384 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 768, "h": 768 }
- },
- "moon.png": {
- "frame": { "x": 0, "y": 1536, "w": 768, "h": 768 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 768, "h": 768 },
- "sourceSize": { "w": 768, "h": 768 },
- "pivot": { "x": 384, "y": 384 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 768, "h": 768 }
- },
- "autoplr_error.png": {
- "frame": { "x": 0, "y": 2304, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "autoplr_cfg.png": {
- "frame": { "x": 0, "y": 2496, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "hearty.png": {
- "frame": { "x": 0, "y": 2688, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "superthruster_on.png": {
- "frame": { "x": 0, "y": 2880, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "ecothruster_on.png": {
- "frame": { "x": 0, "y": 3072, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "landingthruster_on.png": {
- "frame": { "x": 0, "y": 3264, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "thruster_on.png": {
- "frame": { "x": 0, "y": 3456, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "landingleg.png": {
- "frame": { "x": 0, "y": 3648, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "hub_on.png": {
- "frame": { "x": 0, "y": 3840, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "powerhub_on.png": {
- "frame": { "x": 0, "y": 4032, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "autoplr_on.png": {
- "frame": { "x": 0, "y": 4224, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "landingthruster_off.png": {
- "frame": { "x": 0, "y": 4416, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "superthruster_off.png": {
- "frame": { "x": 0, "y": 4608, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "thruster_off.png": {
- "frame": { "x": 0, "y": 4800, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "cargo_on.png": {
- "frame": { "x": 0, "y": 4992, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "cargo_off.png": {
- "frame": { "x": 0, "y": 5184, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "hub_off.png": {
- "frame": { "x": 0, "y": 5376, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- },
- "powerhub_off.png": {
- "frame": { "x": 0, "y": 5568, "w": 192, "h": 192 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 192, "h": 192 },
- "sourceSize": { "w": 192, "h": 192 },
- "pivot": { "x": 96, "y": 96 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 192, "h": 192 }
- }
- },
- "meta": {
- "app": "atlasify https://github.com/soimy/atlasify#readme",
- "version": "0.4.1",
- "image": "spritesheet-375.png",
- "format": "RGBA8888",
- "size": { "w": 8096, "h": 8096 },
- "scale": 1
- }
-}>
\ No newline at end of file
D assets/dist/spritesheet-375.png => assets/dist/spritesheet-375.png +0 -0
D assets/dist/spritesheet-full => assets/dist/spritesheet-full +0 -0
D assets/dist/spritesheet-full.json => assets/dist/spritesheet-full.json +0 -201
@@ 1,201 0,0 @@
-{
- "frames": {
- "starfield.png": {
- "frame": { "x": 0, "y": 0, "w": 2048, "h": 2048 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 2048, "h": 2048 },
- "sourceSize": { "w": 2048, "h": 2048 },
- "pivot": { "x": 1024, "y": 1024 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 2048, "h": 2048 }
- },
- "earth.png": {
- "frame": { "x": 0, "y": 2048, "w": 2048, "h": 2048 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 2048, "h": 2048 },
- "sourceSize": { "w": 2048, "h": 2048 },
- "pivot": { "x": 1024, "y": 1024 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 2048, "h": 2048 }
- },
- "moon.png": {
- "frame": { "x": 0, "y": 4096, "w": 2048, "h": 2048 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 2048, "h": 2048 },
- "sourceSize": { "w": 2048, "h": 2048 },
- "pivot": { "x": 1024, "y": 1024 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 2048, "h": 2048 }
- },
- "autoplr_error.png": {
- "frame": { "x": 0, "y": 6144, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "autoplr_cfg.png": {
- "frame": { "x": 0, "y": 6656, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "hearty.png": {
- "frame": { "x": 0, "y": 7168, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "superthruster_on.png": {
- "frame": { "x": 512, "y": 6144, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "ecothruster_on.png": {
- "frame": { "x": 512, "y": 6656, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "landingthruster_on.png": {
- "frame": { "x": 512, "y": 7168, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "thruster_on.png": {
- "frame": { "x": 1024, "y": 6144, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "landingleg.png": {
- "frame": { "x": 1024, "y": 6656, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "hub_on.png": {
- "frame": { "x": 1024, "y": 7168, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "powerhub_on.png": {
- "frame": { "x": 1536, "y": 6144, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "autoplr_on.png": {
- "frame": { "x": 1536, "y": 6656, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "superthruster_off.png": {
- "frame": { "x": 1536, "y": 7168, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "landingthruster_off.png": {
- "frame": { "x": 2048, "y": 0, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "thruster_off.png": {
- "frame": { "x": 2560, "y": 0, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "cargo_on.png": {
- "frame": { "x": 3072, "y": 0, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "cargo_off.png": {
- "frame": { "x": 3584, "y": 0, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "hub_off.png": {
- "frame": { "x": 4096, "y": 0, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- },
- "powerhub_off.png": {
- "frame": { "x": 4608, "y": 0, "w": 512, "h": 512 },
- "rotated": false,
- "trimmed": false,
- "spriteSourceSize": { "x": 0, "y": 0, "w": 512, "h": 512 },
- "sourceSize": { "w": 512, "h": 512 },
- "pivot": { "x": 256, "y": 256 },
- "9slicedFrame": { "x": 0, "y": 0, "w": 512, "h": 512 }
- }
- },
- "meta": {
- "app": "atlasify https://github.com/soimy/atlasify#readme",
- "version": "0.4.1",
- "image": "spritesheet-full.png",
- "format": "RGBA8888",
- "size": { "w": 8096, "h": 8096 },
- "scale": 1
- }
-}>
\ No newline at end of file
D assets/dist/spritesheet-full.png => assets/dist/spritesheet-full.png +0 -0
D assets/final/125/autoplr_cfg.png => assets/final/125/autoplr_cfg.png +0 -0
D assets/final/125/autoplr_error.png => assets/final/125/autoplr_error.png +0 -0
D assets/final/125/autoplr_on.png => assets/final/125/autoplr_on.png +0 -0
D assets/final/125/cargo_off.png => assets/final/125/cargo_off.png +0 -0
D assets/final/125/cargo_on.png => assets/final/125/cargo_on.png +0 -0
D assets/final/125/earth.png => assets/final/125/earth.png +0 -0
D assets/final/125/ecothruster_on.png => assets/final/125/ecothruster_on.png +0 -0
D assets/final/125/hearty.png => assets/final/125/hearty.png +0 -0
D assets/final/125/hub_off.png => assets/final/125/hub_off.png +0 -0
D assets/final/125/hub_on.png => assets/final/125/hub_on.png +0 -0
D assets/final/125/landingleg.png => assets/final/125/landingleg.png +0 -0
D assets/final/125/landingthruster_off.png => assets/final/125/landingthruster_off.png +0 -0
D assets/final/125/landingthruster_on.png => assets/final/125/landingthruster_on.png +0 -0
D assets/final/125/moon.png => assets/final/125/moon.png +0 -0
D assets/final/125/powerhub_off.png => assets/final/125/powerhub_off.png +0 -0
D assets/final/125/powerhub_on.png => assets/final/125/powerhub_on.png +0 -0
D assets/final/125/starfield.png => assets/final/125/starfield.png +0 -0
D assets/final/125/superthruster_off.png => assets/final/125/superthruster_off.png +0 -0
D assets/final/125/superthruster_on.png => assets/final/125/superthruster_on.png +0 -0
D assets/final/125/thruster_off.png => assets/final/125/thruster_off.png +0 -0
D assets/final/125/thruster_on.png => assets/final/125/thruster_on.png +0 -0
D assets/final/375/autoplr_cfg.png => assets/final/375/autoplr_cfg.png +0 -0
D assets/final/375/autoplr_error.png => assets/final/375/autoplr_error.png +0 -0
D assets/final/375/autoplr_on.png => assets/final/375/autoplr_on.png +0 -0
D assets/final/375/cargo_off.png => assets/final/375/cargo_off.png +0 -0
D assets/final/375/cargo_on.png => assets/final/375/cargo_on.png +0 -0
D assets/final/375/earth.png => assets/final/375/earth.png +0 -0
D assets/final/375/ecothruster_on.png => assets/final/375/ecothruster_on.png +0 -0
D assets/final/375/hearty.png => assets/final/375/hearty.png +0 -0
D assets/final/375/hub_off.png => assets/final/375/hub_off.png +0 -0
D assets/final/375/hub_on.png => assets/final/375/hub_on.png +0 -0
D assets/final/375/landingleg.png => assets/final/375/landingleg.png +0 -0
D assets/final/375/landingthruster_off.png => assets/final/375/landingthruster_off.png +0 -0
D assets/final/375/landingthruster_on.png => assets/final/375/landingthruster_on.png +0 -0
D assets/final/375/moon.png => assets/final/375/moon.png +0 -0
D assets/final/375/powerhub_off.png => assets/final/375/powerhub_off.png +0 -0
D assets/final/375/powerhub_on.png => assets/final/375/powerhub_on.png +0 -0
D assets/final/375/starfield.png => assets/final/375/starfield.png +0 -0
D assets/final/375/superthruster_off.png => assets/final/375/superthruster_off.png +0 -0
D assets/final/375/superthruster_on.png => assets/final/375/superthruster_on.png +0 -0
D assets/final/375/thruster_off.png => assets/final/375/thruster_off.png +0 -0
D assets/final/375/thruster_on.png => assets/final/375/thruster_on.png +0 -0
D assets/final/full/autoplr_cfg.png => assets/final/full/autoplr_cfg.png +0 -0
D assets/final/full/autoplr_error.png => assets/final/full/autoplr_error.png +0 -0
D assets/final/full/autoplr_on.png => assets/final/full/autoplr_on.png +0 -0
D assets/final/full/cargo_off.png => assets/final/full/cargo_off.png +0 -0
D assets/final/full/cargo_on.png => assets/final/full/cargo_on.png +0 -0
D assets/final/full/earth.png => assets/final/full/earth.png +0 -0
D assets/final/full/ecothruster_on.png => assets/final/full/ecothruster_on.png +0 -0
D assets/final/full/hearty.png => assets/final/full/hearty.png +0 -0
D assets/final/full/hub_off.png => assets/final/full/hub_off.png +0 -0
D assets/final/full/hub_on.png => assets/final/full/hub_on.png +0 -0
D assets/final/full/landingleg.png => assets/final/full/landingleg.png +0 -0
D assets/final/full/landingthruster_off.png => assets/final/full/landingthruster_off.png +0 -0
D assets/final/full/landingthruster_on.png => assets/final/full/landingthruster_on.png +0 -0
D assets/final/full/moon.png => assets/final/full/moon.png +0 -0
D assets/final/full/powerhub_off.png => assets/final/full/powerhub_off.png +0 -0
D assets/final/full/powerhub_on.png => assets/final/full/powerhub_on.png +0 -0
D assets/final/full/starfield.png => assets/final/full/starfield.png +0 -0
D assets/final/full/superthruster_off.png => assets/final/full/superthruster_off.png +0 -0
D assets/final/full/superthruster_on.png => assets/final/full/superthruster_on.png +0 -0
D assets/final/full/thruster_off.png => assets/final/full/thruster_off.png +0 -0
D assets/final/full/thruster_on.png => assets/final/full/thruster_on.png +0 -0
M server/src/handler.rs => server/src/handler.rs +1 -3
@@ 203,6 203,7 @@ pub async fn handle_client(
])
.rotation(angle + PI / 2.)
.build();
+ debug!("rotation: {}", player_body.rotation().angle());
let player_collider: Collider =
ColliderBuilder::cuboid(25.0 / SCALE, 25.0 / SCALE)
.mass_properties(MassProperties::new(
@@ 281,7 282,6 @@ pub async fn handle_client(
player_id,
ModuleTemplate {
translation: vector![0.0, 50.0],
- heading: 0.0,
mass_properties: MassProperties::new(
point![0.0, 0.0],
120.0,
@@ 290,9 290,7 @@ pub async fn handle_client(
module_type: ModuleType::Cargo,
},
0,
- angle,
);
- debug!("running");
}
}
MessageC2S::Goodbye(pkt) => {
M server/src/manager.rs => server/src/manager.rs +38 -8
@@ 1,5 1,6 @@
use async_std::channel::Sender;
use async_std::sync::RwLock;
+use log::debug;
use nalgebra::{point, vector};
use rapier2d_f64::na::Vector2;
use rapier2d_f64::prelude::{
@@ 11,6 12,7 @@ use rapier2d_f64::prelude::{
use starkingdoms_protocol::api::APISavedPlayerData;
use starkingdoms_protocol::module::ModuleType;
use std::collections::HashMap;
+use std::f64::consts::PI;
use std::net::SocketAddr;
use std::sync::Arc;
@@ 62,7 64,6 @@ pub struct Module {
#[derive(Clone)]
pub struct ModuleTemplate {
pub translation: Vector2<Real>,
- pub heading: f64,
pub mass_properties: MassProperties,
pub module_type: ModuleType,
}
@@ 168,7 169,6 @@ impl AttachedModule {
player_id: EntityId,
module: ModuleTemplate,
attachment_slot: usize,
- rotation: f64,
) {
let mut entity_map = entities.entities.clone();
@@ 188,12 188,41 @@ impl AttachedModule {
let parent_body = data.rigid_body_set.get(parent_handle).expect("Parent body does not exist");
let parent_pos = vector![parent_body.translation().x, parent_body.translation().y];
- let anchor = point![
- -0. / SCALE * rotation.cos() + 100. / SCALE * rotation.sin(),
- -0. / SCALE * rotation.sin() - 100. / SCALE * rotation.cos()
- ];
+ let (anchor, rotation) = match attachment_slot {
+ 0 => {
+ (point![
+ 0. / SCALE,
+ 53. / SCALE
+ ], PI)
+ }
+ 1 => {
+ (point![
+ -53. / SCALE,
+ 0. / SCALE
+ ], -PI/2.)
+ }
+ 2 => {
+ (point![
+ 0. / SCALE,
+ -53. / SCALE
+ ], 0.)
+ }
+ 3 => {
+ (point![
+ 53. / SCALE,
+ 0. / SCALE
+ ], PI/2.)
+ }
+ _ => {
+ (point![
+ 0. / SCALE,
+ 53. / SCALE
+ ], 0.)
+ }
+ };
+ debug!("anchor: {}", anchor);
- let module_pos = parent_pos + vector![anchor.x, anchor.y];
+ let module_pos = parent_pos + vector![anchor.x * -rotation.sin(), anchor.y * rotation.cos()];
// create attachment module
let module_collider = ColliderBuilder::cuboid(25.0 / SCALE, 25.0 / SCALE)
@@ 201,8 230,9 @@ impl AttachedModule {
.build();
let module_body = RigidBodyBuilder::dynamic()
.translation(module_pos)
- .rotation(module.heading)
+ .rotation(parent_body.rotation().angle() + rotation)
.build();
+ debug!("angle: {}", module_body.rotation().angle());
let attached_handle = data.rigid_body_set.insert(module_body);
data.collider_set.insert_with_parent(
module_collider,
M server/src/timer.rs => server/src/timer.rs +3 -3
@@ 302,21 302,21 @@ pub async fn timer_main(
.iter()
.map(|m| {
let module = m.to_module();
- info!("{:?}", module);
+ //info!("{:?}", module);
module
})
.collect(),
);
modules.iter().for_each(|module| {
if attached_handles.contains(&module.handle) {
- info!(
+ /*info!(
"{:?}",
physics_data
.rigid_body_set
.get(module.handle)
.unwrap()
.translation()
- );
+ );*/
}
});
let protocol_modules: Vec<starkingdoms_protocol::module::Module> = modules