forked from DFHack/stonesense
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Actually got the performance enhancements working. No more drawtime c…
…alculations. Also rearranged MANY references to the allegro draw target which were causing mischief.
- Loading branch information
1 parent
20b3388
commit f9c5d29
Showing
15 changed files
with
8,731 additions
and
8,746 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,163 +1,163 @@ | ||
| #include "common.h" | ||
| #include "ConditionalSprite.h" | ||
| #include "Block.h" | ||
| #include "GameBuildings.h" | ||
| #include "GUI.h" | ||
|
|
||
| /* RootBlock */ | ||
|
|
||
| RootBlock::RootBlock() | ||
| : SpriteNode() | ||
| { | ||
| //cout << "RootBlock +" << endl; | ||
| } | ||
|
|
||
| RootBlock::~RootBlock(void) | ||
| { | ||
| //cout << "RootBlock -" << endl; | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| delete(children[i]); | ||
| } | ||
| } | ||
|
|
||
| bool RootBlock::copyToBlock(Block* b) | ||
| { | ||
| bool haveMatch = false; | ||
| uint32_t max = (uint32_t)children.size(); | ||
|
|
||
| for(uint32_t i=0; i<max; i++) { | ||
| if (children[i]->copyToBlock(b)) { | ||
| haveMatch = true; | ||
| } | ||
| } | ||
| return haveMatch; | ||
| } | ||
|
|
||
| void RootBlock::addChild(SpriteNode* child) | ||
| { | ||
| children.push_back(child); | ||
| } | ||
|
|
||
| /* SpriteBlock */ | ||
|
|
||
| SpriteBlock::SpriteBlock() | ||
| : ConditionalNode(), SpriteNode() | ||
| { | ||
| //cout << "SpriteBlock +" << endl; | ||
| conditions = NULL; | ||
| elsenode = NULL; | ||
| } | ||
|
|
||
| SpriteBlock::~SpriteBlock(void) | ||
| { | ||
| //cout << "SpriteBlock -" << endl; | ||
| delete(elsenode); | ||
| delete(conditions); | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| delete(children[i]); | ||
| } | ||
| }; | ||
|
|
||
| bool SpriteBlock::copyToBlock(Block* b) | ||
| { | ||
| bool condMatch = false; | ||
| if (conditions == NULL) { | ||
| condMatch = true; | ||
| } else { | ||
| condMatch = conditions->Matches( b ); | ||
| } | ||
|
|
||
| bool haveMatch=false; | ||
| if (condMatch) { | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| if (children[i]->copyToBlock(b)) { | ||
| haveMatch = true; | ||
| } | ||
| } | ||
| } else if (elsenode != NULL) { | ||
| haveMatch = elsenode->copyToBlock(b); | ||
| } | ||
| return haveMatch; | ||
| } | ||
|
|
||
| bool SpriteBlock::addCondition(BlockCondition* cond) | ||
| { | ||
| if (conditions != NULL) { | ||
| LogError("Too many condition elements for SpriteBlock\n"); | ||
| return false; | ||
| } | ||
| conditions = cond; | ||
| return true; | ||
| } | ||
|
|
||
| void SpriteBlock::addChild(SpriteNode* child) | ||
| { | ||
| children.push_back(child); | ||
| } | ||
|
|
||
| void SpriteBlock::addElse(SpriteNode* child) | ||
| { | ||
| elsenode = child; | ||
| } | ||
|
|
||
|
|
||
| /* RotationBlock */ | ||
|
|
||
| RotationBlock::RotationBlock() | ||
| : ConditionalNode(), SpriteNode() | ||
| { | ||
| //cout << "SpriteBlock +" << endl; | ||
| } | ||
|
|
||
| RotationBlock::~RotationBlock(void) | ||
| { | ||
| //cout << "SpriteBlock -" << endl; | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| delete(children[i]); | ||
| } | ||
| }; | ||
|
|
||
| bool RotationBlock::copyToBlock(Block* b) | ||
| { | ||
| int index = DisplayedRotation; | ||
| int max = (int)children.size(); | ||
| if (max == 0) { | ||
| return false; | ||
| } | ||
| while (index >= max) { | ||
| index = index - max; | ||
| } | ||
| return children[index]->copyToBlock(b); | ||
| } | ||
|
|
||
| bool RotationBlock::addCondition(BlockCondition* cond) | ||
| { | ||
| LogError("Condition elements not permitted for RotationBlock\n"); | ||
| return false; | ||
| } | ||
|
|
||
| void RotationBlock::addChild(SpriteNode* child) | ||
| { | ||
| children.push_back(child); | ||
| } | ||
|
|
||
| /* SpriteElement */ | ||
|
|
||
| SpriteElement::SpriteElement() | ||
| : SpriteNode() | ||
| { | ||
| //cout << "SpriteElement +" << endl; | ||
| sprite.set_sheetindex(-1); | ||
| } | ||
|
|
||
| bool SpriteElement::copyToBlock(Block* b) | ||
| { | ||
| if (sprite.get_sheetindex() > -1) { | ||
| b->building.sprites.push_back(sprite); | ||
| } | ||
| return true; | ||
| } | ||
| #include "common.h" | ||
| #include "ConditionalSprite.h" | ||
| #include "Block.h" | ||
| #include "GameBuildings.h" | ||
| #include "GUI.h" | ||
|
|
||
| /* RootBlock */ | ||
|
|
||
| RootBlock::RootBlock() | ||
| : SpriteNode() | ||
| { | ||
| //cout << "RootBlock +" << endl; | ||
| } | ||
|
|
||
| RootBlock::~RootBlock(void) | ||
| { | ||
| //cout << "RootBlock -" << endl; | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| delete(children[i]); | ||
| } | ||
| } | ||
|
|
||
| bool RootBlock::copyToBlock(Block* b) | ||
| { | ||
| bool haveMatch = false; | ||
| uint32_t max = (uint32_t)children.size(); | ||
|
|
||
| for(uint32_t i=0; i<max; i++) { | ||
| if (children[i]->copyToBlock(b)) { | ||
| haveMatch = true; | ||
| } | ||
| } | ||
| return haveMatch; | ||
| } | ||
|
|
||
| void RootBlock::addChild(SpriteNode* child) | ||
| { | ||
| children.push_back(child); | ||
| } | ||
|
|
||
| /* SpriteBlock */ | ||
|
|
||
| SpriteBlock::SpriteBlock() | ||
| : ConditionalNode(), SpriteNode() | ||
| { | ||
| //cout << "SpriteBlock +" << endl; | ||
| conditions = NULL; | ||
| elsenode = NULL; | ||
| } | ||
|
|
||
| SpriteBlock::~SpriteBlock(void) | ||
| { | ||
| //cout << "SpriteBlock -" << endl; | ||
| delete(elsenode); | ||
| delete(conditions); | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| delete(children[i]); | ||
| } | ||
| }; | ||
|
|
||
| bool SpriteBlock::copyToBlock(Block* b) | ||
| { | ||
| bool condMatch = false; | ||
| if (conditions == NULL) { | ||
| condMatch = true; | ||
| } else { | ||
| condMatch = conditions->Matches( b ); | ||
| } | ||
|
|
||
| bool haveMatch=false; | ||
| if (condMatch) { | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| if (children[i]->copyToBlock(b)) { | ||
| haveMatch = true; | ||
| } | ||
| } | ||
| } else if (elsenode != NULL) { | ||
| haveMatch = elsenode->copyToBlock(b); | ||
| } | ||
| return haveMatch; | ||
| } | ||
|
|
||
| bool SpriteBlock::addCondition(BlockCondition* cond) | ||
| { | ||
| if (conditions != NULL) { | ||
| LogError("Too many condition elements for SpriteBlock\n"); | ||
| return false; | ||
| } | ||
| conditions = cond; | ||
| return true; | ||
| } | ||
|
|
||
| void SpriteBlock::addChild(SpriteNode* child) | ||
| { | ||
| children.push_back(child); | ||
| } | ||
|
|
||
| void SpriteBlock::addElse(SpriteNode* child) | ||
| { | ||
| elsenode = child; | ||
| } | ||
|
|
||
|
|
||
| /* RotationBlock */ | ||
|
|
||
| RotationBlock::RotationBlock() | ||
| : ConditionalNode(), SpriteNode() | ||
| { | ||
| //cout << "SpriteBlock +" << endl; | ||
| } | ||
|
|
||
| RotationBlock::~RotationBlock(void) | ||
| { | ||
| //cout << "SpriteBlock -" << endl; | ||
| uint32_t max = (uint32_t)children.size(); | ||
| for(uint32_t i=0; i<max; i++) { | ||
| delete(children[i]); | ||
| } | ||
| }; | ||
|
|
||
| bool RotationBlock::copyToBlock(Block* b) | ||
| { | ||
| int index = ssState.DisplayedRotation; | ||
| int max = (int)children.size(); | ||
| if (max == 0) { | ||
| return false; | ||
| } | ||
| while (index >= max) { | ||
| index = index - max; | ||
| } | ||
| return children[index]->copyToBlock(b); | ||
| } | ||
|
|
||
| bool RotationBlock::addCondition(BlockCondition* cond) | ||
| { | ||
| LogError("Condition elements not permitted for RotationBlock\n"); | ||
| return false; | ||
| } | ||
|
|
||
| void RotationBlock::addChild(SpriteNode* child) | ||
| { | ||
| children.push_back(child); | ||
| } | ||
|
|
||
| /* SpriteElement */ | ||
|
|
||
| SpriteElement::SpriteElement() | ||
| : SpriteNode() | ||
| { | ||
| //cout << "SpriteElement +" << endl; | ||
| sprite.set_sheetindex(-1); | ||
| } | ||
|
|
||
| bool SpriteElement::copyToBlock(Block* b) | ||
| { | ||
| if (sprite.get_sheetindex() > -1) { | ||
| b->building.sprites.push_back(sprite); | ||
| } | ||
| return true; | ||
| } |
Oops, something went wrong.