Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default for twoFrameAnimation smoothing is false.

This commit is contained in:
Titus Tscharntke 2013-04-17 00:56:04 +00:00
parent 88e2756ac2
commit 883cfbbd27
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/type_instances/object.cpp
View File

@ -141,8 +141,7 @@ void Object::update() {
const float speedDivider= 100.f; const float speedDivider= 100.f;
float speedDenominator = (speedDivider * GameConstants::updateFps); float speedDenominator = (speedDivider * GameConstants::updateFps);
// // smooth TwoFrameanimations
//float f= 2.1-4*abs(animProgress-.5f);
float f=1.0f; float f=1.0f;
if(objectType->getTilesetModelType(variation)->getSmoothTwoFrameAnim()==true){ if(objectType->getTilesetModelType(variation)->getSmoothTwoFrameAnim()==true){
f=abs(std::sin(animProgress*2*3.16))+0.4f; f=abs(std::sin(animProgress*2*3.16))+0.4f;

6
source/glest_game/world/tileset.cpp
View File

@ -315,12 +315,8 @@ void Tileset::load(const string &dir, Checksum *checksum, Checksum *tilesetCheck
if(modelNode->hasAttribute("smoothTwoFrameAnim") == true) { if(modelNode->hasAttribute("smoothTwoFrameAnim") == true) {
tmt->setSmoothTwoFrameAnim(modelNode->getAttribute("smoothTwoFrameAnim")->getBoolValue()); tmt->setSmoothTwoFrameAnim(modelNode->getAttribute("smoothTwoFrameAnim")->getBoolValue());
} }
else if(modelNode->hasChild("smoothTwoFrameAnim")){
const XmlNode *smoothTwoFrameAnimNode= modelNode->getChild("smoothTwoFrameAnim");
tmt->setSmoothTwoFrameAnim(smoothTwoFrameAnimNode->getAttribute("value")->getBoolValue());
}
else{ else{
tmt->setSmoothTwoFrameAnim(true); tmt->setSmoothTwoFrameAnim(false);
} }
} }
} }