Removed all assets* from Engine

2026-01-12 07:53:43 +00:00 · 2024-11-05 17:44:39 +01:00 · 2024-11-05 17:44:39 +01:00 · 7c82ee5beb
commit 7c82ee5beb
parent 0179a27aaf
45 changed files with 6 additions and 174 deletions
--- a/assets/Map.aseprite
+++ b/assets/Map.aseprite
--- a/assets/MapNew-Sheet.aseprite
+++ b/assets/MapNew-Sheet.aseprite
--- a/assets/MapNew.aseprite
+++ b/assets/MapNew.aseprite
--- a/assets/MapNew.json
+++ b/assets/MapNew.json
@ -1,106 +0,0 @@
-{ "frames": [
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 32, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 64, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 96, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 128, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 160, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 192, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 224, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 256, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   },
-   {
-    "filename": "MapNew.aseprite",
-    "frame": { "x": 288, "y": 0, "w": 32, "h": 32 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 },
-    "sourceSize": { "w": 32, "h": 32 },
-    "duration": 100
-   }
- ],
- "meta": {
-  "app": "https://www.aseprite.org/",
-  "version": "1.3.2-x64",
-  "format": "RGBA8888",
-  "size": { "w": 320, "h": 32 },
-  "scale": "1",
-  "frameTags": [
-  ],
-  "layers": [
-  ],
-  "slices": [
-  ]
- }
-}
--- a/assets/MapNewBackup.aseprite
+++ b/assets/MapNewBackup.aseprite
--- a/assets/MapTest.aseprite
+++ b/assets/MapTest.aseprite
--- a/assets/Player1Victory.png
+++ b/assets/Player1Victory.png
--- a/assets/Player2Victory.png
+++ b/assets/Player2Victory.png
--- a/assets/SDL_map_test.txt
+++ b/assets/SDL_map_test.txt
@ -1,20 +0,0 @@
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,2,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,2,2,2,3
-3,3,3,2,3,3,3,3,2,3,7,1,1,1,9,3,3,3,3,3,3,3,2,2,3
-3,3,2,2,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,2,2,2,3,3,3,3,3,7,1,1,1,9,3,3,2,3,3,3,3,3,3,3
-3,3,2,2,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,2,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,3,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,2,3,3,3,3
-3,3,3,2,2,3,3,3,3,3,7,1,1,1,9,3,3,3,3,2,2,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,2,2,2,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,2,2,3,3,3,3
-3,3,3,3,3,3,3,2,3,3,7,1,1,1,9,3,2,3,3,2,3,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,2,3,3,3,3,3,3,3,3
-2,2,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,2,2,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
-3,3,3,3,3,3,3,3,3,3,7,1,1,1,9,3,3,3,3,3,3,3,3,3,3
--- a/assets/VictoryBackup.aseprite
+++ b/assets/VictoryBackup.aseprite
--- a/assets/atk_speed_powerup.png
+++ b/assets/atk_speed_powerup.png
--- a/assets/cat.png
+++ b/assets/cat.png
--- a/assets/characterSelection.png
+++ b/assets/characterSelection.png
--- a/assets/chicken_gentleman_spritesheet.png
+++ b/assets/chicken_gentleman_spritesheet.png
--- a/assets/chicken_knight_spritesheet.png
+++ b/assets/chicken_knight_spritesheet.png
--- a/assets/chicken_mlady_spritesheet.png
+++ b/assets/chicken_mlady_spritesheet.png
--- a/assets/chicken_neutral.png
+++ b/assets/chicken_neutral.png
--- a/assets/chicken_neutral_knight.png
+++ b/assets/chicken_neutral_knight.png
--- a/assets/chicken_neutral_mlady.png
+++ b/assets/chicken_neutral_mlady.png
--- a/assets/chicken_neutral_wizard.png
+++ b/assets/chicken_neutral_wizard.png
--- a/assets/chicken_spritesheet.png
+++ b/assets/chicken_spritesheet.png
--- a/assets/chicken_wizard_spritesheet.png
+++ b/assets/chicken_wizard_spritesheet.png
--- a/assets/chicken_wizzard_spritesheet.png
+++ b/assets/chicken_wizzard_spritesheet.png
--- a/assets/cow.png
+++ b/assets/cow.png
--- a/assets/dirt.png
+++ b/assets/dirt.png
--- a/assets/egg.png
+++ b/assets/egg.png
--- a/assets/grass.png
+++ b/assets/grass.png
--- a/assets/grass_water_left.png
+++ b/assets/grass_water_left.png
--- a/assets/grass_water_right.png
+++ b/assets/grass_water_right.png
--- a/assets/heart.png
+++ b/assets/heart.png
--- a/assets/heart_powerup.png
+++ b/assets/heart_powerup.png
--- a/assets/iconImage.bmp
+++ b/assets/iconImage.bmp
--- a/assets/movement_speed_powerup.png
+++ b/assets/movement_speed_powerup.png
--- a/assets/sound/background_music.mp3
+++ b/assets/sound/background_music.mp3
--- a/assets/sound/steps.wav
+++ b/assets/sound/steps.wav
--- a/assets/sound/throw_egg.wav
+++ b/assets/sound/throw_egg.wav
--- a/assets/startscreen.png
+++ b/assets/startscreen.png
--- a/assets/stone.png
+++ b/assets/stone.png
--- a/assets/title_screen.png
+++ b/assets/title_screen.png
--- a/assets/title_screen_backup.aseprite
+++ b/assets/title_screen_backup.aseprite
--- a/assets/water.png
+++ b/assets/water.png
--- a/assets/water1.ase
+++ b/assets/water1.ase
--- a/assets/water1.png
+++ b/assets/water1.png
--- a/src/GameInternal.cpp
+++ b/src/GameInternal.cpp
@ -5,6 +5,7 @@
 #include "CollisionHandler.h"
 #include "AssetManager.h"
 #include "RenderManager.h"
