summaryrefslogtreecommitdiffstats
path: root/scene/3d/particles.cpp
diff options
context:
space:
mode:
authorHubert Jarosz <marqin.pl@gmail.com>2016-03-09 00:00:52 +0100
committerHubert Jarosz <marqin.pl@gmail.com>2016-03-09 00:00:52 +0100
commit4a4f2479146aa33e235ed57cde311efda68d3c8f (patch)
treecf91f2869ff8f058c6682569fb31e22e5ee736ad /scene/3d/particles.cpp
parent1dad6eca812e5c2e313b54265114de8a1d73d999 (diff)
downloadredot-engine-4a4f2479146aa33e235ed57cde311efda68d3c8f.tar.gz
remove trailing whitespace
Diffstat (limited to 'scene/3d/particles.cpp')
-rw-r--r--scene/3d/particles.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp
index 47662bcccb..3ac5d8ed7b 100644
--- a/scene/3d/particles.cpp
+++ b/scene/3d/particles.cpp
@@ -100,10 +100,10 @@ void Particles::set_amount(int p_amount) {
VisualServer::get_singleton()->particles_set_amount(particles,p_amount);
}
int Particles::get_amount() const {
-
+
return amount;
}
-
+
void Particles::set_emitting(bool p_emitting) {
emitting=p_emitting;
@@ -115,19 +115,19 @@ bool Particles::is_emitting() const {
return emitting;
}
-
+
void Particles::set_visibility_aabb(const AABB& p_aabb) {
visibility_aabb=p_aabb;
VisualServer::get_singleton()->particles_set_visibility_aabb(particles,p_aabb);
update_gizmo();
-
+
}
AABB Particles::get_visibility_aabb() const {
return visibility_aabb;
}
-
+
void Particles::set_emission_points(const DVector<Vector3>& p_points) {
@@ -179,7 +179,7 @@ Vector3 Particles::get_gravity_normal() const {
return gravity_normal;
}
-
+
void Particles::set_variable(Variable p_variable,float p_value) {
ERR_FAIL_INDEX(p_variable,VAR_MAX);
@@ -273,7 +273,7 @@ float Particles::get_emit_timeout() const {
Ref<Material> Particles::get_material() const {
return material;
-}
+}
void Particles::set_height_from_velocity(bool p_enable) {
@@ -507,11 +507,11 @@ Particles::Particles() {
set_amount(64);
set_emitting(true);
set_visibility_aabb(AABB( Vector3(-4,-4,-4), Vector3(8,8,8) ) );
-
+
for (int i=0;i<VAR_MAX;i++) {
set_randomness((Variable)i,0.0);
}
-
+
set_variable( VAR_LIFETIME, 5.0);
set_variable( VAR_SPREAD, 0.2);
set_variable( VAR_GRAVITY, 9.8);
@@ -523,7 +523,7 @@ Particles::Particles() {
set_variable( VAR_DAMPING, 0.0);
set_variable( VAR_INITIAL_SIZE, 1.0);
set_variable( VAR_FINAL_SIZE, 1.0);
- set_variable( VAR_INITIAL_ANGLE, 0.0);
+ set_variable( VAR_INITIAL_ANGLE, 0.0);
set_variable( VAR_HEIGHT, 1.0);
set_variable( VAR_HEIGHT_SPEED_SCALE, 0.0);