diff --git a/assets/ewpratten/.gitignore b/assets/ewpratten/.gitignore new file mode 100644 index 00000000..f8e685ce --- /dev/null +++ b/assets/ewpratten/.gitignore @@ -0,0 +1 @@ +**/*.jpg~ \ No newline at end of file diff --git a/assets/ewpratten/chr_testFox/preview-01.jpg b/assets/ewpratten/chr_testFox/preview-01.jpg index e7575487..5b1a5cb9 100644 Binary files a/assets/ewpratten/chr_testFox/preview-01.jpg and b/assets/ewpratten/chr_testFox/preview-01.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-02.jpg b/assets/ewpratten/chr_testFox/preview-02.jpg index fda8274c..ea31d94f 100644 Binary files a/assets/ewpratten/chr_testFox/preview-02.jpg and b/assets/ewpratten/chr_testFox/preview-02.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-03.jpg b/assets/ewpratten/chr_testFox/preview-03.jpg index 92c169f5..efdb232b 100644 Binary files a/assets/ewpratten/chr_testFox/preview-03.jpg and b/assets/ewpratten/chr_testFox/preview-03.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-04.jpg b/assets/ewpratten/chr_testFox/preview-04.jpg index 1247bff8..9f698900 100644 Binary files a/assets/ewpratten/chr_testFox/preview-04.jpg and b/assets/ewpratten/chr_testFox/preview-04.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-05.jpg b/assets/ewpratten/chr_testFox/preview-05.jpg index 387ee349..48de7ffc 100644 Binary files a/assets/ewpratten/chr_testFox/preview-05.jpg and b/assets/ewpratten/chr_testFox/preview-05.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-06.jpg b/assets/ewpratten/chr_testFox/preview-06.jpg index 9e15d415..b436dd26 100644 Binary files a/assets/ewpratten/chr_testFox/preview-06.jpg and b/assets/ewpratten/chr_testFox/preview-06.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-07.jpg b/assets/ewpratten/chr_testFox/preview-07.jpg index 0bb1c0e3..ec2b3e99 100644 Binary files a/assets/ewpratten/chr_testFox/preview-07.jpg and b/assets/ewpratten/chr_testFox/preview-07.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-08.jpg b/assets/ewpratten/chr_testFox/preview-08.jpg index 0e5b2dca..96524909 100644 Binary files a/assets/ewpratten/chr_testFox/preview-08.jpg and b/assets/ewpratten/chr_testFox/preview-08.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-09.jpg b/assets/ewpratten/chr_testFox/preview-09.jpg index 6745bba9..f15d68e3 100644 Binary files a/assets/ewpratten/chr_testFox/preview-09.jpg and b/assets/ewpratten/chr_testFox/preview-09.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-10.jpg b/assets/ewpratten/chr_testFox/preview-10.jpg index 4fa60bc0..6e90782c 100644 Binary files a/assets/ewpratten/chr_testFox/preview-10.jpg and b/assets/ewpratten/chr_testFox/preview-10.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-11.jpg b/assets/ewpratten/chr_testFox/preview-11.jpg index ecc04113..94c290bf 100644 Binary files a/assets/ewpratten/chr_testFox/preview-11.jpg and b/assets/ewpratten/chr_testFox/preview-11.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-12.jpg b/assets/ewpratten/chr_testFox/preview-12.jpg index 6f1560b4..51601a61 100644 Binary files a/assets/ewpratten/chr_testFox/preview-12.jpg and b/assets/ewpratten/chr_testFox/preview-12.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-13.jpg b/assets/ewpratten/chr_testFox/preview-13.jpg index 6489d21a..3ff4edb0 100644 Binary files a/assets/ewpratten/chr_testFox/preview-13.jpg and b/assets/ewpratten/chr_testFox/preview-13.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-14.jpg b/assets/ewpratten/chr_testFox/preview-14.jpg index 6b918a1c..cb1f3954 100644 Binary files a/assets/ewpratten/chr_testFox/preview-14.jpg and b/assets/ewpratten/chr_testFox/preview-14.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-15.jpg b/assets/ewpratten/chr_testFox/preview-15.jpg index 5a6675ac..b79bb1df 100644 Binary files a/assets/ewpratten/chr_testFox/preview-15.jpg and b/assets/ewpratten/chr_testFox/preview-15.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-16.jpg b/assets/ewpratten/chr_testFox/preview-16.jpg index c0a19389..b8337fbf 100644 Binary files a/assets/ewpratten/chr_testFox/preview-16.jpg and b/assets/ewpratten/chr_testFox/preview-16.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-17.jpg b/assets/ewpratten/chr_testFox/preview-17.jpg index a3f211a1..0063c74f 100644 Binary files a/assets/ewpratten/chr_testFox/preview-17.jpg and b/assets/ewpratten/chr_testFox/preview-17.jpg differ diff --git a/assets/ewpratten/chr_testFox/preview-18.jpg b/assets/ewpratten/chr_testFox/preview-18.jpg index 2f6f9a7b..ebde156c 100644 Binary files a/assets/ewpratten/chr_testFox/preview-18.jpg and b/assets/ewpratten/chr_testFox/preview-18.jpg differ diff --git a/game/dist/assets/anm/chr/chr_testFox/chr_testFox.anim_meta.json b/game/dist/assets/anm/chr/chr_testFox/chr_testFox.anim_meta.json index 944769bc..7333301b 100644 --- a/game/dist/assets/anm/chr/chr_testFox/chr_testFox.anim_meta.json +++ b/game/dist/assets/anm/chr/chr_testFox/chr_testFox.anim_meta.json @@ -1,117 +1,117 @@ { - "sheet_height": 1080, - "sheet_width": 34560, - "published_at": "2022-03-29 16:46:34", + "sheet_height": 338, + "sheet_width": 10800, + "published_at": "2022-03-29 18:21:28", "published_by": "ewpratten", "fps": 24.0, "frames": [ { "x": 0, "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 }, { - "x": 1920, + "x": 600, "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 }, { - "x": 3840, + "x": 1200, "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 }, { - "x": 5760, + "x": 1800, "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 }, { - "x": 7680, + "x": 2400, "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 + }, + { + "x": 3000, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 3600, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 4200, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 4800, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 5400, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 6000, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 6600, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 7200, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 7800, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 8400, + "y": 0, + "width": 600, + "height": 338 + }, + { + "x": 9000, + "y": 0, + "width": 600, + "height": 338 }, { "x": 9600, "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 }, { - "x": 11520, + "x": 10200, "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 13440, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 15360, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 17280, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 19200, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 21120, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 23040, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 24960, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 26880, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 28800, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 30720, - "y": 0, - "width": 1920, - "height": 1080 - }, - { - "x": 32640, - "y": 0, - "width": 1920, - "height": 1080 + "width": 600, + "height": 338 } ] } \ No newline at end of file diff --git a/game/dist/assets/anm/chr/chr_testFox/chr_testFox.png b/game/dist/assets/anm/chr/chr_testFox/chr_testFox.png index 155c9eaf..ee8e60ca 100644 Binary files a/game/dist/assets/anm/chr/chr_testFox/chr_testFox.png and b/game/dist/assets/anm/chr/chr_testFox/chr_testFox.png differ diff --git a/game/game_logic/src/rendering/utilities/anim_texture.rs b/game/game_logic/src/rendering/utilities/anim_texture.rs index 2d5e85da..68c50611 100644 --- a/game/game_logic/src/rendering/utilities/anim_texture.rs +++ b/game/game_logic/src/rendering/utilities/anim_texture.rs @@ -142,7 +142,7 @@ impl AnimatedTexture { ); let origin: raylib::core::math::Vector2 = origin.unwrap_or_else(|| Vector2::::zeros()).into(); - debug!("{:?} -> {:?}", source, destination); + // debug!("{:?} -> {:?}", source, destination); // Render the frame draw_handle.draw_texture_pro( diff --git a/game/game_logic/src/scenes/test_fox.rs b/game/game_logic/src/scenes/test_fox.rs index 297c610a..fb089b85 100644 --- a/game/game_logic/src/scenes/test_fox.rs +++ b/game/game_logic/src/scenes/test_fox.rs @@ -18,7 +18,7 @@ impl TestFoxScene { /// Construct a new `TestFoxScene` pub fn new(raylib_handle: &mut RaylibHandle, thread: &RaylibThread) -> Self { // Load the fox texture - let fox = AnimatedTexture::new(raylib_handle, thread, "test", "debugTexture").unwrap(); + let fox = AnimatedTexture::new(raylib_handle, thread, "chr", "testFox").unwrap(); Self { fox_animation: fox } }