Merge branch 'master' of https://github.com/tumble1999/cinnabar

README.md

@@ -48,9 +48,9 @@ Linux: /build/run/engine
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
 
 ## Todo
-* Window Class
+* ~~Window Class~~
 * Resize context on window resize
-* Time Class
+* ~~Time Class~~
 * Camera Class
 * Input System
 * Render System

engine/ce_event_handler.h

@@ -0,0 +1,15 @@
+
+#ifndef _CE_EVENT_HANDLER_H_
+#define _CE_EVENT_HANDLER_H_
+
+#include <SDL_events.h>
+
+namespace ce {
+	class IEventHandler {
+	private:
+	public:
+		virtual void onEvent(SDL_Event& event)=0;
+	};
+}
+
+#endif // _CE_EVENT_HANDLER_H_

engine/core/window.cpp

@@ -59,7 +59,7 @@ glm::vec2 ce::Window::getWindowSize()
 {
 	int w,h;
 	SDL_GetWindowSize(m_window,&w, &h);
-	return glm::vec2(w,h);
+	return glm::vec2((float)w,(float)h);
 }
 float ce::Window::getAspectRatio()
 {

engine/core/window.h

@@ -3,6 +3,7 @@
 
 #include <ce_math.h>
 #include <ce_rendering.h>
+#include <ce_event_handler.h>
 
 namespace ce {
 	class Window {

engine/main.cpp

@@ -88,9 +88,6 @@ int main(int argc, char* argv[]) {
 
 	//Time
 	ce::Time* time = new ce::Time();
-	/*float
-		deltaTime = 0.0f,
-		last = 0.0f;*/
 
 	ce::Transform transform;
 	ce::Shader* shader = new ce::Shader("basic");
@@ -101,8 +98,6 @@ int main(int argc, char* argv[]) {
 	mesh->sendToShader(shader);
 	ce::Texture* texture = new ce::Texture("uv-map.png");
 	shader->setInt("uTex",0);
-
-	bool mouseLocked = true;
 	float
 		mouseSensitivity = 0.1f,
 		cameraPitch = 0.0f,
@@ -168,6 +163,12 @@ int main(int argc, char* argv[]) {
 					running = 0;
 					break;
 				}
+				case SDL_WINDOWEVENT:
+				{
+					glm::vec2 size = window->getWindowSize();
+					glViewport(0, 0, size.x,size.y);
+					break;
+				}
 			}
 		}
 
@@ -180,7 +181,6 @@ int main(int argc, char* argv[]) {
 		transform.pitch(100.0f*time->getDeltaTime());
 		transform.saveToShader(shader);
 
-
 		// Camera
 		glm::vec3
 			cameraDirection(