katajisto/trueno
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: katajisto:2ddff03189be4968019157e3b195052a94fec6f6
Branches Tags
katajisto:main
...
compare: katajisto:b3874d4c3911e503629bcd3bc16f205331ac2032
Branches Tags
katajisto:main

2 Commits
2ddff03189 ... b3874d4c39

Author SHA1 Message Date
Katajisto
b3874d4c39 remove game menu from the html shell 2025-10-25 11:15:10 +03:00
Katajisto
0bf17c3ca5 don't even import any of the editor code in the wasm build 2025-10-25 11:15:00 +03:00
3 changed files with 58 additions and 54 deletions
Show Stats Expand all files Collapse all files

27
src/editor/editor.jai
View File

@ -1,11 +1,13 @@
#load "iprof.jai";
#load "picker.jai";
#load "console.jai";
#load "postprocess.jai";
#load "trile_editor.jai";
#load "level_editor.jai";
#load "textureDebugger.jai";
#if OS != .WASM {
#load "iprof.jai";
#load "picker.jai";
#load "postprocess.jai";
#load "trile_editor.jai";
#load "level_editor.jai";
}
#if HAS_TACOMA { #load "tacoma.jai"; }
#load "console.jai";
#load "textureDebugger.jai";
#scope_file
@ -23,7 +25,7 @@ current_editor_view : Editor_View = .Trile_Editor;
in_editor_view : bool = false;
init_editor :: () {
init_profiler();
#if OS != .WASM {init_profiler();}
init_console();
}
@ -32,6 +34,7 @@ console_open_ignore_input : bool = false;
draw_editor_ui :: (theme: *GR.Overall_Theme) {
#if OS != .WASM {
if in_editor_view {
r := GR.get_rect(0,0,0,0);
r.x = 0; r.w = 100*vw;
@ -62,8 +65,9 @@ draw_editor_ui :: (theme: *GR.Overall_Theme) {
draw_post_process_editor_ui(theme);
}
}
draw_console(theme);
draw_profiler();
}
draw_console(theme);
draw_texture_debugger(theme);
draw_postprocess_popup(theme);
GR.draw_popups();
@ -71,6 +75,7 @@ draw_editor_ui :: (theme: *GR.Overall_Theme) {
}
draw_editor :: () {
#if OS != .WASM {
if !in_editor_view then return;
if current_editor_view == {
@ -81,7 +86,7 @@ draw_editor :: () {
case .Post_Process_Editor;
draw_post_process_editor();
}
}
}
tick_editor_ui :: () {
@ -89,6 +94,7 @@ tick_editor_ui :: () {
in_editor_view = !in_editor_view;
}
#if OS != .WASM {
if in_editor_view {
if current_editor_view == {
case .Trile_Editor;
@ -99,6 +105,7 @@ tick_editor_ui :: () {
tick_post_process_editor();
}
}
}
tick_console();
}

4
src/main.jai
View File

@ -145,7 +145,7 @@ frame :: () {
dpis := state.dpi_scale;
tick_profiler();
#if OS != .WASM { tick_profiler(); }
if !in_editor_view then game_tick();
fonsClearState(state.fons);
for event: Input.events_this_frame {
@ -167,7 +167,7 @@ frame :: () {
memory_visualizer_per_frame_update();
}
profiler_update();
#if OS != .WASM { profiler_update(); }
reset_temporary_storage();
}

3
src/platform_specific/shell.html
View File

@ -53,9 +53,6 @@ body {
</style>
</head>
<body style="background:black">
<div class="game-title">${name}
<span class="game-menu-item"><a class="game-menu-link" href="index.html">home</a></span>
</div>
<canvas class="game" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
<script type="text/javascript">
var Module = {