From 32e44a901877a4314b527978855f945bf2cb8f94 Mon Sep 17 00:00:00 2001
From: plane000 <playsplane@gmail.com>
Date: Sun, 30 Sep 2018 15:59:36 +0100
Subject: [PATCH] not much

---
 crumpet-engine/crumpet-engine.vcxproj         |  2 ++
 crumpet-engine/crumpet-engine.vcxproj.filters |  2 ++
 crumpet-engine/logger.cpp                     |  9 +++++++++
 crumpet-engine/logger.h                       |  8 ++++++++
 crumpet-engine/main.cpp                       | 19 +++++++++++++++++--
 crumpet-engine/mathHelper.cpp                 |  1 -
 crumpet-engine/renderer.cpp                   |  6 ++++--
 7 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 crumpet-engine/logger.cpp
 create mode 100644 crumpet-engine/logger.h
 delete mode 100644 crumpet-engine/mathHelper.cpp

diff --git a/crumpet-engine/crumpet-engine.vcxproj b/crumpet-engine/crumpet-engine.vcxproj
index 469a2d8..cb423f5 100644
--- a/crumpet-engine/crumpet-engine.vcxproj
+++ b/crumpet-engine/crumpet-engine.vcxproj
@@ -127,6 +127,7 @@
   <ItemGroup>
     <ClCompile Include="entity.cpp" />
     <ClCompile Include="game.cpp" />
+    <ClCompile Include="logger.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="mathHelper.cpp" />
     <ClCompile Include="renderer.cpp" />
@@ -135,6 +136,7 @@
   <ItemGroup>
     <ClInclude Include="entity.h" />
     <ClInclude Include="game.h" />
+    <ClInclude Include="logger.h" />
     <ClInclude Include="mathHelper.h" />
     <ClInclude Include="renderer.h" />
     <ClInclude Include="sprite.h" />
diff --git a/crumpet-engine/crumpet-engine.vcxproj.filters b/crumpet-engine/crumpet-engine.vcxproj.filters
index f123f78..e2b78bf 100644
--- a/crumpet-engine/crumpet-engine.vcxproj.filters
+++ b/crumpet-engine/crumpet-engine.vcxproj.filters
@@ -7,6 +7,7 @@
     <ClCompile Include="game.cpp" />
     <ClCompile Include="mathHelper.cpp" />
     <ClCompile Include="sprite.cpp" />
+    <ClCompile Include="logger.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="headers">
@@ -32,5 +33,6 @@
     <ClInclude Include="timer.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="logger.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/crumpet-engine/logger.cpp b/crumpet-engine/logger.cpp
new file mode 100644
index 0000000..7459c14
--- /dev/null
+++ b/crumpet-engine/logger.cpp
@@ -0,0 +1,9 @@
+#include "logger.h"
+
+Logger::Logger() {
+
+}
+
+Logger::~Logger() {
+
+}
diff --git a/crumpet-engine/logger.h b/crumpet-engine/logger.h
new file mode 100644
index 0000000..8e53f7d
--- /dev/null
+++ b/crumpet-engine/logger.h
@@ -0,0 +1,8 @@
+#pragma once
+
+class Logger {
+public:
+	Logger();
+	virtual ~Logger();
+};
+
diff --git a/crumpet-engine/main.cpp b/crumpet-engine/main.cpp
index e39123a..611c9b1 100644
--- a/crumpet-engine/main.cpp
+++ b/crumpet-engine/main.cpp
@@ -6,12 +6,25 @@
 #define SCREEN_HEIGHT 600
 
 int main(int argc, char** argv) {
-	Game game("Crumpet engine", SCREEN_WIDTH, SCREEN_HEIGHT, 0, 1000 / 60);
+	Game game("Crumpet engine", SCREEN_WIDTH, SCREEN_HEIGHT, 1, 1000 / 60);
 	Timer timer;
 
 	Entity mario("mario", game.SDLRenderer);
 	mario.LoadTexture("/resources/mario.png");
 
+	Entity box("box", game.SDLRenderer, PolyDrawType::DRAW_FILLED_RECT);
+	box.SetDrawColour(Vec4(144, 022, 111, 255));
+	box.SetRect(Vec2(0, 0), Vec2(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2));
+
+	Entity boxOutline("box", game.SDLRenderer, PolyDrawType::DRAW_OUTLINE_RECT);
+	boxOutline.SetDrawColour(Vec4(144, 111, 111, 255));
+	boxOutline.SetRect(Vec2(100, 100), Vec2(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2));
+
+	Entity mesh("mesh", game.SDLRenderer, PolyDrawType::DRAW_LINES);
+	mesh.SetDrawColour(Vec4(255, 244, 111, 255));
+	mesh.AddVecPoint(Vec4(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT));
+	mesh.AddVecPoint(Vec4(SCREEN_WIDTH, 0, 0, SCREEN_HEIGHT));
+
 	Sprite sans("sans", game.SDLRenderer, SpriteType::SPRITE_ANIMATED);
 	
 
@@ -19,7 +32,6 @@ int main(int argc, char** argv) {
 		game.PollEvents();
 
 		if (timer.GetTimeElapsed() >= game.TargetMsPerUpdate) {
-			std::cout << timer.GetTimeElapsed() << std::endl;
 
 			// game logic
 
@@ -28,6 +40,9 @@ int main(int argc, char** argv) {
 
 		game.RenderClear();
 		game.RenderEntity(&mario);
+		game.RenderEntity(&box);
+		game.RenderEntity(&mesh);
+		game.RenderEntity(&boxOutline);
 		game.RenderUpdate();
 	}
 
diff --git a/crumpet-engine/mathHelper.cpp b/crumpet-engine/mathHelper.cpp
deleted file mode 100644
index d2e7dbf..0000000
--- a/crumpet-engine/mathHelper.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "mathHelper.h"
diff --git a/crumpet-engine/renderer.cpp b/crumpet-engine/renderer.cpp
index e474af5..81cbab7 100644
--- a/crumpet-engine/renderer.cpp
+++ b/crumpet-engine/renderer.cpp
@@ -2,12 +2,14 @@
 #include "entity.h"
 
 Renderer::Renderer(std::string title, int width, int height, int targetFramerate) {
-	if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
+	if (SDL_Init(SDL_INIT_VIDEO) < 0) {
 		std::cout << "SDL could not initialize, SDL ERROR: " << SDL_GetError() << std::endl;
 	}
+	std::cout << "SDL initialized" << std::endl;
 
 	m_window = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_SHOWN);
-	
+	std::cout << "SDL window created" << std::endl;
+
 	if (targetFramerate == 0)
 		SDLRenderer = SDL_CreateRenderer(m_window, -1, SDL_RENDERER_ACCELERATED);
 	if (targetFramerate == 1)