summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock1
-rw-r--r--Cargo.toml4
-rw-r--r--flake.lock12
-rw-r--r--src/game.rs51
-rw-r--r--src/main.rs2
5 files changed, 33 insertions, 37 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 653ab59..70c03c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2576,6 +2576,7 @@ dependencies = [
[[package]]
name = "teleia"
version = "0.1.0"
+source = "git+https://github.com/lcolonq/teleia#cfc7accbb1b4cddaa3ab53558d5067218afcdd0e"
dependencies = [
"ahash",
"base64 0.22.1",
diff --git a/Cargo.toml b/Cargo.toml
index 5cad026..c8d9ca0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,8 +25,8 @@ debug = false
opt-level = 2
[dependencies]
-# teleia = { git = "https://github.com/lcolonq/teleia" } # engine
-teleia = { path = "../teleia/crates/teleia" }
+teleia = { git = "https://github.com/lcolonq/teleia" } # engine
+# teleia = { path = "../teleia/crates/teleia" }
glam = {version = "0.29.2", features = ["serde"]} # linear algebra
bitflags = { version = "2.6.0", features = ["serde"] } # C-style bitwise flags
rand = { version = "=0.8.5", features = ["small_rng"] } # rng
diff --git a/flake.lock b/flake.lock
index 515599d..6eb1f81 100644
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
]
},
"locked": {
- "lastModified": 1777329908,
- "narHash": "sha256-UhRpKmDNj7chpHjaO+EpGBTyBnCpgntYp1fMyikbVyU=",
+ "lastModified": 1778890311,
+ "narHash": "sha256-JZx/jh/E16SlAATrzQvB7kZcbBBfXX0zCqpwgw+Qlfc=",
"owner": "lcolonq",
"repo": "pit",
- "rev": "7748d30575151af59844f43a0e9149b18c40f2f1",
+ "rev": "48ab2cb8e3de88dbd0722337bd4617ad22de1a12",
"type": "github"
},
"original": {
@@ -158,11 +158,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1777601333,
- "narHash": "sha256-pOr1roqZnzGw6qoFwLEb4QSGQFsWL9v65LHbrWTUsYk=",
+ "lastModified": 1780690850,
+ "narHash": "sha256-TxMDw8ksi8OTqPGXu3+uCLGlpGUaNem4YZSxwnlvJDs=",
"owner": "lcolonq",
"repo": "teleia",
- "rev": "4c9541f35913bb8e68a07ad6ab4628d241099482",
+ "rev": "cfc7accbb1b4cddaa3ab53558d5067218afcdd0e",
"type": "github"
},
"original": {
diff --git a/src/game.rs b/src/game.rs
index 0596a2b..29a7186 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -80,34 +80,29 @@ impl teleia::state::Game for Game {
("mrbeast".to_owned(), audio::Audio::new(&actx, include_bytes!("assets/audio/mrbeast.mp3"))),
])
}
- fn finish_title(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> {
- if self.mode == Mode::Titlescreen {
- self.mode = Mode::Game;
- ctx.lock_mouse();
- // TODO
- if cfg!(target_arch = "wasm32") {
- self.room.load_from_bytes(ctx, st,
- Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/room.ini")),
- include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FLOOR.png"),
- include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/WALL.png"),
- include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ROOF.png"),
- include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ART.png"),
- include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/CREDIT.png"),
- Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MINI.png")),
- Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/INTERACT.png")),
- Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/LAYER.png")),
- Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MUSIC.mp3")),
- Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FOOT.wav")),
- )?;
- } else {
- self.room.load(ctx, st, &self.room_path)?;
- }
- }
- Ok(())
- }
fn mouse_press(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> {
match self.mode {
Mode::Titlescreen => {
+ self.mode = Mode::Game;
+ ctx.lock_mouse();
+ // TODO
+ // if cfg!(target_arch = "wasm32") {
+ // self.room.load_from_bytes(ctx, st,
+ // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/room.ini")),
+ // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FLOOR.png"),
+ // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/WALL.png"),
+ // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ROOF.png"),
+ // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ART.png"),
+ // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/CREDIT.png"),
+ // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MINI.png")),
+ // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/INTERACT.png")),
+ // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/LAYER.png")),
+ // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MUSIC.mp3")),
+ // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FOOT.wav")),
+ // )?;
+ // } else {
+ self.room.load(ctx, st, &self.room_path)?;
+ // }
}
Mode::Game => {
self.room.credit_mode.toggle(st.tick);
@@ -178,10 +173,10 @@ impl teleia::state::Game for Game {
ctx.clear();
match self.mode {
Mode::Titlescreen => {
- self.assets.font.render_text(
+ self.assets.font.render_text_at(
ctx, st,
- &glam::Vec2::new(0.0, 0.0),
- "click to continue",
+ glam::Vec2::new(0.0, 0.0), "click to continue",
+ font::BitmapParams::default(),
);
}
Mode::Game => {
diff --git a/src/main.rs b/src/main.rs
index 3c8ed4f..8713914 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ mod room;
pub fn main() -> teleia::Erm<()> {
let room_path = std::env::args().nth(1).unwrap();
teleia::run("game", 640, 480, teleia::Options::FULLSCREEN_MOUSE,
- |ctx| game::Game::new(ctx, &room_path)
+ |ctx, _st| game::Game::new(ctx, &room_path)
)
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-07 05:12:40 +0000