code refactoring

CMakeLists.txt

@@ -102,7 +102,7 @@ add_executable(shooter
         engine/animation/AAttractToPoint.h
         engine/animation/ARotateRelativePoint.h
         engine/animation/ARotateLeft.h
-        engine/animation/Interpolation.cpp engine/animation/Animations.h)
+        engine/animation/Interpolation.cpp engine/animation/Animations.h engine/animation/AShowCreation.h)
 
 if(APPLE OR UNIX)
     include_directories(/usr/local/include)

Shooter.cpp

@@ -277,16 +277,24 @@ void Shooter::spawnPlayer(sf::Uint16 id) {
     world->body(ObjectNameTag(name + "_foot_2"))->setColor(ShooterConsts::DARK_COLORS[colorFootNum]);
 
     changeEnemyWeapon("gun", id);
+
+    newPlayer->scale(Vec3D(0.01, 0.01, 0.01));
+    Timeline::addAnimation<AScale>(AnimationListTag(name + "_creation"), newPlayer, Vec3D(100, 100, 100));
 }
 
 void Shooter::removePlayer(sf::Uint16 id) {
     std::string name = "Enemy_" + std::to_string(id);
-    world->removeBody(ObjectNameTag(name));
-    world->removeBody(ObjectNameTag(name + "_head"));
-    world->removeBody(ObjectNameTag(name + "_weapon"));
-    world->removeBody(ObjectNameTag(name + "_foot_1"));
-    world->removeBody(ObjectNameTag(name + "_foot_2"));
 
+    auto playerToRemove = world->body(ObjectNameTag(name));
+
+    Timeline::addAnimation<AScale>(AnimationListTag(name + "_remove"), playerToRemove, Vec3D(0.01, 0.01, 0.01));
+    Timeline::addAnimation<AFunction>(AnimationListTag(name + "_remove"), [this, name](){
+        world->removeBody(ObjectNameTag(name));
+        world->removeBody(ObjectNameTag(name + "_head"));
+        world->removeBody(ObjectNameTag(name + "_weapon"));
+        world->removeBody(ObjectNameTag(name + "_foot_1"));
+        world->removeBody(ObjectNameTag(name + "_foot_2"));
+    });
 }
 
 void Shooter::addFireTrace(const Vec3D &from, const Vec3D &to) {
@@ -311,12 +319,16 @@ void Shooter::addBonus(const string &bonusName, const Vec3D &position) {
     ObjectNameTag nameTag(bonusName);
 
     world->addBody(std::make_shared<RigidBody>(ObjectNameTag(bonusName), "obj/" + name + ".obj", Vec3D{3, 3, 3}));
-    world->body(ObjectNameTag(bonusName))->translateToPoint(position);
+
-    world->body(ObjectNameTag(bonusName))->setCollider(false);
+    auto bonus = world->body(ObjectNameTag(bonusName));
-    world->body(ObjectNameTag(bonusName))->setTrigger(true);
+
+    bonus->translateToPoint(position);
+    bonus->setCollider(false);
+    bonus->setTrigger(true);
+    bonus->scale(Vec3D(0.01, 0.01, 0.01));
+    Timeline::addAnimation<AScale>(AnimationListTag(bonusName + "_creation"), bonus, Vec3D(100, 100, 100));
     Timeline::addAnimation<ARotate>(AnimationListTag(bonusName + "_rotation"),
-                                    world->body(ObjectNameTag(bonusName)),
+                                    bonus, Vec3D{0, 2 * Consts::PI, 0}, 4,
-                                    Vec3D{0, 2 * Consts::PI, 0}, 4,
                                     Animation::LoopOut::Continue,
                                     Animation::InterpolationType::Linear);
 }
@@ -338,6 +350,7 @@ void Shooter::changeEnemyWeapon(const std::string &weaponName, sf::Uint16 enemyI
     ObjectNameTag weaponTag("Enemy_" + std::to_string(enemyId) + "_weapon");
     auto head = world->body(ObjectNameTag("Enemy_" + std::to_string(enemyId) + "_head"));
     auto enemy = world->body(ObjectNameTag("Enemy_" + std::to_string(enemyId)));
+    auto weapon = world->body(weaponTag);
 
     // remove old weapon:
     world->removeBody(weaponTag);

engine/Mesh.cpp

@@ -91,19 +91,18 @@ Mesh::LineTo(ObjectNameTag nameTag, const Vec3D &from, const Vec3D &to, double l
     return line;
 }
 
-void Mesh::setTriangles(const vector<Triangle> &t) {
-    _tris.clear();
-    for (auto &tri : t) {
-        _tris.push_back(tri);
-    }
-}
-
 void Mesh::setTriangles(vector<Triangle>&& t) {
     _tris = std::move(t);
 }
 
 Mesh::~Mesh() {
     delete[] _geometry;
+    _geometry = nullptr;
+}
+
+void Mesh::glFreeFloatArray() {
+    delete[] _geometry;
+    _geometry = nullptr;
 }
 
 GLfloat *Mesh::glFloatArray() const {

engine/Mesh.h

@@ -38,8 +38,6 @@ public:
 
     [[nodiscard]] std::vector<Triangle> const &triangles() const { return _tris; }
 
-    void setTriangles(const std::vector<Triangle> &t);
-
     void setTriangles(std::vector<Triangle>&& t);
 
     [[nodiscard]] size_t size() const { return _tris.size() * 3; }
@@ -59,6 +57,7 @@ public:
 
     // OpenGL functions
     GLfloat *glFloatArray() const;
+    void glFreeFloatArray();
 };
 
 #endif //INC_3DZAVR_MESH_H

engine/Object.h

@@ -36,11 +36,7 @@ private:
     const ObjectNameTag _nameTag;
 
     Matrix4x4 _transformMatrix = Matrix4x4::Identity();
-
-    std::map<ObjectNameTag, std::weak_ptr<Object>> _attachedObjects;
-
     Vec3D _position{0, 0, 0};
-
     /*
      * Take into account when you rotate body,
      * you change '_angle' & '_angleLeftUpLookAt' only for this particular body,
@@ -49,67 +45,52 @@ private:
      */
     Vec3D _angle{0, 0, 0};
     Vec3D _angleLeftUpLookAt{0, 0, 0};
+
+    std::map<ObjectNameTag, std::weak_ptr<Object>> _attachedObjects;
+
 public:
     explicit Object(ObjectNameTag nameTag) : _nameTag(std::move(nameTag)) {};
 
-    Object(const Object &object) = default;
+    Object(const Object &object) :  _nameTag(object._nameTag),
+                                    _transformMatrix(object._transformMatrix),
+                                    _position(object._position),
+                                    _angle(object._angle),
+                                    _angleLeftUpLookAt(object._angleLeftUpLookAt) {};
 
     // TODO: implement rotations using quaternions (?)
     void transform(const Matrix4x4 &t);
-
     void transformRelativePoint(const Vec3D &point, const Matrix4x4 &transform);
-
     void translate(const Vec3D &dv);
-
     void translateToPoint(const Vec3D &point);
-
     void attractToPoint(const Vec3D &point, double value);
-
     void scale(const Vec3D &s);
-
     void rotate(const Vec3D &r);
-
     void rotate(const Vec3D &v, double rv);
-
     void rotateToAngle(const Vec3D &v);
-
     void rotateRelativePoint(const Vec3D &s, const Vec3D &r);
-
     void rotateRelativePoint(const Vec3D &s, const Vec3D &v, double r);
-
     void rotateLeft(double rl);
-
     void rotateUp(double ru);
-
     void rotateLookAt(double rlAt);
 
     [[nodiscard]] Vec3D left() const { return _transformMatrix.x(); }
-
     [[nodiscard]] Vec3D up() const { return _transformMatrix.y(); }
-
     [[nodiscard]] Vec3D lookAt() const { return _transformMatrix.z(); }
-
     [[nodiscard]] Vec3D position() const { return _position; }
-
     [[nodiscard]] Vec3D angle() const { return _angle; }
-
     [[nodiscard]] Vec3D angleLeftUpLookAt() const { return _angleLeftUpLookAt; }
 
     void attach(std::shared_ptr<Object> object);
-
     void unattach(const ObjectNameTag &tag);
-
     std::shared_ptr<Object> attached(const ObjectNameTag &tag);
 
     [[nodiscard]] ObjectNameTag name() const { return _nameTag; }
 
     [[nodiscard]] Matrix4x4 model() const { return Matrix4x4::Translation(_position) * _transformMatrix; }
-
     [[nodiscard]] Matrix4x4 invModel() const { return Matrix4x4::View(left(), up(), lookAt(), position()); }
 
     // OpenGL function
     [[nodiscard]] GLfloat *glModel() const;
-
     [[nodiscard]] GLfloat *glInvModel() const;
 
     virtual ~Object();

engine/animation/AScale.h

@@ -6,12 +6,13 @@
 #define ENGINE_ASCALE_H
 
 #include "Animation.h"
-#include "../physics/RigidBody.h"
+#include "../Object.h"
 
 class AScale final : public Animation {
 private:
-    const std::weak_ptr<RigidBody> _object;
+    const std::weak_ptr<Object> _object;
     const Vec3D _scalingValue;
+    Vec3D _prevScaleFactor{1, 1, 1};
 
     void update() override {
         auto obj = _object.lock();
@@ -20,19 +21,15 @@ private:
             stop();
             return;
         }
-
+        // invert scale
-        std::vector<Triangle> newTriangles;
+        obj->scale(Vec3D(1.0/_prevScaleFactor.x(), 1.0/_prevScaleFactor.y(), 1.0/_prevScaleFactor.z()));
-        newTriangles.reserve(obj->triangles().size());
+        Vec3D scaleFactor = Vec3D{1, 1, 1} + (_scalingValue - Vec3D{1, 1, 1}) * progress();
-        for (auto &t : obj->triangles()) {
+        obj->scale(scaleFactor);
-            newTriangles.emplace_back(t * Matrix4x4::Scale(Vec3D{1, 1, 1} +
+        _prevScaleFactor = scaleFactor;
-                                    (_scalingValue - Vec3D{1, 1, 1}) * progress())
-                                    );
-        }
-        obj->setTriangles(std::move(newTriangles));
     }
 
 public:
-    AScale(std::weak_ptr<RigidBody> object, const Vec3D &s, double duration = 1, LoopOut looped = LoopOut::None,
+    AScale(std::weak_ptr<Object> object, const Vec3D &s, double duration = 1, LoopOut looped = LoopOut::None,
            InterpolationType interpolationType = InterpolationType::Bezier) : Animation(duration, looped,
                                                                                         interpolationType),
                                                                               _object(object), _scalingValue(s) {

engine/animation/AShowCreation.h

@@ -0,0 +1,40 @@
+//
+// Created by Иван Ильин on 10.11.2021.
+//
+
+#ifndef SHOOTER_ASHOWCREATION_H
+#define SHOOTER_ASHOWCREATION_H
+
+#include "Animation.h"
+#include "../Mesh.h"
+
+class AShowCreation final : public Animation {
+private:
+    const std::weak_ptr<Mesh> _mesh;
+    const std::vector<Triangle> _triangles;
+
+    void update() override {
+        auto mesh = _mesh.lock();
+
+        if (mesh == nullptr) {
+            stop();
+            return;
+        }
+
+        std::vector<Triangle> newTriangles;
+        newTriangles.reserve(_triangles.size());
+        for(auto &t : _triangles) {
+            newTriangles.emplace_back(t[0], t[1], t[1] + (t[2] - t[1]) * progress(), t.color());
+        }
+        mesh->setTriangles(std::move(newTriangles));
+        mesh->glFreeFloatArray();
+    }
+
+public:
+    AShowCreation(std::weak_ptr<Mesh> mesh, double duration = 1, LoopOut looped = LoopOut::None,
+           InterpolationType interpolationType = InterpolationType::Bezier) : Animation(duration, looped,
+                                                                                        interpolationType),
+                                                                              _mesh(mesh), _triangles(mesh.lock()->triangles()) {}
+};
+
+#endif //SHOOTER_ASHOWCREATION_H

engine/animation/Animations.h

@@ -17,5 +17,6 @@
 #include "ATranslate.h"
 #include "ATranslateToPoint.h"
 #include "AWait.h"
+#include "AShowCreation.h"
 
 #endif //SHOOTER_ANIMATIONS_H

engine/gui/Button.h

@@ -5,6 +5,8 @@
 #ifndef ENGINE_BUTTON_H
 #define ENGINE_BUTTON_H
 
+#include <functional>
+
 #include <SFML/Graphics.hpp>
 
 struct tPos final {

shooter.vcxproj

@@ -212,6 +212,7 @@
     <ClInclude Include="engine\animation\AAttractToPoint.h" />
     <ClInclude Include="engine\animation\ARotateRelativePoint.h" />
     <ClInclude Include="engine\animation\ARotateLeft.h" />
+    <ClInclude Include="engine\animation\AShowCreation.h" />
     <ClInclude Include="engine\animation\Interpolation.h" />
     <ClInclude Include="engine\animation\Timeline.h" />
     <ClInclude Include="engine\animation\Animations.h" />

shooter.vcxproj.filters

@@ -260,6 +260,9 @@
     <ClInclude Include="engine\animation\Animations.h">
       <Filter>Файлы заголовков\engine\animation</Filter>
     </ClInclude>
+    <ClInclude Include="engine\animation\AShowCreation.h">
+      <Filter>Файлы заголовков\engine\animation</Filter>
+    </ClInclude>
     <ClInclude Include="engine\network\ClientUDP.h">
       <Filter>Файлы заголовков\engine\network</Filter>
     </ClInclude>