pointer update

some shared pointers will become weak pointers after further testing.
durkisneer1 · Dec 7, 2023 · f0a5c37 · f0a5c37
1 parent 762612b
commit f0a5c37
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 48 deletions.
diff --git a/example/include/Player.hpp b/example/include/Player.hpp
@@ -2,11 +2,12 @@
 
 #include <KrakenEngine.hpp>
 #include <vector>
+#include <memory>
 
 
 class Player : public kn::Sprite {
 public:
-    Player(kn::RenderWindow& window, kn::Texture& texture);
+    Player(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture);
     ~Player() = default;
 
     void process(double deltaTime) override;

diff --git a/example/include/Tracker.hpp b/example/include/Tracker.hpp
@@ -1,16 +1,17 @@
 #pragma once
 
 #include <KrakenEngine.hpp>
+#include <memory>
 
 
 class Tracker {
 public:
-    Tracker(kn::RenderWindow& window, kn::Texture& texture);
-    void process(double deltaTime);
+    Tracker(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture);
+    void update(double deltaTime, kn::math::Vector2 target);
 
 private:
     kn::RenderWindow& window;
-    kn::Texture& texture;
+    std::shared_ptr<kn::Texture> texture;
     kn::Rect rect;
 
     kn::math::Vector2 position;

diff --git a/example/include/Wall.hpp b/example/include/Wall.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <KrakenEngine.hpp>
+#include <memory>
 
 
 class Wall : public kn::Sprite {
 public:
-    Wall(kn::RenderWindow& window, kn::Texture& texture, kn::math::Vector2 position);
+    Wall(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture, kn::math::Vector2 position);
     ~Wall() = default;
 
     void process(double deltaTime) override;

diff --git a/example/src/main.cpp b/example/src/main.cpp
@@ -29,13 +29,17 @@ int main() {
 	kn::Rect hwRect = hwTexture->getRect();
 	hwRect.setCenter(WIN_SIZE / 2.0f);
 
-	Player player(window, *textureCache.get("player"));
-	Tracker tracker(window, *textureCache.get("tracker"));
+	Player player(window, textureCache.get("player"));
+	Tracker tracker(window, textureCache.get("tracker"));
 
 	for (float x = 0.0f; x <= WIN_SIZE.x - 50.0f; x += 50.0f) {
-		kn::Sprite::addSprite(std::make_unique<Wall>(window, *textureCache.get("wall"), kn::math::Vector2(x, WIN_SIZE.y)));
+		kn::Sprite::addSprite(
+			std::make_unique<Wall>(window, textureCache.get("wall"), kn::math::Vector2(x, WIN_SIZE.y))
+		);
 	}
-	kn::Sprite::addSprite(std::make_unique<Wall>(window, *textureCache.get("wall"), kn::math::Vector2(WIN_SIZE.x - 150.0f, WIN_SIZE.y - 50.0f)));
+	kn::Sprite::addSprite(
+		std::make_unique<Wall>(window, textureCache.get("wall"), kn::math::Vector2(WIN_SIZE.x - 150.0f, WIN_SIZE.y - 50.0f))
+	);
 
 	bool done = false;
 	while (!done) {
@@ -52,14 +56,14 @@ int main() {
 		}
 
 		window.fill({ 40, 40, 40 });
-		window.blit(*bgTexture, bgTexture->getRect());
+		window.blit(bgTexture, bgTexture->getRect());
 
 		for (const auto& sprite : kn::Sprite::getSprites()) {
 			sprite->process(deltaTime);
 		}
-		window.blit(*hwTexture, hwRect);  // FIXME: This is not working
+		window.blit(hwTexture, hwRect);  // FIXME: This is not working
 		player.process(deltaTime);
-		tracker.process(deltaTime);
+		tracker.update(deltaTime, player.getPosition());
 
 		window.flip();
 	}

diff --git a/example/src/player.cpp b/example/src/player.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 
 
-Player::Player(kn::RenderWindow& window, kn::Texture& texture)
+Player::Player(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture)
 : kn::Sprite(window, texture) {
     position = WIN_SIZE / 2.0f;
 }

diff --git a/example/src/tracker.cpp b/example/src/tracker.cpp
@@ -2,13 +2,11 @@
 #include <iostream>
 
 
-Tracker::Tracker(kn::RenderWindow& window, kn::Texture& texture)
-: window(window), texture(texture), rect(texture.getRect()) {
-    position = WIN_SIZE / 2.0f;
-}
+Tracker::Tracker(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture)
+: window(window), texture(texture), rect(texture->getRect()), position(WIN_SIZE / 2.0f) {}
 
-void Tracker::process(double deltaTime) {
-    position = kn::math::lerpVec(position, kn::input::getMousePos(), speed * deltaTime);
+void Tracker::update(double deltaTime, kn::math::Vector2 target) {
+    position = kn::math::lerpVec(position, target, speed * deltaTime);
     rect.setCenter(position);
     window.blit(texture, rect);
 }
diff --git a/example/src/wall.cpp b/example/src/wall.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 
 
-Wall::Wall(kn::RenderWindow& window, kn::Texture& texture, kn::math::Vector2 position)
+Wall::Wall(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture, kn::math::Vector2 position)
 : kn::Sprite(window, texture) {
     this->position = position;
     rect.setBottomLeft(position);

diff --git a/include/Constants.hpp b/include/Constants.hpp
@@ -3,6 +3,7 @@
 #include <SDL.h>
 
 typedef SDL_Scancode KN_KEYS;
+typedef SDL_Event KN_Event;
 
 const SDL_Scancode KNK_w = SDL_SCANCODE_W;
 const SDL_Scancode KNK_a = SDL_SCANCODE_A;

diff --git a/include/RenderWindow.hpp b/include/RenderWindow.hpp
@@ -5,8 +5,10 @@
 #include <SDL_ttf.h>
 #include <SDL_mixer.h>
 #include <vector>
+#include <memory>
 #include "Texture.hpp"
 #include "Math.hpp"
+#include "Constants.hpp"
 
 
 namespace kn {
@@ -17,19 +19,19 @@ namespace kn {
 
 		void fill(SDL_Color color);
 		void flip();
-		void blit(kn::Texture& texture, kn::Rect rect);
-		void blit(kn::Texture& texture, kn::math::Vector2 position);
-		void blitEx(kn::Texture& texture, kn::Rect rect, double angle = 0.0, bool flipX = false, bool flipY = false);
-		void blitEx(kn::Texture& texture, kn::math::Vector2 position, double angle = 0.0, bool flipX = false, bool flipY = false);
+		void blit(const std::shared_ptr<kn::Texture> texture, kn::Rect rect);
+		void blit(const std::shared_ptr<kn::Texture> texture, kn::math::Vector2 position);
+		void blitEx(const std::shared_ptr<kn::Texture>, kn::Rect rect, double angle = 0.0, bool flipX = false, bool flipY = false);
+		void blitEx(const std::shared_ptr<kn::Texture>, kn::math::Vector2 position, double angle = 0.0, bool flipX = false, bool flipY = false);
 
 		SDL_Renderer* getRenderer() { return renderer; }
-		const std::vector<SDL_Event>& getEvents();
+		const std::vector<KN_Event>& getEvents();
 
 	private:
 		SDL_Renderer* renderer = nullptr;
 		SDL_Window* window = nullptr;
 
-		SDL_Event event;
+		KN_Event event;
 		std::vector<SDL_Event> events;
 
 		void init();

diff --git a/include/Sprite.hpp b/include/Sprite.hpp
@@ -11,7 +11,7 @@
 namespace kn {
     class Sprite {
     public:
-        Sprite(kn::RenderWindow& window, kn::Texture& texture);
+        Sprite(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture);
         ~Sprite() = default;
 
         kn::math::Vector2 getPosition() const;
@@ -24,7 +24,7 @@ namespace kn {
 
     protected:
         kn::RenderWindow& window;
-        kn::Texture& texture;
+        std::shared_ptr<kn::Texture> texture;
         kn::Rect rect;
 
         kn::math::Vector2 position;
@@ -41,4 +41,4 @@ namespace kn {
         void rectHorizontalCollision();
         void rectVerticalCollision();
     };
-}
+}
diff --git a/include/Texture.hpp b/include/Texture.hpp
@@ -8,7 +8,7 @@
 namespace kn {
 	class Texture {
 	public:
-		Texture(SDL_Texture* texture);
+		explicit Texture(SDL_Texture* texture);
 		~Texture() { if (texture) SDL_DestroyTexture(texture); }
 
 		kn::math::Vector2 getSize() const { return { rect.w, rect.h }; }

diff --git a/include/TextureCache.hpp b/include/TextureCache.hpp
@@ -10,8 +10,8 @@
 namespace kn {
     class TextureCache {
     public:
-        TextureCache(kn::RenderWindow& window) : window(window) {}
-        ~TextureCache() { unloadAll();};
+        explicit TextureCache(kn::RenderWindow& window) : window(window) {}
+        ~TextureCache() { unloadAll(); };
 
         void load(const char* name, const char* path);
         void create(const char* name, kn::math::Vector2 size, SDL_Color color);

diff --git a/src/render_window.cpp b/src/render_window.cpp
@@ -80,22 +80,22 @@ namespace kn {
 		SDL_RenderPresent(renderer);
 	}
 
-	void RenderWindow::blit(kn::Texture& texture, kn::Rect rect) {
-		SDL_RenderCopyF(renderer, texture.getSDLTexture(), nullptr, &rect);
+	void RenderWindow::blit(std::shared_ptr<kn::Texture> texture, kn::Rect rect) {
+		SDL_RenderCopyF(renderer, texture->getSDLTexture(), nullptr, &rect);
 	}
 
-	void RenderWindow::blitEx(kn::Texture& texture, kn::Rect rect, double angle, bool flipX, bool flipY) {
+	void RenderWindow::blitEx(std::shared_ptr<kn::Texture> texture, kn::Rect rect, double angle, bool flipX, bool flipY) {
 		SDL_RendererFlip flip = SDL_FLIP_NONE;
 		if (flipX) {
 			flip = (SDL_RendererFlip)(flip | SDL_FLIP_HORIZONTAL);
 		} else {}
 		if (flipY) {
 			flip = (SDL_RendererFlip)(flip | SDL_FLIP_VERTICAL);
 		} else {}
-		SDL_RenderCopyExF(renderer, texture.getSDLTexture(), nullptr, &rect, angle, nullptr, flip);
+		SDL_RenderCopyExF(renderer, texture->getSDLTexture(), nullptr, &rect, angle, nullptr, flip);
 	}
 
-	void RenderWindow::blitEx(kn::Texture& texture, kn::math::Vector2 position, double angle, bool flipX, bool flipY) {
+	void RenderWindow::blitEx(std::shared_ptr<kn::Texture> texture, kn::math::Vector2 position, double angle, bool flipX, bool flipY) {
 		SDL_RendererFlip flip = SDL_FLIP_NONE;
 		if (flipX) {
 			flip = (SDL_RendererFlip)(flip | SDL_FLIP_HORIZONTAL);
@@ -105,16 +105,16 @@ namespace kn {
 		} else {}
 		SDL_FRect rect = {
 			position.x, position.y,
-			texture.getSize().x, texture.getSize().y
+			texture->getSize().x, texture->getSize().y
 		};
-		SDL_RenderCopyExF(renderer, texture.getSDLTexture(), nullptr, &rect, angle, nullptr, flip);
+		SDL_RenderCopyExF(renderer, texture->getSDLTexture(), nullptr, &rect, angle, nullptr, flip);
 	}
 
-	void RenderWindow::blit(kn::Texture& texture, kn::math::Vector2 position) {
+	void RenderWindow::blit(std::shared_ptr<kn::Texture> texture, kn::math::Vector2 position) {
 		SDL_FRect rect = {
 			position.x, position.y,
-			texture.getSize().x, texture.getSize().y
+			texture->getSize().x, texture->getSize().y
 		};
-		SDL_RenderCopyF(renderer, texture.getSDLTexture(), nullptr, &rect);
+		SDL_RenderCopyF(renderer, texture->getSDLTexture(), nullptr, &rect);
 	}
 }
diff --git a/src/sprite.cpp b/src/sprite.cpp
@@ -2,8 +2,8 @@
 
 
 namespace kn {
-    Sprite::Sprite(kn::RenderWindow& window, kn::Texture& texture)
-    : window(window), texture(texture), rect(texture.getRect()) {}
+    Sprite::Sprite(kn::RenderWindow& window, std::shared_ptr<kn::Texture> texture)
+    : window(window), texture(texture), rect(texture->getRect()) {}
 
     kn::math::Vector2 Sprite::getPosition() const {
         return position;

diff --git a/src/texture_cache.cpp b/src/texture_cache.cpp
@@ -37,14 +37,10 @@ namespace kn {
     }
 
     void TextureCache::unload(const char* name) {
-        SDL_DestroyTexture(textures[name]->getSDLTexture());
         textures.erase(name);
     }
 
     void TextureCache::unloadAll() {
-        for (auto& texture : textures) {
-            SDL_DestroyTexture(texture.second->getSDLTexture());
-        }
         textures.clear();
     }