Minor refactor in experimental

mogemimi · Oct 17, 2015 · 2850af8 · 2850af8
1 parent 6c73c48
commit 2850af8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/experimental/Pomdog.Experimental/MagicaVoxel/VoxModelExporter.cpp b/experimental/Pomdog.Experimental/MagicaVoxel/VoxModelExporter.cpp
@@ -15,7 +15,7 @@ namespace Pomdog {
 namespace MagicaVoxel {
 namespace {
 
-static std::string Error(std::string const& assetName, char const* description)
+static std::string Error(std::string const& assetName, std::string const& description)
 {
     return description + (": " + assetName);
 }

diff --git a/experimental/Pomdog.Experimental/MagicaVoxel/VoxModelLoader.cpp b/experimental/Pomdog.Experimental/MagicaVoxel/VoxModelLoader.cpp
@@ -16,7 +16,7 @@ namespace Pomdog {
 namespace MagicaVoxel {
 namespace {
 
-static std::string Error(std::string const& assetName, char const* description)
+static std::string Error(std::string const& assetName, std::string const& description)
 {
     return description + (": " + assetName);
 }

diff --git a/experimental/Pomdog.Experimental/Particle2D/ParticleLoader.cpp b/experimental/Pomdog.Experimental/Particle2D/ParticleLoader.cpp
@@ -104,11 +104,12 @@ namespace {
 //}
 //-----------------------------------------------------------------------
 template <typename T>
-static T GetMemberAs(rapidjson::Value const& object, char const* name)
+static T GetMemberAs(rapidjson::Value const& object, std::string const& name)
 {
-    POMDOG_ASSERT(object.HasMember(name));
+    POMDOG_ASSERT(!name.empty());
+    POMDOG_ASSERT(object.HasMember(name.c_str()));
 
-    auto const& value = object[name];
+    auto const& value = object[name.c_str()];
     POMDOG_ASSERT(value.IsNumber());
 
     if (value.IsInt()) {

diff --git a/experimental/Pomdog.Experimental/Spine/AnimationLoader.cpp b/experimental/Pomdog.Experimental/Spine/AnimationLoader.cpp
@@ -30,10 +30,10 @@ static JointIndex FindJoint(std::vector<BoneDesc> const& bones, std::string cons
 
 } // unnamed namespace
 //-----------------------------------------------------------------------
-AnimationClip CreateAnimationClip(SkeletonDesc const& desc, char const* name)
+AnimationClip CreateAnimationClip(SkeletonDesc const& desc, std::string const& name)
 {
     auto iter = std::find_if(std::begin(desc.AnimationClips), std::end(desc.AnimationClips),
-        [name](AnimationClipDesc const& clip){ return clip.Name == name; });
+        [&name](AnimationClipDesc const& clip){ return clip.Name == name; });
 
     POMDOG_ASSERT(std::end(desc.AnimationClips) != iter);
 

diff --git a/experimental/Pomdog.Experimental/Spine/AnimationLoader.hpp b/experimental/Pomdog.Experimental/Spine/AnimationLoader.hpp
@@ -4,6 +4,8 @@
 #ifndef POMDOG_ANIMATIONLOADER_F321C327_HPP
 #define POMDOG_ANIMATIONLOADER_F321C327_HPP
 
+#include <string>
+
 namespace Pomdog {
 
 class AnimationClip;
@@ -12,7 +14,7 @@ namespace Spine {
 
 class SkeletonDesc;
 
-AnimationClip CreateAnimationClip(SkeletonDesc const& desc, char const* name);
+AnimationClip CreateAnimationClip(SkeletonDesc const& desc, std::string const& name);
 
 } // namespace Spine
 } // namespace Pomdog

diff --git a/experimental/Pomdog.Experimental/Spine/SpriteAnimationLoader.cpp b/experimental/Pomdog.Experimental/Spine/SpriteAnimationLoader.cpp
@@ -15,13 +15,13 @@ namespace Spine {
 std::vector<Detail::Skeletal2D::SpriteAnimationTrack> CreateSpriteAnimationTrack(
     SkeletonDesc const& desc,
     TexturePacker::TextureAtlas const& textureAtlas,
-    char const* name)
+    std::string const& name)
 {
     using namespace Detail::Skeletal2D;
     using Detail::CRC32;
 
     auto iter = std::find_if(std::begin(desc.AnimationClips), std::end(desc.AnimationClips),
-        [name](AnimationClipDesc const& clip){ return clip.Name == name; });
+        [&name](AnimationClipDesc const& clip){ return clip.Name == name; });
 
     POMDOG_ASSERT(std::end(desc.AnimationClips) != iter);
 

diff --git a/experimental/Pomdog.Experimental/Spine/SpriteAnimationLoader.hpp b/experimental/Pomdog.Experimental/Spine/SpriteAnimationLoader.hpp
@@ -6,6 +6,7 @@
 
 #include "Pomdog.Experimental/TexturePacker/TextureAtlas.hpp"
 #include <vector>
+#include <string>
 
 namespace Pomdog {
 namespace Detail {
@@ -22,7 +23,7 @@ class SkeletonDesc;
 std::vector<Detail::Skeletal2D::SpriteAnimationTrack> CreateSpriteAnimationTrack(
     SkeletonDesc const& desc,
     TexturePacker::TextureAtlas const& textureAtlas,
-    char const* name);
+    std::string const& name);
 
 } // namespace Spine
 } // namespace Pomdog