diff --git a/assets/entities/Spot.symtres b/assets/entities/Spot.symtres new file mode 100644 index 0000000..46764a4 --- /dev/null +++ b/assets/entities/Spot.symtres @@ -0,0 +1,18 @@ +Entity +{ + type : 5 + inner_angle : 20.0000 + falloff : 1.5000 + light_type : 2 + depth_bias : 0.0005 + cast_shadow : false + intensity : 1.0000 + color : 1.000 1.000 1.000 + active : true + radius : 20.0000 + outer_angle : 30.0000 + name : Test_Light + pcf_enabled : false + valid : true +} + diff --git a/assets/entities/Suzanne.symtres b/assets/entities/Suzanne.symtres new file mode 100644 index 0000000..5284f62 --- /dev/null +++ b/assets/entities/Suzanne.symtres @@ -0,0 +1,9 @@ +Entity +{ + type : 6 + material : 0 + geometry : suzanne.symbres + active : true + name : Suzanne_0 +} + diff --git a/assets/sounds/test.wav b/assets/sounds/test.wav new file mode 100644 index 0000000..e0cda05 Binary files /dev/null and b/assets/sounds/test.wav differ diff --git a/lib/windows/soloud/soloud_static_x64.lib b/lib/windows/soloud/soloud_static_x64.lib new file mode 100644 index 0000000..f0ef61d Binary files /dev/null and b/lib/windows/soloud/soloud_static_x64.lib differ diff --git a/lib/windows/soloud/soloud_static_x64_d.lib b/lib/windows/soloud/soloud_static_x64_d.lib new file mode 100644 index 0000000..f628209 Binary files /dev/null and b/lib/windows/soloud/soloud_static_x64_d.lib differ diff --git a/lib/windows/soloud/soloud_static_x64_d.pdb b/lib/windows/soloud/soloud_static_x64_d.pdb new file mode 100644 index 0000000..40915ef Binary files /dev/null and b/lib/windows/soloud/soloud_static_x64_d.pdb differ diff --git a/src/game/im_render.c b/src/game/im_render.c index c8b1f4a..56a3104 100755 --- a/src/game/im_render.c +++ b/src/game/im_render.c @@ -249,6 +249,7 @@ void im_render(struct Camera* active_viewer) glDepthFunc(GL_LEQUAL); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_BLEND); + glEnable(GL_MULTISAMPLE); shader_bind(IM_State.im_shader); { static mat4 mvp, translation, rotation, scale; @@ -292,6 +293,7 @@ void im_render(struct Camera* active_viewer) shader_unbind(); glDisable(GL_BLEND); glDisable(GL_DEPTH_TEST); + glDisable(GL_MULTISAMPLE); IM_State.curr_geom = -1; IM_State.curr_vertex = 0; diff --git a/src/game/renderer.c b/src/game/renderer.c index e479906..15f29b6 100755 --- a/src/game/renderer.c +++ b/src/game/renderer.c @@ -38,6 +38,7 @@ void renderer_init(struct Renderer* renderer) assert(renderer); glClearColor(0.3f, 0.6f, 0.9f, 1.0f); + glEnable(GL_MULTISAMPLE); glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE); glCullFace(GL_BACK);