[GLTF] Export Sound/Texture anim data

It now writes the information intot he "extras" section,
allowing other tools to deal with that information.

Author: SydMontague

src/Animation.cpp

@@ -42,6 +42,7 @@ Animation::Animation(const MMDAnimation& anim)
 
         mtnFrame++;
         keyFrame++;
+        keyFrameTime = (keyFrame - 1) / 20.0f;
     }
 
     for (uint32_t node = 0; node < momentumData.size(); node++)
@@ -79,9 +80,8 @@ void Animation::updateData(const Axis axis, uint32_t node)
 
     auto oldPos     = nodeData[node].data[axis].back();
     auto frameCount = keyFrame - oldMomentum.first;
-    auto timeCode   = (keyFrame - 1) / 20.0f;
 
-    nodeData[node].data[axis].push_back({ timeCode, oldPos.second + (oldMomentum.second * frameCount) });
+    nodeData[node].data[axis].push_back({ keyFrameTime, oldPos.second + (oldMomentum.second * frameCount) });
 }
 
 bool KeyframeInstruction::run(Animation& anim)
@@ -102,7 +102,7 @@ bool KeyframeInstruction::run(Animation& anim)
 
 bool LoopStartInstruction::run(Animation& anim)
 {
-    if (loopCount == 0 || loopCount == 0xFF) anim.endlessStart = ((anim.keyFrame - 1) / 20.0f);
+    if (loopCount == 0 || loopCount == 0xFF) anim.endlessStart = anim.keyFrameTime;
 
     anim.jumpbackIndex = anim.currentIndex;
     anim.loopCount     = loopCount;
@@ -130,13 +130,15 @@ bool PlaySoundInstruction::run(Animation& anim)
 {
     if (anim.mtnFrame != timecode) return false;
 
+    anim.sound.emplace_back(anim.keyFrameTime, vabId, soundId);
     return true;
 }
 
 bool TextureInstruction::run(Animation& anim)
 {
     if (anim.mtnFrame != timecode) return false;
 
+    anim.texture.emplace_back(anim.keyFrameTime, srcX, srcY, destX, destY, width, height);
     return true;
 }
 

src/Animation.hpp

@@ -144,16 +144,35 @@ struct AnimNodeData
     AnimNodeData(const Position& pos);
 };
 
-typedef std::map<Axis, std::pair<uint32_t, float>> MomentumData;
+struct TextureAnimation
+{
+    float time;
+    uint16_t srcX;
+    uint16_t srcY;
+    uint16_t destX;
+    uint16_t destY;
+    uint16_t width;
+    uint16_t height;
+};
+
+struct SoundAnimation
+{
+    float time;
+    uint16_t vabId;
+    uint16_t soundId;
+};
 
 class Animation
 {
+    using MomentumData = std::map<Axis, std::pair<uint32_t, float>>;
+
 private:
     std::vector<AnimNodeData> nodeData;
     std::vector<MomentumData> momentumData;
 
-    uint32_t mtnFrame = 1; // used by MTN data, can jump
-    uint32_t keyFrame = 1; // used by keyframe data, is continuious
+    uint32_t mtnFrame  = 1; // used by MTN data, can jump
+    uint32_t keyFrame  = 1; // used by keyframe data, is continuious
+    float keyFrameTime = 0.0f;
 
     uint32_t currentIndex  = 0;
     uint32_t jumpbackIndex = 0;
@@ -172,6 +191,8 @@ class Animation
 public:
     // start of endless looping, as time code
     float endlessStart = -1;
+    std::vector<SoundAnimation> sound;
+    std::vector<TextureAnimation> texture;
 
 public:
     Animation(const MMDAnimation& anim);

src/GLTF.cpp

@@ -444,7 +444,34 @@ void GLTFExporter::buildAnimations()
         }
 
         tinygltf::Value::Object extras;
-        extras.emplace("endlessStart", std::to_string(data.endlessStart));
+        tinygltf::Value::Array soundArray;
+        tinygltf::Value::Array textureArray;
+
+        for (auto s : data.sound)
+        {
+            tinygltf::Value::Object sound;
+            sound.emplace("time", s.time);
+            sound.emplace("vabId", s.vabId);
+            sound.emplace("soundId", s.soundId);
+            soundArray.emplace_back(sound);
+        }
+
+        for (auto t : data.texture)
+        {
+            tinygltf::Value::Object texture;
+            texture.emplace("time", t.time);
+            texture.emplace("srxX", t.srcX);
+            texture.emplace("srcY", t.srcY);
+            texture.emplace("destX", t.destX);
+            texture.emplace("destY", t.destY);
+            texture.emplace("width", t.width);
+            texture.emplace("height", t.height);
+            textureArray.emplace_back(texture);
+        }
+
+        if (data.endlessStart != -1) extras.emplace("endlessStart", std::to_string(data.endlessStart));
+        if (!data.sound.empty()) extras.emplace("sounds", soundArray);
+        if (!data.texture.empty()) extras.emplace("textures", textureArray);
         anim.extras = tinygltf::Value(extras);
         push(model.animations, anim);
     }
@@ -485,14 +512,6 @@ GLTFExporter::GLTFExporter(Model& mmd, AbstractTIM& tim)
     buildMeshEntries();
     buildAnimations();
     buildTexture();
-    /*
-        tinygltf::TinyGLTF gltf;
-        gltf.WriteGltfSceneToFile(&model,
-                                  "MUGE.gltf",
-                                  true,   // embedImages
-                                  true,   // embedBuffers
-                                  true,   // pretty print
-                                  false); // write binary*/
 }
 
 void GLTFExporter::save(const std::string& filename)

src/main.cpp

@@ -87,8 +87,6 @@ int main()
 
     // TODO support for multiple images (that one arena)
     // TODO support for images being used by multiple models
-    // TODO playSound animation data into glTF
-    // TODO changeTexture animation data into glTF
 
     std::cout << "Done" << std::endl;
     return 0;