[Next] Add Voxel::clone, cooler Wreckages

src/voxel/specialvoxel.cpp

@@ -11,3 +11,8 @@ SpecialVoxel::SpecialVoxel(const glm::ivec3& gridCell, int group, uint32_t color
 int SpecialVoxel::group() const {
     return m_group;
 }
+
+SpecialVoxel* SpecialVoxel::clone() const {
+    return new SpecialVoxel(*this);
+}
+

src/voxel/specialvoxel.h

@@ -9,6 +9,8 @@ class SpecialVoxel: public Voxel {
 
     int group() const;
 
+    virtual SpecialVoxel* clone() const override;
+
 
 protected:
     int m_group;

src/voxel/specialvoxels/cockpitvoxel.cpp

@@ -12,17 +12,17 @@ CockpitVoxel::CockpitVoxel(const glm::ivec3& gridCell, int index):
 {
 }
 
+CockpitVoxel::CockpitVoxel(const CockpitVoxel& other):
+    SpecialVoxel(other)
+{
+}
+
 void CockpitVoxel::addToObject(WorldObject* worldObject) {
     Voxel::addToObject(worldObject);
     worldObject->addCockpitVoxel(m_gridCell);
 }
 
-void CockpitVoxel::onRemoval() {
-    //TODO: Tell my cockpit I'm gone
-}
-
-void CockpitVoxel::onDestruction() {
-    Voxel::onDestruction();
-    // Spawn dead pilot
+CockpitVoxel* CockpitVoxel::clone() const {
+    return new CockpitVoxel(*this);
 }
 

src/voxel/specialvoxels/cockpitvoxel.h

@@ -6,10 +6,10 @@
 class CockpitVoxel: public SpecialVoxel {
 public:
     CockpitVoxel(const glm::ivec3& gridCell, int index);
+    CockpitVoxel(const CockpitVoxel& other);
 
     virtual void addToObject(WorldObject* object) override;
 
-    virtual void onRemoval() override;
-    virtual void onDestruction() override;
+    virtual CockpitVoxel* clone() const override;
 };
 

src/voxel/specialvoxels/crucialvoxel.cpp

@@ -19,11 +19,7 @@ void CrucialVoxel::addToObject(WorldObject* worldObject){
     worldObject->setCrucialVoxel(m_gridCell);
 }
 
-void CrucialVoxel::onRemoval(){
-    //TODO: Destroy ship / make wreckage?
-}
-
-void CrucialVoxel::onDestruction(){
-    Voxel::onDestruction();
+CrucialVoxel* CrucialVoxel::clone() const {
+    return new CrucialVoxel(*this);
 }
 

src/voxel/specialvoxels/crucialvoxel.h

@@ -9,6 +9,6 @@ class CrucialVoxel: public SpecialVoxel {
 
     virtual void addToObject(WorldObject* worldObject) override;
 
-    virtual void onRemoval() override;
-    virtual void onDestruction() override;
+    virtual CrucialVoxel* clone() const override;
 };
+

src/voxel/specialvoxels/engineslotvoxel.cpp

@@ -2,10 +2,11 @@
 
 #include "property/property.h"
 
-#include "voxel/voxelcluster.h"
-
 #include "equipment/engine.h"
 #include "equipment/engineslot.h"
+
+#include "voxel/voxelcluster.h"
+
 #include "worldobject/worldobject.h"
 #include "worldobject/worldobjectcomponents.h"
 
@@ -16,6 +17,12 @@ EngineSlotVoxel::EngineSlotVoxel(const glm::ivec3& gridCell, int index):
 {
 }
 
+EngineSlotVoxel::EngineSlotVoxel(const EngineSlotVoxel& other):
+    SpecialVoxel(other)
+{
+    // m_engineSlot remains nullptr
+}
+
 void EngineSlotVoxel::addToObject(WorldObject* worldObject) {
     Voxel::addToObject(worldObject);
     m_engineSlot = std::make_shared<EngineSlot>(&worldObject->components(), this);
@@ -36,7 +43,7 @@ void EngineSlotVoxel::onRemoval() {
     Voxel::onRemoval();
 }
 
-void EngineSlotVoxel::onDestruction() {
-    Voxel::onDestruction();
+EngineSlotVoxel* EngineSlotVoxel::clone() const {
+    return new EngineSlotVoxel(*this);
 }
 

src/voxel/specialvoxels/engineslotvoxel.h

@@ -10,13 +10,15 @@ class EngineSlot;
 class EngineSlotVoxel: public SpecialVoxel {
 public:
     EngineSlotVoxel(const glm::ivec3& gridCell, int index);
+    EngineSlotVoxel(const EngineSlotVoxel& other);
 
     virtual Visuals visuals() const override;
 
     virtual void addToObject(WorldObject* worldObject) override;
 
     virtual void onRemoval() override;
-    virtual void onDestruction() override;
+
+    virtual EngineSlotVoxel* clone() const override;
 
 
 protected:

src/voxel/specialvoxels/fuelvoxel.cpp

@@ -6,10 +6,10 @@
 #include "voxel/voxeltree.h"
 #include "voxel/voxeltreenode.h"
 
-#include "worldobject/worldobject.h"
-
 #include "voxeleffect/voxelexplosiongenerator.h"
 
+#include "worldobject/worldobject.h"
+
 
 FuelVoxel::FuelVoxel(const glm::ivec3& gridCell, int index):
     SpecialVoxel(gridCell, index, Property<uint32_t>::get("voxels.fuel.color"), Property<float>::get("voxels.fuel.density"), Property<float>::get("voxels.fuel.hp"))
@@ -24,10 +24,6 @@ float FuelVoxel::damageForwardingDestructionDamage() {
     return 100.0f;
 }
 
-void FuelVoxel::onRemoval() {
-
-}
-
 void FuelVoxel::onDestruction() {
     Voxel::onDestruction();
 
@@ -46,3 +42,7 @@ void FuelVoxel::onDestruction() {
     generator.spawn();
 }
 
+FuelVoxel* FuelVoxel::clone() const {
+    return new FuelVoxel(*this);
+}
+

src/voxel/specialvoxels/fuelvoxel.h

@@ -11,7 +11,8 @@ class FuelVoxel: public SpecialVoxel {
 
     virtual float damageForwardingDestructionDamage() override;
 
-    virtual void onRemoval() override;
     virtual void onDestruction() override;
+
+    virtual FuelVoxel* clone() const override;
 };
 

src/voxel/specialvoxels/hardpointvoxel.cpp

@@ -17,6 +17,12 @@ HardpointVoxel::HardpointVoxel(const glm::ivec3& gridCell, int index):
 
 }
 
+HardpointVoxel::HardpointVoxel(const HardpointVoxel& other):
+    SpecialVoxel(other)
+{
+    // m_hardpoint remains a nullptr
+}
+
 Visuals HardpointVoxel::visuals() const {
     return Visuals(
         m_hardpoint->weapon() ? m_hardpoint->weapon()->visuals() : Voxel::visuals()
@@ -38,8 +44,7 @@ void HardpointVoxel::onRemoval() {
     Voxel::onRemoval();
 }
 
-void HardpointVoxel::onDestruction() {
-    //Drop Ammo?
-    Voxel::onDestruction();
+HardpointVoxel* HardpointVoxel::clone() const {
+    return new HardpointVoxel(*this);
 }
 

src/voxel/specialvoxels/hardpointvoxel.h

@@ -10,13 +10,15 @@ class Hardpoint;
 class HardpointVoxel: public SpecialVoxel {
 public:
     HardpointVoxel(const glm::ivec3& gridCell, int index);
+    HardpointVoxel(const HardpointVoxel& other);
 
     virtual Visuals visuals() const override;
 
     virtual void addToObject(WorldObject* object) override;
 
     virtual void onRemoval() override;
-    virtual void onDestruction() override;
+
+    virtual HardpointVoxel* clone() const override;
 
 
 protected:

src/voxel/voxel.cpp

@@ -81,6 +81,10 @@ float Voxel::density() const {
     return m_density;
 }
 
+Voxel* Voxel::clone() const {
+    return new Voxel(*this);
+}
+
 void Voxel::onRemoval() {
 
 }

src/voxel/voxel.h

@@ -18,7 +18,7 @@ class Voxel {
     Voxel(const Voxel& other);
     virtual ~Voxel();
 
-    const glm::ivec3 &gridCell() const;
+    const glm::ivec3& gridCell() const;
 
     glm::vec3 position() const;
 
@@ -37,6 +37,8 @@ class Voxel {
 
     float density() const;
 
+    virtual Voxel* clone() const;
+
     // These hooks apply only for WorldObjects and do not need to be called by pure VoxelClusters
     virtual void onRemoval();
     virtual void onDestruction();

src/world/handler/wrecker.cpp

@@ -1,10 +1,14 @@
 #include "wrecker.h"
 
+#include "physics/physics.h"
+
+#include "voxel/voxel.h"
+
 #include "world/helper/worldobjectmodification.h"
+
 #include "worldobject/worldobject.h"
 #include "worldobject/worldobjectinfo.h"
-#include "physics/physics.h"
-#include "voxel/voxel.h"
+
 
 void Wrecker::detectWreckedObjects(std::list<WorldObjectModification>& worldObjectModifications) {
     m_wreckedObjects.clear();
@@ -17,7 +21,6 @@ void Wrecker::detectWreckedObjects(std::list<WorldObjectModification>& worldObje
             m_newWreckages.push_back(wreckFromObject(object));
         }
     }
-
 }
 
 std::list<WorldObject*>& Wrecker::wreckedObjects() {
@@ -35,8 +38,9 @@ WorldObject* Wrecker::wreckFromObject(WorldObject* object) {
     wreckage->physics().setSpeed(object->physics().speed());
 
     for (auto& pair : object->voxelMap()) {
-        wreckage->addVoxel(new Voxel(*pair.second));
+        wreckage->addVoxel(pair.second->clone());
     }
 
     return wreckage;
 }
+