From 752f8f82f989f949a5723cbad3a234ff4f19d8e9 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 10 Apr 2016 00:12:27 +1000 Subject: [PATCH] Unit tested CompositeImage, BaseBarrier::CorrectSprite working correctly --- client/composite_image.hpp | 25 ++++++++++++++-------- client/entities/barrier_manager.cpp | 5 +++-- client/entities/barrier_manager.hpp | 2 +- client/entities/base_barrier.cpp | 33 +++++++++++++++++++++++++++-- client/scenes/world.cpp | 31 ++++++++++++++++----------- 5 files changed, 70 insertions(+), 26 deletions(-) diff --git a/client/composite_image.hpp b/client/composite_image.hpp index c33308b..0091f4c 100644 --- a/client/composite_image.hpp +++ b/client/composite_image.hpp @@ -33,8 +33,8 @@ public: CompositeImage() = default; ~CompositeImage() = default; - void Load(std::string spriteDir, std::list nameList); - void SetImageTextures(std::map& templateImages); + void Load(SDL_Renderer* const, std::string spriteDir, std::list nameList); + void SetTextures(std::map& templateImages); void Free(); void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0); @@ -47,21 +47,23 @@ public: void EnableAll(); void DisableAll(); + std::map>* GetTemplateImages(); + private: - std::map > imageMap; + std::map> imageMap; }; template -void CompositeImage::Load(std::string spriteDir, std::list nameList) { +void CompositeImage::Load(SDL_Renderer* const renderer, std::string spriteDir, std::list nameList) { for (auto& it : nameList) { imageMap[it].first = true; - imageMap[it].second.Load(spriteDir + it); + imageMap[it].second.Load(renderer, spriteDir + it); } } template -void CompositeImage::SetImageTextures(std::map& templateImages) { +void CompositeImage::SetTextures(std::map& templateImages) { for (auto& it : templateImages) { imageMap[it.first].first = true; imageMap[it.first].second.SetTexture(it.second.GetTexture()); @@ -95,7 +97,7 @@ T* CompositeImage::Find(std::string name) { return nullptr; } else { - return &it.second; + return &it->second.second; } } @@ -126,13 +128,18 @@ bool CompositeImage::Disable(std::string name) { template void CompositeImage::EnableAll() { for (auto& it : imageMap) { - it.first = true; + it.second.first = true; } } template void CompositeImage::DisableAll() { for (auto& it : imageMap) { - it.first = false; + it.second.first = false; } } + +template +std::map>* CompositeImage::GetTemplateImages() { + return &imageMap; +} \ No newline at end of file diff --git a/client/entities/barrier_manager.cpp b/client/entities/barrier_manager.cpp index f04e2c6..0287701 100644 --- a/client/entities/barrier_manager.cpp +++ b/client/entities/barrier_manager.cpp @@ -35,9 +35,10 @@ void BarrierManager::UnloadBaseImage() { baseImage.Free(); } -void BarrierManager::LoadTemplateImages(SDL_Renderer* renderer, std::list names) { +void BarrierManager::LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list names) { + //sprite names are file names only for (auto& it : names) { - templateImages.emplace(it, Image(renderer, it)); + templateImages.emplace(it, Image(renderer, spriteDir + it)); } } diff --git a/client/entities/barrier_manager.hpp b/client/entities/barrier_manager.hpp index ae8c222..c458820 100644 --- a/client/entities/barrier_manager.hpp +++ b/client/entities/barrier_manager.hpp @@ -36,7 +36,7 @@ public: //NOTE: don't use these while you have barriers loaded void LoadBaseImage(SDL_Renderer* renderer, std::string fname); void UnloadBaseImage(); - void LoadTemplateImages(SDL_Renderer* renderer, std::list names); + void LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list names); void UnloadTemplateImages(); BaseBarrier* Create(int index); diff --git a/client/entities/base_barrier.cpp b/client/entities/base_barrier.cpp index adaebe4..9f91f19 100644 --- a/client/entities/base_barrier.cpp +++ b/client/entities/base_barrier.cpp @@ -24,10 +24,14 @@ #include "config_utility.hpp" #include +#include +#include BaseBarrier::BaseBarrier(Image& argBaseImage, std::map& templateImages) { baseImage.SetTexture(argBaseImage.GetTexture()); - composite.SetImageTextures(templateImages); + composite.SetTextures(templateImages); + memset(status, 0, sizeof(int) * 8); + CorrectSprite(); } BaseBarrier::~BaseBarrier() { @@ -35,7 +39,32 @@ BaseBarrier::~BaseBarrier() { } void BaseBarrier::CorrectSprite() { - //TODO: (0) link status to sprite + //TODO: link status to sprite + for (int i = 0; i < 8; i++) { + //setup the name + std::ostringstream os; + os << "slot " << i+1; + + switch(status[i]) { + case 0: + composite.Disable(os.str() + " green.png"); + composite.Disable(os.str() + " red.png"); + break; + case 1: + composite.Enable(os.str() + " green.png"); + composite.Disable(os.str() + " red.png"); + break; + case 2: + composite.Disable(os.str() + " green.png"); + composite.Enable(os.str() + " red.png"); + break; + default: { + std::ostringstream os; + os << "index " << i << ", value " << status[i] << std::endl; + throw(std::runtime_error("Unknown graphical status in barrier; " + os.str())); + } + } + } } void BaseBarrier::Update() { diff --git a/client/scenes/world.cpp b/client/scenes/world.cpp index f426d46..fd034d6 100644 --- a/client/scenes/world.cpp +++ b/client/scenes/world.cpp @@ -98,19 +98,26 @@ World::World(int* const argClientIndex, int* const argAccountIndex): SDL_RenderGetLogicalSize(GetRenderer(), &camera.width, &camera.height); //debug + std::list slotNames = { + "slot 1 green.png", + "slot 2 green.png", + "slot 3 green.png", + "slot 4 green.png", + "slot 5 green.png", + "slot 6 green.png", + "slot 7 green.png", + "slot 8 green.png", + "slot 1 red.png", + "slot 2 red.png", + "slot 3 red.png", + "slot 4 red.png", + "slot 5 red.png", + "slot 6 red.png", + "slot 7 red.png", + "slot 8 red.png" + }; barrierMgr.LoadBaseImage(GetRenderer(), config["dir.sprites"] + "/barrier/base.png"); - barrierMgr.LoadTemplateImages(GetRenderer(), - std::list{ - config["dir.sprites"] + "/barrier/slot 1 green.png", - config["dir.sprites"] + "/barrier/slot 2 green.png", - config["dir.sprites"] + "/barrier/slot 3 green.png", - config["dir.sprites"] + "/barrier/slot 4 green.png", - config["dir.sprites"] + "/barrier/slot 5 green.png", - config["dir.sprites"] + "/barrier/slot 6 green.png", - config["dir.sprites"] + "/barrier/slot 7 green.png", - config["dir.sprites"] + "/barrier/slot 8 green.png" - } - ); + barrierMgr.LoadTemplateImages(GetRenderer(), config["dir.sprites"] + "/barrier/", slotNames); std::cout << "Templates loaded: " << barrierMgr.GetTemplateContainer()->size() << std::endl; }