I forgot what I cahnged

durkisneer1 · Nov 13, 2023 · 994e06d · 994e06d
1 parent 2a54b42
commit 994e06d
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 78 deletions.
diff --git a/DurkGame/DurkGame.hpp b/DurkGame/DurkGame.hpp
@@ -11,7 +11,6 @@
 #include "Font.hpp"
 #include "Character.hpp"
 #include "Globals.hpp"
-#include "Surface.hpp"
 #include "RenderWindow.hpp"
 
 

diff --git a/DurkGame/DurkGame.vcxproj b/DurkGame/DurkGame.vcxproj
@@ -156,7 +156,6 @@
     <ClInclude Include="Character.hpp" />
     <ClInclude Include="Clock.hpp" />
     <ClInclude Include="RenderWindow.hpp" />
-    <ClInclude Include="Surface.hpp" />
     <ClInclude Include="DurkGame.hpp" />
     <ClInclude Include="Font.hpp" />
     <ClInclude Include="framework.h" />
@@ -171,7 +170,6 @@
     <ClCompile Include="character.cpp" />
     <ClCompile Include="clock.cpp" />
     <ClCompile Include="render_window.cpp" />
-    <ClCompile Include="surface.cpp" />
     <ClCompile Include="durk_game.cpp" />
     <ClCompile Include="font.cpp" />
     <ClCompile Include="input.cpp" />

diff --git a/DurkGame/DurkGame.vcxproj.filters b/DurkGame/DurkGame.vcxproj.filters
@@ -48,9 +48,6 @@
     <ClInclude Include="Math.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Surface.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="RenderWindow.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -83,9 +80,6 @@
     <ClCompile Include="texture.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="surface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="render_window.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/DurkGame/Font.hpp b/DurkGame/Font.hpp
@@ -4,7 +4,6 @@
 #include <SDL_ttf.h>
 #include <iostream>
 #include "Texture.hpp"
-#include "Surface.hpp"
 #include "RenderWindow.hpp"
 
 

diff --git a/DurkGame/Globals.hpp b/DurkGame/Globals.hpp
@@ -4,4 +4,4 @@
 
 
 extern const dk::math::Vector2 WIN_SIZE;
-extern const float GRAVITY;
+extern float GRAVITY;
diff --git a/DurkGame/Math.hpp b/DurkGame/Math.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cmath>
+#include <algorithm>
 
 
 namespace dk {
@@ -20,7 +21,13 @@ namespace dk {
 			Vector2 operator*(float scalar) const;
 			Vector2 operator/(float scalar) const;
 			Vector2 operator+(const Vector2& other) const;
+			Vector2 operator-(const Vector2& other) const;
 			Vector2 operator+=(const Vector2& other);
 		};
+
+		Vector2 clampVec(Vector2 vec, Vector2 min, Vector2 max);
+
+		template <class digit>
+		digit clamp(digit val, digit min, digit max);
 	}
 }
diff --git a/DurkGame/Rect.hpp b/DurkGame/Rect.hpp
@@ -2,6 +2,7 @@
 
 #include <SDL.h>
 #include "Math.hpp"
