evol3D/evol-sandbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/evol3D/evol-sandbox

Browse Source
This commit is contained in:
J3oss
2021-06-15 16:51:23 +02:00
parent 561713a9d2 1fe847e4dc
commit 67c4db7a72
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@@ -131,6 +131,7 @@ load_project()
State.window = Window->create(width, height, "Main Window"); State.window = Window->create(width, height, "Main Window");
Input->setActiveWindow(State.window); Input->setActiveWindow(State.window);
Renderer->setWindow((GenericHandle)State.window);
ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent); ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent);
evstring project_dir = NULL; evstring project_dir = NULL;
@@ -145,15 +146,6 @@ load_project()
AssetManager->mount(&project_dir, &project_mountpoint); AssetManager->mount(&project_dir, &project_mountpoint);
evstring_free(project_mountpoint); evstring_free(project_mountpoint);
AssetHandle shader_asset = Asset->load("project://triangle.vert");
ShaderAsset shader_bin = ShaderLoader->loadAsset(shader_asset, EV_SHADERASSETSTAGE_VERTEX, "TriangleVertex", "main", EV_SHADER_BIN);
ShaderAsset shader_asm = ShaderLoader->loadAsset(shader_asset, EV_SHADERASSETSTAGE_VERTEX, "TriangleVertex", "main", EV_SHADER_ASM);
ev_log_debug("Shader Binary: %.*s", shader_bin.len, shader_bin.binary);
ev_log_debug("Shader Assembly: %.*s", shader_asm.len, shader_asm.binary);
Asset->free(shader_asset);
EV_DEFER( EV_DEFER(
AssetHandle project_config = Asset->load("project://game.proj"), AssetHandle project_config = Asset->load("project://game.proj"),
Asset->free(project_config)) Asset->free(project_config))