Changeset 7297892 in opengl-game for vulkan-game.cpp

Timestamp:

Apr 19, 2020, 4:06:03 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

73a10ca

Parents:

3950236

Message:

Make lasers deal damage to asteroids and eventually destroy them

File:

• vulkan-game.cpp (modified) (3 diffs)

vulkan-game.cpp

@@ -707 +707 @@
                   laserObjects[leftLaserIdx].modified = true;
                   leftLaserIdx = -1;
+
+                  if (leftLaserEffect != nullptr) {
+                     leftLaserEffect->deleted = true;
+                     leftLaserEffect = nullptr;
+                  }
                } else if (e.key.keycode == SDL_SCANCODE_X && rightLaserIdx != -1) {
                   laserObjects[rightLaserIdx].ssbo.deleted = true;
                   laserObjects[rightLaserIdx].modified = true;
                   rightLaserIdx = -1;
+
+                  if (rightLaserEffect != nullptr) {
+                     rightLaserEffect->deleted = true;
+                     rightLaserEffect = nullptr;
+                  }
                }
                break;
@@ -786 +796 @@
    }
 
+   for (vector<BaseEffectOverTime*>::iterator it = effects.begin(); it != effects.end(); ) {
+      if ((*it)->deleted) {
+         delete *it;
+         it = effects.erase(it);
+      } else {
+         BaseEffectOverTime* eot = *it;
+
+         eot->applyEffect();
+
+         it++;
+      }
+   }
+
    for (SceneObject<AsteroidVertex, SSBO_Asteroid>& asteroid : this->asteroidObjects) {
       if (!asteroid.ssbo.deleted) {
          vec3 objCenter = vec3(viewMat * vec4(asteroid.center, 1.0f));
 
-         if ((objCenter.z - asteroid.radius) > -NEAR_CLIP) {
+         if ((objCenter.z - asteroid.radius) > -NEAR_CLIP || asteroid.ssbo.hp <= 0.0f) {
             asteroid.ssbo.deleted = true;
 
@@ -1663 +1686 @@
 
    if (laser.targetAsteroid != closestAsteroid) {
+      if (laser.targetAsteroid != nullptr) {
+         if (index == leftLaserIdx && leftLaserEffect != nullptr) {
+            leftLaserEffect->deleted = true;
+         } else if (index == rightLaserIdx && rightLaserEffect != nullptr) {
+            rightLaserEffect->deleted = true;
+         }
+      }
+
+      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* eot = nullptr;
+
+      if (closestAsteroid != nullptr) {
+         // TODO: Use some sort of smart pointer instead
+         eot = new EffectOverTime(asteroidPipeline, asteroidObjects, closestAsteroidIndex,
+            offset_of(&SSBO_Asteroid::hp), -20.0f);
+         effects.push_back(eot);
+      }
+
+      if (index == leftLaserIdx) {
+         leftLaserEffect = eot;
+      } else if (index == rightLaserIdx) {
+         rightLaserEffect = eot;
+      }
+
       laser.targetAsteroid = closestAsteroid;
    }