particles fixes

This commit is contained in:
Henrique Santiago 2011-12-15 16:39:57 -02:00
parent 7119468b59
commit 8926f33679
5 changed files with 434 additions and 14 deletions

View File

@ -6,25 +6,25 @@ ParticleSystem
burstCount: 1 burstCount: 1
pSize: 8 8 particle-size: 8 8
pPositionRadius: 0 particle-position-radius: 0
pVelocityAngle: 360 particle-velocity-angle: 360
pAcceleration: 0 particle-acceleration: 0
pColor: #22940684 particle-color: #22940684
pTexture: circle2.png particle-texture: circle2.png
Emitter Emitter
position: 100 100 position: 100 100
duration: 9 duration: 9
burstRate: 0.01 burstRate: 1
burstCount: 1 burstCount: 30
pSize: 5 5 particle-size: 5 5
pPositionRadius: 0 particle-position-radius: 0
pVelocityAngle: 360 particle-velocity-angle: 360
pAccelerationAngle: 315 particle-acceleration-angle: 315
pColor: #aaaaaaff particle-color: #ff0000ff
pTexture: circle2.png particle-texture: circle2.png

View File

@ -0,0 +1,274 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "particleemitter.h"
#include "graphics.h"
#include <framework/core/clock.h>
#include <framework/graphics/texturemanager.h>
#include <framework/util/tools.h>
Particle::Particle(const Rect& rect, float vx, float vy, float ax, float ay, float duration, const Color& color, TexturePtr texture)
{
m_rect = rect;
m_ix = rect.x(); m_iy = rect.y();
m_vx = vx; m_vy = vy;
m_ax = ax; m_ay = ay;
m_color = color;
m_texture = texture;
m_duration = duration;
m_startTicks = g_clock.ticks();
m_finished = false;
}
Particle::~Particle()
{
//dump << "deleted";
}
void Particle::render()
{
g_painter.setColor(m_color);
if(!m_texture)
g_painter.drawFilledRect(m_rect);
else {
//g_painter.setCompositionMode(Painter::CompositionMode_AdditiveSource);
g_painter.drawTexturedRect(m_rect, m_texture);
//g_painter.setCompositionMode(Painter::CompositionMode_SourceOver);
}
}
void Particle::update()
{
ticks_t t = g_clock.ticks() - m_startTicks;
// check if finished
if(m_duration >= 0 && t > m_duration * 1000) {
m_finished = true;
return;
}
//update position
m_rect.moveTo(m_ix + (m_vx * t / 1000.0) + (m_ax * t*t / (2.0 * 1000 * 1000)),
m_iy + (m_vy * t / 1000.0) + (m_ay * t*t / (2.0 * 1000 * 1000)));
}
ParticleEmitter::ParticleEmitter()
{
m_position = Point(0, 0);
m_duration = -1;
m_burstRate = 1; m_burstCount = 32;
m_currentBurst = 0;
m_startTicks = g_clock.ticks();
m_finished = false;
// particles default configuration. (make them reasonable for user detect missing properties on scripts)
m_pMinPositionRadius = 0; m_pMaxPositionRadius = 3;
m_pMinPositionAngle = -Fw::pi; m_pMaxPositionAngle = Fw::pi;
m_pMinSize = Size(32, 32); m_pMaxSize = Size(32, 32);
m_pMinDuration = 0; m_pMaxDuration = 10;
m_pMinVelocity = 32; m_pMaxVelocity = 64;
m_pMinVelocityAngle = -Fw::pi; m_pMaxVelocityAngle = Fw::pi;
m_pMinAcceleration = 32; m_pMaxAcceleration = 64;
m_pMinAccelerationAngle = -Fw::pi; m_pMaxAccelerationAngle = Fw::pi;
m_pColor = Color(255, 0, 0, 128);
m_pTexture = nullptr;
}
bool ParticleEmitter::load(const OTMLNodePtr& node)
{
for(const OTMLNodePtr& childNode : node->children()) {
// self related
if(childNode->tag() == "position") {
std::string value = childNode->value();
std::vector<std::string> split;
boost::split(split, value, boost::is_any_of(std::string(" ")));
if(split.size() == 2)
m_position = Point(Fw::safeCast<int>(split[0]), Fw::safeCast<int>(split[1]));
}
else if(childNode->tag() == "duration")
m_duration = childNode->value<float>();
else if(childNode->tag() == "burstRate")
m_burstRate = childNode->value<float>();
else if(childNode->tag() == "burstCount")
m_burstCount = childNode->value<int>();
// particles generation related
else if(childNode->tag() == "particle-position-radius") {
m_pMinPositionRadius = childNode->value<float>();
m_pMaxPositionRadius = childNode->value<float>();
}
else if(childNode->tag() == "particle-min-position-radius")
m_pMinPositionRadius = childNode->value<float>();
else if(childNode->tag() == "particle-max-position-radius")
m_pMaxPositionRadius = childNode->value<float>();
else if(childNode->tag() == "particle-position-angle") {
m_pMinPositionAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
m_pMaxPositionAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
}
else if(childNode->tag() == "particle-min-position-angle")
m_pMinPositionAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
else if(childNode->tag() == "particle-max-position-angle")
m_pMaxPositionAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
else if(childNode->tag() == "particle-velocity") {
m_pMinVelocity = childNode->value<float>();
m_pMaxVelocity = childNode->value<float>();
}
else if(childNode->tag() == "particle-min-velocity")
m_pMinVelocity = childNode->value<float>();
else if(childNode->tag() == "particle-max-velocity")
m_pMaxVelocity = childNode->value<float>();
else if(childNode->tag() == "particle-velocity-angle") {
m_pMinVelocityAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
m_pMaxVelocityAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
}
else if(childNode->tag() == "particle-min-velocity-angle")
m_pMinVelocityAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
else if(childNode->tag() == "particle-max-velocity-angle")
m_pMaxVelocityAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
else if(childNode->tag() == "particle-acceleration") {
m_pMinAcceleration = childNode->value<float>();
m_pMaxAcceleration = childNode->value<float>();
}
else if(childNode->tag() == "particle-min-acceleration")
m_pMinAcceleration = childNode->value<float>();
else if(childNode->tag() == "particle-max-acceleration")
m_pMaxAcceleration = childNode->value<float>();
else if(childNode->tag() == "particle-acceleration-angle") {
m_pMinAccelerationAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
m_pMaxAccelerationAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
}
else if(childNode->tag() == "particle-min-acceleration-angle")
m_pMinAccelerationAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
else if(childNode->tag() == "particle-max-acceleration-angle")
m_pMaxAccelerationAngle = (childNode->value<float>() * Fw::pi / 180.0) - Fw::pi;
else if(childNode->tag() == "particle-duration") {
m_pMinDuration = childNode->value<float>();
m_pMaxDuration = childNode->value<float>();
}
else if(childNode->tag() == "particle-min-duration")
m_pMinDuration = childNode->value<float>();
else if(childNode->tag() == "particle-max-duration")
m_pMaxDuration = childNode->value<float>();
else if(childNode->tag() == "particle-size") {
std::string value = childNode->value();
std::vector<std::string> split;
boost::split(split, value, boost::is_any_of(std::string(" ")));
if(split.size() == 2) {
m_pMinSize = Size(Fw::safeCast<int>(split[0]), Fw::safeCast<int>(split[1]));
m_pMaxSize = Size(Fw::safeCast<int>(split[0]), Fw::safeCast<int>(split[1]));
}
}
else if(childNode->tag() == "particle-min-size") {
std::string value = childNode->value();
std::vector<std::string> split;
boost::split(split, value, boost::is_any_of(std::string(" ")));
if(split.size() == 2) {
m_pMinSize = Size(Fw::safeCast<int>(split[0]), Fw::safeCast<int>(split[1]));
}
}
else if(childNode->tag() == "particle-max-size") {
std::string value = childNode->value();
std::vector<std::string> split;
boost::split(split, value, boost::is_any_of(std::string(" ")));
if(split.size() == 2) {
m_pMaxSize = Size(Fw::safeCast<int>(split[0]), Fw::safeCast<int>(split[1]));
}
}
else if(childNode->tag() == "particle-color")
m_pColor = childNode->value<Color>();
else if(childNode->tag() == "particle-texture")
m_pTexture = g_textures.getTexture(childNode->value());
}
return true;
}
void ParticleEmitter::render()
{
for(auto it = m_particles.begin(), end = m_particles.end(); it != end; ++it)
(*it)->render();
}
void ParticleEmitter::update()
{
ticks_t elapsedTicks = g_clock.ticks() - m_startTicks;
// update particles
for(auto it = m_particles.begin(), end = m_particles.end(); it != end;) {
const ParticlePtr& particle = *it;
if(particle->hasFinished()) {
it = m_particles.erase(it);
continue;
}
particle->update();
++it;
}
// check if finished
if(m_duration >= 0 && elapsedTicks > m_duration * 1000) {
// stop emitting but only self remove when there are no particles left
if(m_particles.size() == 0)
m_finished = true;
return;
}
int currentBurst = elapsedTicks / 1000.0 / m_burstRate + 1;
for(int b = m_currentBurst; b < currentBurst; ++b) {
// every burst created at same position.
float pRadius = Fw::randomRange(m_pMinPositionRadius, m_pMaxPositionRadius);
float pAngle = Fw::randomRange(m_pMinPositionAngle, m_pMaxPositionAngle);
Point pPosition = Point(-pRadius * cos(pAngle), pRadius * sin(pAngle));
for(int p = 0; p < m_burstCount; ++p) {
Size pSize = Size(Fw::randomRange(m_pMinSize.width(), m_pMaxSize.width()), Fw::randomRange(m_pMinSize.height(), m_pMaxSize.height()));
float pDuration = Fw::randomRange(m_pMinDuration, m_pMaxDuration);
// particles initial velocity
float pVelocity = Fw::randomRange(m_pMinVelocity, m_pMaxVelocity);
float pVelocityAngle = Fw::randomRange(m_pMinVelocityAngle, m_pMaxVelocityAngle);
// particles initial acceleration
float pAcceleration = Fw::randomRange(m_pMinAcceleration, m_pMaxAcceleration);
float pAccelerationAngle = Fw::randomRange(m_pMinAccelerationAngle, m_pMaxAccelerationAngle);
m_particles.push_back(ParticlePtr(new Particle(Rect(m_position + pPosition, pSize),
-pVelocity * cos(pVelocityAngle), pVelocity * sin(pVelocityAngle),
-pAcceleration * cos(pAccelerationAngle), pAcceleration * sin(pAccelerationAngle),
pDuration, m_pColor, m_pTexture)));
}
}
m_currentBurst = currentBurst;
}

