[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32280] trunk/lib/darwin-9.x.universal/ opencollada: OSX/Cocoa 10.5 libs: update OpenCollada libs to rev.

[Damien Plisson]

Revision: 32280
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32280
Author:   damien78
Date:     2010-10-03 19:23:39 +0200 (Sun, 03 Oct 2010)

Log Message:
-----------
OSX/Cocoa 10.5 libs: update OpenCollada libs to rev. 769 + jesterKing patch

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTextureCoordinateBinding.h
    trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIFilePartLoader.h
    trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.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/opencollada/include/COLLADAFramework/COLLADAFWTextureCoordinateBinding.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTextureCoordinateBinding.h	2010-10-03 16:39:07 UTC (rev 32279)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTextureCoordinateBinding.h	2010-10-03 17:23:39 UTC (rev 32280)
@@ -33,7 +33,11 @@
         with parameter id. */
         size_t mSetIndex;
 
-    public:
+		
+		/** The semantic used for this texture coordinate binding (<bind_vertex_input> attribute semantic) */
+		String mName;
+		
+	public:
 
         /** Constructor. */
         TextureCoordinateBinding() {}
@@ -52,7 +56,10 @@
         with parameter id. */
         const size_t& getSetIndex () const { return mSetIndex; }
         void setSetIndex ( const size_t& val ) { mSetIndex = val; }
-
+		
+		const String getName() const { return mName; }
+		void setName( const String& val ) { mName = val; }
+		
         /** Operator overloading. */
         bool operator<( const TextureCoordinateBinding& rhs) const
         {

Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIFilePartLoader.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIFilePartLoader.h	2010-10-03 16:39:07 UTC (rev 32279)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIFilePartLoader.h	2010-10-03 17:23:39 UTC (rev 32280)
@@ -174,10 +174,8 @@
 		@return The elements COLLADAFW::UniqueId */
 		COLLADAFW::UniqueId createUniqueId(COLLADAFW::ClassId classId);
 
-		/** Returns the GeometryMaterialIdInfo object of the geometry with @a uniqueId. If this method has
-		not been called before with the same uniqueId, an empty GeometryMaterialIdInfo is created, added to
-		the map and returned.*/
-		GeometryMaterialIdInfo& getMeshMaterialIdInfo( const COLLADAFW::UniqueId& uniqueId);
+		/** Returns the GeometryMaterialIdInfo to map symbols to ids*/
+		GeometryMaterialIdInfo& getMeshMaterialIdInfo( );
 
 		/** Returns TextureMapId for @a semantic. Successive call with same semantic return the same TextureMapId.*/
 		COLLADAFW::TextureMapId getTextureMapIdBySematic( const String& semantic );

Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h	2010-10-03 16:39:07 UTC (rev 32279)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h	2010-10-03 17:23:39 UTC (rev 32280)
@@ -64,8 +64,6 @@
 	class Loader : public COLLADAFW::ILoader
 	{
 	public:
-		/** Maps the unique id of each geometry to the corresponding ColladaSymbolMaterialIdMap.*/
-		typedef std::map<COLLADAFW::UniqueId, GeometryMaterialIdInfo> UniqueIdMeshMaterialIdInfoMap;
 
 		typedef std::map<String, COLLADAFW::TextureMapId> StringTextureMapIdMap;
 
@@ -215,7 +213,7 @@
 		COLLADAFW::FileId mCurrentFileId;
 
 		/** Maps the unique id of each geometry to the corresponding GeometryMaterialIdInfo.*/
-		UniqueIdMeshMaterialIdInfoMap mGeometryMeshMaterialIdInfoMapMap;
+		GeometryMaterialIdInfo mGeometryMaterialIdInfo;
 
 		/** The error handler to pass the errors to.*/
 		IErrorHandler* mErrorHandler;
@@ -390,10 +388,8 @@
 		@a fileId nor @a uri have been passed to that method before.*/
 		void addFileIdUriPair( COLLADAFW::FileId fileId, const COLLADABU::URI& uri );
 
-		/** Returns the GeometryMaterialIdInfo object of the geometry with @a uniqueId. If this method has 
-		not been called before with the same uniqueId, an empty GeometryMaterialIdInfo is created, added to
-		the map and returned.*/
-		GeometryMaterialIdInfo& getMeshMaterialIdInfo( const COLLADAFW::UniqueId& uniqueId);
+		/** Returns the GeometryMaterialIdInfo to map symbols to ids*/
+		GeometryMaterialIdInfo& getMeshMaterialIdInfo( );
 
 		/** Returns TextureMapId for @a semantic. Successive call with same semantic return the same TextureMapId.*/
 		COLLADAFW::TextureMapId getTextureMapIdBySematic( const String& semantic );

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a
===================================================================
(Binary files differ)