randrews/kiln
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move passable and opaque into objectdef

Browse Source
This commit is contained in:
Ross Andrews
2026-05-30 21:22:36 -05:00
parent a0d21bde20
commit 0241cd2a8d
5 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiln-egui/src/editor.rs
+4
View File
@@ -180,6 +180,10 @@ pub(crate) fn show_editor_panel(
}
let obj = &mut board.objects[i];
ui.checkbox(&mut obj.passable, "Passable");
ui.checkbox(&mut obj.opaque, "Opaque");
let current =
obj.script_name.as_deref().unwrap_or("(none)").to_string();
kiln-egui/src/main.rs
+8 -6
View File
@@ -10,7 +10,7 @@ mod render;
use editor::{EditorState, EditorTab, show_editor_panel};
use font::BitmapFont;
use kiln_core::game::{Archetype, FontSpec, GameState, Glyph, ObjectDef};
use kiln_core::game::{FontSpec, GameState, Glyph, ObjectDef};
use kiln_core::map_file;
use render::{
DEFAULT_WINDOW_H, DEFAULT_WINDOW_W, MIN_WINDOW_H, MIN_WINDOW_W, board_origin, draw_board,
@@ -236,22 +236,24 @@ impl eframe::App for App {
if self.editor.tab == EditorTab::Objects {
if self.editor.placing_object {
// Placement mode: create a new object here if none exists.
if board.object_at(cx, cy).is_none() {
if board.object_index_at(cx, cy).is_none() {
board.objects.push(ObjectDef {
x: cx,
y: cy,
glyph: Glyph {
tile: Archetype::Object.default_glyph().tile,
fg: Archetype::Object.default_glyph().fg,
bg: Archetype::Object.default_glyph().bg,
tile: ObjectDef::default_glyph().tile,
fg: ObjectDef::default_glyph().fg,
bg: ObjectDef::default_glyph().bg,
},
passable: false,
opaque: true,
script_name: None,
});
}
self.editor.placing_object = false;
} else {
// Selection mode: click to select an existing object.
let found = board.object_at(cx, cy);
let found = board.object_index_at(cx, cy);
self.editor.selected_object = found;
self.editor.object_glyph_picker_open = false;
if let Some(i) = found {