From fdfe1c8333b5dc44ab20acbbec92b3d47793ad7b Mon Sep 17 00:00:00 2001 From: luckyturtledev Date: Sat, 6 Jul 2024 19:32:17 +0200 Subject: [PATCH] some draw fixs --- src/activities/overworld.rs | 18 +++++++++++++----- src/activities/overworld/worldgen.rs | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/activities/overworld.rs b/src/activities/overworld.rs index 32d4317..cc44c13 100644 --- a/src/activities/overworld.rs +++ b/src/activities/overworld.rs @@ -1,23 +1,31 @@ -use comfy::{draw_circle, draw_sprite, vec2, EngineContext, Vec2, GREEN}; +use comfy::{ + draw_circle, draw_rect_outline, draw_sprite, main_camera_mut, texture_id, vec2, + EngineContext, IVec2, Vec2, GREEN, RED, WHITE +}; use crate::game::ZLayer; pub mod worldgen; pub fn draw(state: &crate::State, _engine: &comfy::EngineContext<'_>) { - draw_circle(vec2(0.0, 0.0), 0.5, GREEN, 0); for (coords, tile) in state.overworld.iter_tiles() { for (i, texture) in tile.textures().iter().rev().enumerate() { let i = i as i32; draw_sprite( *texture, coords.as_vec2(), - Default::default(), + WHITE, ZLayer::MapMax - i, Vec2::ONE - ) + ); + draw_rect_outline(coords.as_vec2(), Vec2::ONE, 0.1, RED, 10); } } } -pub fn update(_state: &mut crate::State, _engine: &mut EngineContext<'_>) {} +pub fn update(state: &mut crate::State, _engine: &mut EngineContext<'_>) { + let mut camera = main_camera_mut(); + camera.center = Vec2::ZERO; + camera.zoom = 30.0; + state.overworld.get_or_generate_tile(IVec2::ZERO); +} diff --git a/src/activities/overworld/worldgen.rs b/src/activities/overworld/worldgen.rs index 07fbd96..e12bd0f 100644 --- a/src/activities/overworld/worldgen.rs +++ b/src/activities/overworld/worldgen.rs @@ -1,5 +1,6 @@ use crate::assets::ASSETS; use comfy::{IVec2, TextureHandle, UVec2}; +use log::info; use std::collections::HashMap; pub enum MovementCost { @@ -115,6 +116,7 @@ pub struct Chunk { impl Chunk { pub fn generate_chunk() -> Self { + info!("gen chunk"); // TODO real worldgen // for the time being we just copy this pre-made house block into the chunk