X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FParticle.cpp;h=c978d3877bde081423bb87bb28c66d09c5017170;hb=389bf8fdd7e1b8f4fe21e5a9fdb477d40d03d829;hp=6aae3ed78f6ad583563a8e60d3208f34164f1e89;hpb=617dcc71d9a71663f63fb56ffac2505b45bf91b9;p=physics.git
diff --git a/src/Entities/Particle.cpp b/src/Entities/Particle.cpp
index 6aae3ed..c978d38 100644
--- a/src/Entities/Particle.cpp
+++ b/src/Entities/Particle.cpp
@@ -1,17 +1,35 @@
+/*
+ * Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
#include "Particle.h"
-#include "../Vector2.h"
+#include
+using namespace bear;
/// ***** 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)
- : Entity(pos), lifeTime(lifeTime)
+ : Entity(pos), m_lifeTime(lifeTime)
{
}
@@ -24,13 +42,13 @@ Particle::~Particle()
void Particle::update(float time_step)
{
- if(isDead)
+ if(m_isDead)
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;
}