Stuff

headers/window.hpp

@@ -1,17 +1,18 @@
 #pragma once
+// #include "renderer.hpp"
+#include <glad/glad.h>
 #include "GLFW/glfw3.h"
 
 // Default window dimensions
 #define D_WINDOW_TITLE "Euclid Engine"
 
-// #define D_WINDOW_WIDTH 640
-// #define D_WINDOW_HEIGHT 480
-#define D_WINDOW_WIDTH 1920
-#define D_WINDOW_HEIGHT 1080 
+#define D_WINDOW_WIDTH 640
+#define D_WINDOW_HEIGHT 480
 
 class Window {
 	public:
 		GLFWwindow* win;
+		// Renderer::Camera cam;
 
 		Window(const char* title);
 		Window(const char* title, unsigned int w, unsigned int h);
@@ -21,12 +22,12 @@ class Window {
 		unsigned int width()  { return _width; }  // getters and dumb and 
 		unsigned int height() { return _height; } // cpp should have readonly fields...
 
+		void updateSize(int w, int h);
 	private:
 		const char* _title = D_WINDOW_TITLE;
 		unsigned int _width = D_WINDOW_WIDTH;
 		unsigned int _height = D_WINDOW_HEIGHT;
 
-		void updateSize(); 
 		void setWidth(unsigned int w)  { _width = w; }
 		void setHeight(unsigned int h) { _height = h; }
 };

src/controller.cpp

@@ -6,6 +6,8 @@
 #include <cmath>
 #include <cstdio>
 
+// TODO: move file into examples
+
 void Controller::processMouseInput(float deltaTime) {
 	double x, y;
 	glfwGetCursorPos(window->win, &x, &y); 	
@@ -41,7 +43,7 @@ void Controller::processMouseInput(float deltaTime) {
 
 	updateCameraTransforms();
 
-	printf("%f %f %f (pitch: %f yaw: %f)\n", position.x, position.y, position.z, pitch, yaw);
+	// printf("%f %f %f (pitch: %f yaw: %f)\n", position.x, position.y, position.z, pitch, yaw);
 }
 
 void Controller::processInput(float deltaTime) {

src/main.cpp

@@ -102,8 +102,12 @@ std::vector<unsigned int> indices({
 	11, 12, 13,
 });
 
-void framebuffer_size_callback(GLFWwindow* win, int w, int h) {
-	glViewport(0, 0, w, h);
+
+// Window for the game
+Window win("Euclid Engine: Demo");
+
+void framebuffer_size_callback(GLFWwindow* glfwWindow, int w, int h) {
+	win.updateSize(w, h);
 }
 
 void processInput(GLFWwindow *win) {
@@ -114,7 +118,7 @@ void processInput(GLFWwindow *win) {
 }
 
 int main() {
-	Window win("Euclid Engine: Demo");
+	// Spawn window
 	win.spawn();
 
 	if ( !gladLoadGLLoader((GLADloadproc)glfwGetProcAddress) ) {

src/window.cpp

@@ -1,5 +1,6 @@
 #include "window.hpp"
 #include "GLFW/glfw3.h"
+#include <GL/gl.h>
 #include <cstdlib>
 #include <stdio.h>
 
@@ -29,9 +30,11 @@ void Window::spawn() {
 	glfwMakeContextCurrent(win);
 }
 
-void Window::updateSize() {
-	int w, h;
-	glfwGetWindowSize(win, &w, &h);
+void Window::updateSize(int w, int h) {
+	// int w, h;
+	// glfwGetWindowSize(win, &w, &h);
 	_width = w;
 	_height = h;
+	glViewport(0, 0, w, h);
+	printf("New size: %i %i\n", w, h);
 }