projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finished changes to deps directory building
[physics.git]
/
src
/
Entities
/
Particle.cpp
diff --git
a/src/Entities/Particle.cpp
b/src/Entities/Particle.cpp
index
97cbafb
..
c978d38
100644
(file)
--- a/
src/Entities/Particle.cpp
+++ b/
src/Entities/Particle.cpp
@@
-17,18
+17,19
@@
#include "Particle.h"
#include "Particle.h"
-#include <pg/Vector2.h>
+#include <bear/Vector2.h>
+using namespace bear;
/// ***** Constructors/Destructors *****
Particle::Particle(const Vector2& pos, bool canDie)
/// ***** Constructors/Destructors *****
Particle::Particle(const Vector2& pos, bool canDie)
- : Entity(pos), canDie(canDie)
+ : Entity(pos),
m_
canDie(canDie)
{
}
Particle::Particle(const Vector2& pos, float lifeTime)
{
}
Particle::Particle(const Vector2& pos, float lifeTime)
- : Entity(pos), lifeTime(lifeTime)
+ : Entity(pos),
m_
lifeTime(lifeTime)
{
}
{
}
@@
-41,13
+42,13
@@
Particle::~Particle()
void Particle::update(float time_step)
{
void Particle::update(float time_step)
{
- if(isDead)
+ if(
m_
isDead)
return;
return;
- if (canDie)
+ if (
m_
canDie)
{
{
- lifeTime -= time_step;
-
isDead =
lifeTime <= 0;
+
m_
lifeTime -= time_step;
+
m_isDead = m_
lifeTime <= 0;
}
}
-
position +=
velocity * time_step;
+
m_position += m_
velocity * time_step;
}
}