Revision: 59054
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59054
Author: shadowrom
Date: 2013-08-10 19:05:17 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
VS 2012 x64 libs update:
- new OpenCollada revision 828b60384552b83e55d2af7055f07d2c40b4d3f4
- compiled debug libs with /D_ITERATOR_DEBUG_LEVEL=0 to prepare general debug
lib compatibility.
Modified Paths:
--------------
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLPolygons.h
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWBuffer.h
trunk/lib/win64_vc11/opencollada/lib/opencollada/GeneratedSaxParser.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/MathMLSolver.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/MathMLSolver_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAFramework.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/UTF.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/UTF_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/buffer.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/buffer.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/buffer_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/ftoa.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/ftoa.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/ftoa_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/generatedsaxparser.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/mathmlsolver.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/opencolladabaseutils.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/opencolladaframework.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/opencolladasaxframeworkloader.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/opencolladastreamwriter.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/pcre.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/pcre.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/pcre_d.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/utf.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/xml.lib
trunk/lib/win64_vc11/opencollada/lib/opencollada/xml.pdb
trunk/lib/win64_vc11/opencollada/lib/opencollada/xml_d.lib
Modified:
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h
===================================================================
---
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h
2013-08-10 15:37:24 UTC (rev 59053)
+++
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h
2013-08-10 19:05:17 UTC (rev 59054)
@@ -64,7 +64,9 @@
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
#include <ext/hash_map>
#include <ext/hash_set>
+ #if !(defined(__APPLE__) && defined(__MACH__))
#include <ext/hash_fun.h>
+ #endif //if !(defined(__APPLE__) && defined(__MACH__))
namespace __gnu_cxx // Do we need these specializations under
Windows (with _MSC_VER==1400 (VS2005) and namespace "stdext") as well?
{
Modified:
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h
===================================================================
---
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h
2013-08-10 15:37:24 UTC (rev 59053)
+++
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h
2013-08-10 19:05:17 UTC (rev 59054)
@@ -6,8 +6,8 @@
Licensed under the MIT Open Source License,
for details please see LICENSE file or the website
http://www.opensource.org/licenses/mit-license.php
-*/
-
+*/
+
#ifndef __COLLADAFW_NODE_H__
#define __COLLADAFW_NODE_H__
@@ -56,20 +56,25 @@
/**
* The original object id, if it in the original file format exist.
- */
- String mOriginalId;
-
- /**
- * The name attribute is the text string name of this element.
- * Optional attribute.
- */
- String mName;
-
+ */
+ String mOriginalId;
+
+ /**
+ * The name attribute is the text string name of this element.
+ * Optional attribute.
+ */
+ String mName;
+
/**
* The type of the <node> element. Valid values are JOINT or NODE. The
default is
* NODE. Optional.
*/
NodeType mType;
+
+ /**
+ * The sid of the joint. Only relevant is mType is JOINT.
+ */
+ String mSid;
/** List of all transformations of the node. Array and contents
will be delete in destructor.*/
TransformationPointerArray mTransformations;
@@ -101,12 +106,12 @@
/**
* The original object id, if it in the original file format exist.
- */
+ */
const String& getOriginalId () const { return mOriginalId; }
/**
* The original object id, if it in the original file format exist.
- */
+ */
void setOriginalId ( const String& val ) { mOriginalId = val; }
/** Returns the name of the node*/
@@ -114,7 +119,13 @@
/** Sets the name of the node*/
void setName(const String& name) { mName = name; }
-
+
+ /** Returns the sid of the joint. Only relevant when mType is JOINT. */
+ const String& getSid() const { return mSid; }
+
+ /** Sets the sid of the joint. Only relevant when mType is JOINT. */
+ void setSid(const String& sid) { mSid = sid; }
+
/** The type of the <node> element. Valid values are JOINT or NODE.
The default is
NODE. Optional. */
const Node::NodeType getType () const { return mType; }
Modified:
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
===================================================================
---
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
2013-08-10 15:37:24 UTC (rev 59053)
+++
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
2013-08-10 19:05:17 UTC (rev 59054)
@@ -326,9 +326,11 @@
/** Disable default assignment operator. */
const DocumentProcessor& operator= ( const DocumentProcessor&
pre );
-
/** The version of the collada document.*/
void setCOLLADAVersion(COLLADAVersion cOLLADAVersion);
+
+ /** add joint for skin controller */
+ bool addValidatedJoint(const SidTreeNode &joint, NodeList
&joints);
};
} // namespace COLLADASAXFWL
Modified:
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
===================================================================
---
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
2013-08-10 15:37:24 UTC (rev 59053)
+++
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
2013-08-10 19:05:17 UTC (rev 59054)
@@ -352,6 +352,10 @@
assigned to any Uri, an invalid uri is returned.*/
const COLLADABU::URI& getFileUri( COLLADAFW::FileId fileId
)const;
+ /** Maps the Unique generated from the id of the COLLADA controller
element to the
+ InstanceControllerDataList containing all instance controllers that
reference the same controller.*/
+ InstanceControllerDataListMap&
getInstanceControllerDataListMap() { return mInstanceControllerDataListMap; }
+
private:
friend class IFilePartLoader;
friend class FileLoader;
@@ -448,10 +452,6 @@
/** Maps unique ids of skin data to the sids or ids of the
joints of this skin controller.*/
SkinDataJointSidsMap& getSkinDataJointSidsMap() { return
mSkinDataJointSidsMap; }
- /** Maps the Unique generated from the id of the COLLADA
controller element to the
- InstanceControllerDataList containing all instance controllers
that reference the same controller.*/
- InstanceControllerDataListMap&
getInstanceControllerDataListMap() { return mInstanceControllerDataListMap; }
-
/** Maps unique ids of skin data to the source uri string.*/
SkinDataSkinSourceMap& getSkinDataSkinSourceMap() {
return mSkinDataSkinSourceMap;
Modified:
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLPolygons.h
===================================================================
---
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLPolygons.h
2013-08-10 15:37:24 UTC (rev 59053)
+++
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLPolygons.h
2013-08-10 19:05:17 UTC (rev 59054)
@@ -12,7 +12,6 @@
#define __COLLADASAXFWL_POLYGONS_H__
#include "COLLADASaxFWLPHElement.h"
-#include "COLLADASaxFWLPolyBase.h"
namespace COLLADASaxFWL
Modified:
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWBuffer.h
===================================================================
---
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWBuffer.h
2013-08-10 15:37:24 UTC (rev 59053)
+++
trunk/lib/win64_vc11/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWBuffer.h
2013-08-10 19:05:17 UTC (rev 59054)
@@ -13,8 +13,6 @@
#include "COLLADASWPrerequisites.h"
-#include "COLLADASWIBufferFlusher.h"
-
#include <string.h>
namespace COLLADASW
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/GeneratedSaxParser.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/MathMLSolver.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/MathMLSolver_d.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAFramework.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib
===================================================================
(Binary files differ)
Modified:
trunk/lib/win64_vc11/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/UTF.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/UTF_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/buffer.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/buffer.pdb
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/buffer_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/ftoa.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc11/opencollada/lib/opencollada/ftoa.pdb
===================================================================
(Binary files differ)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