+#include "Globals.hpp"
 
 
 namespace dk {
@@ -14,6 +15,7 @@ namespace dk {
         dk::math::Vector2 getPos();
         dk::math::Vector2 getSize();
         bool collidePoint(dk::math::Vector2 pos);
+        void clamp(dk::math::Vector2 min = {}, dk::math::Vector2 max = WIN_SIZE);
 
         void setCenter(dk::math::Vector2 pos);
         void setTopLeft(dk::math::Vector2 pos);

diff --git a/DurkGame/Surface.hpp b/DurkGame/Surface.hpp
diff --git a/DurkGame/Texture.hpp b/DurkGame/Texture.hpp
@@ -5,7 +5,6 @@
 #include <iostream>
 #include "Math.hpp"
 #include "Rect.hpp"
-#include "Surface.hpp"
 #include "RenderWindow.hpp"
 
 
@@ -14,7 +13,9 @@ namespace dk {
 	public:
 		Texture() = default;
 		Texture(dk::RenderWindow& window, const char* fileDir);
-		Texture(dk::RenderWindow& window, dk::Surface& surface);
+		Texture(dk::RenderWindow& window, dk::math::Vector2 size, SDL_Color color);
+		Texture(dk::RenderWindow& window, SDL_Surface* surface);
+		Texture(dk::RenderWindow& window, SDL_Texture* texture);
 		~Texture() { if (texture) SDL_DestroyTexture(texture); }
 
 		[[nodiscard]] dk::math::Vector2 getSize() const;
@@ -25,6 +26,7 @@ namespace dk {
 		void scaleBy(float scale);
 		void blit(dk::Rect rect);
 		void blitAngle(dk::Rect rect, float angle);
+		void query();
 	private:
 		dk::RenderWindow& window;
 		SDL_Texture* texture = nullptr;

diff --git a/DurkGame/font.cpp b/DurkGame/font.cpp
@@ -13,31 +13,32 @@ namespace dk {
 	}
 
 	dk::Texture Font::render(const char* text, bool antialias, SDL_Color color, int wrapLength) {
-		dk::Surface surface;
+		SDL_Surface* surface;
 
 		if (antialias) {
 			if (wrapLength > 0) {
-				surface.set(TTF_RenderUTF8_Blended_Wrapped(font, text, color, wrapLength));
+				surface = TTF_RenderUTF8_Blended_Wrapped(font, text, color, wrapLength);
 			}
 			else {
-				surface.set(TTF_RenderUTF8_Blended(font, text, color));
+				surface = TTF_RenderUTF8_Blended(font, text, color);
 			}
 		}
 		else {
 			if (wrapLength > 0) {
-				surface.set(TTF_RenderText_Solid_Wrapped(font, text, color, wrapLength));
+				surface = TTF_RenderText_Solid_Wrapped(font, text, color, wrapLength);
 			}
 			else {
-				surface.set(TTF_RenderText_Solid(font, text, color));
+				surface = TTF_RenderText_Solid(font, text, color);
 			}
 		}
 
-		if (!surface.get()) {
+		if (surface == nullptr) {
 			std::cout << "Failed to render text: " << TTF_GetError() << std::endl;
 			exit(3);
 		}
 
 		dk::Texture texture(window, surface);
+		SDL_FreeSurface(surface);
 
 		return texture;
 	}

diff --git a/DurkGame/math.cpp b/DurkGame/math.cpp
@@ -34,10 +34,27 @@ namespace dk {
 			return { x + other.x, y + other.y };
 		}
 
+		Vector2 Vector2::operator-(const Vector2& other) const {
+			return { x - other.x, y - other.y };
+		}
+
 		Vector2 Vector2::operator+=(const Vector2& other) {
 			x += other.x;
 			y += other.y;
 			return *this;
 		}
+
+		Vector2 clampVec(Vector2 vec, Vector2 min, Vector2 max) {
+			vec.x = clamp(vec.x, min.x, max.x);
+			vec.y = clamp(vec.y, min.y, max.y);
+			return vec;
+		}
+
+		template <class digit>
+		digit clamp(digit val, digit min, digit max) {
+			if (min > max) return val;
+			val = std::min(max, std::max(min, val));
+			return val;
+		}
 	}
 }
diff --git a/DurkGame/rect.cpp b/DurkGame/rect.cpp
@@ -15,6 +15,14 @@ namespace dk {
 		return (pos.x >= x && pos.x <= x + w && pos.y >= y && pos.y <= y + h);
 	}
 
+	void Rect::clamp(dk::math::Vector2 min, dk::math::Vector2 max) {
+		if ((max.x - min.x < this->w) || max.y - min.y < this->h) {
+			return;
+		}
+		setTopLeft(clampVec(getTopLeft(), min, max));
+		setBottomRight(clampVec(getBottomRight(), min, max));
+	}
+
 	void Rect::setCenter(dk::math::Vector2 pos) {
 		x = pos.x - w / 2;
 		y = pos.y - h / 2;

diff --git a/DurkGame/surface.cpp b/DurkGame/surface.cpp
diff --git a/DurkGame/texture.cpp b/DurkGame/texture.cpp
@@ -8,14 +8,41 @@ namespace dk {
 		loadTextureFile(fileDir);
 	}
 
-	Texture::Texture(dk::RenderWindow& window, dk::Surface& surface)
+	Texture::Texture(dk::RenderWindow& window, dk::math::Vector2 size, SDL_Color color)
 	: window(window) {
-		texture = SDL_CreateTextureFromSurface(window.getRenderer(), surface.get());
+		SDL_Surface* surface = SDL_CreateRGBSurface(0, (int)size.x, (int)size.y, 32, 0, 0, 0, 0);
+		if (surface == nullptr) {
+			std::cout << "SDL_CreateRGBSurface Error: " << SDL_GetError() << std::endl;
+			exit(3);
+		}
+
+		SDL_FillRect(surface, nullptr, SDL_MapRGB(surface->format, color.r, color.g, color.b));
+		texture = SDL_CreateTextureFromSurface(window.getRenderer(), surface);
+		if (texture == nullptr) {
+			std::cout << "SDL_CreateTextureFromSurface Error: " << SDL_GetError() << std::endl;
+		}
+
+		SDL_FreeSurface(surface);
+		query();
+	}
+
+	Texture::Texture(dk::RenderWindow& window, SDL_Surface* surface)
+	: window(window) {
+		texture = SDL_CreateTextureFromSurface(window.getRenderer(), surface);
 		if (!texture) {
 			std::cout << "SDL_CreateTextureFromSurface Error: " << SDL_GetError() << std::endl;
 			exit(3);
 		}
 
+		query();
+	}
+
+	Texture::Texture(dk::RenderWindow& window, SDL_Texture* texture)
+	: window(window), texture(texture) {
+		query();
+	}
+
+	void Texture::query() {
 		int w, h;
 		SDL_QueryTexture(texture, nullptr, nullptr, &w, &h);
 		this->rect = { 0, 0, w, h };
@@ -28,9 +55,7 @@ namespace dk {
 			exit(3);
 		}
 
-		int w, h;
-		SDL_QueryTexture(texture, nullptr, nullptr, &w, &h);
-		this->rect = { 0, 0, w, h };
+		query();
 	}
 
 	void Texture::blit(dk::Rect dstRect) {