added window and stuff

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/glfw"]
+	path = vendor/glfw
+	url = git@github.com:glfw/glfw.git

CMakeLists.txt

@@ -6,4 +6,6 @@ cmake_minimum_required (VERSION 3.8)
 project ("Mandelbrot")
 
 # Include sub-projects.
+add_subdirectory ("vendor/glfw")
+add_subdirectory ("vendor/glad")
 add_subdirectory ("src")

src/Application.cpp

@@ -0,0 +1,38 @@
+#include <glad/glad.h>
+#include "Application.hpp"
+
+#include <stdexcept>
+
+Application::Application() :
+	window(new Window(1280, 720, "Mandelbrot")), canvas(nullptr)
+{
+	window->MakeContextCurrent();
+
+	if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
+	{
+		throw std::runtime_error("GLAD failed to initialize.");
+	}
+
+	glViewport(0, 0, 1280, 720);
+
+	canvas = new Canvas();
+}
+
+Application::~Application()
+{
+}
+
+void Application::Launch()
+{
+	while (!window->ShouldClose())
+	{
+		glfwPollEvents();
+
+		glClearColor(0.1f, 0.01f, 0.19f, 1.0f);
+		glClear(GL_COLOR_BUFFER_BIT);
+
+		canvas->Render();
+
+		window->Display();
+	}
+}

src/Application.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Window.hpp"
+#include "Canvas.hpp"
+
+class Application
+{
+public:
+	Application();
+	~Application();
+
+	void Launch();
+
+private:
+	Window* window;
+	Canvas* canvas;
+};

src/CMakeLists.txt

@@ -4,6 +4,14 @@
 cmake_minimum_required (VERSION 3.8)
 
 # Add source to this project's executable.
-add_executable (Mandelbrot "main.cpp")
+add_executable (Mandelbrot "main.cpp" "Window.cpp" "Application.cpp" "Canvas.cpp")
 
-# TODO: Add tests and install targets if needed.
+target_include_directories(Mandelbrot PRIVATE
+	glfw
+	glad
+)
+
+target_link_libraries(Mandelbrot
+	glfw
+	glad
+)

src/Canvas.cpp

@@ -0,0 +1,124 @@
+#include "Canvas.hpp"
+
+#include <string>
+#include <stdexcept>
+
+#include <glad/glad.h>
+
+Canvas::Canvas() :
+	vao(0), vbo(0), shader(0)
+{
+	CreateVertexArrayObject();
+	CreateShaderProgram();
+}
+
+Canvas::~Canvas()
+{
+	if (shader)
+		glDeleteProgram(shader);
+
+	if (vbo)
+		glDeleteBuffers(1, &vbo);
+
+	if (vao)
+		glDeleteVertexArrays(1, &vao);
+}
+
+void Canvas::Render()
+{
+	glUseProgram(shader);
+	glBindVertexArray(vao);
+
+	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+}
+
+void Canvas::CreateVertexArrayObject()
+{
+	float vertices[4 * 2] = {
+		-0.9f, -0.9f,
+		-0.9f, 0.9f,
+		0.9f, 0.9f,
+		0.9f, -0.9f
+	};
+
+	glGenVertexArrays(1, &vao);
+	glBindVertexArray(vao);
+
+	glGenBuffers(1, &vbo);
+	glBindBuffer(GL_ARRAY_BUFFER, vbo);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), (const void*)&vertices, GL_STATIC_DRAW);
+
+	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (const void*)0);
+	glEnableVertexAttribArray(0);
+}
+
+void Canvas::CreateShaderProgram()
+{
+	GLint result;
+	char infoLog[512];
+
+	shader = glCreateProgram();
+
+	GLuint vertexShader = glCreateShader(GL_VERTEX_SHADER);
+	std::string vertexShaderSource = R"(
+		#version 460 core
+
+		layout (location = 0) in vec2 pos;
+
+		void main()
+		{
+			gl_Position = vec4(pos, 0.0f, 1.0f);
+		}
+	)";
+	const char* shaderSourceCString = vertexShaderSource.c_str();
+	glShaderSource(vertexShader, 1, &shaderSourceCString, NULL);
+	glCompileShader(vertexShader);
+
+	glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &result);
+	if (!result)
+	{
+		glGetShaderInfoLog(vertexShader, 512, NULL, infoLog);
+		glDeleteShader(vertexShader);
+		throw std::runtime_error("Failed to compile vertex shader\n" + std::string(infoLog));
+	}
+
+	GLuint fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
+	std::string fragmentShaderSource = R"(
+		#version 460 core
+
+		out vec4 FragColor;
+
+		void main()
+		{
+			FragColor = vec4(1.0f, 0.0f, 1.0f, 1.0f);
+		}
+	)";
+	shaderSourceCString = fragmentShaderSource.c_str();
+	glShaderSource(fragmentShader, 1, &shaderSourceCString, NULL);
+	glCompileShader(fragmentShader);
+
+	glAttachShader(shader, vertexShader);
+	glAttachShader(shader, fragmentShader);
+	glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &result);
+	if (!result)
+	{
+		glGetShaderInfoLog(fragmentShader, 512, NULL, infoLog);
+		glDeleteShader(fragmentShader);
+		glDeleteShader(vertexShader);
+		throw std::runtime_error("Failed to compile fragment shader\n" + std::string(infoLog));
+	}
+
+	glLinkProgram(shader);
+
+	glGetProgramiv(shader, GL_LINK_STATUS, &result);
+	if (!result)
+	{
+		glGetProgramInfoLog(shader, 512, NULL, infoLog);
+		glDeleteShader(fragmentShader);
+		glDeleteShader(vertexShader);
+		throw std::runtime_error("Failed to link shader program\n" + std::string(infoLog));
+	}
+
+	glDeleteShader(fragmentShader);
+	glDeleteShader(vertexShader);
+}

