starting obj parsing

2 files changed, 3 insertions, 1 deletions

diff --git a/src/game/assets.cpp b/src/game/assets.cpp
index 62663a9..2a73756 100644
--- a/src/game/assets.cpp
+++ b/src/game/assets.cpp
@@ -2,6 +2,7 @@
 
 #include "../game.h"
 #include "../render/gl_2d_font.h"
+#include "../render/model.h"
 
 #include "../util/stb_image.h"
 #include "../util/anim.h"
@@ -9,6 +10,7 @@
 void assets_init( GAME_DATA *game ) {
   game->assets.test = gl_texture_from_file( game->gl, "uvtest.png" );
   game->assets.fonts_init = 0;
+  MODEL model = model_from_obj( "../assets/obj/", "base" );
 }
 
 void assets_create_fonts( struct GAME_DATA *game ) {
diff --git a/src/game/player.cpp b/src/game/player.cpp
index e4c0390..8f418ac 100644
--- a/src/game/player.cpp
+++ b/src/game/player.cpp
@@ -58,7 +58,7 @@ void capture_move_keys( PLAYER* p ) {
   p->input.jump = input.keys[input.binds.jump];
   if( input.keys[input.binds.fwd] ) {
     if( !p->input.fwd_held ) move->x = 1.f;
-     p->input.fwd_held = 1;
+    p->input.fwd_held = 1;
   } else {
     if( p->input.fwd_held ) {
       if( p->input.bk_held ) move->x = -1.f;