optimizations

2 files changed, 31 insertions, 28 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index 18c91ed..2d9de76 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -941,11 +941,12 @@ Particles::Particles(float x, float y, float w, float h, float vx, float vy, Col
 	bounce = false;
 	index = Texture::getIndex(c);
 	zOffset = ((rand()%20)-10)/1000.0f;
+	stu = nullptr;
 }
 
 void Particles::draw(GLfloat*& p) const
 {
-	vec2 tc = vec2(0.25f * this->index.x, 0.125f * (8.0f - this->index.y));
+	vec2 tc = vec2(0.25f * index.x, 0.125f * (8.0f - index.y));
 
     float z = 0.9;
 	if (behind)
@@ -1004,6 +1005,8 @@ void Particles::draw(GLfloat*& p) const
 
 void Particles::update(float _gravity, float ground_y)
 {
+	auto delta = game::time::getDeltaTime();
+
 	// handle ground collision
 	if (loc.y < ground_y) {
 		loc.y = ground_y;
@@ -1020,13 +1023,16 @@ void Particles::update(float _gravity, float ground_y)
 
 	// handle gravity
 	else if (gravity && vel.y > -1.0f) {
-		vel.y -= _gravity * game::time::getDeltaTime();
+		vel.y -= _gravity * delta;
 	}
+
+	// handle lifetime
+	duration -= delta;
 }
 
-bool Particles::kill(float delta)
+bool Particles::timeUp(void)
 {
-	return (duration -= delta) <= 0;
+	return !(duration > 0);
 }
 
 void Player::save(void) {
diff --git a/src/world.cpp b/src/world.cpp
index f13c3b7..5ab20ed 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -311,7 +311,7 @@ void World::drawBackgrounds(void)
 
 		
 	static GLuint starTex = Texture::genColor(Color(255, 255, 255));
-	const static float stardim = 2;
+	constexpr const static float stardim = 2;
 	GLfloat star_coord[star.size() * 5 * 6 + 1];
     GLfloat *si = &star_coord[0];		
 
@@ -718,15 +718,15 @@ void World::draw(Player *p)
 	
 	std::vector<GLfloat> partVec(pss);
 	GLfloat *pIndex = &partVec[0];
-    
-	for (uint p = 0; p < ps; p++) {
+   
+	for (const auto &p : particles) {
         pc += 30;
 		if (pc > pss) {
 			// TODO resize the vector or something better than breaking
-			std::cout << "Whoops:" << pc << "," << partVec.size() << std::endl;
+			//std::cout << "Whoops:" << pc << "," << partVec.size() << std::endl;
 			break;
 		}
-		particles[p].draw(pIndex);
+		p.draw(pIndex);
     }
 
     glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &partVec[0]);
@@ -896,6 +896,7 @@ detect(Player *p)
 							2500												// duration (ms)
 							);
 				particles.back().fountain = true;
+				particles.back().stu = b;
 			}
 			break;
 		case FIRE_PIT:
@@ -911,6 +912,7 @@ detect(Player *p)
 							);
 				particles.back().gravity = false;
 				particles.back().behind  = true;
+				particles.back().stu = b;
 			}
 			break;
 		default:
@@ -968,25 +970,20 @@ update(Player *p, unsigned int delta, unsigned int ticks)
         }
 	}
     // iterate through particles
-    particles.erase(std::remove_if(particles.begin(), particles.end(), [&delta](Particles &part) {
-                        return part.kill(delta);
-                    }),
-                    particles.end());
-
-    for (auto part = particles.begin(); part != particles.end(); part++) {
-        auto pa = *part;
-
-		if (pa.canMove) {
-			(*part).loc.y += pa.vel.y * delta;
-			(*part).loc.x += pa.vel.x * delta;
-
-            if (std::any_of(std::begin(build), std::end(build), [pa](const Structures *s) {
-                    return (s->bsubtype == FOUNTAIN) &&
-                           (pa.loc.x >= s->loc.x) && (pa.loc.x <= s->loc.x + s->width) &&
-                           (pa.loc.y <= s->loc.y + s->height * 0.25f);
-                })) {
-                particles.erase(part);
-            }
+    particles.remove_if([](const Particles &part) {
+		return part.duration <= 0;
+    });
+
+    for (auto &pa : particles) {
+		if (pa.canMove) { // causes overhead
+			pa.loc.y += pa.vel.y * delta;
+			pa.loc.x += pa.vel.x * delta;
+
+			if (pa.stu != nullptr) {
+				if (pa.loc.x >= pa.stu->loc.x && pa.loc.x <= pa.stu->loc.x + pa.stu->width &&
+				    pa.loc.y <= pa.stu->loc.y + pa.stu->height * 0.25f)
+					pa.duration = 0;
+			}
 		}
 	}