Merge pull request #3 from RyanVreeke/fix-tests

Fix tests

install-ubuntu.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# install-linux.sh is the installation script for TSGL on Linux.
+# install-ubuntu.sh is the installation script for TSGL on Linux Ubuntu.
 # Last updated: 06/30/26
 # 
 # -SUBJECT TO CHANGE-
@@ -241,6 +241,9 @@ sudo rm -rf /usr/lib/libtsgl.*
 #Create the following directories (Since they aren't included in github but are needed)
 mkdir -p lib bin
 
+#Make clean the library
+sudo make clean
+
 #Make the library
 make prefix=$PREFIX
 

src/TSGL/Canvas.cpp

@@ -1,4 +1,5 @@
 #include "Canvas.h"
+#include <stdlib.h>
 
 // From stb_image.h:
 // Do this:
@@ -16,7 +17,7 @@ namespace tsgl {
 
 // Shader sources
 
-static const GLchar* shapeVertexShader = 
+static const GLchar* shapeVertexShader =
   "#version 330 core\n"
   "layout (location = 0) in vec3 aPos;"
   "layout (location = 1) in vec4 aColor;"
@@ -37,7 +38,7 @@ static const GLchar* shapeFragmentShader =
 	"FragColor = color;"
   "}";
 
-static const GLchar* textVertexShader = 
+static const GLchar* textVertexShader =
   "#version 330 core\n"
   "layout (location = 0) in vec3 aPos;"
   "layout (location = 1) in vec2 aTexCoord;"
@@ -62,7 +63,7 @@ static const GLchar* textFragmentShader =
   "FragColor = textColor * sampled;"
   "}";
 
-static const GLchar* textureVertexShader = 
+static const GLchar* textureVertexShader =
   "#version 330 core\n"
   "layout (location = 0) in vec3 aPos;"
   "layout (location = 1) in vec2 aTexCoord;"
@@ -75,7 +76,7 @@ static const GLchar* textureVertexShader =
 	"TexCoords = vec2(aTexCoord.x, aTexCoord.y);"
   "}";
 
-static const GLchar* textureFragmentShader = 
+static const GLchar* textureFragmentShader =
   "#version 330 core\n"
   "out vec4 FragColor;"
   "in vec2 TexCoords;"
@@ -322,7 +323,7 @@ void Canvas::draw()
           screenShot();
           captureScreen = false;
         }
-      
+
         // Update Screen
         glfwSwapBuffers(window);
 