View File

@ -0,0 +1,102 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef PARTICLEEMITTER_H
#define PARTICLEEMITTER_H
#include <framework/global.h>
#include <framework/graphics/texture.h>
#include <framework/otml/otml.h>
class Particle {
public:
Particle(const Rect& rect, float vx, float vy, float ax, float ay, float duration, const Color& color = Color(255, 255, 255), TexturePtr texture = nullptr);
~Particle();
void render();
void update();
bool hasFinished() { return m_finished; }
private:
Rect m_rect;
Color m_color;
TexturePtr m_texture;
int m_ix, m_iy;
float m_vx, m_vy;
float m_ax, m_ay;
float m_duration;
ticks_t m_startTicks;
bool m_finished;
};
typedef std::shared_ptr<Particle> ParticlePtr;
class ParticleEmitter {
public:
ParticleEmitter();
bool load(const OTMLNodePtr& node);
void render();
void update();
bool hasFinished() { return m_finished; }
private:
// self related
Point m_position;
int m_duration;
ticks_t m_startTicks;
bool m_finished;
float m_burstRate;
int m_currentBurst, m_burstCount;
std::list<ParticlePtr> m_particles;
// particles size
Size m_pMinSize, m_pMaxSize;
// particles initial position related to emitter position
float m_pMinPositionRadius, m_pMaxPositionRadius;
float m_pMinPositionAngle, m_pMaxPositionAngle;
// particles initial velocity
float m_pMinVelocity, m_pMaxVelocity;
float m_pMinVelocityAngle, m_pMaxVelocityAngle;
// particles initial acceleration
float m_pMinAcceleration, m_pMaxAcceleration;
float m_pMinAccelerationAngle, m_pMaxAccelerationAngle;
// particles duration
float m_pMinDuration, m_pMaxDuration;
// visual ralated
Color m_pColor;
TexturePtr m_pTexture;
};
typedef std::shared_ptr<ParticleEmitter> ParticleEmitterPtr;
#endif

View File

@ -1,3 +1,25 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "particlemanager.h" #include "particlemanager.h"
#include <framework/core/resourcemanager.h> #include <framework/core/resourcemanager.h>
#include <framework/otml/otml.h> #include <framework/otml/otml.h>

View File

@ -1,3 +1,25 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "particlesystem.h" #include "particlesystem.h"
bool ParticleSystem::load(const OTMLNodePtr& node) bool ParticleSystem::load(const OTMLNodePtr& node)