Upload latest changes to git before transfer to mac

dev
Shariq Shah 6 years ago
parent adcdab7aad
commit 36943a487a
  1. 18
      assets/entities/Spot.symtres
  2. 9
      assets/entities/Suzanne.symtres
  3. BIN
      assets/sounds/test.wav
  4. BIN
      lib/windows/soloud/soloud_static_x64.lib
  5. BIN
      lib/windows/soloud/soloud_static_x64_d.lib
  6. BIN
      lib/windows/soloud/soloud_static_x64_d.pdb
  7. 2
      src/game/im_render.c
  8. 1
      src/game/renderer.c

@ -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
}

@ -0,0 +1,9 @@
Entity
{
type : 6
material : 0
geometry : suzanne.symbres
active : true
name : Suzanne_0
}

Binary file not shown.

@ -249,6 +249,7 @@ void im_render(struct Camera* active_viewer)
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glEnable(GL_MULTISAMPLE);
shader_bind(IM_State.im_shader); shader_bind(IM_State.im_shader);
{ {
static mat4 mvp, translation, rotation, scale; static mat4 mvp, translation, rotation, scale;
@ -292,6 +293,7 @@ void im_render(struct Camera* active_viewer)
shader_unbind(); shader_unbind();
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_MULTISAMPLE);
IM_State.curr_geom = -1; IM_State.curr_geom = -1;
IM_State.curr_vertex = 0; IM_State.curr_vertex = 0;

@ -38,6 +38,7 @@ void renderer_init(struct Renderer* renderer)
assert(renderer); assert(renderer);
glClearColor(0.3f, 0.6f, 0.9f, 1.0f); glClearColor(0.3f, 0.6f, 0.9f, 1.0f);
glEnable(GL_MULTISAMPLE);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glCullFace(GL_BACK); glCullFace(GL_BACK);

Loading…
Cancel
Save