[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37769] trunk/lib/darwin-9.x.universal/ opencollada: Commit updated OSX OpenCOLLADA libs (r839 and some patches).
Nathan Letwory
nathan at letworyinteractive.com
Fri Jun 24 00:11:26 CEST 2011
Revision: 37769
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37769
Author: jesterking
Date: 2011-06-23 22:11:25 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
Commit updated OSX OpenCOLLADA libs (r839 and some patches). Provided by Jens Verwiebe. Thanks!
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=839
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathVector3.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFW.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWArray.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWArrayPrimitiveType.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEdge.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMesh.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshVertexData.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWObject.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLHelperLoaderBase.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLPostProcessor.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWPrimitves.h
trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserParserTemplateBase.h
trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_141.patch
trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_150.patch
trunk/lib/darwin-9.x.universal/opencollada/collada_assertbu.patch
trunk/lib/darwin-9.x.universal/opencollada/scons_line.txt
Added: trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_141.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_141.patch (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_141.patch 2011-06-23 22:11:25 UTC (rev 37769)
@@ -0,0 +1,13 @@
+Index: COLLADASaxFWLNodeLoader14.cpp
+===================================================================
+--- COLLADASaxFWLNodeLoader14.cpp (revision 839)
++++ COLLADASaxFWLNodeLoader14.cpp (working copy)
+@@ -267,6 +267,8 @@
+ if ( (attributeData.present_attributes & COLLADASaxFWL14::bind_vertex_input__AttributeData::ATTRIBUTE_INPUT_SET_PRESENT) == COLLADASaxFWL14::bind_vertex_input__AttributeData::ATTRIBUTE_INPUT_SET_PRESENT ) {
+ attrData.input_set = attributeData.input_set;
+ attrData.present_attributes |= COLLADASaxFWL::bind_vertex_input__AttributeData::ATTRIBUTE_INPUT_SET_PRESENT;
++} else {
++ attrData.input_set = ~0;
+ }
+ return mLoader->begin__bind_vertex_input(attrData);
+ }
Added: trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_150.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_150.patch (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/24747_optional_input_set_150.patch 2011-06-23 22:11:25 UTC (rev 37769)
@@ -0,0 +1,14 @@
+Index: COLLADASaxFWLNodeLoader15.cpp
+===================================================================
+--- COLLADASaxFWLNodeLoader15.cpp (revision 839)
++++ COLLADASaxFWLNodeLoader15.cpp (working copy)
+@@ -268,6 +268,9 @@
+ attrData.input_set = attributeData.input_set;
+ attrData.present_attributes |= COLLADASaxFWL::bind_vertex_input__AttributeData::ATTRIBUTE_INPUT_SET_PRESENT;
+ }
++else {
++ attrData.input_set = ~0;
++}
+ return mLoader->begin__bind_vertex_input(attrData);
+ }
+
Added: trunk/lib/darwin-9.x.universal/opencollada/collada_assertbu.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/collada_assertbu.patch (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/collada_assertbu.patch 2011-06-23 22:11:25 UTC (rev 37769)
@@ -0,0 +1,25 @@
+Index: common/libBuffer/include/CommonBuffer.h
+===================================================================
+--- common/libBuffer/include/CommonBuffer.h (revision 839)
++++ common/libBuffer/include/CommonBuffer.h (working copy)
+@@ -12,6 +12,7 @@
+ #define __COMMON_BUFFER_H__
+
+ #include "CommonIBufferFlusher.h"
++#include "COLLADABUPlatform.h"
+
+ namespace Common
+ {
+Index: common/libBuffer/SConscript
+===================================================================
+--- common/libBuffer/SConscript (revision 839)
++++ common/libBuffer/SConscript (working copy)
+@@ -11,7 +11,7 @@
+ targetPath = outputDir + libName
+
+
+-incDirs = ['include/', '../libftoa/include']
++incDirs = ['include/', '../libftoa/include', '../../COLLADABaseUtils/include/']
+
+
+ src = []
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h 2011-06-23 22:00:54 UTC (rev 37768)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h 2011-06-23 22:11:25 UTC (rev 37769)
@@ -31,5 +31,23 @@
# define COLLADABU_OS_WIN
#endif
+// from ogre OgrePlatform.h
+// Win32 compilers use _DEBUG for specifying debug builds.
+// Unlike the Win32 compilers, Linux compilers seem to use DEBUG for when
+// specifying a debug build.
+// (??? this is wrong, on Linux debug builds aren't marked in any way unless
+// you mark it yourself any way you like it -- zap ???)
+#if defined(_DEBUG) || defined(DEBUG)
+# define COLLADABU_DEBUG
+#endif
+#include <cassert>
+
+#if defined(COLLADABU_DEBUG)
+# define COLLADABU_ASSERT(cond) assert(cond);
+#else
+# define COLLADABU_ASSERT(cond)
+#endif
+
+
#endif //__COLLADABU_PLATTFORM_H__
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2011-06-23 22:00:54 UTC (rev 37768)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2011-06-23 22:11:25 UTC (rev 37769)
@@ -23,6 +23,7 @@
#include <hash_set>
#define COLLADABU_HASH_MAP stdext::hash_map
+ #define COLLADABU_HASH_MULTIMAP stdext::hash_multimap
#define COLLADABU_HASH_SET stdext::hash_set
#define COLLADABU_HASH_NAMESPACE_OPEN stdext
#define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -32,6 +33,7 @@
#include <unordered_set>
#define COLLADABU_HASH_MAP std::tr1::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
#define COLLADABU_HASH_SET std::tr1::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
#define COLLADABU_HASH_NAMESPACE_CLOSE }
@@ -40,7 +42,8 @@
#include <unordered_map>
#include <unordered_set>
- #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
#define COLLADABU_HASH_SET std::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std
#define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -76,7 +79,8 @@
};
}
- #define COLLADABU_HASH_MAP __gnu_cxx::hash_map
+ #define COLLADABU_HASH_MAP __gnu_cxx::hash_map
+ #define COLLADABU_HASH_MULTIMAP __gnu_cxx::hash_multimap
#define COLLADABU_HASH_SET __gnu_cxx::hash_set
#define COLLADABU_HASH_NAMESPACE_OPEN __gnu_cxx
#define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -85,7 +89,8 @@
#include <tr1/unordered_map>
#include <tr1/unordered_set>
- #define COLLADABU_HASH_MAP std::tr1::unordered_map
+ #define COLLADABU_HASH_MAP std::tr1::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
#define COLLADABU_HASH_SET std::tr1::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
#define COLLADABU_HASH_NAMESPACE_CLOSE }
@@ -96,16 +101,26 @@
namespace COLLADABU
{
// typedef COLLADABU_HASH_MAP<X, Y> hash_map<X, Y>; // Unfortunately, this is not possible...
- template<class X, class Y>
- class hash_map : public COLLADABU_HASH_MAP<X,Y>
- {
- public:
+ template<class X, class Y>
+ class hash_map : public COLLADABU_HASH_MAP<X,Y>
+ {
+ public:
- hash_map() {}
- hash_map(const hash_map& a) : COLLADABU_HASH_MAP<X,Y>(a) {}
- hash_map& operator = (const hash_map& a) { COLLADABU_HASH_MAP<X,Y>::operator = (*this, a); return this; }
- };
+ hash_map() {}
+ hash_map(const hash_map& a) : COLLADABU_HASH_MAP<X,Y>(a) {}
+ hash_map& operator = (const hash_map& a) { COLLADABU_HASH_MAP<X,Y>::operator = (*this, a); return this; }
+ };
+ template<class X, class Y>
+ class hash_multimap : public COLLADABU_HASH_MULTIMAP<X,Y>
+ {
+ public:
+
+ hash_multimap() {}
+ hash_multimap(const hash_multimap& a) : COLLADABU_HASH_MULTIMAP<X,Y>(a) {}
+ hash_multimap& operator = (const hash_multimap& a) { COLLADABU_HASH_MULTIMAP<X,Y>::operator = (*this, a); return this; }
+ };
+
template<class X>
class hash_set : public COLLADABU_HASH_SET<X>
{
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h 2011-06-23 22:00:54 UTC (rev 37768)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h 2011-06-23 22:11:25 UTC (rev 37769)
@@ -205,7 +205,7 @@
*/
inline const Real *const operator [] ( size_t iRow ) const
{
- assert( iRow < 4 );
+ COLLADABU_ASSERT( iRow < 4 );
return m[ iRow ];
}
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathVector3.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathVector3.h 2011-06-23 22:00:54 UTC (rev 37768)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathVector3.h 2011-06-23 22:11:25 UTC (rev 37769)
@@ -11,13 +11,12 @@
#ifndef __COLLADABU_MATH_VECTOR3_H__
#define __COLLADABU_MATH_VECTOR3_H__
+#include "COLLADABUPlatform.h"
#include "COLLADABUMathPrerequisites.h"
#include "COLLADABUMathQuaternion.h"
-#include <assert.h>
#include <math.h>
-
namespace COLLADABU
{
namespace Math
@@ -82,14 +81,14 @@
inline Real operator [] ( size_t i ) const
{
- assert( i < 3 );
+ COLLADABU_ASSERT( i < 3 );
return *( &x + i );
}
inline Real& operator [] ( size_t i )
{
- assert( i < 3 );
+ COLLADABU_ASSERT( i < 3 );
return *( &x + i );
}
@@ -164,7 +163,7 @@
inline Vector3 operator / ( Real fScalar ) const
{
- assert( fScalar != 0.0 );
+ COLLADABU_ASSERT( fScalar != 0.0 );
Vector3 kDiv;
@@ -248,7 +247,7 @@
inline Vector3& operator /= ( Real fScalar )
{
- assert( fScalar != 0.0 );
+ COLLADABU_ASSERT( fScalar != 0.0 );
Real fInv = 1.0 / fScalar;
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFW.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFW.h 2011-06-23 22:00:54 UTC (rev 37768)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list