Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unit tested CompositeImage, BaseBarrier::CorrectSprite working correctly

Browse Source
This commit is contained in:
Kayne Ruse
2016-04-10 00:12:27 +10:00
parent 1f2d0b8e76
commit 752f8f82f9
5 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/composite_image.hpp
+15 -8
View File
@@ -33,8 +33,8 @@ public:
CompositeImage() = default;
~CompositeImage() = default;
void Load(std::string spriteDir, std::list<std::string> nameList);
void SetImageTextures(std::map<std::string, Image>& templateImages);
void Load(SDL_Renderer* const, std::string spriteDir, std::list<std::string> nameList);
void SetTextures(std::map<std::string, Image>& 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<std::string, std::pair<bool, T>>* GetTemplateImages();
private:
std::map<std::string, std::pair<bool, T>> imageMap;
};
template<typename T>
void CompositeImage<T>::Load(std::string spriteDir, std::list<std::string> nameList) {
void CompositeImage<T>::Load(SDL_Renderer* const renderer, std::string spriteDir, std::list<std::string> nameList) {
for (auto& it : nameList) {
imageMap[it].first = true;
imageMap[it].second.Load(spriteDir + it);
imageMap[it].second.Load(renderer, spriteDir + it);
}
}
template<typename T>
void CompositeImage<T>::SetImageTextures(std::map<std::string, Image>& templateImages) {
void CompositeImage<T>::SetTextures(std::map<std::string, Image>& templateImages) {
for (auto& it : templateImages) {
imageMap[it.first].first = true;
imageMap[it.first].second.SetTexture(it.second.GetTexture());
@@ -95,7 +97,7 @@ T* CompositeImage<T>::Find(std::string name) {
return nullptr;
}
else {
return &it.second;
return &it->second.second;
}
}
@@ -126,13 +128,18 @@ bool CompositeImage<T>::Disable(std::string name) {
template<typename T>
void CompositeImage<T>::EnableAll() {
for (auto& it : imageMap) {
it.first = true;
it.second.first = true;
}
}
template<typename T>
void CompositeImage<T>::DisableAll() {
for (auto& it : imageMap) {
it.first = false;
it.second.first = false;
}
}
template<typename T>
std::map<std::string, std::pair<bool, T>>* CompositeImage<T>::GetTemplateImages() {
return &imageMap;
}
client/entities/barrier_manager.cpp
+3 -2
View File
@@ -35,9 +35,10 @@ void BarrierManager::UnloadBaseImage() {
baseImage.Free();
}
void BarrierManager::LoadTemplateImages(SDL_Renderer* renderer, std::list<std::string> names) {
void BarrierManager::LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list<std::string> names) {
//sprite names are file names only
for (auto& it : names) {
templateImages.emplace(it, Image(renderer, it));
templateImages.emplace(it, Image(renderer, spriteDir + it));
}
}
client/entities/barrier_manager.hpp
+1 -1
View File
@@ -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<std::string> names);
void LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list<std::string> names);
void UnloadTemplateImages();
BaseBarrier* Create(int index);
client/entities/base_barrier.cpp
+31 -2
View File
@@ -24,10 +24,14 @@
#include "config_utility.hpp"
#include <cstring>
#include <sstream>
#include <stdexcept>
BaseBarrier::BaseBarrier(Image& argBaseImage, std::map<std::string, Image>& 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() {
client/scenes/world.cpp
+19 -12
View File
@@ -98,19 +98,26 @@ World::World(int* const argClientIndex, int* const argAccountIndex):
SDL_RenderGetLogicalSize(GetRenderer(), &camera.width, &camera.height);
//debug
std::list<std::string> 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<std::string>{
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;
}