@@ -643,7 +644,7 @@ void Canvas::initGlew() {
 
     textShader = new Shader(textVertexShader, textFragmentShader);
 
-    shapeShader = new Shader(shapeVertexShader, shapeFragmentShader); 
+    shapeShader = new Shader(shapeVertexShader, shapeFragmentShader);
 
     textureShader = new Shader(textureVertexShader, textureFragmentShader);
 
@@ -739,7 +740,7 @@ void Canvas::initWindow() {
       screenBuffer[i] = 0;
     }
     screenBufferMutex.unlock();
-    
+
     // Get info of GPU and supported OpenGL version
     // printf("Renderer: %s\n", glGetString(GL_RENDERER));
     // printf("OpenGL version supported %s\n", glGetString(GL_VERSION));
@@ -789,8 +790,11 @@ void Canvas::pauseDrawing() {
   * \details The function automatically terminates after num_frames cycles have completed.
   *   \param num_frames The number of frames to dump screenshots for.
   */
-void Canvas::recordForNumFrames(unsigned int num_frames) {
+void Canvas::recordForNumFrames(unsigned int num_frames, const std::string& newCapturePrefix) {
     toRecord = num_frames;
+    if(newCapturePrefix != "") {
+      capturePrefix = newCapturePrefix;
+    }
 }
 
  /*!
@@ -945,8 +949,9 @@ void Canvas::run(void (*myFunction)(Canvas&, int, char**), int argc, char* argv[
 }
 
 void Canvas::screenShot() {
-    char filename[25];
-    sprintf(filename, "Image%06d.png", frameCounter);  // TODO: Make this save somewhere not in root
+    char sufix[20];
+    sprintf(sufix, "%06d.png", frameCounter);
+    std::string filename = capturePrefix + sufix;
 
     screenBufferMutex.lock();
     // loader.saveImageToFile(filename, screenBuffer, framebufferWidth, winHeight);
@@ -959,7 +964,7 @@ void Canvas::screenShot() {
             screenBuffer[s2] = tmp;
         }
     }
-    stbi_write_png(filename, framebufferWidth, framebufferHeight, 3, screenBuffer, 0);
+    stbi_write_png(filename.c_str(), framebufferWidth, framebufferHeight, 3, screenBuffer, 0);
     screenBufferMutex.unlock();
 }
 
@@ -1099,8 +1104,11 @@ void Canvas::stopRecording() {
   * \details Images are saved as ImageXXXXXX.png, where XXXXXX is the current frame number.
   * \bug Multiple calls to this function in rapid succession render the FPS counter inaccurate.
   */
-void Canvas::takeScreenShot() {
+void Canvas::takeScreenShot(const std::string& newCapturePrefix) {
     if (toRecord == 0) toRecord = 1;
+    if(newCapturePrefix != "") {
+      capturePrefix = newCapturePrefix;
+    }
 }
 
 void Canvas::selectShaders(unsigned int sType) {
@@ -1140,7 +1148,7 @@ void Canvas::selectShaders(unsigned int sType) {
         glVertexAttribPointer(texAttrib, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (void*)(3 * sizeof(float)));
         program->use();
     }
- 
+
     // Recompute the camera matrices
     uniModel = glGetUniformLocation(program->ID, "model");
     uniView = glGetUniformLocation(program->ID, "view");

src/TSGL/Canvas.h

@@ -102,7 +102,8 @@ class Canvas {
     GLint           framebufferHeight;
     int             frameCounter;                                       // Counter for the number of frames that have elapsed in the current session (for animations)
     bool            isFinished;                                         // If the rendering is done, which will signal the window to close
-    bool            keyDown;                                            // If a key is being pressed. Prevents an action from happening twice
+    bool            keyDown;
+    std::string     capturePrefix = "Image";                                          // If a key is being pressed. Prevents an action from happening twice
     int             monitorX, monitorY;                                 // Monitor position for upper left corner
     double          mouseX, mouseY;                                     // Location of the mouse once HandleIO() has been called
     Background *    myBackground;                                       // Pointer to the Background drawn each frame
@@ -150,10 +151,10 @@ class Canvas {
     static void  errorCallback(int error, const char* string);          // Display where an error is coming from
     void         glDestroy();                                           // Destroys the GL and GLFW things that are specific for this canvas
     void         init(int xx,int yy,int ww,int hh,
-                   std::string title, 
-                   ColorFloat backgroundColor, Background * background, 
+                   std::string title,
+                   ColorFloat backgroundColor, Background * background,
                    double timerLength);                                 // Method for initializing the canvas
-    void         initBackground(Background * background, 
+    void         initBackground(Background * background,
                                 ColorFloat bgcolor);                    // Initializes myBackground
     void         initGl();                                              // Initializes the GL things specific to the Canvas
     void         initGlew();                                            // Initialized the GLEW things specific to the Canvas
@@ -231,7 +232,7 @@ class Canvas {
 
     void pauseDrawing();
 
-    void recordForNumFrames(unsigned int num_frames);
+    void recordForNumFrames(unsigned int num_frames, const std::string& newCaputurePrefix = "");
 
     void remove(Drawable * shapePtr);
 
@@ -246,7 +247,7 @@ class Canvas {
     virtual void run(void (*myFunction)(Canvas&, unsigned), unsigned u);
 
     virtual void run(void (*myFunction)(Canvas&, int, int), int i1, int i2);
-    
+
     virtual void run(void (*myFunction)(Canvas&, int, int, int), int i1, int i2, int i3);
 
     virtual void run(void (*myFunction)(Canvas&, unsigned, unsigned), unsigned u1, unsigned u2);
@@ -279,7 +280,7 @@ class Canvas {
 
     void stopRecording();
 
-    void takeScreenShot();
+    void takeScreenShot(const std::string& newCapturePrefix = "");
 
     int wait();
 };

src/tests/test2Dvs3D/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/test3DRotation/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testAlphaRectangle/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testArrows/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testAura/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testBackground/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testBlurImage/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testCalcPi/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testCamera/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testCircle/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testColorWheel/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testConcavePolygon/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************

src/tests/testCone/Makefile

@@ -43,11 +43,11 @@ BREW := -lomp -I"$(brew --prefix libomp)/include"
 endif
 
 CXXFLAGS = -O3 -g3 -ggdb3 \
-	-I/usr/include/TSGL \
-	-I/usr/include/freetype2 \
+	-I$(TSGL_HOME)/include/TSGL \
+	-I$(TSGL_HOME)/include/freetype2 \
 
 LFLAGS = -g -ltsgl -lfreetype -lGLEW -lglfw $(GL_FLAGS) -fopenmp  \
-			$(BREW) -L/usr/lib \
+			$(BREW) -L$(TSGL_HOME)/lib \
 
 
 # ****************************************************