Cleanup into master

Makefile

@@ -1,3 +1,8 @@
+# Master Makefile for TSGL
+
+# *****************************************************
+# Variables to control Makefile operation
+
 AR=ar
 CC=g++
 RM=rm -f
@@ -6,31 +11,41 @@ PREFIX=/usr/local
 
 SRC_PATH=src/TSGL/
 TESTS_PATH=src/tests/
+EXAMPLES_PATH=src/examples/
 OBJ_PATH=build/
 VPATH=SRC_PATH:TESTS_PATH:OBJ_PATH
 
 HEADERS  := $(wildcard src/TSGL/*.h)
 SOURCES  := $(wildcard src/TSGL/*.cpp)
-TESTS    := $(wildcard src/tests/*.cpp)
 OBJS     := $(patsubst src/TSGL/%.cpp,build/TSGL/%.o,${SOURCES})
-TESTOBJS := $(patsubst src/tests/%.cpp,build/tests/%.o,${TESTS})
 NOWARN   := -Wno-unused-parameter -Wno-unused-function -Wno-narrowing
 UNAME    := $(shell uname)
 
 ifeq ($(UNAME), Linux)
 	OS_LFLAGS := -lpthread
 	OS_LDIRS := -L/opt/AMDAPP/lib/x86_64/
 	OS_EXTRA_LIB := -L/usr/lib
-	OS_GLFW := glfw
 	OS_GL := -lGL
+	OS_OMP := -fopenmp -lomp
+	OS_COMPILER := -std=c++0x
+endif
+
+ifeq ($(UNAME), CYGWIN_NT-10.0)
+	OS_LFLAGS := -lpthread
+	OS_LDIRS := -L/opt/AMDAPP/lib/x86_64/
+	OS_EXTRA_LIB := -L/usr/lib
+	OS_GL := -lGL
+	OS_OMP := -lgomp -fopenmp
+	OS_COMPILER := -std=gnu++11
 endif
 
 ifeq ($(UNAME), Darwin)
 	OS_LFLAGS := -framework Cocoa -framework OpenGl -framework IOKit -framework Corevideo
 	OS_LDIRS :=
-	OS_EXTRA_LIB := 
-	OS_GLFW := glfw
+	OS_EXTRA_LIB :=
 	OS_GL :=
+	OS_OMP := -fopenmp -lomp
+	OS_COMPILER := -std=c++0x
 endif
 
 CXXFLAGS=-O3 -g3 -ggdb3 \
@@ -45,11 +60,11 @@ CXXFLAGS=-O3 -g3 -ggdb3 \
 	-I/opt/AMDAPP/include/ \
 	-I/usr/include/c++/4.6/ \
 	-I/usr/include/c++/4.6/x86_64-linux-gnu/ \
-	-I/usr/lib/gcc/x86_64-linux-gnu/4.6/include/ \
+	-I/usr/lib/gcc/x86_64-linux-gnu/9/include/ \
 	-I/usr/include/freetype2  \
 	-I/usr/include/freetype2/freetype  \
 	-I./ \
-  -std=c++0x -fopenmp \
+  $(OS_COMPILER) -fopenmp \
   ${NOWARN} -fpermissive
   # -pedantic-errors
 
@@ -58,108 +73,114 @@ LFLAGS=-Llib/ \
 	${OS_EXTRA_LIB} \
 	-L/usr/X11/lib/ \
 	${OS_LDIRS} \
-	-ltsgl -lfreetype -lGLEW -l${OS_GLFW} \
-	-lX11 ${OS_GL} -lXrandr -Xpreprocessor -fopenmp -lomp -I"$(brew --prefix libomp)/include" \
+	-ltsgl -lfreetype -lGLEW -lglfw \
+	-lX11 ${OS_GL} -lXrandr -Xpreprocessor $(OS_OMP) -I"$(brew --prefix libomp)/include" \
 	${OS_LFLAGS} 
 
 DEPFLAGS=-MMD -MP
 
-BINARIES= \
-  bin/test_specs \
-	bin/testAlphaRectangle \
-	bin/testArrows \
-	bin/testAura \
-	bin/testBallroom \
-	bin/testBlurImage \
-	bin/testCalcPi \
-	bin/testColorPoints \
-	bin/testColorWheel \
-	bin/testConcavePolygon \
-	bin/testConstructors \
-	bin/testConway \
-	bin/testCosineIntegral \
-	bin/testDumbSort \
-	bin/testFireworks \
-	bin/testForestFire \
-	bin/testFunction \
-	bin/testGetPixels \
-	bin/testGradientWheel \
-	bin/testGraydient \
-	bin/testGreyscale \
-	bin/testHighData \
-	bin/testImage \
-	bin/testImageCart \
-	bin/testInverter \
-	bin/testLangton \
-	bin/testLineChain \
-	bin/testLineFan \
-	bin/testMandelbrot \
-	bin/testMouse \
-	bin/testNewtonPendulum \
-	bin/testPhilosophers \
-	bin/testProducerConsumer \
-	bin/testPong \
-	bin/testProgressBar \
-	bin/testProjectiles \
-	bin/testReaderWriter \
-	bin/testRotation \
-	bin/testScreenshot \
-	bin/testSeaUrchin \
-	bin/testSmartSort \
-	bin/testSpectrogram \
-	bin/testSpectrum \
-	bin/testStar \
-	bin/testText \
-	bin/testTextCart \
-	bin/testTextTwo \
-	bin/testUnits \
-	bin/testVoronoi \
+TESTFLAGS = -lsrc/TSGL/
+
+# ****************************************************
+# Targets needed to bring all files up to date
 
 #Use make tsgl to make only the library files
-all: dif tsgl tests docs tutorial
+all: dif tsgl docs tutorial
 
 debug: dif tsgl tests
 
 dif: build/build
 
 #This may change (for the Mac installer)!
+#tsgl
+ifeq ($(UNAME), Linux)
 tsgl: lib/libtsgl.a lib/libtsgl.so
+endif
+ifeq ($(UNAME), CYGWIN_NT-10.0)
+tsgl: lib/libtsgl.a lib/libtsgl.dll
+endif
+ifeq ($(UNAME), Darwin)
+tsgl: lib/libtsgl.a lib/libtsgl.so
+endif
 
-tests: ${BINARIES}
+# must run 'make' before 'make tests' and 'make examples'
+tests: $(TESTS_PATH) lib/libtsgl.a
+	$(MAKE) -C $<
+	@touch build/build
+
+examples: $(EXAMPLES_PATH) lib/libtsgl.a
+	$(MAKE) -C $<
+	@touch build/build
 
 docs: docs/html/index.html
 
 tutorial: tutorial/docs/html/index.html
 
-cleanall: clean cleandocs
+cleanall: clean cleantests cleanexamples cleandocs
 
 clean:
 	$(RM) -r bin/* build/* lib/* tutorial/docs/html/* *~ *# *.tmp
+	$(MAKE) cleantests
+	$(MAKE) cleanexamples
+
+cleantests:
+	(cd $(TESTS_PATH) && $(MAKE) clean)
+
+cleanexamples:
+	(cd $(EXAMPLES_PATH) && $(MAKE) clean)
 
 cleandocs:
 	$(RM) -r docs/html/*
 
 # -include build/*.d
 
+#install
+ifeq ($(UNAME), Linux)
 install:
 	test -d $(PREFIX) || mkdir $(PREFIX)
 	test -d $(PREFIX)/lib || mkdir $(PREFIX)
 	test -d $(PREFIX)/include || mkdir $(PREFIX)
 	install -m 0644 lib/libtsgl.a $(PREFIX)/lib
 	install -m 0755 lib/libtsgl.so $(PREFIX)/lib
 	cp -r src/TSGL $(PREFIX)/include
+endif
+ifeq ($(UNAME), CYGWIN_NT-10.0)
+install:
+	test -d $(PREFIX) || mkdir $(PREFIX)
+	test -d $(PREFIX)/lib || mkdir $(PREFIX)
+	test -d $(PREFIX)/include || mkdir $(PREFIX)
+	install -m 0644 lib/libtsgl.a $(PREFIX)/lib
+	install -m 0755 lib/libtsgl.dll $(PREFIX)/lib
+	cp -r src/TSGL $(PREFIX)/include
+endif
+ifeq ($(UNAME), Darwin)
+install:
+	test -d $(PREFIX) || mkdir $(PREFIX)
+	test -d $(PREFIX)/lib || mkdir $(PREFIX)
+	test -d $(PREFIX)/include || mkdir $(PREFIX)
+	install -m 0644 lib/libtsgl.a $(PREFIX)/lib
+	install -m 0755 lib/libtsgl.so $(PREFIX)/lib
+	cp -r src/TSGL $(PREFIX)/include
+	cp -r stb $(PREFIX)/include
+endif
 
 build/build: ${HEADERS} ${SOURCES} ${TESTS}
 	@echo 'Files that changed:'
 	@echo $(patsubst src/%,%,$?)
 
+#lib/libtsgl.*
 ifeq ($(UNAME), Linux)
 lib/libtsgl.so: ${OBJS}
 	@echo 'Building $(patsubst lib/%,%,$@)'
 	$(CC) -shared -o $@ $?
 	@touch build/build
 endif
-
+ifeq ($(UNAME), CYGWIN_NT-10.0)
+lib/libtsgl.dll: ${OBJS}
+	@echo 'Building $(patsubst lib/%,%,$@)'
+	$(CC) -shared -o $@ $? $(LFLAGS)
+	@touch build/build
+endif
 ifeq ($(UNAME), Darwin)
 lib/libtsgl.so: ${OBJS}
 	@echo 'Building $(pathsubst lib/%,%,$@)'
@@ -173,44 +194,6 @@ lib/libtsgl.a: ${OBJS}
 	$(AR) -r $@ $?
 	@touch build/build
 
-#List additional dependencies for test binaries
-bin/testConway: build/tests/Conway/LifeFarm.o
-bin/testFireworks: build/tests/Fireworks/Arc.o \
-		   build/tests/Fireworks/Dot.o \
-		   build/tests/Fireworks/Firework.o
-bin/testInverter: build/tests/ImageInverter/ImageInverter.o
-bin/testLangton: build/tests/Langton/AntFarm.o build/tests/Langton/LangtonAnt.o
-bin/testMandelbrot: build/tests/Mandelbrot/Mandelbrot.o \
-	build/tests/Mandelbrot/GradientMandelbrot.o \
-	build/tests/Mandelbrot/Buddhabrot.o \
-	build/TSGL/VisualTaskQueue.o \
-	build/tests/Mandelbrot/Julia.o \
-	build/tests/Mandelbrot/Nova.o
-bin/testPhilosophers: build/tests/DiningPhilosophers/Philosopher.o \
-	build/tests/DiningPhilosophers/Table.o
-bin/testPong: build/tests/Pong/Pong.o build/tests/Pong/Paddle.o build/tests/Pong/Ball.o
-bin/testProducerConsumer: build/tests/ProducerConsumer/Producer.o \
-	build/tests/ProducerConsumer/Consumer.o \
-	build/tests/ProducerConsumer/Thread.o \
-	build/tests/ProducerConsumer/PCThread.o
-bin/testReaderWriter: build/tests/ReaderWriter/FLock.o \
-	build/tests/ReaderWriter/Lock.o \
-	build/tests/ReaderWriter/Reader.o \
-	build/tests/ReaderWriter/RLock.o \
-	build/tests/ReaderWriter/RWThread.o \
-	build/tests/ReaderWriter/Thread.o \
-	build/tests/ReaderWriter/WLock.o \
-	build/tests/ReaderWriter/Writer.o
-bin/testSeaUrchin: build/tests/SeaUrchin/SeaUrchin.o
-bin/testVoronoi: build/tests/Voronoi/Voronoi.o build/tests/Voronoi/ShadedVoronoi.o
-
-#General compilation recipes for test binaries (appended to earlier dependencies)
-bin/test%: build/tests/test%.o lib/libtsgl.a
-	mkdir -p bin
-	@echo 'Building $(patsubst bin/%,%,$@)'
-	$(CC) $^ -o $@ $(LFLAGS)
-	@touch build/build
-
 build/%.o: src/%.cpp
 	@echo ""
 	@tput setaf 3;
@@ -221,7 +204,6 @@ build/%.o: src/%.cpp
 	$(CC) -c -fpic $(CXXFLAGS) $(DEPFLAGS) -o "$@" "$<"
 
 
-
 #Doxygen stuff
 docs/html/index.html: ${HEADERS} doxyfile
 	@echo ""
@@ -241,5 +223,5 @@ tutorial/docs/html/index.html: ${HEADERS} tutDoxyFile
 	mkdir -p tutorial/docs
 	doxygen tutDoxyFile
 
-.PHONY: all debug clean tsgl tests docs tutorial dif
+.PHONY: all debug clean tsgl docs tutorial dif
 .SECONDARY: ${OBJS} ${TESTOBJS} $(OBJS:%.o=%.d)

assets/shaders/shape.fs

@@ -0,0 +1,9 @@
+#version 330 core
+out vec4 FragColor;
+
+in vec4 color;
+
+void main()
+{
+	FragColor = color;
+}

assets/shaders/shape.vs

@@ -0,0 +1,15 @@
+#version 330 core
+layout (location = 0) in vec3 aPos;
+layout (location = 1) in vec4 aColor;
+
+out vec4 color;
+
+uniform mat4 projection;
+uniform mat4 view;
+uniform mat4 model;
+
+void main()
+{
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
+	color = aColor;
+}

assets/shaders/text.fs

@@ -0,0 +1,12 @@
+#version 330 core
+in vec2 TexCoords;
+out vec4 FragColor;
+
+uniform sampler2D text;
+uniform vec4 textColor;
+
+void main()
+{    
+    vec4 sampled = vec4(1.0, 1.0, 1.0, texture(text, TexCoords).r);
+    FragColor = textColor * sampled;
+}

assets/shaders/text.vs

@@ -0,0 +1,15 @@
+#version 330 core
+layout (location = 0) in vec3 aPos;
+layout (location = 1) in vec2 aTexCoord;
+
+out vec2 TexCoords;
+
+uniform mat4 projection;
+uniform mat4 view;
+uniform mat4 model;
+
+void main()
+{
+    gl_Position = projection * view * model * vec4(aPos, 1.0);
+    TexCoords = vec2(aTexCoord.x, aTexCoord.y);
+}

assets/shaders/texture_simple.fs

@@ -0,0 +1,11 @@
+#version 330 core
+out vec4 FragColor;
+
+in vec2 TexCoords;
+
+uniform sampler2D texture1;
+
+void main()
+{
+	FragColor = texture(texture1, TexCoords);
+}

assets/shaders/texture_simple.vs

@@ -0,0 +1,15 @@
+#version 330 core
+layout (location = 0) in vec3 aPos;
+layout (location = 1) in vec2 aTexCoord;
+
+out vec2 TexCoords;
+
+uniform mat4 projection;
+uniform mat4 view;
+uniform mat4 model;
+
+void main()
+{
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
+	TexCoords = vec2(aTexCoord.x, aTexCoord.y);
+}