Merge pull request #43 from weigert/versioned

Versioned

Author: weigert

.gitignore

@@ -1,3 +1,6 @@
 main
 imgui.ini
-*.dSYM
+*.dSYM
+.idea
+**/tmp
+tmp

Makefile

@@ -1,11 +1,11 @@
 # TinyEngine Build Recipe
 # Author: Nicholas McDonald
-# Version 1.0
+# Version 1.7
 # Tested on GNU/Linux
 
 # Install Location Configuration
-LIBPATH = /usr/local/lib
-INCPATH = /usr/local/include
+LIBPATH = $(HOME)/.local/lib
+INCPATH = $(HOME)/.local/include
 
 # Compilation Settings
 CC = g++ -std=c++17
@@ -33,18 +33,18 @@ all: setup helpers install
 .PHONY: setup
 setup:
 			@echo "Copying Core Header Files ...";
-			@if [ ! -d "$(INCPATH)" ]; then mkdir $(INCPATH); fi;
-			@if [ ! -d "$(INCPATH)/TinyEngine" ]; then mkdir $(INCPATH)/TinyEngine; fi;
-			@cp TinyEngine.h $(INCPATH)/TinyEngine/TinyEngine
-			@cp include/audio.h $(INCPATH)/TinyEngine/Audio
-			@cp include/event.h $(INCPATH)/TinyEngine/Event
-			@cp include/view.h $(INCPATH)/TinyEngine/View
-			@cp include/utility/buffer.cpp $(INCPATH)/TinyEngine/Buffer
-			@cp include/utility/instance.cpp $(INCPATH)/TinyEngine/Instance
-			@cp include/utility/model.cpp $(INCPATH)/TinyEngine/Model
-			@cp include/utility/shader.cpp $(INCPATH)/TinyEngine/Shader
-			@cp include/utility/texture.cpp $(INCPATH)/TinyEngine/Texture
-			@cp include/utility/target.cpp $(INCPATH)/TinyEngine/Target
+			@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi;
+			@if [ ! -d $(INCPATH)/TinyEngine ]; then mkdir $(INCPATH)/TinyEngine; fi;
+			@cp TinyEngine.hpp $(INCPATH)/TinyEngine/TinyEngine
+			@cp include/audio.hpp $(INCPATH)/TinyEngine/Audio
+			@cp include/event.hpp $(INCPATH)/TinyEngine/Event
+			@cp include/view.hpp $(INCPATH)/TinyEngine/View
+			@cp include/utility/buffer.hpp $(INCPATH)/TinyEngine/Buffer
+			@cp include/utility/instance.hpp $(INCPATH)/TinyEngine/Instance
+			@cp include/utility/model.hpp $(INCPATH)/TinyEngine/Model
+			@cp include/utility/shader.hpp $(INCPATH)/TinyEngine/Shader
+			@cp include/utility/texture.hpp $(INCPATH)/TinyEngine/Texture
+			@cp include/utility/target.hpp $(INCPATH)/TinyEngine/Target
 			@cp include/imgui/imgui.h $(INCPATH)/TinyEngine/imgui
 			@cp include/imgui/imgui_impl_opengl3.h $(INCPATH)/TinyEngine/imgui_impl_opengl3
 			@cp include/imgui/imgui_impl_sdl.h $(INCPATH)/TinyEngine/imgui_impl_sdl
@@ -66,7 +66,7 @@ install:
 			@echo "Generating Static Library Archive ...";
 			@ar cr tmp/libTinyEngine.a tmp/TinyEngine.o tmp/imgui.o tmp/imgui_demo.o tmp/imgui_draw.o tmp/imgui_widgets.o tmp/imgui_impl_opengl3.o tmp/imgui_impl_sdl.o
 			@echo "Placing Compiled TinyEngine Library ...";
-			@if [ ! -d "$(LIBPATH)" ]; then mkdir $(LIBPATH); fi;
+			@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi;
 			@cp tmp/libTinyEngine.a $(LIBPATH)/libTinyEngine.a
 			@rm -rf tmp
 			@echo "Done";
@@ -75,14 +75,14 @@ install:
 # TinyEngine Helpers #
 ######################
 
-HELPERS = camera color helper image object timer parse log
+HELPERS = camera color math image object timer parse log
 
 .PHONY: helpers
 helpers:
 			@echo "Copying Helper Header Files ...";
 			@if [ ! -d "$(INCPATH)" ]; then mkdir $(INCPATH); fi;
 			@if [ ! -d "$(INCPATH)/TinyEngine" ]; then mkdir $(INCPATH)/TinyEngine; fi;
