summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-20 00:34:20 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-20 00:34:20 +0300
commit899d3b925ccb249de881bbc957f6e4ddc754cbbd (patch)
tree4c35a6f21d909f9bc07ed091f0c8e3cb5f700105 /src/particle
parent1049de4c76ac6fc85c9f7f2bd35fb62ca787aa4c (diff)
downloadmv-899d3b925ccb249de881bbc957f6e4ddc754cbbd.tar.gz
mv-899d3b925ccb249de881bbc957f6e4ddc754cbbd.tar.bz2
mv-899d3b925ccb249de881bbc957f6e4ddc754cbbd.tar.xz
mv-899d3b925ccb249de881bbc957f6e4ddc754cbbd.zip
Add function for read float and double number from xml.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particle.cpp12
-rw-r--r--src/particle/particleemitter.cpp8
-rw-r--r--src/particle/particleengine.cpp12
3 files changed, 16 insertions, 16 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index dd5b86913..3019aeda0 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -475,12 +475,12 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
}
// Read and set the basic properties of the particle
- const float offsetX = static_cast<float>(XML::getFloatProperty(
- effectChildNode, "position-x", 0));
- const float offsetY = static_cast<float>(XML::getFloatProperty(
- effectChildNode, "position-y", 0));
- const float offsetZ = static_cast<float>(XML::getFloatProperty(
- effectChildNode, "position-z", 0));
+ const float offsetX = XML::getFloatProperty(
+ effectChildNode, "position-x", 0);
+ const float offsetY = XML::getFloatProperty(
+ effectChildNode, "position-y", 0);
+ const float offsetZ = XML::getFloatProperty(
+ effectChildNode, "position-z", 0);
const Vector position(mPos.x + static_cast<float>(pixelX) + offsetX,
mPos.y + static_cast<float>(pixelY) + offsetY,
mPos.z + offsetZ);
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 326daea7a..642acd851 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -473,15 +473,15 @@ ParticleEmitter::readParticleEmitterProp(XmlNodePtrConst propertyNode, T def)
{
ParticleEmitterProp<T> retval;
- def = static_cast<T>(XML::getFloatProperty(propertyNode, "value",
+ def = static_cast<T>(XML::getDoubleProperty(propertyNode, "value",
static_cast<double>(def)));
- retval.set(static_cast<T>(XML::getFloatProperty(propertyNode, "min",
- static_cast<double>(def))), static_cast<T>(XML::getFloatProperty(
+ retval.set(static_cast<T>(XML::getDoubleProperty(propertyNode, "min",
+ static_cast<double>(def))), static_cast<T>(XML::getDoubleProperty(
propertyNode, "max", static_cast<double>(def))));
const std::string change = XML::getProperty(
propertyNode, "change-func", "none");
- T amplitude = static_cast<T>(XML::getFloatProperty(propertyNode,
+ T amplitude = static_cast<T>(XML::getDoubleProperty(propertyNode,
"change-amplitude", 0.0));
const int period = XML::getProperty(propertyNode, "change-period", 0);
diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp
index 51620a11e..02e21e0bc 100644
--- a/src/particle/particleengine.cpp
+++ b/src/particle/particleengine.cpp
@@ -197,12 +197,12 @@ Particle *ParticleEngine::addEffect(const std::string &restrict
}
// Read and set the basic properties of the particle
- const float offsetX = static_cast<float>(XML::getFloatProperty(
- effectChildNode, "position-x", 0));
- const float offsetY = static_cast<float>(XML::getFloatProperty(
- effectChildNode, "position-y", 0));
- const float offsetZ = static_cast<float>(XML::getFloatProperty(
- effectChildNode, "position-z", 0));
+ const float offsetX = XML::getFloatProperty(
+ effectChildNode, "position-x", 0);
+ const float offsetY = XML::getFloatProperty(
+ effectChildNode, "position-y", 0);
+ const float offsetZ = XML::getFloatProperty(
+ effectChildNode, "position-z", 0);
const Vector position(static_cast<float>(pixelX) + offsetX,
static_cast<float>(pixelY) + offsetY,
offsetZ);