+#include "SDL_mixer.h"
 #include "SoundManager.h"
 #include "TileComponent.h"
 #include "Direction.h"
@ -62,11 +63,11 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he
 		return;
 	}

-    SDL_Surface* icon = SDL_LoadBMP("assets/iconImage.bmp");
-    if(!icon)
+    // bad
+    SDL_Surface* icon;
+    if((icon = SDL_LoadBMP("assets/iconImage.bmp")))
    {
-        std::cout << "ERROR: Couldn't create icon!" << std::endl;
-        return;
+    	SDL_SetWindowIcon(window, icon);
    }

    SDL_SetWindowIcon(window, icon);
@ -80,12 +81,6 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he
 	}
 	SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);

-	SDL_Texture* backgroundTexture = GameInternal::textureManager->loadTexture("assets/startscreen.png");
-
-	SDL_RenderClear(renderer);
-	SDL_RenderCopy(renderer, backgroundTexture, NULL, NULL);
-	SDL_RenderPresent(renderer);
-
 	if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 2048) < 0)
 	{
 		std::cout << "ERROR: Mixer couldnt be initialized! " << SDL_GetError() << std::endl;
@ -96,43 +91,6 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he
 	Mix_Volume(-1, MIX_MAX_VOLUME);
 	Mix_AllocateChannels(16);

-	//SDL_Event event;
-	bool hasQuit = false;
-
-	while (!hasQuit)
-	{
-		SDL_PollEvent(&event);
-
-		if (event.type == SDL_QUIT)
-		{
-			hasQuit = true;
-			break;
-		}
-
-		if (event.type == SDL_KEYDOWN)
-		{
-			if (event.key.keysym.scancode == SDL_SCANCODE_RETURN)
-			{
-				std::cout << "Enter pressed > Game start..." << std::endl;
-				break;
-			}
-
-			if (event.key.keysym.scancode == SDL_SCANCODE_ESCAPE)
-			{
-				std::cout << "Escape pressed > Game quit..." << std::endl;
-				hasQuit = true;
-			}
-		}
-	}
-
-	if (hasQuit)
-	{
-		this->setRunning(false);
-		return;
-	}
-
-	if (this->isRunning() == false) return;
-
 	map = new Map();

 	// loading sounds
--- a/src/Map.cpp
+++ b/src/Map.cpp
@ -61,6 +61,6 @@ void Map::addTile(unsigned long id, int x, int y, GameInternal* game, const std:
 	auto& tile(game->manager.addEntity());
 	tile.addComponent<TileComponent>(x, y, TILE_SIZE, TILE_SIZE, id, textureDict);
 	
-	if(tile.getComponent<TileComponent>().hasCollision()) tile.addComponent<ColliderComponent>(tile.getComponent<TileComponent>().getName().data());
+	if(tile.getComponent<TileComponent>().hasCollision()) tile.addComponent<ColliderComponent>("tile"/*tile.getComponent<TileComponent>().getName().data()*/);
 	tile.addGroup((size_t)Entity::GroupLabel::MAPTILES);
 }