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

collider loading

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 14:27:41 -04:00
parent b73ba2cf0e
commit 66a965511e
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/img/map/cave.json
View File

File diff suppressed because one or more lines are too long

7
src/main.rs
View File

@ -13,7 +13,7 @@ use lib::{utils::profiler::GameProfiler, wrappers::audio::player::AudioPlayer};
use log::info; use log::info;
use logic::{gameend::GameEndScreen, ingame::InGameScreen, loadingscreen::LoadingScreen, mainmenu::MainMenuScreen, pausemenu::PauseMenuScreen, screen::Screen}; use logic::{gameend::GameEndScreen, ingame::InGameScreen, loadingscreen::LoadingScreen, mainmenu::MainMenuScreen, pausemenu::PauseMenuScreen, screen::Screen};
use raylib::prelude::*; use raylib::prelude::*;
use world::World; use world::{World, load_world_colliders};
// Game Launch Configuration // Game Launch Configuration
const DEFAULT_WINDOW_DIMENSIONS: Vector2 = Vector2 { const DEFAULT_WINDOW_DIMENSIONS: Vector2 = Vector2 {
@ -32,7 +32,7 @@ fn main() {
.size( .size(
DEFAULT_WINDOW_DIMENSIONS.x as i32, DEFAULT_WINDOW_DIMENSIONS.x as i32,
DEFAULT_WINDOW_DIMENSIONS.y as i32, DEFAULT_WINDOW_DIMENSIONS.y as i32,
) ).msaa_4x()
.title(WINDOW_TITLE) .title(WINDOW_TITLE)
.build(); .build();
raylib.set_target_fps(MAX_FPS); raylib.set_target_fps(MAX_FPS);
@ -41,7 +41,8 @@ fn main() {
raylib.set_exit_key(None); raylib.set_exit_key(None);
// Load the world // Load the world
let world = World::load_from_json("./assets/worlds/mainworld.json".to_string()).expect("Failed to load main world JSON"); let world_colliders = load_world_colliders("./assets/img/map/cave.json".to_string()).expect("Failed to load world colliders");
let world = World::load_from_json("./assets/worlds/mainworld.json".to_string(), world_colliders).expect("Failed to load main world JSON");
// Load the game progress // Load the game progress
let game_progress = GameProgress::try_from_file("./assets/savestate.json".to_string()); let game_progress = GameProgress::try_from_file("./assets/savestate.json".to_string());

22
src/world.rs
View File

@ -1,6 +1,6 @@
use std::{fs::File, io::BufReader}; use std::{fs::File, io::BufReader};
use raylib::math::Vector2; use raylib::math::{Rectangle, Vector2};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::io::Read; use std::io::Read;
use failure::Error; use failure::Error;
@ -15,11 +15,14 @@ pub struct World {
pub fish_positions: Vec<Vector2>, pub fish_positions: Vec<Vector2>,
#[serde(skip)] #[serde(skip)]
pub fish: Vec<FishEntity> pub fish: Vec<FishEntity>,
#[serde(skip)]
pub colliders: Vec<Rectangle>
} }
impl World { impl World {
pub fn load_from_json(file: String) -> Result<Self, Error> { pub fn load_from_json(file: String, colliders: Vec<Rectangle>) -> Result<Self, Error> {
// Load the file // Load the file
let file = File::open(file)?; let file = File::open(file)?;
let reader = BufReader::new(file); let reader = BufReader::new(file);
@ -30,6 +33,9 @@ impl World {
// Init all fish // Init all fish
result.fish = FishEntity::new_from_positions(&result.fish_positions); result.fish = FishEntity::new_from_positions(&result.fish_positions);
// Init colliders
result.colliders = colliders;
Ok(result) Ok(result)
} }
@ -45,3 +51,13 @@ impl World {
} }
} }
} }
pub fn load_world_colliders(file: String) -> Result<Vec<Rectangle>, Error> {
// Load the file
let file = File::open(file)?;
let reader = BufReader::new(file);
// Deserialize
Ok(serde_json::from_reader(reader)?)
}