Have the submodules working correctly.

.gitmodules

@@ -9,8 +9,4 @@
 	url = https://github.com/recp/cglm
 [submodule "lib/glfw"]
 	path = lib/glfw
-	url = https://github.com/glfw/glfw
+	url = https://github.com/glfw/glfw
-[submodule "lib/glad2"]
-	path = lib/glad2
-	url = https://github.com/Dav1dde/glad
-	branch = glad2

client/CMakeLists.txt

@@ -3,4 +3,4 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-add_subdirectory(glfw)
+add_subdirectory(glfwclient)

client/glfwclient/CMakeLists.txt

@@ -5,6 +5,10 @@
 
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
 file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
+add_executable(${PROJECT_NAME} ${SOURCES})
 
-target_link_libraries(${PROJECT_NAME} src glfw glad_gl_core_33)
+target_link_libraries(${PROJECT_NAME} 
+  game
+  glfw
+  glad
+)

client/glfwclient/glfwclient.c

@@ -3,12 +3,17 @@
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
-#include "glwfwplatform.h"
+#include "glfwclient.h"
 
-game_t *GAME_STATE;
+static game_t *GAME_STATE;
-GLFWwindow *window = NULL;
+static GLFWwindow *window = NULL;
 
 int32_t main() {
+  double time, newTime;
+  game_t *game;
+  input_t *input;
+  float fDelta;
+
   // Attempt to init GLFW
   if(!glfwInit()) return 1;
 
@@ -23,23 +28,23 @@ int32_t main() {
     glfwTerminate();
     return 1;
   }
-
+  
   // Load GLAD
   glfwMakeContextCurrent(window);
   glfwSwapInterval(0);
-  gladLoadGL((GLADloadfunc)glfwGetProcAddress);
+  gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
-  // gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
 
   // Setup window listeners
   glfwSetWindowSizeCallback(window, &glfwOnResize);
   glfwSetKeyCallback(window, &glfwOnKey);
   glfwSetErrorCallback(&glfwOnError);
   glfwSetCursorPosCallback(window, &glfwOnCursor);
-
+  glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+  
   // Prepare the game
-  game_t *game = malloc(sizeof(game_t));
+  game = malloc(sizeof(game_t));
   GAME_STATE = game;
-  input_t *input = &game->engine.input;
+  input = &game->engine.input;
 
   printf("Game is %zu bytes.\n", sizeof(game_t));
   
@@ -47,7 +52,7 @@ int32_t main() {
   renderSetResolution(&game->engine.render,
     WINDOW_WIDTH_DEFAULT, WINDOW_HEIGHT_DEFAULT
   );
-
+  
   // Init the game
   if(gameInit(game)) {
     // Bind initial keys
@@ -69,18 +74,15 @@ int32_t main() {
     inputBind(input, INPUT_MOUSE_Y,       GLFW_PLATFORM_INPUT_MOUSE_Y);
     glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
 
-    // Update the window title.
+    time = 0;
-    glfwSetWindowTitle(window, game->engine.name);
-
-    double time = 0;
 
     // Main Render Loop 
     while(!glfwWindowShouldClose(window)) {
       glfwPollEvents();
 
       // Determine the delta.
-      double newTime = glfwGetTime();
+      newTime = glfwGetTime();
-      float fDelta = (float)(newTime - time);
+      fDelta = (float)(newTime - time);
       time = newTime;
 
       // Tick the engine.
@@ -89,9 +91,11 @@ int32_t main() {
       sleep(0);//Fixes some weird high CPU bug, not actually necessary.
     }
 
+    
     // Game has finished running, cleanup.
     gameDispose(game);
   }
+
   free(game);
   
   // Terminate the GLFW context.
@@ -110,9 +114,9 @@ void glfwOnKey(GLFWwindow *window,
 ) {
   input_t *input = &GAME_STATE->engine.input;
   if(action == GLFW_PRESS) {
-    input->buffer[glfwGetInputSourceForKey(key)] = 1;
+    inputStateSet(input, glfwGetInputSourceForKey(key), 1.0f);
   } else if(action == GLFW_RELEASE) {
-    input->buffer[glfwGetInputSourceForKey(key)] = 0;
+    inputStateSet(input, glfwGetInputSourceForKey(key), 0.0f);
   }
 }
 
@@ -122,11 +126,10 @@ void glfwOnError(int error, const char* description) {
 
 void glfwOnCursor(GLFWwindow *window, double x, double y) {
   input_t *input = &GAME_STATE->engine.input;
-  input->buffer[GLFW_PLATFORM_INPUT_MOUSE_X] = (float)x;
+  inputStateSet(input, GLFW_PLATFORM_INPUT_MOUSE_X, (float)x);
-  input->buffer[GLFW_PLATFORM_INPUT_MOUSE_Y] = (float)y;
+  inputStateSet(input, GLFW_PLATFORM_INPUT_MOUSE_Y, (float)y);
 }
 
-
 inputsource_t glfwGetInputSourceForKey(int32_t key) {
   return (inputsource_t)((
     key <= GLFW_KEY_GRAVE_ACCENT ? key - GLFW_KEY_SPACE :

client/glfwclient/glfwclient.h

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include <glad/gl.h>
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #include <libs.h>
 #include <display/render.h>

lib/CMakeLists.txt

@@ -3,16 +3,14 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-#add_subdirectory(Unity)
+add_subdirectory(Unity)
 add_subdirectory(cglm)
 add_subdirectory(glfw)
 add_subdirectory(duktape)
+add_subdirectory(glad)
+
 
 # STB
 file(GLOB_RECURSE STB_SOURCES stb/*.h)
 add_library(stb INTERFACE)
-target_include_directories(stb INTERFACE stb)
+target_include_directories(stb INTERFACE stb)
-
-# GLAD
-add_subdirectory(glad2/cmake)
-glad_add_library(glad_gl_core_33 SHARED API gl:core=3.3)

lib/glad/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.11)
+project(glad)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+add_library(${PROJECT_NAME}
+  src/glad.c
+)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)

lib/glad/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_ */

src/CMakeLists.txt

@@ -4,22 +4,23 @@
 # https://opensource.org/licenses/MIT
 
 # Add Sources
-file(GLOB_RECURSE SOURCES *.c)
+file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
-add_library(src STATIC ${SOURCES})
+add_library(game STATIC ${SRCS})
-target_include_directories(src PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(game PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(src PUBLIC
+target_link_libraries(game PUBLIC
+  glad
   cglm
   duktape
-  glad_gl_core_33
   stb
 )
 
+
 # Set up flags
-target_compile_definitions(src PRIVATE
+target_compile_definitions(game PRIVATE
   SETTING_PLATFORM_GLFW=1
   SETTING_PLATFORM=1
   SETTING_PLATFORM_USE_GLAD=1
-  SETTING_ASSET_PREFIX="../assets/"
+  SETTING_ASSET_PREFIX="../../../assets/"
   SETTING_GAME_NAME="DawnGame"
   SETTING_GAME_POKER=1
   SETTING_GAME_DAWN=2

src/input/input.c

@@ -19,7 +19,7 @@ void inputInit(input_t *input) {
   input->previous = input->inputsB;
 
   // Create the buffer, zero all the values out.
-  memset(&input->buffer, 0, sizeof(inputval_t)*INPUT_SOURCE_COUNT);
+  memset(input->buffer, 0, sizeof(inputval_t)*INPUT_SOURCE_COUNT);
 }
 
 void inputUpdate(input_t *input) {
@@ -66,6 +66,10 @@ void inputUnbind(input_t *input, inputbind_t bind, inputsource_t source) {
   listRemove(input->bindMap[bind], (void *)source);
 }
 
+void inputStateSet(input_t *input, inputsource_t source, float value) {
+  input->buffer[source] = value;
+}
+
 bool inputIsDown(input_t *input, inputbind_t binding) {
   return input->current[binding] != 0;
 }

src/input/input.h

@@ -111,6 +111,15 @@ void inputBind(input_t *input, inputbind_t bind, inputsource_t source);
  */
 void inputUnbind(input_t *input, inputbind_t bind, inputsource_t source);
 
+/**
+ * Set the state of an input.
+ * 
+ * @param input Input to set the state for.
+ * @param source Source to set.
+ * @param value Value to set.
+ */
+void inputStateSet(input_t *input, inputsource_t source, float value);
+
 /**
  * Is the current input "down", being pressed, being moved, not in a state
  * of rest.

src/libs.h

@@ -6,13 +6,12 @@
 #pragma once
 
 // Static Libs
-#include <glad/gl.h>
+#include <glad/glad.h>
 #include <duktape.h>
 #include <cglm/cglm.h>
 #include <stb_image.h>
 #include <stb_truetype.h>
 
-
 // Standard Libs
 #include <stdio.h>
 #include <stdint.h>
@@ -25,7 +24,7 @@
 #if defined(_WIN32) || defined(_WIN64)
   // Windows Fixes
   # define strtok_r strtok_s
-  # define sleep(n) Sleep(n)
+  # define sleep(n) _sleep(n)
 #else
   // Unix Fixes
   #include <unistd.h>