summaryrefslogtreecommitdiff
path: root/src/game/assets.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/assets.cpp')
-rw-r--r--src/game/assets.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/assets.cpp b/src/game/assets.cpp
index 62663a9..f1fa37b 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,9 @@
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" );
+ MODEL earth = model_from_obj( "../assets/obj/", "earth" );
+ MODEL latest = model_from_obj( "../assets/obj/", "latest" );
}
void assets_create_fonts( struct GAME_DATA *game ) {