[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24225] trunk/lib/windows/opencollada: == COLLADA ==

Nathan Letwory jesterking at letwory.net
Mon Nov 2 01:30:13 CET 2009


Revision: 24225
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24225
Author:   jesterking
Date:     2009-11-02 01:30:13 +0100 (Mon, 02 Nov 2009)

Log Message:
-----------
== COLLADA ==

* update libraries to r641. Small commit to default config win32-vc coming shortly after this.

Modified Paths:
--------------
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathUtils.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimationCurve.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimationList.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnnotate.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEffect.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEffectCommon.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWExtraData.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWExtraKeys.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWGeometry.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWILoader.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWIWriter.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWImage.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWIndexList.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceGeometry.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLibraryNodes.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLight.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMaterial.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMesh.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitive.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWModifier.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMorphController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWNode.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWObject.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWParam.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWPassClear.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWPassOutput.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWPointerArray.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWRenderState.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWRoot.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWScene.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWShaderConstantFX.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWShaderElement.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWShaderLambert.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWShaderPhong.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWSkew.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWSkinController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWSkinControllerData.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWStableHeaders.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTexture.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTypes.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWUniqueId.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWValueType.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWVisualScene.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLAccessor.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLArrayElement.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFileLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLGeometryLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIFilePartLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInputShared.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInputUnshared.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryAnimationsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryCamerasLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryControllersLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryEffectsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryImagesLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryLightsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryMaterialsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryNodesLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLMeshLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLNodeLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPrimitiveBase.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSaxFWLError.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSceneLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSidAddress.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSidTreeNode.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSource.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLStableHeaders.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLTechniqueCommon.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLTypes.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLVersionParser.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLVertices.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLVisualSceneLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated14/COLLADASaxFWLNodeLoader14.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLNodeLoader15.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWAnnotation.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWBuffer.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWCode.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWConstants.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWEffectProfile.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWFormatHint.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWImage.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWInclude.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWInputList.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWInstanceMaterial.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryAnimationClips.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryCameras.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryGeometries.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryImages.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryLights.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryMaterials.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLight.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWPass.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWRenderState.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWSampler.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWShader.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWStreamWriter.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWSurfaceInitOption.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWTechniqueFX.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWValueType.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWitoa.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserLibxmlSaxParser.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserParserError.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserSaxParser.h

Added Paths:
-----------
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAxisInfo.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFormula.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFormulaNewParam.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFormulas.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWJoint.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWJointPrimitive.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsModel.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsScene.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLines.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLinestrips.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMotionProfile.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTarget.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTargetableValue.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLCOLLADACsymbol.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLDocumentProcessor.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFormulasLinker.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFormulasLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLHelperLoaderBase.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIntermediateTargetable.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLJointsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsSceneCreator.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryArticulatedSystemsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryFormulasLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryJointsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryKinematicsModelsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLPostProcessor.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLFormulasLoader15.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryFormulasLoader15.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryJointsLoader15.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryKinematicsModelsLoader15.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWControlVertices.h
    trunk/lib/windows/opencollada/lib/GeneratedSaxParser.lib
    trunk/lib/windows/opencollada/lib/MathMLSolver.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter.lib
    trunk/lib/windows/opencollada/lib/UTF.lib
    trunk/lib/windows/opencollada/lib/pcre.lib
    trunk/lib/windows/opencollada/lib/xml2.lib

Removed Paths:
-------------
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWSurface.h
    trunk/lib/windows/opencollada/lib/opencollada.lib

