refactor

Author: markaren

include/threepp/animation/AnimationClip.hpp

@@ -27,7 +27,7 @@ namespace threepp {
 
         void resetDuration();
 
-        static std::shared_ptr<AnimationClip> findByName(Object3D* object, const std::string& name);
+        static std::shared_ptr<AnimationClip> findByName(const Object3D& object, const std::string& name);
         static std::shared_ptr<AnimationClip> findByName(const std::vector<std::shared_ptr<AnimationClip>>& clipArray, const std::string& name);
 
     private:

include/threepp/core/Object3D.hpp

@@ -3,7 +3,6 @@
 #ifndef THREEPP_OBJECT3D_HPP
 #define THREEPP_OBJECT3D_HPP
 
-#include "threepp/animation/AnimationClip.hpp"
 
 #include "threepp/math/Euler.hpp"
 #include "threepp/math/Matrix3.hpp"
@@ -28,6 +27,7 @@ namespace threepp {
     struct Intersection;
     class Object3D;
     class BufferGeometry;
+    class AnimationClip;
 
     typedef std::function<void(void*, Object3D*, Camera*, BufferGeometry*, Material*, std::optional<GeometryGroup>)> RenderCallback;
 

src/threepp/animation/AnimationClip.cpp

@@ -39,16 +39,11 @@ std::shared_ptr<AnimationClip> AnimationClip::findByName(const std::vector<std::
     return nullptr;
 }
 
-std::shared_ptr<AnimationClip> AnimationClip::findByName(Object3D* object, const std::string& name) {
+std::shared_ptr<AnimationClip> AnimationClip::findByName(const Object3D& object, const std::string& name) {
 
-    std::vector<std::shared_ptr<AnimationClip>>* clipArray = nullptr;
-    if (auto geometry = object->geometry()) {
-        clipArray = &object->animations;
-    }
-
-    if (!clipArray) return nullptr;
+    if (!object.geometry()) return nullptr;
 
-    for (auto& clip : *clipArray) {
+    for (auto& clip : object.animations) {
 
         if (clip->name == name) {
 

src/threepp/animation/AnimationMixer.cpp

@@ -126,8 +126,8 @@ struct AnimationMixer::Impl {
 
     AnimationAction* clipAction(const std::string& clipName, Object3D* optionalRoot, std::optional<AnimationBlendMode> blendMode) {
 
-        auto root = optionalRoot ? optionalRoot : this->_root;
-        auto clip = AnimationClip::findByName(root, clipName);
+        const auto root = optionalRoot ? optionalRoot : this->_root;
+        const auto clip = AnimationClip::findByName(*root, clipName);
 
         return clipAction(clip, root, blendMode);
     }
@@ -137,7 +137,7 @@ struct AnimationMixer::Impl {
     // previously unknown clip/root combination is specified)
     AnimationAction* clipAction(std::shared_ptr<AnimationClip> clipObject, Object3D* optionalRoot, std::optional<AnimationBlendMode> blendMode) {
 
-        auto root = optionalRoot ? optionalRoot : this->_root;
+        const auto root = optionalRoot ? optionalRoot : this->_root;
         const auto rootUuid = root->uuid;
 
         const auto clipUuid = clipObject->uuid();

src/threepp/core/Object3D.cpp

@@ -1,6 +1,8 @@
 
 #include "threepp/core/Object3D.hpp"
 
+#include "threepp/animation/AnimationClip.hpp"
+
 #include "threepp/cameras/Camera.hpp"
 
 #include "threepp/math/MathUtils.hpp"