Displays proper img size & fish instead of grass

I stopped displaying a grass block from a tutorial and began displaying the fish instead.

Made images render in their proper size automatically.

Stopped copying assets directory since it is not necessary at the moment

Author: Hugo M. Ruiz-Mireles

CMakeLists.txt

@@ -92,9 +92,6 @@ add_custom_command(TARGET ${BIN_NAME} POST_BUILD
         "$<TARGET_FILE_DIR:${BIN_NAME}>"
 )
 
-# Copy assets (res/ directory) to the output bin folder
-file(COPY assets DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-
 # Explicitly tell Visual Studio that headers belong to the project
 source_group("Header Files" FILES ${HEADERS})
 source_group("Source Files" FILES ${SOURCES})

include/Entity.hpp

@@ -8,7 +8,7 @@ class Entity
 	Entity(float x, float y, SDL_Texture* texture);
 	float getX();
 	float getY();
-	SDL_Texture* getTexture();
+	SDL_Texture *getTexture();
 	SDL_Rect getCurrentFrame();
 private:
 	float x;

include/RenderWindow.hpp

@@ -6,15 +6,15 @@
 class RenderWindow
 {
 public:
-	RenderWindow(const char* title, int w, int h);
-	SDL_Texture* loadTexture(const char* filePath);
+	RenderWindow(const char *title, int w, int h);
+	SDL_Texture *loadTexture(const char *filePath);
 	void clear();
 	void render(Entity& entity);
 	void display();
 	~RenderWindow();
 private:
-	SDL_Window* window;
-	SDL_Renderer* renderer;
+	SDL_Window *window;
+	SDL_Renderer *renderer;
 
 };
 

src/Entity.cpp

@@ -4,8 +4,11 @@ Entity::Entity(float x, float y, SDL_Texture* texture) : x(x), y(y), texture(tex
 {
 	currentFrame.x = 0;
 	currentFrame.y = 0;
-	currentFrame.w = 32;
-	currentFrame.h = 32;
+	// Automatically detect texture size
+	int textureW, textureH;
+	SDL_QueryTexture(texture, NULL, NULL, &textureW, &textureH);
+	currentFrame.w = textureW;
+	currentFrame.h = textureH;
 }
 float Entity::getX()
 {
@@ -15,7 +18,7 @@ float Entity::getY()
 {
 	return y;
 }
-SDL_Texture* Entity::getTexture()
+SDL_Texture *Entity::getTexture()
 {
 	return texture;
 }

src/RenderWindow.cpp

@@ -2,7 +2,7 @@
 #include "RenderWindow.hpp"
 
 
-RenderWindow::RenderWindow(const char* title, int w, int h) : window(NULL), renderer(NULL)
+RenderWindow::RenderWindow(const char *title, int w, int h) : window(NULL), renderer(NULL)
 {
 	window = SDL_CreateWindow(title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, SDL_WINDOW_SHOWN);
 	if (window == NULL)
@@ -13,9 +13,9 @@ RenderWindow::RenderWindow(const char* title, int w, int h) : window(NULL), rend
 	renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
 }
 
-SDL_Texture* RenderWindow::loadTexture(const char* filePath)
+SDL_Texture *RenderWindow::loadTexture(const char *filePath)
 {
-	SDL_Texture* texture = NULL;
+	SDL_Texture *texture = NULL;
 	texture = IMG_LoadTexture(renderer, filePath);
 
 	if (texture == NULL)

src/game.cpp

@@ -1,30 +1,46 @@
 #include <iostream>
+#include <string>
 #include "RenderWindow.hpp"
 #include "Entity.hpp"
 
-int main(int argc, char* args[])
+int main(int argc, char *args[])
 {
 	if (SDL_Init(SDL_INIT_VIDEO) > 0)
 		std::cout << "SDL_Init has failed, SDL ERROR: " << SDL_GetError();
 	if (!(IMG_Init(IMG_INIT_PNG)))
 		std::cout << "IMG_Init has failed, SDL ERROR: " << SDL_GetError();
 
-	RenderWindow window("GAME v1.0", 1080, 600);
+	RenderWindow window("GAME v1.0", 1280, 720);
 
-	const char *assetPath = "../assets/";
-	// CHANGE FILEPATH FOR TEXTURE LOADER
-	SDL_Texture* grassTexture = window.loadTexture((std::string(assetPath) + "images/ground_grass_1.png").c_str());
-
-	Entity entities[3] = { Entity(0, 568,grassTexture),
-						   Entity(32,568,grassTexture),
-						   Entity(64,568,grassTexture) };
-
-	#ifdef CI_BUILD
-    SDL_Delay(5000);
-    SDL_Quit();
-    return 0;
-    #endif
+#ifdef CI_BUILD
+	SDL_Delay(5000);
+	SDL_Quit();
+	return 0;
+#endif
 
+	const int NUM_FISH_TEXTURES = 9;
+	SDL_Texture* fishTextures[NUM_FISH_TEXTURES];
+
+	fishTextures[0] = window.loadTexture("../assets/images/blue-fish/fish-1.png");
+	fishTextures[1] = window.loadTexture("../assets/images/blue-fish/fish-2.png");
+	fishTextures[2] = window.loadTexture("../assets/images/blue-fish/fish-3.png");
+	fishTextures[3] = window.loadTexture("../assets/images/green-fish/fish-1.png");
+	fishTextures[4] = window.loadTexture("../assets/images/green-fish/fish-2.png");
+	fishTextures[5] = window.loadTexture("../assets/images/green-fish/fish-3.png");
+	fishTextures[6] = window.loadTexture("../assets/images/gold-fish/fish-1.png");
+	fishTextures[7] = window.loadTexture("../assets/images/gold-fish/fish-2.png");
+	fishTextures[8] = window.loadTexture("../assets/images/gold-fish/fish-3.png");
+
+	Entity fishEntities[8] = { Entity(180, 570, fishTextures[0]),
+							   Entity(408, 570, fishTextures[1]),
+							   Entity(636, 570, fishTextures[2]),
+							   Entity(864, 570, fishTextures[3]),
+							   Entity(1092, 570, fishTextures[4]),
+							   Entity(1092, 410, fishTextures[5]),
+							   Entity(1092, 250, fishTextures[6]),
+							   Entity(1092, 90, fishTextures[7]) };
+
+
 	bool gameRunning = true;
 
 	SDL_Event event;
@@ -39,10 +55,12 @@ int main(int argc, char* args[])
 			}
 		}
 		window.clear();
-		for (int i = 0; i < 3; i++)
+		// window.render(background);
+		for (int i = 0; i < 8; i++)
 		{
-			window.render(entities[i]);
+			window.render(fishEntities[i]);
 		}
+		
 		window.display();
 	}