Compare commits

..

No commits in common. "b3874d4c3911e503629bcd3bc16f205331ac2032" and "2ddff03189be4968019157e3b195052a94fec6f6" have entirely different histories.

3 changed files with 53 additions and 57 deletions

View File

@ -1,13 +1,11 @@
#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 "iprof.jai";
#load "picker.jai";
#load "console.jai";
#load "postprocess.jai";
#load "trile_editor.jai";
#load "level_editor.jai";
#load "textureDebugger.jai";
#if HAS_TACOMA { #load "tacoma.jai"; }
#scope_file
@ -25,7 +23,7 @@ current_editor_view : Editor_View = .Trile_Editor;
in_editor_view : bool = false;
init_editor :: () {
#if OS != .WASM {init_profiler();}
init_profiler();
init_console();
}
@ -34,40 +32,38 @@ 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;
r.y = 0; r.h = ui_h(5, 0);
draw_bg_rectangle(r, theme);
r.w = 15*vw;
GR.label(r, tprint("Trueno v%.%", V_MAJOR, V_MINOR), *t_label_left(theme));
if in_editor_view {
r := GR.get_rect(0,0,0,0);
r.x = 0; r.w = 100*vw;
r.y = 0; r.h = ui_h(5, 0);
draw_bg_rectangle(r, theme);
r.w = 15*vw;
GR.label(r, tprint("Trueno v%.%", V_MAJOR, V_MINOR), *t_label_left(theme));
r.x = 100*vw - r.w;
if GR.button(r, "Level editor", *t_button_selectable(theme, current_editor_view == .Level_Editor))
then current_editor_view = .Level_Editor;
r.x = 100*vw - r.w;
if GR.button(r, "Level editor", *t_button_selectable(theme, current_editor_view == .Level_Editor))
then current_editor_view = .Level_Editor;
r.x -= r.w;
if GR.button(r, "Trile editor", *t_button_selectable(theme, current_editor_view == .Trile_Editor))
then current_editor_view = .Trile_Editor;
r.x -= r.w;
if GR.button(r, "Trile editor", *t_button_selectable(theme, current_editor_view == .Trile_Editor))
then current_editor_view = .Trile_Editor;
r.x -= r.w;
if GR.button(r, "Post-process", *t_button_selectable(theme, current_editor_view == .Post_Process_Editor))
then current_editor_view = .Post_Process_Editor;
r.x -= r.w;
if GR.button(r, "Post-process", *t_button_selectable(theme, current_editor_view == .Post_Process_Editor))
then current_editor_view = .Post_Process_Editor;
if current_editor_view == {
case .Trile_Editor;
draw_trile_editor_ui(theme);
case .Level_Editor;
draw_level_editor_ui(theme);
case .Post_Process_Editor;
draw_post_process_editor_ui(theme);
}
if current_editor_view == {
case .Trile_Editor;
draw_trile_editor_ui(theme);
case .Level_Editor;
draw_level_editor_ui(theme);
case .Post_Process_Editor;
draw_post_process_editor_ui(theme);
}
draw_profiler();
}
draw_console(theme);
draw_profiler();
draw_texture_debugger(theme);
draw_postprocess_popup(theme);
GR.draw_popups();
@ -75,18 +71,17 @@ draw_editor_ui :: (theme: *GR.Overall_Theme) {
}
draw_editor :: () {
#if OS != .WASM {
if !in_editor_view then return;
if !in_editor_view then return;
if current_editor_view == {
case .Trile_Editor;
draw_trile_editor();
case .Level_Editor;
draw_level_editor();
case .Post_Process_Editor;
draw_post_process_editor();
}
if current_editor_view == {
case .Trile_Editor;
draw_trile_editor();
case .Level_Editor;
draw_level_editor();
case .Post_Process_Editor;
draw_post_process_editor();
}
}
tick_editor_ui :: () {
@ -94,16 +89,14 @@ tick_editor_ui :: () {
in_editor_view = !in_editor_view;
}
#if OS != .WASM {
if in_editor_view {
if current_editor_view == {
case .Trile_Editor;
tick_trile_editor();
case .Level_Editor;
tick_level_editor();
case .Post_Process_Editor;
tick_post_process_editor();
}
if in_editor_view {
if current_editor_view == {
case .Trile_Editor;
tick_trile_editor();
case .Level_Editor;
tick_level_editor();
case .Post_Process_Editor;
tick_post_process_editor();
}
}

View File

@ -145,7 +145,7 @@ frame :: () {
dpis := state.dpi_scale;
#if OS != .WASM { tick_profiler(); }
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();
}
#if OS != .WASM { profiler_update(); }
profiler_update();
reset_temporary_storage();
}

View File

@ -53,6 +53,9 @@ 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 = {