Add push lasers, they kill you in a different way.

Author: daid

src/laser.cpp

@@ -54,8 +54,7 @@ void Laser::onFixedUpdate()
         if (!object->isSolid())
             return true;
         laser_vector = hit_location - getPosition2D();
-        if (sp::P<Spaceship>(object))
-            (sp::P<Spaceship>(object))->explode();
+        onHit(object, hit_location);
         return false;
     });
     render_data.scale.x = laser_vector.x;
@@ -73,8 +72,8 @@ void Laser::onFixedUpdate()
         parameters.velocity.x = sp::random(-7, 7);
         parameters.velocity.y = sp::random(-7, 7);
         parameters.acceleration = -parameters.velocity;
-        parameters.start_color = sp::Color(1, 0.5, 0.5);
-        parameters.end_color = sp::Color(1, 0, 0, 0);
+        parameters.start_color = render_data.color;
+        parameters.end_color = sp::Color(0, 0, 0, 0);
 
         parameters.start_size = 3.0;
         parameters.end_size = 5.0;
@@ -91,3 +90,9 @@ void Laser::setProperty(sp::string name, sp::string value)
     else
         TriggerableNode::setProperty(name, value);
 }
+
+void Laser::onHit(sp::P<sp::Node> object, sp::Vector2d hit_location)
+{
+    if (sp::P<Spaceship>(object))
+        (sp::P<Spaceship>(object))->explode();
+}

src/laser.h

@@ -15,8 +15,11 @@ class Laser : public TriggerableNode
     virtual void onFixedUpdate() override;
 
     virtual void setProperty(sp::string name, sp::string value) override;
-private:
+protected:
+    virtual void onHit(sp::P<sp::Node> object, sp::Vector2d hit_location);
+
     sp::Vector2d aim_vector;
+private:
     bool active;
     int sparkdelay;
 

src/levelLoader.cpp

@@ -5,6 +5,7 @@
 #include "spaceship.h"
 #include "door.h"
 #include "laser.h"
+#include "pushLaser.h"
 #include "physicsObject.h"
 #include "trigger.h"
 #include "timer.h"
@@ -108,6 +109,11 @@ void loadLevel(sp::P<sp::Node> root, sp::string name)
                     obj = new Laser(root, object["name"].string_value());
                     obj->setPosition(position);
                 }
+                else if (object["type"] == "PUSHLASER")
+                {
+                    obj = new PushLaser(root, object["name"].string_value());
+                    obj->setPosition(position);
+                }
                 else if (object["type"] == "TRIGGER")
                 {
                     float w = object["width"].number_value();

src/pushLaser.cpp

@@ -0,0 +1,12 @@
+#include "pushLaser.h"
+
+PushLaser::PushLaser(sp::P<sp::Node> parent, sp::string trigger)
+: Laser(parent, trigger)
+{
+    render_data.color = sp::Color(0.5, 0.5, 1.0);
+}
+
+void PushLaser::onHit(sp::P<sp::Node> object, sp::Vector2d hit_location)
+{
+    object->setLinearVelocity(object->getLinearVelocity2D() + aim_vector * 0.001);
+}

src/pushLaser.h

@@ -0,0 +1,15 @@
+#ifndef PUSH_LASER_H
+#define PUSH_LASER_H
+
+#include "laser.h"
+
+class PushLaser : public Laser
+{
+public:
+    PushLaser(sp::P<sp::Node> parent, sp::string trigger);
+    
+protected:
+    virtual void onHit(sp::P<sp::Node> object, sp::Vector2d hit_location) override;
+};
+
+#endif//PUSH_LASER_H