Scene: add method to add children.

diff --git a/include/assimp/scene.h b/include/assimp/scene.h
index d9799db..02cbbbb 100644 (file)
--- a/include/assimp/scene.h
+++ b/include/assimp/scene.h
@@ -173,34 +173,37 @@ struct aiNode
      *  @param name Name to search for
      *  @return NULL or a valid Node if the search was successful.
      */
-    inline const aiNode* FindNode(const aiString& name) const
-    {
+    inline 
+    const aiNode* FindNode(const aiString& name) const {
         return FindNode(name.data);
     }
 
-
-    inline aiNode* FindNode(const aiString& name)
-    {
+    inline 
+    aiNode* FindNode(const aiString& name) {
         return FindNode(name.data);
     }
 
 
-    inline const aiNode* FindNode(const char* name) const
-    {
-        if (!::strcmp( mName.data,name))return this;
-        for (unsigned int i = 0; i < mNumChildren;++i)
-        {
+    inline 
+    const aiNode* FindNode(const char* name) const {
+        if ( nullptr == name ) {
+            return nullptr;
+        }
+        if ( !::strcmp( mName.data, name ) ) {
+            return this;
+        }
+        for (unsigned int i = 0; i < mNumChildren;++i) {
             const aiNode* const p = mChildren[i]->FindNode(name);
             if (p) {
                 return p;
             }
         }
         // there is definitely no sub-node with this name
-        return NULL;
+        return nullptr;
     }
 
-    inline aiNode* FindNode(const char* name)
-    {
+    inline 
+    aiNode* FindNode(const char* name) {
         if (!::strcmp( mName.data,name))return this;
         for (unsigned int i = 0; i < mNumChildren;++i)
         {
@@ -210,9 +213,38 @@ struct aiNode
             }
         }
         // there is definitely no sub-node with this name
-        return NULL;
+        return nullptr;
     }
 
+    inline void addChildren( unsigned int numChildren, aiNode **children ) {
+        if ( nullptr == children || 0 == numChildren ) {
+            return;
+        }
+
+        for ( unsigned int i = 0; i < numChildren; i++ ) {
+            aiNode *child = children[ i ];
+            if ( nullptr != child ) {
+                child->mParent = this;
+            }
+        }
+
+        if ( mNumChildren > 0 ) {
+            aiNode **tmp( new aiNode*[ mNumChildren ] );
+            ::memcpy( tmp, mChildren, sizeof( aiNode* ) * mNumChildren );
+            delete[] mChildren;
+            mChildren = new aiNode*[ mNumChildren + numChildren ];
+            ::memcpy( mChildren, tmp, sizeof( aiNode* ) * mNumChildren );
+            ::memcpy( &mChildren[ mNumChildren ], children, sizeof( aiNode* )* numChildren );
+            mNumChildren += numChildren;
+            delete[] tmp;
+        } else {
+            mChildren = new aiNode*[ numChildren ];
+            for ( unsigned int i = 0; i < numChildren; i++ ) {
+                mChildren[ i ] = children[ i ];
+            }
+            mNumChildren = numChildren;
+        }
+    }
 #endif // __cplusplus
 };
 

diff --git a/test/unit/utScene.cpp b/test/unit/utScene.cpp
new file mode 100644 (file)
index 0000000..8d630ce
--- /dev/null
+++ b/test/unit/utScene.cpp
@@ -0,0 +1,64 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2016, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "UnitTestPCH.h"
+#include <assimp/scene.h>
+
+using namespace ::Assimp;
+
+class utScene : public ::testing::Test {
+    // empty
+};
+
+TEST_F( utScene, aiNode_addChildrenTest ) {
+    aiNode myNode;
+
+    static const size_t NumChildren = 10;
+    aiNode **childrenPtr = new aiNode*[ NumChildren ];
+    for ( unsigned int i = 0; i < NumChildren; i++ ) {
+        childrenPtr[ i ] = new aiNode;
+    }
+    myNode.addChildren( NumChildren, childrenPtr );
+    EXPECT_EQ( NumChildren, myNode.mNumChildren );
+    for ( unsigned int i = 0; i < NumChildren; i++ ) {
+        EXPECT_EQ( childrenPtr[ i ], myNode.mChildren[ i ] );
+    }
+}
+