Revision: 29255
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29255
Author: jesterking
Date: 2010-06-06 02:50:47 +0200 (Sun, 06 Jun 2010)
Log Message:
-----------
Add win64 release libs of OpenCOLLADA (r746) in preparation for re-enabling its
support in Blender.
Modified Paths:
--------------
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsController.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsModel.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsScene.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWLines.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitive.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMeshVertexData.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWScene.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWTypes.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLDocumentProcessor.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIFilePartLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInputUnshared.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIntermediateTargetable.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsSceneCreator.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryArticulatedSystemsLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLMeshLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrerequisites.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSaxFWLError.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSceneLoader.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLUtils.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLSceneLoader15.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWEffectProfile.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibrary.h
trunk/lib/win64/opencollada/lib/GeneratedSaxParser.lib
trunk/lib/win64/opencollada/lib/MathMLSolver.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter.lib
trunk/lib/win64/opencollada/lib/pcre.lib
trunk/lib/win64/opencollada/lib/xml2.lib
Added Paths:
-----------
trunk/lib/win64/opencollada/lib/buffer.lib
trunk/lib/win64/opencollada/lib/ftoa.lib
Removed Paths:
-------------
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWExtraData.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWExtraKeys.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWCharacterBuffer.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWFWriteBufferFlusher.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWIBufferFlusher.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWdtoa.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWftoa.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWitoa.h
trunk/lib/win64/opencollada/lib/UTF.lib
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
2010-06-06 00:35:48 UTC (rev 29254)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
2010-06-06 00:50:47 UTC (rev 29255)
@@ -12,29 +12,22 @@
#define __COLLADABU_HASHFUNCTIONS_H__
#include "COLLADABUPrerequisites.h"
-#include "COLLADABUhash_map.h"
+#include "COLLADABUPlatform.h"
+#include "COLLADABUURI.h"
+
-#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
-//# include
-#else
-# ifdef COLLADABU_OS_LINUX
-# include <ext/hash_fun.h>
-# include "COLLADABUURI.h"
-# elif (defined COLLADABU_OS_MAC)
-# include <ext/hash_fun.h>
-# include "COLLADABUURI.h"
-# endif
-#endif
-
namespace COLLADABU
{
- class URI;
-
-
size_t calculateHash(const String& str);
+ /** Converts all lower case ASCII caracters to the corresponding upper
case character befor calculating the hash.*/
+ size_t calculateHashUpper(const String& str);
+
size_t calculateHash(const char* str);
+ /** Converts all lower case ASCII caracters to the corresponding upper
case character befor calculating the hash.*/
+ size_t calculateHashUpper(const char* str);
+
size_t calculateHash(const URI& uri);
inline size_t calculateHashU(const URI& uri){
return calculateHash(uri);
@@ -56,14 +49,6 @@
operator()(const COLLADABU::URI& uri) const
{ return COLLADABU::calculateHash(uri); }
};
-/*
- template<>
- struct hash<COLLADAFW::UniqueId>
- {
- size_t
- operator()(const COLLADAFW::UniqueId& uniqueId) const {
return uniqueId; }
- };
-*/
#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP)
}
#endif
Deleted:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h
2010-06-06 00:35:48 UTC (rev 29254)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h
2010-06-06 00:50:47 UTC (rev 29255)
@@ -1,119 +0,0 @@
-/*
- Copyright (c) 2008-2009 NetAllied Systems GmbH
-
- This file is part of COLLADABaseUtils.
-
- 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 __COLLADABU_HASHMAP_H__
-#define __COLLADABU_HASHMAP_H__
-
-#include "COLLADABUPrerequisites.h"
-
-#include <map>
-
-namespace COLLADABU
-{
- template<class KeyType, class ValueType, class HashType, HashType
(*calculateHash)(const KeyType& key)>
- class HashMap
- {
- private:
- struct HashValuePair
- {
- HashValuePair(const HashType& _hash, const KeyType&
_key ) : hash(_hash), key(_key){}
- HashType hash;
- KeyType key;
-
- bool operator<( const HashValuePair& rhs)const
- {
- if ( hash < rhs.hash )
- return true;
-
- if ( rhs.hash < hash )
- return false;
-
- if ( key < rhs.key )
- return true;
-
- if ( rhs.key < key )
- return false;
- return false;
- }
- };
-
-
- private:
-
- typedef std::map<HashValuePair, ValueType> Map;
-
- Map mMap;
-
-
- public:
- class const_iterator;
- class iterator
- {
- private:
- typename Map::iterator mIt;
- friend class const_iterator;
- public:
- iterator(typename Map::iterator it):mIt(it){}
- KeyType& first() { return mIt->first.key; }
- ValueType& second() { return mIt->second; }
-
- bool operator==(iterator other)const { return mIt ==
other.mIt; }
- bool operator==(const_iterator other)const { return mIt
== other.mIt; }
- };
-
- // typedef const iterator const_iterator;
-
- class const_iterator
- {
- private:
- typename Map::const_iterator mIt;
- friend class iterator;
- public:
- const_iterator(typename Map::const_iterator
it):mIt(it){}
- const KeyType& first() const { return mIt->first.key; }
- const ValueType& second() const { return mIt->second; }
- bool operator==(const_iterator other)const { return mIt
== other.mIt; }
- bool operator==(iterator other)const { return mIt ==
other.mIt; }
- };
- private:
- // HashMap(){}
- // virtual ~HashMap(){}
- public:
-
- ValueType& operator[](const KeyType& key);
-
- const ValueType& operator[](const KeyType& key)const;
-
- iterator find(const KeyType& key) {return
iterator(mMap.find(HashValuePair(calculateHash(key), key)) ); }
-
- const_iterator find(const KeyType& key) const{return
iterator(mMap.find(HashValuePair(calculateHash(key), key)) ); }
-
- const_iterator end()const { return const_iterator(mMap.end()); }
-
- };
-
- template<class KeyType, class ValueType, class HashType, HashType
(*calculateHash)(const KeyType& key)>
- ValueType& HashMap<KeyType, ValueType, HashType,
calculateHash>::operator[]( const KeyType& key )
- {
- return mMap[HashValuePair(calculateHash(key), key)];
- }
-
-
- template<class KeyType, class ValueType, class HashType, HashType
(*calculateHash)(const KeyType& key)>
- const ValueType& HashMap<KeyType, ValueType, HashType,
calculateHash>::operator[]( const KeyType& key ) const
- {
- return mMap[HashValuePair(calculateHash(key), key)];
- }
-
-
-
-} // namespace COLLADABU
-
-#endif // __COLLADABU_HASHMAP_H__
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h
2010-06-06 00:35:48 UTC (rev 29254)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h
2010-06-06 00:50:47 UTC (rev 29255)
@@ -6,14 +6,62 @@
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 __COLLADABU_PREREQUISITES_H__
#define __COLLADABU_PREREQUISITES_H__
#include <string>
+#include <string.h>
+#define COLLADABU_HAVE_TR1_UNORDERED_MAP
+#ifndef WIN32
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#else
+ #include <tr1/unordered_map>
+ #include <tr1/unordered_set>
+#endif
+#else
+# undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+# if defined(_MSC_VER) && (_MSC_VER >= 1600) \
+ && defined(_MSC_FULL_VER) && \
+ !defined(__SGI_STL_PORT) && \
+ !defined(_STLPORT_VERSION) && \
+ !defined(_RWSTD_VER_STR) && \
+ !defined(_RWSTD_VER)
+# define COLLADABU_HAVE_TR1_UNORDERED_MAP
+# include <unordered_map>
+# include <unordered_set>
+# endif
+#endif
+#ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP
+# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
+# include <ext/hash_map>
+# include <ext/hash_set>
+# else
+# include <hash_map>
+# include <hash_set>
+# endif
+#endif
+
+#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
+//# include
+#else
+# ifdef COLLADABU_OS_LINUX
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+# include <ext/hash_fun.h>
+#else
+# include <backward/hash_fun.h>
+#endif
+# include "COLLADABUURI.h"
+# elif (defined COLLADABU_OS_MAC)
+# include <ext/hash_fun.h>
+# include "COLLADABUURI.h"
+# endif
+#endif
+
namespace COLLADABU
{
typedef std::string String;
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h
2010-06-06 00:35:48 UTC (rev 29254)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h
2010-06-06 00:50:47 UTC (rev 29255)
@@ -6,11 +6,13 @@
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 __COLLADABU_STABLE_HEADERS_H__
#define __COLLADABU_STABLE_HEADERS_H__
+#include "COLLADABUPrerequisites.h"
+
//STL
#include <vector>
#include <sstream>
@@ -19,4 +21,7 @@
#include <string>
#include <iostream>
+
+
+
#endif //__COLLADABU_STABLE_HEADERS_H__
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h
2010-06-06 00:35:48 UTC (rev 29254)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h
2010-06-06 00:50:47 UTC (rev 29255)
@@ -104,6 +104,9 @@
return isAsciiAlphaChar ( c ) || isDigit ( c ) || isIDExtraChar (
c ) ;
}
+ /** If @a c is a lower case ascii character, the corresponding
upper character is returned.*/
+ static char toUpperASCIIChar( char c );
+
static String uriEncode ( const String & sSrc );
/** Escapes all the characters not allowed in xml text elements.
Modified:
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
===================================================================
---
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
2010-06-06 00:35:48 UTC (rev 29254)
+++
trunk/lib/win64/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
2010-06-06 00:50:47 UTC (rev 29255)
@@ -8,64 +8,41 @@
http://www.opensource.org/licenses/mit-license.php
*/
+
#ifndef __COLLADABU_HASH_MAP_H__
#define __COLLADABU_HASH_MAP_H__
#include "COLLADABUPrerequisites.h"
#include "COLLADABUPlatform.h"
-#define COLLADABU_HAVE_TR1_UNORDERED_MAP
-#ifndef WIN32
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-#undef COLLADABU_HAVE_TR1_UNORDERED_MAP
-#else
- #include <tr1/unordered_map>
- #include <tr1/unordered_set>
-#endif
-#else
-# undef COLLADABU_HAVE_TR1_UNORDERED_MAP
-/*
-# if defined(_MSC_VER) && (_MSC_VER >= 1500) \
- && defined(_MSC_FULL_VER) && \
- !defined(__SGI_STL_PORT) && \
- !defined(_STLPORT_VERSION) && \
- !defined(_RWSTD_VER_STR) && \
- !defined(_RWSTD_VER)
-*/
-# if 0
-# define COLLADABU_HAVE_TR1_UNORDERED_MAP
-# include <unordered_map>
-# include <unordered_set>
-# endif
-#endif
-#ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP
-# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
-# include <ext/hash_map>
-# include <ext/hash_set>
-# else
-# include <hash_map>
-# include <hash_set>
-# endif
-#endif
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