src/Canvas.hpp

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <cstdint>
+
+class Canvas
+{
+public:
+	Canvas();
+	~Canvas();
+
+	void Render();
+
+private:
+	void CreateVertexArrayObject();
+	void CreateShaderProgram();
+
+private:
+	uint32_t vao, vbo;
+	uint32_t shader;
+};

src/Window.cpp

@@ -0,0 +1,36 @@
+#include <glad/glad.h>
+#include "Window.hpp"
+
+#include <stdexcept>
+
+Window::Window(uint32_t width, uint32_t height, const std::string& title) :
+	handle(nullptr)
+{
+	handle = glfwCreateWindow(width, height, title.c_str(), nullptr, nullptr);
+	if (handle == nullptr)
+	{
+		const char* buffer;
+		int result = glfwGetError(&buffer);
+
+		throw std::runtime_error("Failed to initialize GLFWwindow (" + std::to_string(result) + ") " + std::string(buffer));
+	}
+
+	glfwSetWindowSizeLimits(handle, 1280, 720, GLFW_DONT_CARE, GLFW_DONT_CARE);
+
+	glfwSetFramebufferSizeCallback(handle, 
+		[](GLFWwindow* window, int width, int height)
+		{
+			glViewport(0, 0, width, height);
+		}
+	);
+}
+
+Window::~Window()
+{
+	glfwDestroyWindow(handle);
+}
+
+void Window::Display()
+{
+	glfwSwapBuffers(handle);
+}

src/Window.hpp

@@ -0,0 +1,19 @@
+#pragma once 
+
+#include <cstdint>
+#include <string>
+#include <GLFW/glfw3.h>
+
+class Window
+{
+public:
+	Window(uint32_t width, uint32_t height, const std::string& title);
+	~Window();
+
+	inline bool ShouldClose() { return glfwWindowShouldClose(handle); }
+	inline void MakeContextCurrent() { glfwMakeContextCurrent(handle); }
+	void Display();
+
+private:
+	GLFWwindow* handle;
+};

src/main.cpp

@@ -1,7 +1,22 @@
 #include <iostream>
+#include "Application.hpp"
 
 int main(int argc, char** argv)
 {
-	std::cout << "Hello, World!" << std::endl;
+	glfwInit();
+
+	Application* app;
+	try
+	{
+		app = new Application();
+	}
+	catch (const std::runtime_error& err)
+	{
+		std::cerr << err.what() << std::endl;
+		return -1;
+	}
+
+	app->Launch();
+
 	return 0;
 }

vendor/glad/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required (VERSION 3.8)
+
+add_library(glad STATIC
+	"src/glad.c"
+)
+
+target_include_directories(glad PUBLIC 
+	"include"
+)

vendor/glad/include/KHR/khrplatform.h

@@ -0,0 +1,311 @@
+#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
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#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 KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+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_ */

vendor/glfw

@@ -0,0 +1 @@
+Subproject commit 97da62a027794d9ff0f4512268cb9a73a8fb5073