rwengine: incorporate review

rwengine/src/ai/CharacterController.cpp

@@ -30,7 +30,7 @@ bool CharacterController::updateActivity() {
 }
 
 void CharacterController::setActivity(std::unique_ptr<Activity> activity) {
-    _currentActivity.swap(activity);
+    _currentActivity = std::move(activity);
 }
 
 void CharacterController::skipActivity() {

rwengine/src/engine/Animator.hpp

@@ -34,7 +34,7 @@ class Animator {
         float speed;
         /// Automatically restart
         bool repeat;
-        std::map<std::shared_ptr<AnimationBone>, ModelFrame*> boneInstances;
+        std::map<AnimationBone*, ModelFrame*> boneInstances;
     };
 
     /**

rwengine/src/loaders/LoaderIFP.cpp

@@ -79,7 +79,7 @@ bool LoaderIFP::loadFromMemory(char* data) {
             CPAN* cpan = read<CPAN>(data, dataI);
             ANIM* frames = read<ANIM>(data, dataI);
 
-            auto bonedata = std::make_shared<AnimationBone>();
+            auto bonedata = new AnimationBone;
             bonedata->name = frames->name;
             bonedata->frames.reserve(frames->frames);
 

rwengine/src/loaders/LoaderIFP.hpp

@@ -40,7 +40,13 @@ struct AnimationBone {
  */
 struct Animation {
     std::string name;
-    std::map<std::string, std::shared_ptr<AnimationBone>> bones;
+    std::map<std::string, AnimationBone*> bones;
+
+    ~Animation() {
+        for (auto &bone_pair : bones) {
+            delete bone_pair.second;
+        }
+    }
 
     float duration;
 };

tests/test_animation.cpp

@@ -18,8 +18,7 @@ BOOST_AUTO_TEST_CASE(test_matrix) {
         Animator animator(test_model);
 
         animation->duration = 1.f;
-        animation->bones["player"] = std::shared_ptr<AnimationBone>(
-            new AnimationBone {
+        animation->bones["player"] = new AnimationBone{
                 "player",
                 0,
                 0,
@@ -29,8 +28,7 @@ BOOST_AUTO_TEST_CASE(test_matrix) {
                     {glm::quat(), glm::vec3(0.f, 0.f, 0.f), glm::vec3(), 0.f, 0},
                     {glm::quat(), glm::vec3(0.f, 1.f, 0.f), glm::vec3(), 1.0f, 1},
                 }
-            }
-        );
+            };
 
         animator.playAnimation(0, animation, 1.f, false);
 

tests/test_loaderdff.cpp

@@ -22,8 +22,6 @@ BOOST_AUTO_TEST_CASE(test_load_dff) {
 
         BOOST_REQUIRE(atomic->getGeometry());
         BOOST_REQUIRE(atomic->getFrame());
-
-        m.reset();
     }
 }