diff --git a/TestProject/TestProject/ECS.cpp b/TestProject/TestProject/ECS.cpp new file mode 100644 index 0000000..58484d7 --- /dev/null +++ b/TestProject/TestProject/ECS.cpp @@ -0,0 +1,7 @@ +#include "ECS.h" + +void Entity::addGroup(Group mGroup) +{ + groupBitSet[mGroup] = true; + manager.addToGroup(this, mGroup); +} \ No newline at end of file diff --git a/TestProject/TestProject/ECS.h b/TestProject/TestProject/ECS.h index b9183ec..9b50830 100644 --- a/TestProject/TestProject/ECS.h +++ b/TestProject/TestProject/ECS.h @@ -9,23 +9,28 @@ class Component; class Entity; +class Manager; using ComponentID = std::size_t; +using Group = std::size_t; -inline ComponentID getComponentTypeID() +inline ComponentID getNewComponentTypeID() { - static ComponentID lastID = 0; + static ComponentID lastID = 0u; return lastID++; } template inline ComponentID getComponentTypeID() noexcept { - static ComponentID typeID = getComponentTypeID(); + static ComponentID typeID = getNewComponentTypeID(); return typeID; } constexpr std::size_t maxComponents = 32; +constexpr std::size_t maxGroups = 32; + using ComponentBitSet = std::bitset; +using GroupBitSet = std::bitset; using ComponentArray = std::array; class Component @@ -43,6 +48,10 @@ class Component class Entity { public: + Entity(Manager& mManager) : manager(mManager) + { + + } void update() { for (auto& c : components) c->update(); @@ -56,6 +65,17 @@ class Entity bool isActive() const { return this->active; } void destroy() { this->active = false; } + bool hasGroup(Group mGroup) + { + return groupBitSet[mGroup]; + } + void addGroup(Group mGroup); + void delGroup(Group mGroup) + { + groupBitSet[mGroup] = false; + } + + template bool hasComponent() const { return componentBitSet[getComponentTypeID()]; @@ -84,11 +104,13 @@ class Entity private: + Manager& manager; bool active = true; std::vector> components; ComponentArray componentArray; ComponentBitSet componentBitSet; + GroupBitSet groupBitSet; }; class Manager @@ -106,6 +128,17 @@ class Manager void refresh() { + for (auto i(0u); i < maxGroups; i++) + { + auto& v(groupedEntities[i]); + v.erase( + std::remove_if(std::begin(v), std::end(v), + [i](Entity* mEntity) + { + return !mEntity->isActive() || !mEntity->hasGroup(i); + }),std::end(v)); + } + entities.erase(std::remove_if(std::begin(entities), std::end(entities), [](const std::unique_ptr& mEntity) { @@ -114,9 +147,19 @@ class Manager std::end(entities)); } + void addToGroup(Entity* mEntity, Group mGroup) + { + groupedEntities[mGroup].emplace_back(mEntity); + } + + std::vector& getGroup(Group mGroup) + { + return groupedEntities[mGroup]; + } + Entity& addEntity() { - Entity* e = new Entity(); + Entity* e = new Entity(*this); std::unique_ptr uPtr{ e }; entities.emplace_back(std::move(uPtr)); return *e; @@ -124,4 +167,5 @@ class Manager private: std::vector> entities; + std::array, maxGroups> groupedEntities; }; diff --git a/TestProject/TestProject/Game.cpp b/TestProject/TestProject/Game.cpp index 58e8e23..702f1f3 100644 --- a/TestProject/TestProject/Game.cpp +++ b/TestProject/TestProject/Game.cpp @@ -19,6 +19,14 @@ auto& player(manager.addEntity()); auto& enemy(manager.addEntity()); auto& wall(manager.addEntity()); +enum GroupLabel +{ + GROUP_MAP, + GROUP_PLAYERS, + GROUP_ENEMIES, + GROUP_COLLIDERS +}; + Game::Game() { @@ -56,6 +64,7 @@ void Game::init(const char* title, int xpos, int ypos, int width, int height, bo this->isRunning = true; map = new Map(); + map->loadMap("assets/SDL_map_test.txt", 25, 20); //ecs implementation @@ -63,15 +72,13 @@ void Game::init(const char* title, int xpos, int ypos, int width, int height, bo player.addComponent("assets/chicken_neutral_knight.png"); player.addComponent(SDL_SCANCODE_W, SDL_SCANCODE_S, SDL_SCANCODE_A, SDL_SCANCODE_D);//custom keycontrols can be added player.addComponent("player"); + player.addGroup(GROUP_PLAYERS); - enemy.addComponent(400, 400, 2); + enemy.addComponent(600, 500, 2); enemy.addComponent("assets/chicken_neutral.png"); enemy.addComponent(SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT); enemy.addComponent("enemy"); - - wall.addComponent(300.0f, 300.0f, 300, 20, 1); - wall.addComponent("assets/stone.png"); - wall.addComponent("wall"); + enemy.addGroup(GROUP_ENEMIES); } @@ -112,10 +119,25 @@ void Game::update() } +auto& tiles(manager.getGroup(GROUP_MAP)); +auto& players(manager.getGroup(GROUP_PLAYERS)); +auto& enemies(manager.getGroup(GROUP_ENEMIES)); + void Game::render() { SDL_RenderClear(renderer); - manager.draw(); + for (auto& t : tiles) + { + t->draw(); + } + for (auto& p : players) + { + p->draw(); + } + for (auto& e : enemies) + { + e->draw(); + } SDL_RenderPresent(renderer); } @@ -130,7 +152,9 @@ void Game::clean() void Game::addTile(int id, int x, int y) { auto& tile(manager.addEntity()); - tile.addComponent(x, y, 32, 32, id); + tile.addComponent(x, y, TILE_SIZE, TILE_SIZE, id); + if (id == 1) tile.addComponent("water"); + tile.addGroup(GROUP_MAP); } bool Game::running() diff --git a/TestProject/TestProject/Map.h b/TestProject/TestProject/Map.h index 74c04a1..ee85c71 100644 --- a/TestProject/TestProject/Map.h +++ b/TestProject/TestProject/Map.h @@ -1,5 +1,6 @@ #pragma once #include "Defines.h" +#include class Map { diff --git a/TestProject/TestProject/SpriteComponent.h b/TestProject/TestProject/SpriteComponent.h index cd8a877..7e538bf 100644 --- a/TestProject/TestProject/SpriteComponent.h +++ b/TestProject/TestProject/SpriteComponent.h @@ -19,7 +19,6 @@ class SpriteComponent : public Component void setTexture(const char* path) { - //SDL_DestroyTexture(this->texture); this->texture = TextureManager::loadTexture(path); } diff --git a/TestProject/TestProject/TestProject.vcxproj b/TestProject/TestProject/TestProject.vcxproj index aa2d940..eadeba5 100644 --- a/TestProject/TestProject/TestProject.vcxproj +++ b/TestProject/TestProject/TestProject.vcxproj @@ -155,6 +155,7 @@ + diff --git a/TestProject/TestProject/TestProject.vcxproj.filters b/TestProject/TestProject/TestProject.vcxproj.filters index c607345..bc16722 100644 --- a/TestProject/TestProject/TestProject.vcxproj.filters +++ b/TestProject/TestProject/TestProject.vcxproj.filters @@ -39,6 +39,9 @@ Source Files + + Source Files + diff --git a/TestProject/TestProject/TextureDict.h b/TestProject/TestProject/TextureDict.h index 133c433..d9c8d53 100644 --- a/TestProject/TestProject/TextureDict.h +++ b/TestProject/TestProject/TextureDict.h @@ -5,10 +5,12 @@ class TextureDict { public: - const std::map textureDictionary = + const std::map textureDictionary = { - {0, "assets/water.png"}, - {1, "assets/dirt.png"}, - {2, "assets/grass.png"} + {1, "assets/water.png"}, + {2, "assets/dirt.png"}, + {3, "assets/grass.png"}, + {7, "assets/grass_water_left.png"}, + {9, "assets/grass_water_right.png"} }; }; diff --git a/TestProject/TestProject/TextureManager.cpp b/TestProject/TestProject/TextureManager.cpp index d79f976..93fc3e3 100644 --- a/TestProject/TestProject/TextureManager.cpp +++ b/TestProject/TestProject/TextureManager.cpp @@ -3,7 +3,6 @@ SDL_Texture* TextureManager::loadTexture(const char* fileName) { return IMG_LoadTexture(Game::renderer, fileName); - } void TextureManager::draw(SDL_Texture* texture, SDL_Rect src, SDL_Rect dest) diff --git a/TestProject/TestProject/TileComponent.h b/TestProject/TestProject/TileComponent.h index d5ea1f3..d8be964 100644 --- a/TestProject/TestProject/TileComponent.h +++ b/TestProject/TestProject/TileComponent.h @@ -26,8 +26,15 @@ public: this->tileRect.h = h; tileID = id; - auto it = textureDict.textureDictionary.find(tileID)->second; //every id has its own distinct texture (in texturedict.h) - this->path = it; + auto it = textureDict.textureDictionary.find(tileID); //every id has its own distinct texture (in texturedict.h) + if (it == textureDict.textureDictionary.end()) + { + std::cout << "it end" << std::endl; + return; + } + bool test = it == textureDict.textureDictionary.end(); + std::cout << it->second.data() << std::endl; + this->path = it->second.data(); } ~TileComponent() = default; diff --git a/TestProject/TestProject/TransformComponent.h b/TestProject/TestProject/TransformComponent.h index cf5dd7e..1c33aed 100644 --- a/TestProject/TestProject/TransformComponent.h +++ b/TestProject/TestProject/TransformComponent.h @@ -57,7 +57,7 @@ public: void update() override { // if(velocity.x != 0 && velocity.y != 0) - double multiplier = velocity.x != 0 && velocity.y != 0 ? 0.707 : 1; + double multiplier = velocity.x != 0 && velocity.y != 0 ? 0.707 : 1; //normalizes vector position.x += velocity.x * speed * multiplier; position.y += velocity.y * speed * multiplier; } diff --git a/TestProject/TestProject/assets/MapNew-Sheet.aseprite b/TestProject/TestProject/assets/MapNew-Sheet.aseprite new file mode 100644 index 0000000..7f27b16 Binary files /dev/null and b/TestProject/TestProject/assets/MapNew-Sheet.aseprite differ diff --git a/TestProject/TestProject/assets/MapNew.json b/TestProject/TestProject/assets/MapNew.json new file mode 100644 index 0000000..f7526fc --- /dev/null +++ b/TestProject/TestProject/assets/MapNew.json @@ -0,0 +1,106 @@ +{ "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": [ + ] + } +} diff --git a/TestProject/TestProject/assets/MapNewBackup.aseprite b/TestProject/TestProject/assets/MapNewBackup.aseprite new file mode 100644 index 0000000..fb12db2 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup.aseprite differ diff --git a/TestProject/TestProject/assets/MapNewBackup/image1.png b/TestProject/TestProject/assets/MapNewBackup/image1.png new file mode 100644 index 0000000..76b8190 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/image1.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/sprite.json b/TestProject/TestProject/assets/MapNewBackup/sprite.json new file mode 100644 index 0000000..6cb0847 --- /dev/null +++ b/TestProject/TestProject/assets/MapNewBackup/sprite.json @@ -0,0 +1 @@ +{"width":800,"tilesets":[{"grid":{"tileSize":{"width":32,"height":32}},"image":"MapNewBackup\\tileset1.png"}],"height":640,"frames":[{"duration":0.1}],"filename":"C:\\Users\\User\\Desktop\\FH_TECHNIKUM\\3.Semester\\INNO1\\TestProject\\TestProject\\assets\\MapNewBackup.aseprite","layers":[{"cels":[{"image":"MapNewBackup\\image1.png","frame":0,"bounds":{"height":640,"width":800,"y":0,"x":0}}],"name":"Layer 1"},{"tileset":0,"cels":[{"bounds":{"height":224,"width":320,"y":96,"x":96},"frame":0,"tilemap":{"height":7,"width":10,"tiles":[3,7,1,1,1,9,3,2,2,2,3,7,1,1,1,9,3,2,2,2,3,7,1,1,1,9,3,2,2,2,3,6,4,4,4,8,3,0,0,0,0,3,3,3,3,3,0,0,0,0,0,0,3,3,3,0,0,0,0,0,0,0,3,3,3,0,0,0,0,0]}}],"name":"Map"}]} \ No newline at end of file diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset1.png b/TestProject/TestProject/assets/MapNewBackup/tileset1.png new file mode 100644 index 0000000..7244b37 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset1.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset10.png b/TestProject/TestProject/assets/MapNewBackup/tileset10.png new file mode 100644 index 0000000..fa75ce7 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset10.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset2.png b/TestProject/TestProject/assets/MapNewBackup/tileset2.png new file mode 100644 index 0000000..88dfbeb Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset2.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset3.png b/TestProject/TestProject/assets/MapNewBackup/tileset3.png new file mode 100644 index 0000000..b60025b Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset3.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset4.png b/TestProject/TestProject/assets/MapNewBackup/tileset4.png new file mode 100644 index 0000000..b096692 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset4.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset5.png b/TestProject/TestProject/assets/MapNewBackup/tileset5.png new file mode 100644 index 0000000..51fc454 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset5.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset6.png b/TestProject/TestProject/assets/MapNewBackup/tileset6.png new file mode 100644 index 0000000..a93b2ac Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset6.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset7.png b/TestProject/TestProject/assets/MapNewBackup/tileset7.png new file mode 100644 index 0000000..d4ad51f Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset7.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset8.png b/TestProject/TestProject/assets/MapNewBackup/tileset8.png new file mode 100644 index 0000000..6a22a75 Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset8.png differ diff --git a/TestProject/TestProject/assets/MapNewBackup/tileset9.png b/TestProject/TestProject/assets/MapNewBackup/tileset9.png new file mode 100644 index 0000000..d67ddec Binary files /dev/null and b/TestProject/TestProject/assets/MapNewBackup/tileset9.png differ diff --git a/TestProject/TestProject/assets/MapTest.aseprite b/TestProject/TestProject/assets/MapTest.aseprite new file mode 100644 index 0000000..c047008 Binary files /dev/null and b/TestProject/TestProject/assets/MapTest.aseprite differ diff --git a/TestProject/TestProject/assets/SDL_map_test.txt b/TestProject/TestProject/assets/SDL_map_test.txt new file mode 100644 index 0000000..809f2e3 --- /dev/null +++ b/TestProject/TestProject/assets/SDL_map_test.txt @@ -0,0 +1,20 @@ +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 diff --git a/TestProject/TestProject/assets/chicken_neutral_knight.png b/TestProject/TestProject/assets/chicken_neutral_knight.png index c44afc1..1cf69c9 100644 Binary files a/TestProject/TestProject/assets/chicken_neutral_knight.png and b/TestProject/TestProject/assets/chicken_neutral_knight.png differ diff --git a/TestProject/TestProject/assets/dirt.png b/TestProject/TestProject/assets/dirt.png index baede82..b60025b 100644 Binary files a/TestProject/TestProject/assets/dirt.png and b/TestProject/TestProject/assets/dirt.png differ diff --git a/TestProject/TestProject/assets/grass.png b/TestProject/TestProject/assets/grass.png index 412bc54..b096692 100644 Binary files a/TestProject/TestProject/assets/grass.png and b/TestProject/TestProject/assets/grass.png differ diff --git a/TestProject/TestProject/assets/grass_water_left.png b/TestProject/TestProject/assets/grass_water_left.png new file mode 100644 index 0000000..6a22a75 Binary files /dev/null and b/TestProject/TestProject/assets/grass_water_left.png differ diff --git a/TestProject/TestProject/assets/grass_water_right.png b/TestProject/TestProject/assets/grass_water_right.png new file mode 100644 index 0000000..fa75ce7 Binary files /dev/null and b/TestProject/TestProject/assets/grass_water_right.png differ diff --git a/TestProject/TestProject/assets/water.png b/TestProject/TestProject/assets/water.png index fc4069a..88dfbeb 100644 Binary files a/TestProject/TestProject/assets/water.png and b/TestProject/TestProject/assets/water.png differ diff --git a/TestProject/TestProject/assets/water1.png b/TestProject/TestProject/assets/water1.png deleted file mode 100644 index 7ef949c..0000000 Binary files a/TestProject/TestProject/assets/water1.png and /dev/null differ diff --git a/TestProject/TestProject/x64/Debug/ECS.obj b/TestProject/TestProject/x64/Debug/ECS.obj new file mode 100644 index 0000000..59994c6 Binary files /dev/null and b/TestProject/TestProject/x64/Debug/ECS.obj differ diff --git a/TestProject/TestProject/x64/Debug/Game.obj b/TestProject/TestProject/x64/Debug/Game.obj index 974b774..b1ebc43 100644 Binary files a/TestProject/TestProject/x64/Debug/Game.obj and b/TestProject/TestProject/x64/Debug/Game.obj differ diff --git a/TestProject/TestProject/x64/Debug/KeyboardController.obj b/TestProject/TestProject/x64/Debug/KeyboardController.obj index c2139e2..d9d9773 100644 Binary files a/TestProject/TestProject/x64/Debug/KeyboardController.obj and b/TestProject/TestProject/x64/Debug/KeyboardController.obj differ diff --git a/TestProject/TestProject/x64/Debug/Map.obj b/TestProject/TestProject/x64/Debug/Map.obj index 53b341c..7f0590e 100644 Binary files a/TestProject/TestProject/x64/Debug/Map.obj and b/TestProject/TestProject/x64/Debug/Map.obj differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.ilk b/TestProject/TestProject/x64/Debug/TestProject.ilk index d8f454d..8e79381 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.ilk and b/TestProject/TestProject/x64/Debug/TestProject.ilk differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.log b/TestProject/TestProject/x64/Debug/TestProject.log index a162739..c83c020 100644 --- a/TestProject/TestProject/x64/Debug/TestProject.log +++ b/TestProject/TestProject/x64/Debug/TestProject.log @@ -1,24 +1,27 @@  Game.cpp C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\TransformComponent.h(61,36): warning C4244: '+=': conversion from 'double' to 'float', possible loss of data C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\TransformComponent.h(62,36): warning C4244: '+=': conversion from 'double' to 'float', possible loss of data +C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\SpriteComponent.h(38,48): warning C4244: '=': conversion from 'float' to 'int', possible loss of data C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\SpriteComponent.h(39,48): warning C4244: '=': conversion from 'float' to 'int', possible loss of data -C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\SpriteComponent.h(40,48): warning C4244: '=': conversion from 'float' to 'int', possible loss of data C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ColliderComponent.h(30,35): warning C4244: '=': conversion from 'float' to 'int', possible loss of data C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ColliderComponent.h(31,35): warning C4244: '=': conversion from 'float' to 'int', possible loss of data -C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ECS.h(67,34): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data -C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\TileComponent.h(37,15): message : see reference to function template instantiation 'T &Entity::addComponent(int &,int &,int &,int &,int &&)' being compiled +C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ECS.h(87,34): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data +C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\TileComponent.h(44,15): message : see reference to function template instantiation 'T &Entity::addComponent(int &,int &,int &,int &,int &&)' being compiled with [ T=TransformComponent ] -C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ECS.h(67,34): warning C4244: 'argument': conversion from '_Ty' to 'float', possible loss of data +C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ECS.h(87,34): warning C4244: 'argument': conversion from '_Ty' to 'float', possible loss of data with [ _Ty=int ] -C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\Game.cpp(62,8): message : see reference to function template instantiation 'T &Entity::addComponent(int &&,int &&,int &&)' being compiled +C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\Game.cpp(71,8): message : see reference to function template instantiation 'T &Entity::addComponent(int &&,int &&,int &&)' being compiled with [ T=TransformComponent ] + Map.cpp + main.cpp + Generating Code... TestProject.vcxproj -> C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\x64\Debug\TestProject.exe diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.command.1.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.command.1.tlog index b73b550..5ce0e4e 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.command.1.tlog and b/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.command.1.tlog differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.read.1.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.read.1.tlog index fe0333b..ba2eca2 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.read.1.tlog and b/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.read.1.tlog differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.write.1.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.write.1.tlog index 9c0239e..ae9b211 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.write.1.tlog and b/TestProject/TestProject/x64/Debug/TestProject.tlog/CL.write.1.tlog differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/Cl.items.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/Cl.items.tlog index 2df7322..1a30e0d 100644 --- a/TestProject/TestProject/x64/Debug/TestProject.tlog/Cl.items.tlog +++ b/TestProject/TestProject/x64/Debug/TestProject.tlog/Cl.items.tlog @@ -1,3 +1,4 @@ +C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\ECS.cpp;C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\x64\Debug\ECS.obj C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\Game.cpp;C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\x64\Debug\Game.obj C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\GameObject.cpp;C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\x64\Debug\GameObject.obj C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\KeyboardController.cpp;C:\Users\User\Desktop\FH_TECHNIKUM\3.Semester\INNO1\TestProject\TestProject\x64\Debug\KeyboardController.obj diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/link.command.1.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/link.command.1.tlog index 70e3192..ad17c84 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.tlog/link.command.1.tlog and b/TestProject/TestProject/x64/Debug/TestProject.tlog/link.command.1.tlog differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/link.read.1.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/link.read.1.tlog index 15b41d6..0ee8d51 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.tlog/link.read.1.tlog and b/TestProject/TestProject/x64/Debug/TestProject.tlog/link.read.1.tlog differ diff --git a/TestProject/TestProject/x64/Debug/TestProject.tlog/link.write.1.tlog b/TestProject/TestProject/x64/Debug/TestProject.tlog/link.write.1.tlog index 2ce4166..286da6d 100644 Binary files a/TestProject/TestProject/x64/Debug/TestProject.tlog/link.write.1.tlog and b/TestProject/TestProject/x64/Debug/TestProject.tlog/link.write.1.tlog differ diff --git a/TestProject/TestProject/x64/Debug/TextureManager.obj b/TestProject/TestProject/x64/Debug/TextureManager.obj index 811100c..5759c14 100644 Binary files a/TestProject/TestProject/x64/Debug/TextureManager.obj and b/TestProject/TestProject/x64/Debug/TextureManager.obj differ diff --git a/TestProject/TestProject/x64/Debug/main.obj b/TestProject/TestProject/x64/Debug/main.obj index de1d658..ece49c2 100644 Binary files a/TestProject/TestProject/x64/Debug/main.obj and b/TestProject/TestProject/x64/Debug/main.obj differ diff --git a/TestProject/TestProject/x64/Debug/vc143.idb b/TestProject/TestProject/x64/Debug/vc143.idb index 000d970..e2f42d8 100644 Binary files a/TestProject/TestProject/x64/Debug/vc143.idb and b/TestProject/TestProject/x64/Debug/vc143.idb differ diff --git a/TestProject/TestProject/x64/Debug/vc143.pdb b/TestProject/TestProject/x64/Debug/vc143.pdb index 4e5854c..63594ed 100644 Binary files a/TestProject/TestProject/x64/Debug/vc143.pdb and b/TestProject/TestProject/x64/Debug/vc143.pdb differ diff --git a/TestProject/x64/Debug/TestProject.exe b/TestProject/x64/Debug/TestProject.exe index 72561a3..9a03a87 100644 Binary files a/TestProject/x64/Debug/TestProject.exe and b/TestProject/x64/Debug/TestProject.exe differ diff --git a/TestProject/x64/Debug/TestProject.pdb b/TestProject/x64/Debug/TestProject.pdb index 3bd1fbc..3cef78f 100644 Binary files a/TestProject/x64/Debug/TestProject.pdb and b/TestProject/x64/Debug/TestProject.pdb differ