evan/ludum-dare-48
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

animation

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 12:48:22 -04:00
parent 3d4cf226b6
commit f97ff9dec4
3 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/wrappers/animation.rs
View File

@ -1,9 +1,4 @@
use raylib::{
core::color::Color,
math::{Rectangle, Vector2},
prelude::{RaylibDraw, RaylibDrawHandle},
texture::Texture2D,
};
use raylib::{core::color::Color, math::{Rectangle, Vector2}, prelude::{RaylibDraw, RaylibDrawHandle, RaylibMode2D}, texture::Texture2D};
/// A wrapper around an animation spritesheet
pub struct FrameAnimationWrapper {
@ -48,7 +43,7 @@ impl FrameAnimationWrapper {
}
/// Draw the next frame to the screen at `position`
pub fn draw(&mut self, handle: &mut RaylibDrawHandle, position: Vector2, rotation: f32) {
pub fn draw(&mut self, handle: &mut RaylibMode2D<RaylibDrawHandle>, position: Vector2, rotation: f32) {
let frame_id = self.get_current_frame_id(handle);
self.draw_frame(handle, position, rotation, frame_id);
}
@ -56,7 +51,7 @@ impl FrameAnimationWrapper {
/// Draw a specified frame to the screen at `position`
pub fn draw_frame(
&mut self,
handle: &mut RaylibDrawHandle,
handle: &mut RaylibMode2D<RaylibDrawHandle>,
position: Vector2,
rotation: f32,
frame_number: u32,
@ -76,6 +71,12 @@ impl FrameAnimationWrapper {
width: self.size.x,
height: self.size.y,
};
let frame_dest = Rectangle {
x: position.x,
y: position.y,
width: self.size.x,
height: self.size.y,
};
// Rotation origin
let origin = Vector2 {
@ -84,6 +85,6 @@ impl FrameAnimationWrapper {
};
// Render
handle.draw_texture_pro(&mut self.sprite_sheet, frame_box, position, origin, rotation, Color::WHITE);
handle.draw_texture_pro(&mut self.sprite_sheet, frame_box, frame_dest, origin, rotation, Color::WHITE);
}
}

25
src/logic/ingame/playerlogic.rs
View File

@ -144,16 +144,19 @@ pub fn render_player(context_2d: &mut RaylibMode2D<RaylibDrawHandle>, game_core:
TRANSLUCENT_WHITE_96,
);
// Render the player
game_core.resources.player_animation_regular.draw(context_2d, player.position, player_rotation.to_degrees() + 90.0);
// TODO: tmp rect
context_2d.draw_rectangle_pro(
Rectangle {
x: player.position.x,
y: player.position.y,
width: player.size.x,
height: player.size.y,
},
player.size / 2.0,
player_rotation.to_degrees() + 90.0,
Color::BLACK,
);
// context_2d.draw_rectangle_pro(
// Rectangle {
// x: player.position.x,
// y: player.position.y,
// width: player.size.x,
// height: player.size.y,
// },
// player.size / 2.0,
// player_rotation.to_degrees() + 90.0,
// Color::BLACK,
// );
}

32
src/resources.rs
View File

@ -1,19 +1,41 @@
use failure::Error;
use raylib::{RaylibHandle, RaylibThread, texture::{Image, Texture2D}};
use raylib::{
math::Vector2,
texture::{Image, Texture2D},
RaylibHandle, RaylibThread,
};
use crate::lib::wrappers::animation::FrameAnimationWrapper;
/// This struct contains all textures and sounds that must be loaded into (V)RAM at the start of the game
pub struct GlobalResources {
// Branding
pub game_logo: Texture2D
pub game_logo: Texture2D,
// Player
pub player_animation_regular: FrameAnimationWrapper,
}
impl GlobalResources {
/// Load all resources. **THIS WILL HANG!**
pub fn load_all(raylib: &mut RaylibHandle, thread: &RaylibThread) -> Result<GlobalResources, String> {
pub fn load_all(
raylib: &mut RaylibHandle,
thread: &RaylibThread,
) -> Result<GlobalResources, String> {
Ok(GlobalResources {
game_logo: raylib.load_texture_from_image(&thread, &Image::load_image("./assets/img/logos/game-logo.png")?)?
game_logo: raylib.load_texture_from_image(
&thread,
&Image::load_image("./assets/img/logos/game-logo.png")?,
)?,
player_animation_regular: FrameAnimationWrapper::new(
raylib.load_texture_from_image(
&thread,
&Image::load_image("./assets/img/character/diveNormal.png")?,
)?,
Vector2 { x: 11.0, y: 21.0 },
8,
100 / 8,
),
})
}
}