Added: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h	                        (rev 0)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -0,0 +1,35 @@
+/*
+    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_H__
+#define __COLLADABU_H__
+
+
+// contains all headers of the COLLADA base utils api
+// might be used in precompiled headers
+#include "COLLADABU.h"
+#include "COLLADABUException.h"
+#include "COLLADABUHashFunctions.h"
+#include "COLLADABUHashMap.h"
+#include "COLLADABUIDList.h"
+#include "COLLADABUNativeString.h"
+#include "COLLADABUPcreCompiledPattern.h"
+#include "COLLADABUPlatform.h"
+#include "COLLADABUStringUtils.h"
+#include "COLLADABUURI.h"
+#include "COLLADABUUtils.h"
+
+#include "Math/COLLADABUMathMatrix3.h"
+#include "Math/COLLADABUMathMatrix4.h"
+#include "Math/COLLADABUMathQuaternion.h"
+#include "Math/COLLADABUMathUtils.h"
+#include "Math/COLLADABUMathVector3.h"
+
+#endif //__COLLADABU_H__

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h	2009-11-02 00:20:07 UTC (rev 24224)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -107,7 +107,7 @@
 
 
 	template<class KeyType, class ValueType, class HashType, HashType (*calculateHash)(const KeyType& key)>
-	const ValueType& COLLADABU::HashMap<KeyType, ValueType, HashType, calculateHash>::operator[]( const KeyType& key ) const
+	const ValueType& HashMap<KeyType, ValueType, HashType, calculateHash>::operator[]( const KeyType& key ) const
 	{
 		return mMap[HashValuePair(calculateHash(key), key)];
 	}

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h	2009-11-02 00:20:07 UTC (rev 24224)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -12,8 +12,11 @@
 #define __COLLADABU_PCRECOMPILEDPATTERN_H__
 
 #include "COLLADABUPrerequisites.h"
-#include "pcre.h"
 
+struct real_pcre;
+typedef struct real_pcre pcre;
+
+
 namespace COLLADABU
 {
 

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h	2009-11-02 00:20:07 UTC (rev 24224)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -106,6 +106,8 @@
 		static const String SCHEME_HTTP;
 		static const String SCHEME_HTTPS;
 
+		static const URI INVALID;
+
 	private:
 		/** Resolved version of the URI */
 		String mUriString;
@@ -123,7 +125,7 @@
 		String mQuery;
 		/** fragment component */
 		String mFragment;
-		/** Inidcates, if the URi is valid*/
+		/** Indicates, if the URi is valid*/
 		bool mIsValid;
 
 	public:

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathUtils.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathUtils.h	2009-11-02 00:20:07 UTC (rev 24224)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathUtils.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -12,6 +12,7 @@
 #define __COLLADABU_MATH_UTILS_H__
 
 #include "COLLADABUPrerequisites.h"
+#include "COLLADABUMathVector3.h"
 
 #define TOLERANCE 0.0001f
 
@@ -46,6 +47,15 @@
 				return value1 - value2 < tolerance && value1 - value2 > -tolerance;
 			}
 
+			/** Returns true if @a value1 and @a value2 are equal within @a tolerance*/
+			static bool equals ( const Vector3& value1, const Vector3& value2, const double& tolerance = TOLERANCE )
+			{
+				return equals( value1[0], value2[0], tolerance ) &&
+					   equals( value1[1], value2[1], tolerance ) &&
+					   equals( value1[2], value2[2], tolerance );
+			}
+			
+
 			/** Returns true if @a value1 and @a value2 are equal within the default tolerance*/
 			/*        template<class T>
 			static bool equals ( const T & value1, const T & value2 )
@@ -80,6 +90,12 @@
 				return equals ( value, 0.0, tolerance );
 			}
 
+			/** Returns true if @a value is equal to zero within the tolerance*/
+			static bool equalsZero ( const Vector3& value, const double tolerance = (double)TOLERANCE )
+			{
+				return equals( value, Vector3::ZERO, tolerance );
+			}
+
 			template<class T>
 			static double radToDeg ( const T & value )
 			{

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h	2009-11-02 00:20:07 UTC (rev 24224)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -516,7 +516,7 @@
                 Real dot = dotProduct( rhs );
                 Real angle_radian = acos( dot );
 
-                return abs( angle_radian ) <= tolerance_radian;
+                return fabs( angle_radian ) <= tolerance_radian;
 
             }
 

