From a33bad7482defa5d77120086a3b37ae2ccb1543d Mon Sep 17 00:00:00 2001
From: lvlong <lvlong@chukong-inc.com>
Date: Tue, 18 Nov 2014 16:10:33 +0800
Subject: [PATCH] modify read animation.

---
 cocos/3d/CCBundle3D.cpp | 36 ++++++++++++++++++++++++++++--------
 cocos/3d/CCBundle3D.h   |  9 +++++----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp
index bca305c28b..a85137f260 100644
--- a/cocos/3d/CCBundle3D.cpp
+++ b/cocos/3d/CCBundle3D.cpp
@@ -1404,10 +1404,24 @@ bool Bundle3D::loadAnimationDataJson(const std::string& id, Animation3DData* ani
 
 bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* animationdata)
 {
-    if (!seekToFirstType(BUNDLE_TYPE_ANIMATIONS))
-        return false;
+ 
+    if( _version == "0.1"|| _version == "0.2" || _version == "0.3"|| _version == "0.4")
+    {
+        if (!seekToFirstType(BUNDLE_TYPE_ANIMATIONS))
+            return false;
+    }
+    else
+    {
+        // if id is not a null string, we need to add a suffix of "animation" for seeding.
+        std::string id_ = id;
+        if(id != "") id_ = id + "animation";
+        
+        if (!seekToFirstType(BUNDLE_TYPE_ANIMATIONS, id_))
+            return false;
+    }
+    
     unsigned int animNum = 1;
-    if( _version == "0.3"|| _version == "0.4")
+    if( _version == "0.1"|| _version == "0.2" || _version == "0.3"|| _version == "0.4")
     {
         if (!_binaryReader.read(&animNum))
         {
@@ -1459,7 +1473,7 @@ bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* a
 
                 // transform flag
                 unsigned char transformFlag(0);
-                if (_version == "0.4")
+                if (_version != "0.1" && _version != "0.2" && _version != "0.3")
                 {
                     if (!_binaryReader.read(&transformFlag))
                     {
@@ -1470,7 +1484,7 @@ bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* a
 
                 // rotation
                 bool hasRotate = true;
-                if (_version == "0.4")
+                if (_version != "0.1" && _version != "0.2" && _version != "0.3")
                     hasRotate = transformFlag & 0x01;
 
                 if (hasRotate)
@@ -1486,7 +1500,7 @@ bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* a
 
                 // scale
                 bool hasScale = true;
-                if (_version == "0.4")
+                if (_version != "0.1" && _version != "0.2" && _version != "0.3")
                     hasScale = (transformFlag >> 1) & 0x01;
 
                 if (hasScale)
@@ -1502,7 +1516,7 @@ bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* a
 
                 // translation
                 bool hasTranslation = true;
-                if (_version == "0.4")
+                if (_version != "0.1" && _version != "0.2" && _version != "0.3")
                     hasTranslation = (transformFlag >> 2) & 0x01;
 
                 if (hasTranslation)
@@ -1938,7 +1952,7 @@ void Bundle3D::getModelRelativePath(const std::string& path)
     _modelPath = path.substr(0, index + 1);
 }
 
-Reference* Bundle3D::seekToFirstType(unsigned int type)
+Reference* Bundle3D::seekToFirstType(unsigned int type, const std::string& id)
 {
     // for each Reference
     for (unsigned int i = 0; i < _referenceCount; ++i)
@@ -1946,6 +1960,12 @@ Reference* Bundle3D::seekToFirstType(unsigned int type)
         Reference* ref = &_references[i];
         if (ref->type == type)
         {
+            // if id is not a null string, we also need to check the Reference's id.
+            if (id != "" && id != ref->id)
+            {
+                continue;
+            }
+            
             // Found a match
             if (_binaryReader.seek(ref->offset, SEEK_SET) == false)
             {
diff --git a/cocos/3d/CCBundle3D.h b/cocos/3d/CCBundle3D.h
index b8591bdf0b..1fadf27a2c 100644
--- a/cocos/3d/CCBundle3D.h
+++ b/cocos/3d/CCBundle3D.h
@@ -144,10 +144,11 @@ protected:
     void getModelRelativePath(const std::string& path);
 
     /*
-    * set the read position in buffer to the target type
-    * @param The data type
-    */
-    Reference* seekToFirstType(unsigned int type);
+     * set the read position in buffer to the target type
+     * @param The data type
+     * @param The data id
+     */
+    Reference* seekToFirstType(unsigned int type, const std::string& id = "");
 
 CC_CONSTRUCTOR_ACCESS:
     Bundle3D();