[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26921] trunk/lib/darwin-8.x.i386/ opencollada/include: OSX/10.4_i386 libs : some opencollada includes had not been committed
Damien Plisson
damien.plisson at yahoo.fr
Mon Feb 15 11:21:19 CET 2010
Revision: 26921
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26921
Author: damien78
Date: 2010-02-15 11:21:19 +0100 (Mon, 15 Feb 2010)
Log Message:
-----------
OSX/10.4_i386 libs : some opencollada includes had not been committed
These header files were not committed. Strange no one had noticed before. Maybe they are not used anyway by Blender collada implementation...
Added Paths:
-----------
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBase.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWMaterialBinding.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWTextureCoordinateBinding.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLExtraDataElementHandler.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLExtraDataLoader.h
trunk/lib/darwin-8.x.i386/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIExtraDataCallbackHandler.h
Added: trunk/lib/darwin-8.x.i386/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
===================================================================
--- trunk/lib/darwin-8.x.i386/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h (rev 0)
+++ trunk/lib/darwin-8.x.i386/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2010-02-15 10:21:19 UTC (rev 26921)
@@ -0,0 +1,71 @@
+/*
+ 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_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)
+# 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
+// file to include the hash map platform independent
+
+namespace COLLADABU
+{
+
+
+#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
+ using namespace std::tr1;
+ template<class X, class Y > class hash_map:public std::tr1::unordered_map<X,Y>
+ { public:
+ hash_map(){}
+ hash_map(const hash_map&a):std::tr1::unordered_map<X,Y>(a){}
+ hash_map&operator=(const hash_map&a){std::tr1::unordered_map<X,Y>::operator=(*this,a);return this;}
+ };
+#else
+# if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
+ using namespace __gnu_cxx;
+# else
+ using namespace stdext;
+# endif
+#endif
+
+
+} // namespace COLLADABU
+
+#endif // __COLLADABU_HASH_MAP_H__
Added: trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBase.h
===================================================================
--- trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBase.h (rev 0)
+++ trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBase.h 2010-02-15 10:21:19 UTC (rev 26921)
@@ -0,0 +1,65 @@
+/*
+ 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_INSTANCEBASE_H__
+#define __COLLADAFW_INSTANCEBASE_H__
+
+#include "COLLADAFWPrerequisites.h"
+#include "COLLADAFWObject.h"
+
+
+namespace COLLADAFW
+{
+
+ /** Base class for the instance classes. */
+ template<ClassId classId>
+ class InstanceBase : public ObjectTemplate<classId>
+ {
+ private:
+
+ /**
+ * The name attribute is the text string name of this element.
+ * Optional attribute.
+ */
+ String mName;
+
+ /** The unique id of the instantiated object.*/
+ UniqueId mInstanciatedObjectId;
+
+ public:
+
+ /** Constructor. Creates an instance of an object with UniqueId @a instanciatedObjectId.
+ @param instanciatedObjectId The UniqueId of the object instantiated.*/
+ InstanceBase ( const UniqueId& uniqueId, const UniqueId& instanciatedObjectId )
+ : ObjectTemplate<classId>(uniqueId)
+ , mInstanciatedObjectId (instanciatedObjectId )
+ {}
+
+ /** Destructor. */
+ virtual ~InstanceBase() {}
+
+ /** Returns the name of the node*/
+ const String& getName () const { return mName; }
+
+ /** Sets the name of the node*/
+ void getName ( const String& name ) { mName = name; }
+
+ /** Returns the unique id of the instantiated object.*/
+ const UniqueId& getInstanciatedObjectId() const { return mInstanciatedObjectId; }
+
+ /** Sets the unique id of the instantiated object.*/
+ void setInstanciatedObjectId ( const UniqueId& instanciatedObjectId ) { mInstanciatedObjectId = instanciatedObjectId; }
+
+ virtual InstanceBase* clone() const { return new InstanceBase(*this); }
+ };
+
+} // namespace COLLADAFW
+
+#endif // __COLLADAFW_INSTANCEBASE_H__
Added: trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
===================================================================
--- trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h (rev 0)
+++ trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h 2010-02-15 10:21:19 UTC (rev 26921)
@@ -0,0 +1,67 @@
+/*
+ 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_INSTANCEBINDINGBASE_H__
+#define __COLLADAFW_INSTANCEBINDINGBASE_H__
+
+#include "COLLADAFWPrerequisites.h"
+#include "COLLADAFWInstanceBase.h"
+#include "COLLADAFWMaterialBinding.h"
+
+
+namespace COLLADAFW
+{
+
+ /** Base class for instance objects with binding elements. */
+ template<ClassId classId>
+ class InstanceBindingBase : public InstanceBase<classId>
+ {
+ private:
+
+ /** The list of all material bindings of this instance geometry. The Material bindings must be
+ order according to MaterialBinding::operator<.*/
+ MaterialBindingArray mMaterialBindings;
+
+ public:
+
+ /** Constructor. Creates an instance geometry, that instantiates the geometry with
+ UniqueId @a instanciatedGeometryId.
+ @param instanceGeometry The UniqueId of the geometry instantiated.*/
+ InstanceBindingBase ( const UniqueId& uniqueId, const UniqueId& instanciatedObjectId )
+ : InstanceBase<classId> ( uniqueId, instanciatedObjectId )
+ {}
+
+ /** Destructor. */
+ virtual ~InstanceBindingBase() {}
+
+ /** Clones the matrix.*/
+ InstanceBindingBase* clone() const { return new InstanceBindingBase(*this); }
+
+ /** Returns the list of all material bindings.*/
+ MaterialBindingArray& getMaterialBindings() { return mMaterialBindings; }
+
+ /** Returns the list of all material bindings.*/
+ const MaterialBindingArray& getMaterialBindings() const { return mMaterialBindings; }
+
+ private:
+
+ /** Default copy constructor. */
+ InstanceBindingBase( const InstanceBindingBase& pre )
+ : InstanceBase<classId> ( pre )
+ , mMaterialBindings ()
+ {
+ pre.mMaterialBindings.cloneArray ( mMaterialBindings );
+ }
+
+ };
+
+} // namespace COLLADAFW
+
+#endif // __COLLADAFW_INSTANCEBINDINGBASE_H__
Added: trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWMaterialBinding.h
===================================================================
--- trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWMaterialBinding.h (rev 0)
+++ trunk/lib/darwin-8.x.i386/opencollada/include/COLLADAFramework/COLLADAFWMaterialBinding.h 2010-02-15 10:21:19 UTC (rev 26921)
@@ -0,0 +1,104 @@
+/*
+ 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_MATERIALBINDING_H__
+#define __COLLADAFW_MATERIALBINDING_H__
+
+#include "COLLADAFWPrerequisites.h"
+#include "COLLADAFWTypes.h"
+#include "COLLADAFWTextureCoordinateBinding.h"
+#include "COLLADAFWUniqueId.h"
+
+
+namespace COLLADAFW
+{
+
+ /** Holds informations how to bind a material to a mesh primitive.
+ The material with UniqueId @a mReferencedMaterial gets bind to all mesh primitives
+ with material id @a mMaterialId.*/
+ class MaterialBinding
+ {
+ private:
+
+ /** The MaterialId of the mesh primitives that should get bind to a material.*/
+ MaterialId mMaterialId;
+
+ /** Unique id of the material that should get bind to the mesh primitives.*/
+ UniqueId mReferencedMaterial;
+
+ /** The name of the shading engine. */
+ String mName;
+
+ /** A list of bindings of texture maps .*/
+ TextureCoordinateBindingArray mTextureCoordinateBindingArray;
+
+ public:
+
+ MaterialBinding ( const MaterialId& materialId, const UniqueId& referencedMaterial )
+ : mMaterialId ( materialId )
+ , mReferencedMaterial ( referencedMaterial )
+ {}
+
+ /** @return MaterialId of the mesh primitives that should get bind to a material.*/
+ MaterialId getMaterialId() const { return mMaterialId; }
+
+ /** Sets the MaterialId of the mesh primitives that should get bind to a material.*/
+ void setMaterialId(MaterialId val) { mMaterialId = val; }
+
+ /** @return Unique id of the material that should get bind to the mesh primitives.*/
+ const UniqueId& getReferencedMaterial() const { return mReferencedMaterial; }
+
+ /** Sets the Unique id of the material that should get bind to the mesh primitives.*/
+ void setReferencedMaterial(const UniqueId& val) { mReferencedMaterial = val; }
+
+ /** The comparison operator that only compares the material ids.*/
+ bool operator<( const MaterialBinding& rhs) const { return mMaterialId < rhs.mMaterialId; }
+
+ /** The name of the shading engine. */
+ const String& getName () const { return mName; }
+ void setName ( const String& val ) { mName = val; }
+
+ /** Returns the list of bindings of texture maps .*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list