Added: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h	                        (rev 0)
+++ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h	2009-11-02 00:30:13 UTC (rev 24225)
@@ -0,0 +1,118 @@
+/*
+    Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+    This file is part of COLLADAFramework.
+
+    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_H__
+#define __COLLADAFW_H__
+
+
+#include "COLLADAFWAnimatable.h"
+#include "COLLADAFWAnimatableFloat.h"
+#include "COLLADAFWAnimation.h"
+#include "COLLADAFWAnimationCurve.h"
+#include "COLLADAFWAnimationList.h"
+#include "COLLADAFWAnnotate.h"
+#include "COLLADAFWArray.h"
+#include "COLLADAFWArrayPrimitiveType.h"
+#include "COLLADAFWCamera.h"
+//#include "COLLADAFWCode.h"
+#include "COLLADAFWColor.h"
+#include "COLLADAFWColorOrTexture.h"
+#include "COLLADAFWConstants.h"
+#include "COLLADAFWController.h"
+#include "COLLADAFWEdge.h"
+#include "COLLADAFWEffect.h"
+#include "COLLADAFWEffectCommon.h"
+#include "COLLADAFWException.h"
+#include "COLLADAFWExtraData.h"
+#include "COLLADAFWExtraKeys.h"
+#include "COLLADAFWFileInfo.h"
+#include "COLLADAFWFloatOrDoubleArray.h"
+#include "COLLADAFWFloatOrParam.h"
+#include "COLLADAFWFormula.h"
+#include "COLLADAFWFormulaNewParam.h"
+#include "COLLADAFWFormulas.h"
+#include "COLLADAFWGeometry.h"
+#include "COLLADAFWILoader.h"
+#include "COLLADAFWIWriter.h"
+#include "COLLADAFWImage.h"
+#include "COLLADAFWImageSource.h"
+//#include "COLLADAFWInclude.h"
+#include "COLLADAFWIndexList.h"
+#include "COLLADAFWInstanceCamera.h"
+#include "COLLADAFWInstanceController.h"
+#include "COLLADAFWInstanceGeometry.h"
+#include "COLLADAFWInstanceLight.h"
+#include "COLLADAFWInstanceNode.h"
+#include "COLLADAFWInstanceSceneGraph.h"
+#include "COLLADAFWInstanceVisualScene.h"
+#include "COLLADAFWJoint.h"
+#include "COLLADAFWJointPrimitive.h"
+#include "COLLADAFWKinematicsController.h"
+#include "COLLADAFWKinematicsModel.h"
+#include "COLLADAFWKinematicsScene.h"
+#include "COLLADAFWLibraryNodes.h"
+#include "COLLADAFWLight.h"
+#include "COLLADAFWLoaderUtils.h"
+#include "COLLADAFWLookat.h"
+#include "COLLADAFWMaterial.h"
+#include "COLLADAFWMatrix.h"
+#include "COLLADAFWMesh.h"
+#include "COLLADAFWMeshPrimitive.h"
+#include "COLLADAFWMeshPrimitiveWithFaceVertexCount.h"
+#include "COLLADAFWMeshVertexData.h"
+//#include "COLLADAFWModifier.h"
+#include "COLLADAFWMorphController.h"
+#include "COLLADAFWMotionProfile.h"
+//#include "COLLADAFWNewParam.h"
+#include "COLLADAFWNode.h"
+#include "COLLADAFWObject.h"
+#include "COLLADAFWParam.h"
+// #include "COLLADAFWPass.h"
+// #include "COLLADAFWPassClear.h"
+// #include "COLLADAFWPassOutput.h"
+// #include "COLLADAFWPassTarget.h"
+#include "COLLADAFWPointerArray.h"
+#include "COLLADAFWPolygons.h"
+// #include "COLLADAFWRenderDraw.h"
+// #include "COLLADAFWRenderState.h"
+// #include "COLLADAFWRenderStateStatic.h"
+#include "COLLADAFWRoot.h"
+#include "COLLADAFWRotate.h"
+#include "COLLADAFWSampler.h"
+#include "COLLADAFWScale.h"
+#include "COLLADAFWScene.h"
+#include "COLLADAFWSemantic.h"
+#include "COLLADAFWSetParam.h"
+// #include "COLLADAFWShader.h"
+// #include "COLLADAFWShaderBlinn.h"
+// #include "COLLADAFWShaderConstantFX.h"
+// #include "COLLADAFWShaderElement.h"
+// #include "COLLADAFWShaderLambert.h"
+// #include "COLLADAFWShaderPhong.h"
+#include "COLLADAFWShear.h"
+#include "COLLADAFWSkew.h"
+#include "COLLADAFWSkinController.h"
+#include "COLLADAFWSkinControllerData.h"
+#include "COLLADAFWTargetableValue.h"
+#include "COLLADAFWTechnique.h"
+#include "COLLADAFWTexture.h"
+#include "COLLADAFWTransformation.h"
+#include "COLLADAFWTranslate.h"
+#include "COLLADAFWTriangles.h"
+#include "COLLADAFWTrifans.h"
+#include "COLLADAFWTristrips.h"
+#include "COLLADAFWTypes.h"
+#include "COLLADAFWUniqueId.h"
+#include "COLLADAFWValidate.h"
+#include "COLLADAFWValueType.h"
+#include "COLLADAFWVisualScene.h"
+
+
+#endif // __COLLADAFW_H__

Modified: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list