-			@$(foreach var,$(HELPERS), cp include/helpers/$(var).h $(INCPATH)/TinyEngine/$(var);)
+			@$(foreach var,$(HELPERS), cp include/helpers/$(var).hpp $(INCPATH)/TinyEngine/$(var);)
 			@echo "Done";
 
 #######################
@@ -92,16 +92,30 @@ helpers:
 # Compiler / Linking Configuration
 TINYLINK = -lpthread -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lGLEW -lboost_system -lboost_filesystem
 
-EXAMPLES = 0.0_Empty 0.1_Windowless \
-1.0_Image 2.0_Heightmap \
-3.0_Automata 4.0_Julia \
-5.0_Particles 6.0_Tree \
-7.0_SDF 8.0_Raymarch \
-9.0_Scene 10.0_Audio \
-11.0_Voronoi 12.0_Diffusion 13.0_Dither \
-15.0_Compute 16.0_Gravity 17.0_ODE3D \
+EXAMPLES = \
+0.0_Empty \
+0.1_Windowless \
+1.0_Image \
+2.0_Heightmap \
+3.0_Automata \
+4.0_Julia \
+5.0_Particles \
+6.0_Tree \
+7.0_SDF \
+8.0_Raymarch \
+9.0_Scene \
+10.0_Audio \
+11.0_Voronoi \
+12.0_Diffusion \
+13.0_Dither \
+15.0_Compute \
+16.0_Gravity \
+17.0_ODE3D \
 18.0_SphereVoronoi \
-19.0_LBM2D 19.1_LBM3D 19.2_CollidingBalls \
+19.0_LBM2D \
+19.1_LBM3D \
+19.2_CollidingBalls \
+19.3_LBM3D \
 20.0_Cloth
 
 .PHONY: examples

TinyEngine.cpp

@@ -1,6 +1,6 @@
 #define TINYENGINE_NAMESPACE
 #define TINYENGINE_UTILITIES
-#include "TinyEngine.h"
+#include "TinyEngine.hpp"
 
 #include "include/audio.cpp"
 #include "include/view.cpp"

TinyEngine.h renamed to TinyEngine.hpp

@@ -1,10 +1,22 @@
+#ifndef TINYENGINE
+#define TINYENGINE
+
+/*
+* TinyEngine
+* by Nicholas McDonald
+* https://github.com/weigert/TinyEngine
+*/
+
+#define TINYENGINE_VERSION "1.7"
+
 #include <iostream>
 #include <functional>
 #include <initializer_list>
 #include <string>
 #include <csignal>
-using Handle = std::function<void()>;
-using slist = std::initializer_list<std::string>;
+#include <deque>
+#include <boost/filesystem.hpp>
+#include <sstream>
 
 #include <GL/glew.h>                                //Rendering Dependencies
 #include <SDL2/SDL.h>
@@ -14,36 +26,32 @@ using slist = std::initializer_list<std::string>;
 #include <glm/glm.hpp>
 #include "glm/gtc/matrix_transform.hpp"
 
-#include <sstream>                                  //File / Console IO
-#include <iostream>
-#include <fstream>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-
-#include <deque>
-#include <unordered_map>
-
+// Include Utility Headers
 #ifndef TINYENGINE_UTILITIES
 #define TINYENGINE_UTILITIES
 
 #include <TinyEngine/Buffer>
-#include <TinyEngine/Texture>
+#include <TinyEngine/Instance>
+#include <TinyEngine/Model>
 #include <TinyEngine/Shader>
 #include <TinyEngine/Target>
-#include <TinyEngine/Model>
-#include <TinyEngine/Instance>
+#include <TinyEngine/Texture>
 
 #endif
 
-#include <TinyEngine/timer>
+using slist = std::initializer_list<std::string>;
+using Handle = std::function<void()>;
 
+// TinyEngine Namespace / Entrypoint
 #ifndef TINYENGINE_NAMESPACE
 #define TINYENGINE_NAMESPACE
 
 #include <TinyEngine/Audio>
 #include <TinyEngine/View>
 #include <TinyEngine/Event>
 
+#include <TinyEngine/timer>
+
 namespace Tiny{
 
 static View view;           //Window and Interface  (Requires Initialization)
@@ -180,3 +188,4 @@ void loop(F function, Args&&... args){
 }
 
 #endif
+#endif