re-order linker flags in example Makefile

fixes a bug when compiling on debian

Makefile

@@ -1,20 +1,24 @@
 
-SHELL = /bin/sh
+SHELL := /bin/sh
-CXX = g++
+CXX := g++
-CXXFLAGS = -std=c++11 -g -ggdb3 -Wall \
+# NOTE: have to set -O or -O1 here to get warnings for uninitialized variables
+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
-
+
-SOURCES = $(wildcard $(SRCDIR)/*.cpp)
+# NOTE: optional library settings
-OBJECTS = $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(SOURCES))
+CXXFLAGS += -DTANGERINE_GL_DEBUG_QUIET
-NDBG_SOURCES = $(wildcard $(SRCDIR)/*.cc)
+
-NDBG_OBJS = $(patsubst $(SRCDIR)/%.cc, $(OBJDIR)/%.o, $(NDBG_SOURCES))
+SOURCES := $(wildcard $(SRCDIR)/*.cpp)
+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 $(LDFLAGS) $(LIB)
+	$(CXX) $(CXXFLAGS) main.cpp -o $(BINDIR)/testing $(LIB) $(LDFLAGS)
 
 mkdirs:
 	@mkdir -p $(BINDIR) $(OBJDIR)

examples/main.cpp

@@ -261,7 +261,7 @@ orbitPositionZ0(vec4* pos, float angle)
 }
 
 void
-render_cb_pre(RenderState* rs)
+render_cb_pre(RenderState* rs, void* user_data = nullptr)
 {
 	SDL_Event e;
 
@@ -332,7 +332,7 @@ main()
 			return 1;
 		}
 
-		doRenderLoop(rs, 60, render_cb_pre, nullptr);
+		doRenderLoop(rs, 60, render_cb_pre, nullptr, nullptr);
 
 		freeRenderState(rs);
 		return 0;

include/GLDebug.h

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

include/camera.h

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

include/shader.h

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

include/tangerine.h

@@ -75,11 +75,17 @@
 
 #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"
@@ -93,9 +99,6 @@ struct SDLHandles
 	u32 SDL_flags;
 };
 
-// TODO: node/tree structure for entities
-struct Node;
-
 struct RenderGroup
 {
 	ShaderProgram* shader;
@@ -105,7 +108,10 @@ struct RenderGroup
 	char* name;
 };
 
+// TODO: node/tree structure for entities
 #if 0
+struct Node;
+
 struct Scene
 {
 	MemoryArena* rg_arena;
@@ -234,7 +240,7 @@ Entity* getFreeEntity(RenderGroup* rg);
 Entity* getEntityByName(RenderGroup* rg, const char* name);
 
 // NOTE: callback function signature to use with renDoRenderLoop()
-typedef void (*frame_callback_fn) (RenderState*);
+typedef void (*frame_callback_fn) (RenderState*, void*);
 
 // NOTE: There are 2 callbacks to use here, cb_func_pre is called before
 // 	the call to renRenderFrame(), cb_fun_post is called after
@@ -243,7 +249,8 @@ typedef void (*frame_callback_fn) (RenderState*);
 void doRenderLoop(RenderState* rs,
 	uint framerate = 60,
 	frame_callback_fn cb_func_pre = nullptr,
-	frame_callback_fn cb_func_post = nullptr);
+	frame_callback_fn cb_func_post = nullptr,
+	void* user_data = nullptr);
 
 void renderFrame(RenderState* rs, const GLClearColor& clear_col);
 

include/types.h

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

src/asset.cpp

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

src/camera.cpp

@@ -2,6 +2,7 @@
 #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,4 +1,5 @@
 
+#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; i < gl_ctx->num_shaders; i++) {
+	for (u32 i = 0; i < gl_ctx->num_shaders; i++) {
 		if (gl_ctx->shaders[i].hash == hash)
 			return &gl_ctx->shaders[i];
 	}

src/tangerine.cpp

@@ -1,11 +1,14 @@
 
 #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
@@ -175,7 +178,8 @@ void
 doRenderLoop(RenderState* rs,
 	u32 framerate,
 	frame_callback_fn cb_func_pre,
-	frame_callback_fn cb_func_post)
+	frame_callback_fn cb_func_post,
+	void* user_data)
 {
 	u32 delay = (framerate > 0) ? 1 / framerate : 0;
 	u32 frameStart, frameTime;
@@ -186,7 +190,7 @@ doRenderLoop(RenderState* rs,
 		frameStart = SDL_GetTicks();
 
 		if (cb_func_pre != nullptr) {
-			cb_func_pre(rs);
+			cb_func_pre(rs, user_data);
 		} else {
 			while (SDL_PollEvent(&e)) {
 				if (e.type == SDL_QUIT ||
@@ -201,7 +205,7 @@ doRenderLoop(RenderState* rs,
 		renderFrame(rs, rs->clear_col);
 
 		if (cb_func_post != nullptr)
-			cb_func_post(rs);
+			cb_func_post(rs, user_data);
 
 		SDL_GL_SwapWindow(rs->handles.window);
 		frameTime = SDL_GetTicks() - frameStart;