ITS REWRITE TIME

legacy/include/KHR/khrplatform.h

@@ -0,0 +1,282 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */

legacy/include/logger.h

@@ -0,0 +1,154 @@
+#ifndef INCLUDE_LOGGER_H_
+#define INCLUDE_LOGGER_H_
+
+#include <iostream>
+#include <string>
+#include <sstream>
+#include <map>
+
+#ifdef _WIN32
+#include <Windows.h>
+typedef enum {
+	CONSOLE_COLOUR_FG_BLACK = 0,
+	CONSOLE_COLOUR_FG_BLUE = FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_GREEN = FOREGROUND_GREEN,
+	CONSOLE_COLOUR_FG_CYAN = FOREGROUND_GREEN | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_RED = FOREGROUND_RED,
+	CONSOLE_COLOUR_FG_MAGENTA = FOREGROUND_RED | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_YELLOW = FOREGROUND_RED | FOREGROUND_GREEN,
+	CONSOLE_COLOUR_FG_GRAY = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_LIGHT_GRAY = FOREGROUND_INTENSITY,
+	CONSOLE_COLOUR_FG_LIGHT_BLUE = FOREGROUND_INTENSITY | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_LIGHT_GREEN = FOREGROUND_INTENSITY | FOREGROUND_GREEN,
+	CONSOLE_COLOUR_FG_LIGHT_CYAN = FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_LIGHT_RED = FOREGROUND_INTENSITY | FOREGROUND_RED,
+	CONSOLE_COLOUR_FG_LIGHT_MAGENTA = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_LIGHT_YELLOW = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN,
+	CONSOLE_COLOUR_FG_WHITE = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_FG_DEFAULT = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
+	CONSOLE_COLOUR_BG_DEFAULT = 0
+} ConsoleColour;
+
+#ifdef _WIN32
+	static HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
+	static WORD wOldColorAttrs;
+	static CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+#endif
+
+#else
+typedef enum {
+	CONSOLE_COLOUR_FG_DEFAULT = 39,
+	CONSOLE_COLOUR_FG_BLACK = 30,
+	CONSOLE_COLOUR_FG_RED = 31,
+	CONSOLE_COLOUR_FG_GREEN = 32,
+	CONSOLE_COLOUR_FG_YELLOW = 33,
+	CONSOLE_COLOUR_FG_BLUE = 34,
+	CONSOLE_COLOUR_FG_MAGENTA = 35,
+	CONSOLE_COLOUR_FG_CYAN = 36,
+	CONSOLE_COLOUR_FG_LIGHT_GRAY = 37,
+	CONSOLE_COLOUR_FG_DARK_GRAY = 90,
+	CONSOLE_COLOUR_FG_LIGHT_RED = 91,
+	CONSOLE_COLOUR_FG_LIGHT_GREEN = 92,
+	CONSOLE_COLOUR_FG_LIGHT_YELLOW = 93,
+	CONSOLE_COLOUR_FG_LIGHT_BLUE = 94,
+	CONSOLE_COLOUR_FG_LIGHT_MAGENTA = 95,
+	CONSOLE_COLOUR_FG_LIGHT_CYAN = 96,
+	CONSOLE_COLOUR_FG_WHITE = 97,
+	CONSOLE_COLOUR_BG_RED = 41,
+	CONSOLE_COLOUR_BG_GREEN = 42,
+	CONSOLE_COLOUR_BG_BLUE = 44,
+	CONSOLE_COLOUR_BG_DEFAULT = 49
+} ConsoleColour;
+#endif
+
+class Colour {
+public:
+	static void resetColour();
+
+	template<typename T>
+	static void consoleColour(T colour) {
+	#ifdef _WIN32
+		SetConsoleTextAttribute(h, colour);
+	#else
+		std::cout << "\033[" << colour << "m";
+	#endif
+	}
+};
+
+typedef enum {
+	LOGGER_INFO = CONSOLE_COLOUR_FG_GREEN,
+	LOGGER_WARN = CONSOLE_COLOUR_FG_YELLOW,
+	LOGGER_ERROR = CONSOLE_COLOUR_FG_LIGHT_RED,
+	LOGGER_PANIC = CONSOLE_COLOUR_FG_RED,
+	LOGGER_DEBUG = CONSOLE_COLOUR_FG_BLUE
+} LogType;
+
+typedef enum {
+	LOGGER_EXIT,
+	LOGGER_ENDL
+} LogAction;
+
+class Logger {
+public:
+	std::stringstream outStream;
+	std::map<LogType, std::string> lookupTable;
+	Logger();
+
+	Logger& operator<< (const LogType type) {
+		std::cout << "[";
+		Colour::consoleColour(type);
+		std::cout << lookupTable[type];
+		Colour::consoleColour(CONSOLE_COLOUR_FG_DEFAULT);
+		std::cout << "] ";
+		return *this;
+	}
+
+	Logger& operator<< (const LogAction action) {
+		if (action == LOGGER_ENDL) {
+			std::cout << outStream.str() << std::endl;
+			outStream.str(std::string());;
+			outStream.flush();
+		}
+		if (action == LOGGER_EXIT)
+			exit(0);
+		return *this;
+	}
+
+	template<typename T>
+	Logger& operator<< (const T& data) {
+		outStream << data;
+		return *this;
+	}
+};
+
+#endif
+
+#ifdef LOGGER_DEFINITION
+#undef LOGGER_DEFINITION
+
+void Colour::resetColour() {
+#ifdef _WIN32
+	SetConsoleTextAttribute(h, CONSOLE_COLOUR_BG_DEFAULT);
+	SetConsoleTextAttribute(h, CONSOLE_COLOUR_FG_DEFAULT);
+#else
+	std::cout
+		<< "\033[" << CONSOLE_COLOUR_BG_DEFAULT << "m"
+		<< "\033[" << CONSOLE_COLOUR_FG_DEFAULT << "m";
+#endif
+}
+
+Logger::Logger() {
+
+#ifdef _WIN32
+	GetConsoleScreenBufferInfo(h, &csbiInfo);
+	wOldColorAttrs = csbiInfo.wAttributes;
+#endif
+
+	lookupTable[LOGGER_INFO] = "INFO";
+	lookupTable[LOGGER_WARN] = "WARN";
+	lookupTable[LOGGER_ERROR] = "ERROR";
+	lookupTable[LOGGER_PANIC] = "PANIC";
+	lookupTable[LOGGER_DEBUG] = "DEBUG";
+}
+
+#endif

