add a user_data parameter for render loop callback functions

Makefile

@@ -1,24 +1,20 @@
 
-SHELL := /bin/sh
+SHELL = /bin/sh
-CXX := g++
+CXX = g++
-# NOTE: have to set -O or -O1 here to get warnings for uninitialized variables
+CXXFLAGS = -std=c++11 -g -ggdb3 -Wall \
-CXXFLAGS := -std=c++11 -g -ggdb3 -Wall -O -Wall -Wuninitialized \
 	-Iinclude \
 	-I/usr/include/SDL2 \
 	-Iext/stb_libs \
 	-Iext/tinygltf
-EXAMPLEDIR := examples
+EXAMPLEDIR = examples
-OBJDIR := build
+OBJDIR = build
-SRCDIR := src
+SRCDIR = src
-LIBNAME := libTangerine.a
+LIBNAME = libTangerine.a
-
+
-# NOTE: optional library settings
+SOURCES = $(wildcard $(SRCDIR)/*.cpp)
-CXXFLAGS += -DTANGERINE_GL_DEBUG_QUIET
+OBJECTS = $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(SOURCES))
-
+NDBG_SOURCES = $(wildcard $(SRCDIR)/*.cc)
-SOURCES := $(wildcard $(SRCDIR)/*.cpp)
+NDBG_OBJS = $(patsubst $(SRCDIR)/%.cc, $(OBJDIR)/%.o, $(NDBG_SOURCES))
-OBJECTS := $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(SOURCES))
-NDBG_SOURCES := $(wildcard $(SRCDIR)/*.cc)
-NDBG_OBJS := $(patsubst $(SRCDIR)/%.cc, $(OBJDIR)/%.o, $(NDBG_SOURCES))
 
 
 all: mkdirs $(LIBNAME)

examples/Makefile

@@ -34,7 +34,7 @@ BINDIR = bin
 #.PHONY: clean
 
 all: mkdirs
-	$(CXX) $(CXXFLAGS) main.cpp -o $(BINDIR)/testing $(LIB) $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) main.cpp -o $(BINDIR)/testing $(LDFLAGS) $(LIB)
 
 mkdirs:
 	@mkdir -p $(BINDIR) $(OBJDIR)

include/GLDebug.h

@@ -92,11 +92,6 @@ openglDebugCallback(GLenum source,
 	if (id == 131185)
 		return;
 
-#ifdef TANGERINE_GL_DEBUG_QUIET
-	if (type != GL_DEBUG_TYPE_ERROR)
-		return;
-#endif
-
 	std::cout << "message id: " << id << ", "
 		<< ((type == GL_DEBUG_TYPE_ERROR) ? "Error" : "Debug")
 		<< (type == GL_DEBUG_TYPE_ERROR ? "** GL Error **" : "")

include/asset.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include <GL/glew.h>
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/glm.hpp>
 
 #include "types.h"

include/camera.h

@@ -1,7 +1,6 @@
 
 #pragma once
 
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/glm.hpp>
 
 #include "types.h"

include/shader.h

@@ -3,7 +3,6 @@
 
 #include <SDL2/SDL.h>
 #include <GL/glew.h>
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/glm.hpp>
 
 #include "asset.h"

include/tangerine.h

@@ -75,17 +75,11 @@
 
 #include <SDL2/SDL.h>
 
-
-// NOTE: optional compile-time defines:
-// 	TANGERINE_GL_DEBUG_QUIET  disable extra debug messages from openGL
-
-
 #include "asset.h"
 #include "camera.h"
 #include "entity.h"
 #include "dumbLog.h"
 #include "GLDebug.h"
-#include "input.h"
 #include "shader.h"
 #include "types.h"
 #include "util.h"
@@ -99,6 +93,9 @@ struct SDLHandles
 	u32 SDL_flags;
 };
 
+// TODO: node/tree structure for entities
+struct Node;
+
 struct RenderGroup
 {
 	ShaderProgram* shader;
@@ -108,10 +105,7 @@ struct RenderGroup
 	char* name;
 };
 
-// TODO: node/tree structure for entities
 #if 0
-struct Node;
-
 struct Scene
 {
 	MemoryArena* rg_arena;

include/types.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include <cstdint>
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/glm.hpp>
 
 

src/asset.cpp

@@ -2,7 +2,6 @@
 #include <cassert>
 #include <cstring>
 
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/ext/matrix_transform.hpp>
 #include "tiny_gltf.h"
 

src/camera.cpp

@@ -2,7 +2,6 @@
 #include <cassert>
 
 #include <GL/glew.h>
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 

src/entity.cpp

@@ -1,5 +1,4 @@
 
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "dumbLog.h"

src/shader.cpp

@@ -6,12 +6,12 @@
 #include <cstring>
 #include <fstream>
 
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "asset.h"
 #include "dumbLog.h"
 #include "dummy_shader.h"
+#define GL_DEBUG_IMPLEMENTATION
 #include "GLDebug.h"
 #include "shader.h"
 #include "util.h"
@@ -135,7 +135,7 @@ getFreeShader(GLContext* gl_ctx)
 ShaderProgram*
 getShaderByHash(GLContext* gl_ctx, u64 hash)
 {
-	for (u32 i = 0; i < gl_ctx->num_shaders; i++) {
+	for (u32 i; i < gl_ctx->num_shaders; i++) {
 		if (gl_ctx->shaders[i].hash == hash)
 			return &gl_ctx->shaders[i];
 	}

src/tangerine.cpp

@@ -1,14 +1,11 @@
 
 #include <cassert>
 
-#define GLM_FORCE_XYZW_ONLY
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "tangerine.h"
 #define UTIL_IMPLEMENTATION
 #include "util.h"
-#define GL_DEBUG_IMPLEMENTATION
-#include "GLDebug.h"
 
 
 // forward declarations