X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fmain.cc;h=6d7f4e710e6b911273b5872cff5824ba46f98d3c;hp=4ba8df33b8028ae92266f2065f5c6f71dfd310b4;hb=3bf3536271e4afa8a8a93c75e2ab1256c0bf718a;hpb=df336012c33f2993bdb80177a1f874ef81e7505f

diff --git a/src/main.cc b/src/main.cc
index 4ba8df3..6d7f4e7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,3 +1,5 @@
+#include <GL/glew.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -5,6 +7,7 @@
 
 #include <gmath/gmath.h>
 
+#include "gfxapi.h"
 #include "global.h"
 
 /* TODO: fix those */
@@ -13,14 +16,13 @@
 #include "object.h"
 #include "renderer.h"
 #include "scene.h"
-#include "shader_manager.h"
 
 #include "opengl/opengl.h"
 #include "vulkan/vk.h"
 
 /* static functions */
 
-static bool init();
+static bool init(Gfx_API api);
 static void cleanup();
 static void display();
 
@@ -33,7 +35,6 @@ static void clbk_reshape(GLFWwindow *win, int width, int height);
 
 /* global variables */
 
-bool use_vulkan = false;
 Mat4 mprojection;
 
 GLFWwindow *win;
@@ -47,27 +48,38 @@ float dist = 4;
 ShaderManager *sdr_man;
 
 /* variables */
+
 static float aspect;
-static Scene *scene;
 static OrbitCamera *camera;
-static Renderer *rdefault; // default renderer
+
+static Scene *scene_cow;
+static Renderer *rcow;
+
+static Scene *scene_ground;
+static Renderer *rground; // default renderer
+
+/* *** */
 
 int main(int argc, char **argv)
 {
+	Gfx_API api;
+
 	for(int i=0; i<argc; ++i) {
 		if(strcmp(argv[i], "-opengl") == 0) {
+			api = GFX_GL;
 			printf("Backend: OpenGL.\n");
 		}
 		else if(strcmp(argv[i], "-vulkan") == 0) {
-			use_vulkan = true;
+			api = GFX_VK;
 			printf("Backend: Vulkan.\n");
 		}
 		else {
+			api = GFX_GL;
 			printf("No backend specified. Using OpenGL.\n");
 		}
 	}
 
-	if(!init()) {
+	if(!init(api)) {
 		fprintf(stderr, "Failed to initialize program.\n");
 		return 1;
 	}
@@ -92,44 +104,53 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-static bool init()
+static bool init(Gfx_API api)
 {
-	if(use_vulkan) {
-		if(!init_vulkan())
-			return false;
-	}
-	else {
-		if(!init_opengl())
-			return false;
-	}
+	if(!gfx_init(api))
+		return false;
 
 	sdr_man = new ShaderManager;
 
 	camera = new OrbitCamera;
 	camera->set_orbit_params(phi, theta, dist);
 
-	scene = new Scene;
-	if(!scene->load("data/spot/spot.obj")) {
-		fprintf(stderr, "Failed to load scene.\n");
+	scene_ground = new Scene;
+	if(!scene_ground->load("data/ground.obj")) {
+		fprintf(stderr, "Failed to load scene: ground.obj.\n");
+		return false;
+	}
+
+	scene_cow = new Scene;
+	if(!scene_cow->load("data/spot/spot.obj")) {
+		fprintf(stderr, "Failed to load scene: spot.obj.\n");
 		return false;
 	}
 
-	rdefault = new Renderer;
-	rdefault->camera = camera;
-	rdefault->scene = scene;
+	rground = new Renderer;
+	rground->camera = camera;
+	rground->scene = scene_ground;
 
-	if(!rdefault->create()) {
+	if(!rground->create()) {
 		fprintf(stderr, "Failed to create default renderer.\n");
 		return false;
 	}
 
+	rcow = new Renderer;
+	rcow->camera = camera;
+	rcow->scene = scene_cow;
+
+	if(!rcow->create()) {
+		fprintf(stderr, "Failed to create renderer for cows.\n");
+		return false;
+	}
+
 // TODO delete: debugging
-	for(size_t i=0; i<scene->objects.size(); ++i) {
+	for(size_t i=0; i<scene_ground->objects.size(); ++i) {
 		printf("object: %d\n", (int)i);
-		printf("mesh: %s\n", scene->objects[i]->mesh->name.c_str());
-		printf("material: %s\n", scene->objects[i]->material->name.c_str());
+		printf("mesh: %s\n", scene_ground->objects[i]->mesh->name.c_str());
+		printf("material: %s\n", scene_ground->objects[i]->material->name.c_str());
 		printf("transform:\n");
-		scene->objects[i]->transform.print();
+		scene_ground->objects[i]->transform.print();
 	}
 	return true;
 }
@@ -138,15 +159,14 @@ static void cleanup()
 {
 	delete sdr_man;
 	delete camera;
-	delete scene;
-	delete rdefault;
 
-	if(use_vulkan) {
-		cleanup_vulkan();
-	}
-	else {
-		cleanup_opengl();
-	}
+	delete scene_cow;
+	delete rcow;
+
+	delete scene_ground;
+	delete rground;
+
+	gfx_cleanup();
 }
 
 static void clbk_key(GLFWwindow *win, int key, int scancode, int action, int mods)
@@ -178,7 +198,7 @@ static void clbk_motion(GLFWwindow *win, double x, double y)
 	}
 
 	if(button[1]) {
-		dist += dy;
+		dist += dy * 0.1;
 		if(dist < 0.0) {
 			dist = 0.0;
 		}
@@ -193,15 +213,9 @@ static void clbk_mouse(GLFWwindow *win, int bn, int action, int mods)
 
 static void clbk_reshape(GLFWwindow *win, int width, int height)
 {
-	if(use_vulkan) {
-		//TODO
-		return;
-	}
-	else {
-		glViewport(0, 0, width, height);
-		aspect = (float)width / (float)height;
-		mprojection = calc_projection_matrix(45, aspect, 0.5, 1000.0);
-	}
+	gfx_viewport(0, 0, width, height);
+	aspect = (float)width / (float)height;
+	mprojection = calc_projection_matrix(45, aspect, 0.5, 1000.0);
 
 	win_h = height;
 	win_w = width;
@@ -210,5 +224,9 @@ static void clbk_reshape(GLFWwindow *win, int width, int height)
 static void display()
 {
 	camera->set_orbit_params(phi, theta, dist);
-	rdefault->draw();
+
+	gfx_clear(0.76, 0.3, 0.43);
+
+	rground->draw();
+	rcow->draw();
 }
\ No newline at end of file