X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fmain.cc;h=1246d2f6edec544c5188f56eff50ad09c2e5986c;hp=d4d4226a32879107c950cc6fe6e6dd05a566d3fa;hb=978140660bed8a4bbe782dc5ca0516a80e1ba233;hpb=f4ba93a902613f2b2c4a397d5a526fb4a4161e86 diff --git a/src/main.cc b/src/main.cc index d4d4226..1246d2f 100644 --- a/src/main.cc +++ b/src/main.cc @@ -13,8 +13,8 @@ /* TODO: fix those */ #include "camera.h" #include "mesh.h" +#include "morph_renderer.h" #include "object.h" -#include "renderer.h" #include "scene.h" #include "terrain.h" #include "texture.h" @@ -43,9 +43,10 @@ GLFWwindow *win; int win_w = 800; int win_h = 600; - ShaderManager *sdr_man; +double time_sec; + /* variables */ static bool move_camera; @@ -59,7 +60,7 @@ static OrbitCamera *camera; static Scene *cow_scene; static Object *cow_object; -static Renderer *cow_rend; +static MorphRenderer *cow_rend; static Terrain terrain; static Texture *skybox_tex; @@ -128,7 +129,7 @@ static bool init(Gfx_API api) return false; } - cow_rend = new Renderer; + cow_rend = new MorphRenderer; cow_rend->camera = camera; cow_rend->scene = cow_scene; @@ -299,9 +300,9 @@ static void update(float dt) static void display() { static float prev_tsec; - float tsec = glfwGetTime(); - float dt = tsec - prev_tsec; - prev_tsec = tsec; + time_sec = glfwGetTime(); + float dt = time_sec - prev_tsec; + prev_tsec = time_sec; update(dt);