Revision: 35404
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35404
Author: jesterking
Date: 2011-03-08 13:16:02 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Update 64bit OpenCOLLADA to r836.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=836
Modified Paths:
--------------
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMesh.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshVertexData.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWObject.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLHelperLoaderBase.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPostProcessor.h
trunk/lib/win64/opencollada/lib/GeneratedSaxParser.lib
trunk/lib/win64/opencollada/lib/GeneratedSaxParser_d.lib
trunk/lib/win64/opencollada/lib/MathMLSolver.lib
trunk/lib/win64/opencollada/lib/MathMLSolver_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
trunk/lib/win64/opencollada/lib/UTF.lib
trunk/lib/win64/opencollada/lib/UTF_d.lib
trunk/lib/win64/opencollada/lib/buffer.lib
trunk/lib/win64/opencollada/lib/buffer_d.lib
trunk/lib/win64/opencollada/lib/ftoa.lib
trunk/lib/win64/opencollada/lib/ftoa_d.lib
trunk/lib/win64/opencollada/lib/pcre.lib
trunk/lib/win64/opencollada/lib/pcre_d.lib
trunk/lib/win64/opencollada/lib/xml2.lib
trunk/lib/win64/opencollada/lib/xml2_d.lib
Added Paths:
-----------
trunk/lib/win64/opencollada/compile_opencollada_rev836.txt
Removed Paths:
-------------
trunk/lib/win64/opencollada/compile_opencollada_rev827.txt
Deleted: trunk/lib/win64/opencollada/compile_opencollada_rev827.txt
===================================================================
--- trunk/lib/win64/opencollada/compile_opencollada_rev827.txt 2011-03-08
13:02:26 UTC (rev 35403)
+++ trunk/lib/win64/opencollada/compile_opencollada_rev827.txt 2011-03-08
13:16:02 UTC (rev 35404)
@@ -1,9 +0,0 @@
-1. checkout collada libs rev 827
-svn checkout -r 827 http://opencollada.googlecode.com/svn/trunk/
-
-2. Create projectfiles using CMake
-3. Open up the OPENCOLLADA solution file
-4. Set code generation to /MT[d]
-5. Build release and debug targets
-6. For each project search in its respective directory and copy them in
- place in lib/windows/opencollada/lib. Do renaming as needed (ie. prepend
Open, for debug _d, xml.lib to xml2.lib and so on).
Copied: trunk/lib/win64/opencollada/compile_opencollada_rev836.txt (from rev
35378, trunk/lib/win64/opencollada/compile_opencollada_rev827.txt)
===================================================================
--- trunk/lib/win64/opencollada/compile_opencollada_rev836.txt
(rev 0)
+++ trunk/lib/win64/opencollada/compile_opencollada_rev836.txt 2011-03-08
13:16:02 UTC (rev 35404)
@@ -0,0 +1,9 @@
+1. checkout collada libs rev 836
+svn checkout -r 836 http://opencollada.googlecode.com/svn/trunk/
+
+2. Create projectfiles using CMake
+3. Open up the OPENCOLLADA solution file
+4. Set code generation to /MT[d]
+5. Build release and debug targets
+6. For each project search in its respective directory and copy them in
+ place in lib/windows/opencollada/lib. Do renaming as needed (ie. prepend
Open, for debug _d, xml.lib to xml2.lib and so on).
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -31,5 +31,21 @@
# 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
+#if defined(COLLADABU_DEBUG)
+# define COLLADABU_ASSERT(cond) assert(cond);
+#else
+# define COLLADABU_ASSERT(cond)
+#endif
+
+
#endif //__COLLADABU_PLATTFORM_H__
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -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/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -11,6 +11,7 @@
#ifndef __COLLADABU_MATH_VECTOR3_H__
#define __COLLADABU_MATH_VECTOR3_H__
+#include "COLLADABUPlatform.h"
#include "COLLADABUMathPrerequisites.h"
#include "COLLADABUMathQuaternion.h"
@@ -82,14 +83,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 +165,7 @@
inline Vector3 operator / ( Real fScalar ) const
{
- assert( fScalar != 0.0 );
+ COLLADABU_ASSERT( fScalar != 0.0 );
Vector3 kDiv;
@@ -248,7 +249,7 @@
inline Vector3& operator /= ( Real fScalar )
{
- assert( fScalar != 0.0 );
+ COLLADABU_ASSERT( fScalar != 0.0 );
Real fInv = 1.0 / fScalar;
Modified:
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -12,6 +12,9 @@
#define __COLLADAFW_ARRAY_H__
#include "COLLADAFWPrerequisites.h"
+
+#include "COLLADABUPlatform.h"
+
#include <cassert>
@@ -158,16 +161,16 @@
bool empty() const { return mCount == 0; }
/** Return s the index'th element in the array. No check is
performed, if the index is out of bounds.*/
- Type& operator[] ( size_t index ) { assert(index < mCapacity); return
mData[index]; }
+ Type& operator[] ( size_t index ) { COLLADABU_ASSERT(index <
mCapacity); return mData[index]; }
/** Return s the index'th element in the array. No check is performed,
if the index is out of bounds.*/
const Type& operator[] ( size_t index ) const { return mData[index]; }
/** Returns a reference to the last element in the array. The
array must not be empty.*/
- Type& back() { assert(mData && (mCount > 0)); return
mData[mCount - 1]; }
+ Type& back() { COLLADABU_ASSERT(mData && (mCount > 0)); return
mData[mCount - 1]; }
/** Returns a reference to the last element in the array. The
array must not be empty.*/
- const Type& back() const { assert(mData && (mCount > 0));
return mData[mCount - 1]; }
+ const Type& back() const { COLLADABU_ASSERT(mData && (mCount >
0)); return mData[mCount - 1]; }
/** Clones the array inti @a clonedArray.*/
void cloneArray( Array<Type>& clonedArray ) const
Modified:
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -231,10 +231,10 @@
const Type& operator[] ( size_t index ) const { return
mData[index]; }
/** Returns a reference to the last element in the array. The
array must not be empty.*/
- Type& back() { assert(mData && (mCount > 0)); return
mData[mCount - 1]; }
+ Type& back() { COLLADABU_ASSERT(mData && (mCount > 0)); return
mData[mCount - 1]; }
/** Returns a reference to the last element in the array. The
array must not be empty.*/
- const Type& back() const { assert(mData && (mCount > 0));
return mData[mCount - 1]; }
+ const Type& back() const { COLLADABU_ASSERT(mData && (mCount >
0)); return mData[mCount - 1]; }
/** Clones the array into @a clonedArray.*/
void cloneArray( ArrayPrimitiveType<Type>& clonedArray ) const
Modified:
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -85,7 +85,7 @@
unsigned int operator[](size_t i) const
{
- assert( i < 2 );
+ COLLADABU_ASSERT( i < 2 );
return mVertexIndices [i];
}
Modified:
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMesh.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMesh.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMesh.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -174,7 +174,7 @@
return index;
}
// std::cerr << "No color with name \"" << name << "\"!" <<
std::endl;
- assert ( COLLADABU::Utils::equals ( name, name ) );
+ COLLADABU_ASSERT ( COLLADABU::Utils::equals ( name,
name ) );
return 0;
}
@@ -210,7 +210,7 @@
return index;
}
// std::cerr << "No uv set with name \"" << name << "\"!" <<
std::endl;
- assert ( true );
+ COLLADABU_ASSERT ( true );
return 0;
}
Modified:
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
2011-03-08 13:02:26 UTC (rev 35403)
+++
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
2011-03-08 13:16:02 UTC (rev 35404)
@@ -88,7 +88,7 @@
if ( faceIndex >= mGroupedVerticesVertexCountArray.getCount () )
{
std::cerr << "Face index out of range: " << faceIndex <<
std::endl;
- assert ( "Face index out of range: " + faceIndex );
+ COLLADABU_ASSERT ( "Face index out of range: "
+ faceIndex );
return -1;
}
Modified:
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshVertexData.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
