Minor editor fixes (#204)

This commit is contained in:
biroder 2023-03-24 12:52:55 +02:00 committed by GitHub
parent 07b1550cf4
commit e57c9cdb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View File

@ -32,7 +32,7 @@ name = "doukutsu-rs"
identifier = "io.github.doukutsu_rs" identifier = "io.github.doukutsu_rs"
version = "0.101.0" version = "0.101.0"
resources = ["data"] resources = ["data"]
copyright = "Copyright (c) 2020-2022 doukutsu-rs contributors" copyright = "Copyright (c) 2020-2023 doukutsu-rs contributors"
category = "Game" category = "Game"
osx_minimum_system_version = "10.12" osx_minimum_system_version = "10.12"

View File

@ -4,12 +4,16 @@ use std::rc::Rc;
use imgui::{Image, MouseButton, Window, WindowFlags}; use imgui::{Image, MouseButton, Window, WindowFlags};
use crate::{Context, GameResult, graphics, I_MAG, SharedGameState};
use crate::common::{Color, Rect}; use crate::common::{Color, Rect};
use crate::components::background::Background; use crate::components::background::Background;
use crate::components::tilemap::{TileLayer, Tilemap}; use crate::components::tilemap::{TileLayer, Tilemap};
use crate::framework::context::Context;
use crate::framework::error::GameResult;
use crate::framework::graphics;
use crate::game::shared_game_state::SharedGameState;
use crate::game::frame::Frame; use crate::game::frame::Frame;
use crate::game::stage::{Stage, StageTexturePaths}; use crate::game::stage::{Stage, StageTexturePaths};
use crate::graphics::texture_set::I_MAG;
#[derive(Copy, Clone, Eq, PartialEq)] #[derive(Copy, Clone, Eq, PartialEq)]
pub enum CurrentTool { pub enum CurrentTool {

View File

@ -12,6 +12,8 @@ use crate::framework::keyboard::ScanCode;
use crate::framework::ui::Components; use crate::framework::ui::Components;
use crate::game::shared_game_state::SharedGameState; use crate::game::shared_game_state::SharedGameState;
use crate::game::stage::Stage; use crate::game::stage::Stage;
use crate::graphics::font::Font;
use crate::scene::Scene;
use crate::scene::game_scene::GameScene; use crate::scene::game_scene::GameScene;
use crate::scene::title_scene::TitleScene; use crate::scene::title_scene::TitleScene;
@ -189,7 +191,8 @@ impl Scene for EditorScene {
ctx, ctx,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
); )?;
return Ok(()); return Ok(());
} }