legacy/src/main.cpp

@@ -0,0 +1,72 @@
+// General includes
+#include <chrono>
+#include <vector>
+
+// #include <glm/glm.hpp>
+// #include <glm/gtc/matrix_transform.hpp>
+// #include <glm/gtc/type_ptr.hpp>
+	
+// Custom includes
+#define LOGGER_DEFINITION
+#include <logger.h>
+
+#include "display.h"
+#include "camera.h"
+#include "shader.h"
+#include "model.h"
+
+int main (int argc, char** argv) {
+
+    std::cout << "-----------------------------\n"
+              << "----- SMH Render Engine -----\n"
+              << "-------- Version 0.0 --------\n"
+              << "----- ©Benjamin Kyd 2019 ----\n"
+              << "-----------------------------\n\n";
+
+    Logger logger;
+
+    Display display{"SMH Engine", logger, 1280, 720, MXAA_16X, VSYNC_ENABLED};
+
+    Camera camera;
+    camera.mouseSensitivity = 0.0012f;
+    camera.cameraSpeed = 1.0f;
+
+	Shader shader;
+	shader.load("./resources/shaders/phong").attatch().link().use();
+
+	Mesh mesh{ "./resources/lucy.obj" };
+	mesh.setup();
+
+    SDL_Event e;
+    while (!display.isClosed) {
+        camera.moveCamera();
+
+        while (SDL_PollEvent(&e)) {
+            if (e.type == SDL_QUIT)
+				display.isClosed = true;
+			//if (e.key.keysym.sym == SDLK_t) {
+			//	SDL_SetRelativeMouseMode(SDL_GetRelativeMouseMode() == SDL_TRUE ? SDL_FALSE : SDL_TRUE);
+			//}
+            camera.handleMouse(e);
+        }
+
+        const Uint8* state = SDL_GetKeyboardState(NULL);
+
+        if (state[SDL_SCANCODE_Q]) {
+            mesh.rotation += -1.5f;
+        }
+
+        if (state[SDL_SCANCODE_E]) {
+            mesh.rotation += 1.5f;
+        }
+
+		mesh.bind();
+		mesh.render(shader, camera);
+		mesh.unbind();
+
+		display.update();
+	}
+
+
+    return 0;
+}

src/main.cpp

@@ -1,72 +1,6 @@
-// General includes
+#include <iostream>
-#include <chrono>
-#include <vector>
-
-// #include <glm/glm.hpp>
-// #include <glm/gtc/matrix_transform.hpp>
-// #include <glm/gtc/type_ptr.hpp>
-	
-// Custom includes
-#define LOGGER_DEFINITION
-#include <logger.h>
-
-#include "display.h"
-#include "camera.h"
-#include "shader.h"
-#include "model.h"
 
 int main(int argc, char** argv) {
-
+    std::cout << "bruh" << std::endl;
-    std::cout << "-----------------------------\n"
-              << "----- SMH Render Engine -----\n"
-              << "-------- Version 0.0 --------\n"
-              << "----- ©Benjamin Kyd 2019 ----\n"
-              << "-----------------------------\n\n";
-
-    Logger logger;
-
-    Display display{"SMH Engine", logger, 1280, 720, MXAA_16X, VSYNC_ENABLED};
-
-    Camera camera;
-    camera.mouseSensitivity = 0.0012f;
-    camera.cameraSpeed = 1.0f;
-
-	Shader shader;
-	shader.load("./resources/shaders/phong").attatch().link().use();
-
-	Mesh mesh{ "./resources/lucy.obj" };
-	mesh.setup();
-
-    SDL_Event e;
-    while (!display.isClosed) {
-        camera.moveCamera();
-
-        while (SDL_PollEvent(&e)) {
-            if (e.type == SDL_QUIT)
-				display.isClosed = true;
-			//if (e.key.keysym.sym == SDLK_t) {
-			//	SDL_SetRelativeMouseMode(SDL_GetRelativeMouseMode() == SDL_TRUE ? SDL_FALSE : SDL_TRUE);
-			//}
-            camera.handleMouse(e);
-        }
-
-        const Uint8* state = SDL_GetKeyboardState(NULL);
-
-        if (state[SDL_SCANCODE_Q]) {
-            mesh.rotation += -1.5f;
-        }
-
-        if (state[SDL_SCANCODE_E]) {
-            mesh.rotation += 1.5f;
-        }
-
-		mesh.bind();
-		mesh.render(shader, camera);
-		mesh.unbind();
-
-		display.update();
-	}
-
-
     return 0;
 }