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

Allow players to take shade

Browse Source
This commit is contained in:
Evan Pratten 2022-04-02 16:33:40 -04:00
parent 133e71a78f
commit 10fbc84252
5 changed files with 154 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
game/dist/assets/env/env_testObject/env_testObject.json vendored
View File

@ -6,15 +6,7 @@
"top_texture": { "top_texture": {
"file_path": "assets/env/env_testObject/env_testObjectTop.png" "file_path": "assets/env/env_testObject/env_testObjectTop.png"
}, },
"footprint": [ "footprint_radius": 128.0,
{
"position": [
0,
0
],
"radius": 256.0
}
],
"physics_colliders": [ "physics_colliders": [
{ {
"position": [ "position": [

5
game/game_logic/src/model/world_object.rs
View File

@ -37,7 +37,8 @@ pub struct WorldObject {
/// The object's top texture /// The object's top texture
pub top_texture: Option<PossiblyAnimatedTexture>, pub top_texture: Option<PossiblyAnimatedTexture>,
/// colliders describing the object's footprint /// colliders describing the object's footprint
pub footprint: Vec<ObjectCollider>, // pub footprint: Vec<ObjectCollider>,
pub footprint_radius: Option<f32>,
/// Colliders for physics /// Colliders for physics
pub physics_colliders: Vec<ObjectCollider>, pub physics_colliders: Vec<ObjectCollider>,
/// Temperature /// Temperature
@ -54,7 +55,7 @@ pub struct WorldObjectRef {
pub kind: String, pub kind: String,
/// Object name /// Object name
pub name: String, pub name: String,
/// Object position. 1,1 being up and to the right /// Object position (tile-space *not* pixel-space). 1,1 being up and to the right
pub position: na::Vector2<f32>, pub position: na::Vector2<f32>,
/// Object rotation, positive is clockwise /// Object rotation, positive is clockwise
pub rotation_radians: f32, pub rotation_radians: f32,

13
game/game_logic/src/rendering/utilities/anim_texture.rs
View File

@ -5,7 +5,7 @@ use nalgebra::Vector2;
use raylib::{ use raylib::{
color::Color, color::Color,
math::Rectangle, math::Rectangle,
prelude::{RaylibDraw, RaylibDrawHandle}, prelude::{RaylibDraw, RaylibDrawHandle, RaylibMode2D},
texture::Texture2D, texture::Texture2D,
RaylibHandle, RaylibThread, RaylibHandle, RaylibThread,
}; };
@ -127,7 +127,7 @@ impl AnimatedTexture {
#[profiling::function] #[profiling::function]
pub fn render_frame_by_index( pub fn render_frame_by_index(
&self, &self,
draw_handle: &mut RaylibDrawHandle, draw_handle: &mut RaylibMode2D<RaylibDrawHandle>,
index: usize, index: usize,
position: Vector2<f32>, position: Vector2<f32>,
percent_scale: Option<Vector2<f32>>, percent_scale: Option<Vector2<f32>>,
@ -186,7 +186,7 @@ impl AnimatedTexture {
/// Render the animation based on timestamp /// Render the animation based on timestamp
pub fn render_automatic( pub fn render_automatic(
&mut self, &mut self,
draw_handle: &mut RaylibDrawHandle, draw_handle: &mut RaylibMode2D<RaylibDrawHandle>,
position: Vector2<f32>, position: Vector2<f32>,
percent_scale: Option<Vector2<f32>>, percent_scale: Option<Vector2<f32>>,
origin: Option<Vector2<f32>>, origin: Option<Vector2<f32>>,
@ -216,4 +216,11 @@ impl AnimatedTexture {
warn!("We somehow got a frame index of None"); warn!("We somehow got a frame index of None");
} }
} }
pub fn size(&self) -> Vector2<f32>{
Vector2::new(
self.texture.width as f32,
self.texture.height as f32,
)
}
} }

119
game/game_logic/src/rendering/utilities/map_render.rs
View File

@ -131,19 +131,30 @@ impl MapRenderer {
}) })
} }
pub fn sample_friction_at(&self, position: na::Vector2<f32>) -> f32 { pub fn sample_friction_at(&self, world_position: na::Vector2<f32>) -> f32 {
// Convert to a tile position
let tile_position = na::Vector2::new(
(world_position.x / 128.0).floor() as i32,
(world_position.y / 128.0).floor() as i32,
);
todo!() todo!()
} }
pub fn sample_temperature_at(&self, position: na::Vector2<f32>) -> f32 { pub fn sample_temperature_at(&self, world_position: na::Vector2<f32>) -> f32 {
// Convert to a tile position
let tile_position = na::Vector2::new(
(world_position.x / 128.0).floor() as i32,
(world_position.y / 128.0).floor() as i32,
);
todo!() todo!()
} }
pub fn render_map( pub fn render_map(
&self, &mut self,
draw_handle: &mut RaylibMode2D<RaylibDrawHandle>, draw_handle: &mut RaylibMode2D<RaylibDrawHandle>,
camera: &Camera2D, camera: &Camera2D,
show_debug_grid: bool, show_debug_grid: bool,
player_position: na::Vector2<f32>,
) { ) {
// Get the window corners in world space // Get the window corners in world space
let screen_width = draw_handle.get_screen_width(); let screen_width = draw_handle.get_screen_width();
@ -206,6 +217,108 @@ impl MapRenderer {
); );
} }
// Check if there is an object at this tile
for obj_ref in &self.world_objects.object_references {
if obj_ref.position.x == sampler_x as f32
&& obj_ref.position.y == sampler_y as f32
{
// Get access to the actual object definition
let object_key =
format!("{}:{}", obj_ref.kind, obj_ref.name);
let obj_def = self
.world_objects
.object_definitions
.get(&object_key)
.unwrap();
// We need to render the base layer of the object
if obj_def.bottom_texture.animated.unwrap_or(false) {
let tex = self
.world_objects
.bottom_animated_textures
.get_mut(&object_key)
.unwrap();
tex.render_automatic(
draw_handle,
obj_ref.position - (tex.size() / 2.0),
None,
None,
Some(obj_ref.rotation_radians),
None,
);
} else {
let tex = self
.world_objects
.bottom_static_textures
.get_mut(&object_key)
.unwrap();
let p: Vector2 = obj_ref.position.into();
draw_handle.draw_texture_ex(
&tex,
p - Vector2::new(
tex.width as f32 / 2.0,
tex.height as f32 / 2.0,
),
obj_ref.rotation_radians,
1.0,
Color::WHITE,
);
}
// If needed we can render the top layer of the object
if let Some(top_texture) = &obj_def.top_texture {
// We need to detect if the player is in the footprint of the object
let mut tint = Color::WHITE;
if let Some(footprint_radius) =
obj_def.footprint_radius
{
let player_dist_to_object =
(obj_ref.position - player_position).norm();
// debug!(
// "Player dist to object: {}",
// player_dist_to_object
// );
if player_dist_to_object <= footprint_radius {
tint.a = 128;
}
}
if top_texture.animated.unwrap_or(false) {
let tex = self
.world_objects
.top_animated_textures
.get_mut(&object_key)
.unwrap();
tex.render_automatic(
draw_handle,
obj_ref.position - (tex.size() / 2.0),
None,
None,
Some(obj_ref.rotation_radians),
Some(tint),
);
} else {
let tex = self
.world_objects
.top_static_textures
.get_mut(&object_key)
.unwrap();
let p: Vector2 = obj_ref.position.into();
draw_handle.draw_texture_ex(
&tex,
p - Vector2::new(
tex.width as f32 / 2.0,
tex.height as f32 / 2.0,
),
obj_ref.rotation_radians,
1.0,
tint,
);
}
}
}
}
if show_debug_grid { if show_debug_grid {
draw_handle.draw_rectangle_lines( draw_handle.draw_rectangle_lines(
tile_x * tile_width as i32, tile_x * tile_width as i32,

36
game/game_logic/src/scenes/test_fox.rs
View File

@ -36,8 +36,8 @@ impl TestFoxScene {
let camera = Camera2D { let camera = Camera2D {
target: Vector2 { x: 0.0, y: 0.0 }, target: Vector2 { x: 0.0, y: 0.0 },
offset: Vector2 { offset: Vector2 {
x: raylib_handle.get_screen_width() as f32, x: raylib_handle.get_screen_width() as f32 * 0.5,
y: (raylib_handle.get_screen_height() as f32) * -0.5, y: (raylib_handle.get_screen_height() as f32) * 0.5,
}, },
rotation: 0.0, rotation: 0.0,
zoom: 1.0, zoom: 1.0,
@ -64,15 +64,15 @@ impl TestFoxScene {
// Clear the screen // Clear the screen
draw.clear_background(Color::WHITE); draw.clear_background(Color::WHITE);
// Render the fox // // Render the fox
self.fox_animation.render_automatic( // self.fox_animation.render_automatic(
&mut draw, // &mut draw,
na::Vector2::new(0.0, 0.0), // na::Vector2::new(0.0, 0.0),
None, // None,
None, // None,
None, // None,
None, // None,
); // );
// Allow the camera to be moved with wasd // Allow the camera to be moved with wasd
if draw.is_key_down(KeyboardKey::KEY_W) { if draw.is_key_down(KeyboardKey::KEY_W) {
@ -93,7 +93,19 @@ impl TestFoxScene {
let mut ctx2d = draw.begin_mode2D(self.camera); let mut ctx2d = draw.begin_mode2D(self.camera);
// Render the map // Render the map
self.world_map.render_map(&mut ctx2d, &self.camera, true); self.world_map.render_map(
&mut ctx2d,
&self.camera,
true,
na::Vector2::new(self.camera.target.x, self.camera.target.y).into(),
);
} }
draw.draw_circle(
draw.get_screen_width() / 2,
draw.get_screen_height() / 2,
4.0,
Color::RED,
);
} }
} }