Revision: 33920
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33920
Author: damien78
Date: 2010-12-28 07:35:24 +0100 (Tue, 28 Dec 2010)
Log Message:
-----------
OSX 10.5 libs: update OpenCollada to rev 788
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=788
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/README
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWColorOrTexture.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFloatOrParam.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMorphController.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsIntermediateData.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSource.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWColorOrTexture.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWNode.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWPrimitves.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
Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README 2010-12-28 06:24:01 UTC (rev
33919)
+++ trunk/lib/darwin-9.x.universal/README 2010-12-28 06:35:24 UTC (rev
33920)
@@ -27,7 +27,7 @@
lame (version 3.98.4)
xvidcore (version 1.2.2)
x264 (version 20101118)
-opencollada (svn rev 775)
+opencollada (svn rev 788)
The following configuration parameters were used to build the libs:
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWColorOrTexture.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWColorOrTexture.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWColorOrTexture.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -35,8 +35,8 @@
};
private:
+ Color mColor;
Type mType;
- Color mColor;
Texture mTexture;
public:
@@ -44,17 +44,17 @@
@param color The color that should be represented.
*/
ColorOrTexture ( Color color)
- : mColor ( color )
- , mType ( COLOR )
- , mTexture ( COLLADAFW::UniqueId::INVALID )
+ : mColor ( color )
+ , mType ( COLOR )
+ , mTexture ( COLLADAFW::UniqueId::INVALID )
{}
/** Constructor to create a ColorOrTexture object that represents a
color.
@param texture The color that should be represented.
*/
ColorOrTexture ( Texture texture )
- : mTexture ( texture )
- , mType ( TEXTURE )
+ : mType ( TEXTURE )
+ , mTexture ( texture )
{}
/** Creates an invalid CommonColorOrTextureType*/
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -239,12 +239,12 @@
to the right, and which is considered inward. */
UpAxisType mUpAxisType;
+ /** A pair where you can hold file informations. */
+ ValuePairPointerArray mValuePairArray;
+
/** The absolute file uri.*/
COLLADABU::URI mAbsoluteFileUri;
- /** A pair where you can hold file informations. */
- ValuePairPointerArray mValuePairArray;
-
public:
/** Constructor. */
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFloatOrParam.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFloatOrParam.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFloatOrParam.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -43,14 +43,14 @@
private:
- /** The type of the current element. */
- Type mType;
-
/** The value is represented by a literal floating-point scalar, for
example:
<float> 3.14 </float>. The sid attribute is optional. */
float mFloatValue;
- /** The value is represented by a reference to a previously defined
parameter that can be
+ /** The type of the current element. */
+ Type mType;
+
+ /** The value is represented by a reference to a previously
defined parameter that can be
directly cast to a floatingpoint scalar. See main entry. */
Param mParam;
@@ -64,9 +64,9 @@
/** Constructor. */
FloatOrParam ( const Param& param )
- : mParam ( param )
+ : mFloatValue ( -1 )
, mType ( PARAM )
- , mFloatValue ( -1 )
+ , mParam ( param )
{};
/** Destructor. */
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMorphController.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMorphController.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMorphController.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -24,6 +24,9 @@
{
private:
+ /** The morph weights.*/
+ FloatOrDoubleArray mMorphWeights;
+
/**
* The original object id, if it in the original file format exist.
*/
@@ -35,8 +38,6 @@
/** The unique ids of the morph targets (geometries).*/
UniqueIdArray mMorphTargets;
- /** The morph weights.*/
- FloatOrDoubleArray mMorphWeights;
public:
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsIntermediateData.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsIntermediateData.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsIntermediateData.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -248,6 +248,8 @@
case VALUETYPE_SIDREF:
mValue._sidref = 0;
break;
+ case VALUETYPE_UNKNOWN:
+ break;
}
}
@@ -623,7 +625,7 @@
float getFloatValue() const { return mValue._float; }
/** Sets the sidref value FloatOrParam. Type will be set to
VALUETYPE_FLOAT.*/
- void setFloatValue( float value) { deleteParam();
mValue._float; mValueType = VALUETYPE_FLOAT; }
+ void setFloatValue( float value) { deleteParam();
mValue._float=value; mValueType = VALUETYPE_FLOAT; }
/** Returns the param ref FloatOrParam. Type must be
VALUETYPE_PARAM.*/
const String* getParamValue() const { return mValue._param; }
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSource.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSource.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSource.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -85,6 +85,12 @@
unsigned long long mStride;
/**
+ * This member will be used, if multiple source elements with the same
input semantic are
+ * referenced in the current mesh.
+ */
+ size_t mInitialIndex;
+
+ /**
* Flags, if the source element is already loaded into the framework.
A source element
* can be referenced from the same input element in multiple primitive
elements or from
* different input elements (NORMALS, COLOR, TEXCOORD, ...). It should
be loaded only once
@@ -92,12 +98,6 @@
*/
COLLADAFW::ArrayPrimitiveType<InputSemantic::Semantic>
mLoadedInputElements;
- /**
- * This member will be used, if multiple source elements with the same
input semantic are
- * referenced in the current mesh.
- */
- size_t mInitialIndex;
-
/** The accessor of the source.*/
Accessor mAccessor;
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -67,12 +67,12 @@
const float* floatVal;
} mValue;
- /** The value type of the used union value. */
- UnionType mUnionType;
-
/** Number of values to insert (for arrays and pointer) */
int mNumValues;
+ /** The value type of the used union value. */
+ UnionType mUnionType;
+
/** Tag closer for the annotation. */
TagCloser mAnnoCloser;
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWColorOrTexture.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWColorOrTexture.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWColorOrTexture.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -35,9 +35,9 @@
COLOR,
TEXTURE
};
- Type mType;
Color mColor;
Texture mTexture;
+ Type mType;
String mSid;
public:
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWNode.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWNode.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWNode.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -40,6 +40,9 @@
/** Closer to close the node*/
TagCloser mNodeCloser;
+ /** The type of the node*/
+ Type mType;
+
/** The id of the node*/
String mNodeId;
@@ -52,9 +55,6 @@
/** The URL of an instance node. */
COLLADABU::URI mNodeURL;
- /** The type of the node*/
- Type mType;
-
/** Flag, if it is an node instance. */
bool mIsInstanceNode;
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWPrimitves.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWPrimitves.h
2010-12-28 06:24:01 UTC (rev 33919)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWPrimitves.h
2010-12-28 06:35:24 UTC (rev 33920)
@@ -36,6 +36,9 @@
/** Pointer to the primitives closer. */
TagCloser mPrimitiveCloser;
+ /** List of all the inputs*/
+ InputList mInputList;
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
