Simplify subprojects

configuration/.vscode/c_cpp_properties.json

@@ -7,7 +7,7 @@
                 "${workspaceFolder}/subprojects/animationwindow/include/**",
                 "${workspaceFolder}/subprojects/std_lib_facilities/**",
                 "${workspaceFolder}/subprojects/sdl2_image_windows/include/**",
-		        "${workspaceFolder}/subprojects/sdl2_mixer_windows/include/**",
+                "${workspaceFolder}/subprojects/sdl2_mixer_windows/include/**",
                 "${workspaceFolder}/subprojects/sdl2_windows/include/**"
             ],
             "defines": [
@@ -17,16 +17,16 @@
             ],
             "cStandard": "c17",
             "cppStandard": "c++23",
-            "compilerPath": "C:\\TDT4102-mingw64\\bin\\gcc",
-            "compileCommands": "${workspaceFolder}/build/compile_commands.json",
+            "compilerPath": "C:\\TDT4102-mingw64\\bin\\g++",
+            "compileCommands": "build/compile_commands.json",
             "intelliSenseMode": "windows-gcc-x64"
         },
         {
             "name": "Mac",
             "includePath": [
                 "${workspaceFolder}/**",
                 "${workspaceFolder}/subprojects/animationwindow/include/**",
-                "${workspaceFolder}/subprojects/std_lib_facilities/**"
+                "${workspaceFolder}/subprojects/std_lib_facilites/**"
             ],
             "defines": [
                 "_DEBUG",

dependencies/subprojects/animationwindow/include/Image.h

@@ -9,7 +9,7 @@
 namespace TDT4102 {
 
     struct ImageCache;
-  
+
     enum class FlipImage {
         NONE, HORIZONTAL, VERTICAL
     };
@@ -78,10 +78,13 @@ namespace TDT4102 {
 
         void load(SDL_Renderer* renderer);
 
+<<<<<<< HEAD
+=======
         void draw(SDL_Renderer* renderer, TDT4102::Point location,
                   int imageWidth = 0, int imageHeight = 0, 
                   double angleDegrees = 0, TDT4102::Point rotationOrigin = {0, 0});
 
+>>>>>>> main
         /// Does conditional texture cleanup.
         /// Unsets the associated texture pointer
         void cleanupTexture();
@@ -94,10 +97,16 @@ namespace TDT4102 {
         void reset();
 
         static ImageCache cache;
+<<<<<<< HEAD
+
+        void draw(SDL_Renderer* renderer, TDT4102::Point location, int imageWidth = 0, int imageHeight = 0, double angleDegrees = 0, TDT4102::Point rotationOrigin = {0, 0});
+        void drawRegion(SDL_Renderer* renderer, TDT4102::Point location, int imageWidth = 0, int imageHeight = 0, TDT4102::Point sourceTopLeftPoint = {0, 0},  int sourceWidth = 0, int sourceHeight = 0, SDL_RendererFlip flip = SDL_FLIP_NONE);
+=======
 
         void drawRegion(SDL_Renderer* renderer, TDT4102::Point location, 
                         int imageWidth = 0, int imageHeight = 0, 
                         TDT4102::Point sourceTopLeftPoint = {0, 0},  
                         int sourceWidth = 0, int sourceHeight = 0, SDL_RendererFlip flip = SDL_FLIP_NONE);
+>>>>>>> main
     };
 }

dependencies/subprojects/animationwindow/src/Image.cpp

@@ -142,6 +142,7 @@ void TDT4102::Image::setPixels(const std::vector<TDT4102::Color> &pixels, int wi
     state = ImageState::FromBuffer;
 }
 
+
 void TDT4102::Image::draw(SDL_Renderer *renderer, TDT4102::Point location, int imageWidth, int imageHeight, double angleDegrees, TDT4102::Point rotationOrigin) {
     // We need a reference to SDL_Renderer to perform the loading operation
     // This requires loading it once it gets used