Added color

.gitignore

@@ -0,0 +1,3 @@
+.vs
+out
+*.json

CMakeLists.txt

@@ -0,0 +1,53 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(openglu)
+
+set(build_examples ON CACHE BOOL "Build examples")
+
+if(WIN32)
+	add_compile_definitions(OGLU_WIN32)
+endif()
+
+file(GLOB_RECURSE include_files 
+	"include/*.hpp"
+)
+
+file(GLOB_RECURSE source_files 
+	"src/*.cpp"
+	"vendor/src/*.c"
+)
+
+add_library(openglu SHARED 
+	${include_files}
+	${source_files}
+)
+
+target_compile_definitions(openglu PRIVATE OGLU_BUILD_DLL)
+
+include_directories(
+	include
+	vendor/include
+)
+
+target_include_directories(openglu PUBLIC
+	include
+	vendor/include
+)
+
+if(${build_examples})
+	macro(subdirlist result curdir)
+		file(GLOB children RELATIVE ${curdir} ${curdir}/*)
+		set(dirlist "")
+		foreach(child ${children})
+			if(IS_DIRECTORY ${curdir}/${child})
+				list(APPEND dirlist ${child})
+			endif()
+		endforeach()
+		set(${result} ${dirlist})
+	endmacro()
+
+	subdirlist(samples ${CMAKE_SOURCE_DIR}/examples)
+	foreach(sample ${samples})
+		add_subdirectory(examples/${sample})
+	endforeach()
+endif()

examples/debug/CMakeLists.txt

@@ -0,0 +1,16 @@
+add_executable(debug "main.cpp")
+
+find_package(glfw3 REQUIRED)
+
+target_include_directories(debug PRIVATE 
+	glfw
+)
+
+target_link_libraries(debug PRIVATE 
+	"$<TARGET_FILE_DIR:openglu>/$<TARGET_FILE_BASE_NAME:openglu>.lib"
+	glfw
+)
+
+add_custom_command(TARGET debug POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openglu> $<TARGET_FILE:glfw> $<TARGET_FILE_DIR:debug>
+)

examples/debug/main.cpp

@@ -0,0 +1,52 @@
+#include <iostream>
+
+#include "openglu.hpp"
+#include <glad/glad.h>
+#include <GLFW/glfw3.h>
+
+void framebuffer_size_callback(GLFWwindow* window, int width, int height)
+{
+	oglu::SetViewport(0, 0, width, height);
+}
+
+void processInput(GLFWwindow* window)
+{
+	if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS)
+		glfwSetWindowShouldClose(window, true);
+}
+
+int main(int argc, char** argv)
+{
+	glfwInit();
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
+	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+
+	const GLFWvidmode* screen = glfwGetVideoMode(glfwGetPrimaryMonitor());
+	int windowSize = screen->height / 4 * 3;
+
+	GLFWwindow* window = glfwCreateWindow(windowSize, windowSize, "Debug", NULL, NULL);
+	if (window == nullptr)
+	{
+		std::cerr << "Failed to create GLFW window" << std::endl;
+		glfwTerminate();
+		return -1;
+	}
+	glfwMakeContextCurrent(window);
+
+	oglu::LoadGLLoader((GLADloadproc)glfwGetProcAddress);
+	oglu::SetViewport(0, 0, windowSize, windowSize);
+
+	while (!glfwWindowShouldClose(window))
+	{
+		processInput(window);
+
+		oglu::ClearScreen(GL_COLOR_BUFFER_BIT, oglu::Color(0.29f, 0.13f, 0.23f));
+
+		glfwSwapBuffers(window);
+		glfwPollEvents();
+	}
+
+	glfwTerminate();
+	return 0;
+}

include/color.hpp

@@ -0,0 +1,39 @@
+#ifndef COLOR_HPP
+#define COLOR_HPP
+
+#include "core.hpp"
+#include <glad/glad.h>
+
+namespace oglu
+{
+	class OGLU_API Color
+	{
+	public:
+		Color();
+		Color(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha = 255);
+		
+	public:
+		GLfloat r, g, b, a;
+
+		static const Color Black;
+		static const Color White;
+		static const Color Red;
+		static const Color Green;
+		static const Color Blue;
+		static const Color Yellow;
+		static const Color Magenta;
+		static const Color Cyan;
+		static const Color Transparent;
+	};
+
+	OGLU_API bool operator==(const Color& left, const Color& right);
+	OGLU_API bool operator!=(const Color& left, const Color& right);
+	OGLU_API Color operator+(const Color& left, const Color& right);
+	OGLU_API Color operator-(const Color& left, const Color& right);
+	OGLU_API Color operator*(const Color& left, const Color& right);
+	OGLU_API Color& operator+=(Color& left, const Color& right);
+	OGLU_API Color& operator-=(Color& left, const Color& right);
+	OGLU_API Color& operator*=(Color& left, const Color& right);
+}
+
+#endif

include/core.hpp

@@ -0,0 +1,14 @@
+#ifndef CORE_HPP
+#define CORE_HPP
+
+#ifdef OGLU_WIN32
+	#ifdef OGLU_BUILD_DLL
+		#define OGLU_API __declspec(dllexport)
+	#else
+		#define OGLU_API __declspec(dllimport)
+	#endif //OGLU_BUILD_DLL
+#else
+	#define OGLU_API
+#endif //OGLU_WIN32
+
+#endif

include/openglu.hpp

@@ -0,0 +1,18 @@
+#ifndef OPENGLU_HPP
+#define OPENGLU_HPP
+
+#include "core.hpp"
+#include <glad/glad.h>
+
+#include "color.hpp"
+
+namespace oglu
+{
+	OGLU_API void LoadGLLoader(GLADloadproc proc);
+
+	// Some raw, exposed OpenGL until I know where to put then
+	OGLU_API void SetViewport(GLint x, GLint y, GLsizei width, GLsizei height);
+	OGLU_API void ClearScreen(GLbitfield mask, Color clearColor);
+}
+
+#endif //OPENGLU_HPP

src/color.cpp

@@ -0,0 +1,88 @@
+#include "color.hpp"
+
+namespace oglu
+{
+	const Color Color::Black(0.f, 0.f, 0.f, 1.f);
+	const Color Color::White(1.f, 1.f, 1.f, 1.f);
+	const Color Color::Red(1.f, 0.f, 0.f, 1.f);
+	const Color Color::Green(0.f, 1.f, 0.f, 1.f);
+	const Color Color::Blue(0.f, 0.f, 1.f, 1.f);
+	const Color Color::Yellow(1.f, 1.f, 0.f, 1.f);
+	const Color Color::Magenta(1.f, 0.f, 1.f, 1.f);
+	const Color Color::Cyan(0.f, 1.f, 1.f, 1.f);
+	const Color Color::Transparent(0.f, 0.f, 0.f, 0.f);
+
+	Color::Color() :
+		r(0.f), g(0.f), b(0.f), a(0.f)
+	{
+	}
+
+	Color::Color(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) :
+		r(red), g(green), b(blue), a(alpha)
+	{
+	}
+
+	bool operator==(const Color& left, const Color& right)
+	{
+		return
+			(
+				(left.r == right.r) &&
+				(left.g == right.g) &&
+				(left.b == right.b) &&
+				(left.a == right.a)
+			);
+	}
+
+	bool operator!=(const Color& left, const Color& right)
+	{
+		return !(left == right);
+	}
+
+	Color operator+(const Color& left, const Color& right)
+	{
+		return Color(
+			left.r + right.r,
+			left.g + right.g,
+			left.b + right.b,
+			left.a + right.a
+		);
+	}
+
+	Color operator-(const Color& left, const Color& right)
+	{
+		return Color(
+			left.r - right.r,
+			left.g - right.g,
+			left.b - right.b,
+			left.a - right.a
+		);
+	}
+
+	Color operator*(const Color& left, const Color& right)
+	{
+		return Color(
+			left.r * right.r,
+			left.g * right.g,
+			left.b * right.b,
+			left.a * right.a
+		);
+	}
+
+	Color& operator+=(Color& left, const Color& right)
+	{
+		left = left + right;
+		return left;
+	}
+
+	Color& operator-=(Color& left, const Color& right)
+	{
+		left = left - right;
+		return left;
+	}
+
+	Color& operator*=(Color& left, const Color& right)
+	{
+		left = left * right;
+		return left;
+	}
+}

src/openglu.cpp

@@ -0,0 +1,26 @@
+#include "openglu.hpp"
+
+#include <iostream>
+#include <exception>
+
+namespace oglu
+{
+	void LoadGLLoader(GLADloadproc proc)
+	{
+		if (!gladLoadGLLoader(proc))
+		{
+			throw std::exception("Failed to initialize GLAD");
+		}
+	}
+
+	void SetViewport(GLint x, GLint y, GLsizei width, GLsizei height)
+	{
+		glViewport(x, y, width, height);
+	}
+
+	void ClearScreen(GLbitfield mask, Color clearColor)
+	{
+		glClearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a);
+		glClear(mask);
+	}
+}

vendor/include/KHR/khrplatform.h

@@ -0,0 +1,290 @@
+#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;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   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_ */