[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59992] trunk/lib/win64/opencollada/ include/opencollada: Collada include fles for Win64
Gaia Clary
gaia.clary at machinimatrix.org
Tue Sep 10 10:24:42 CEST 2013
Revision: 59992
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59992
Author: gaiaclary
Date: 2013-09-10 08:24:42 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Collada include fles for Win64
based on OpenCollada git revision: 828b60384552b83e55d2af7055f07d2c40b4d3f4
Modified Paths:
--------------
trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h
trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLPolygons.h
trunk/lib/win64/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWBuffer.h
Modified: trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h
===================================================================
--- trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h 2013-09-10 08:21:44 UTC (rev 59991)
+++ trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWNode.h 2013-09-10 08:24:42 UTC (rev 59992)
@@ -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/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
===================================================================
--- trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h 2013-09-10 08:21:44 UTC (rev 59991)
+++ trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h 2013-09-10 08:24:42 UTC (rev 59992)
@@ -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/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
===================================================================
--- trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h 2013-09-10 08:21:44 UTC (rev 59991)
+++ trunk/lib/win64/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h 2013-09-10 08:24:42 UTC (rev 59992)
@@ -1,484 +1,484 @@
-/*
- Copyright (c) 2008-2009 NetAllied Systems GmbH
-
- This file is part of COLLADASaxFrameworkLoader.
-
- 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 __COLLADA_LOADER_H__
-#define __COLLADA_LOADER_H__
-
-#include "COLLADASaxFWLPrerequisites.h"
-#include "COLLADASaxFWLGeometryMaterialIdInfo.h"
-#include "COLLADASaxFWLSidTreeNode.h"
-#include "COLLADASaxFWLKinematicsIntermediateData.h"
-#include "COLLADASaxFWLTypes.h"
-
-#include "COLLADAFWILoader.h"
-#include "COLLADAFWLoaderUtils.h"
-#include "COLLADAFWUniqueId.h"
-#include "COLLADAFWTypes.h"
-#include "COLLADAFWSkinController.h"
-#include "COLLADAFWInstanceController.h"
-
-#include "COLLADABUHashFunctions.h"
-#include "COLLADABUURI.h"
-#include "COLLADABUhash_map.h"
-
-#include <set>
-
-namespace COLLADAFW
-{
- class IWriter;
- class VisualScene;
- class LibraryNodes;
- class Effect;
- class Light;
- class Camera;
- class Formula;
- class AnimationList;
- class MorphController;
-}
-
-
-namespace COLLADASaxFWL
-{
-
- class IErrorHandler;
- class DocumentProcessor;
- class PostProcessor;
- class FileLoader;
-
-
- typedef std::list<String> StringList;
-
- typedef std::list<COLLADABU::URI> URIList;
-
- static StringList EMPTY_STRING_LIST = StringList();
-
-
-
- /** Loader to a COLLADA document and all the documents that are referenced it.*/
- class Loader : public COLLADAFW::ILoader
- {
- public:
-
- typedef std::map<String, COLLADAFW::TextureMapId> StringTextureMapIdMap;
-
- /** Flags for each type of object that are passed by the IWriter interface. */
- enum ObjectFlags
- {
- NO_FLAG = 0,
- ASSET_FLAG = 1<< 0,
- SCENE_FLAG = 1<< 1,
- VISUAL_SCENES_FLAG = 1<< 2,
- LIBRARY_NODES_FLAG = 1<< 3,
- GEOMETRY_FLAG = 1<< 4,
- MATERIAL_FLAG = 1<< 5,
- EFFECT_FLAG = 1<< 6,
- CAMERA_FLAG = 1<< 7,
- IMAGE_FLAG = 1<< 8,
- LIGHT_FLAG = 1<< 9,
- ANIMATION_FLAG = 1<<10,
- ANIMATION_LIST_FLAG = 1<<11,
- SKIN_CONTROLLER_DATA_FLAG = 1<<12,
- CONTROLLER_FLAG = 1<<13,
- FORMULA_FLAG = 1<<14,
- KINEMATICS_FLAG = 1<<15,
-
- ALL_OBJECTS_MASK = (1<<16) - 1,
- };
-
- public:
- typedef COLLADABU::hash_map<COLLADABU::URI, COLLADAFW::UniqueId> URIUniqueIdMap;
-
- typedef COLLADABU::hash_map<COLLADABU::URI, COLLADAFW::FileId> URIFileIdMap;
-
- /** Maps file id to uri.*/
- typedef std::map<COLLADAFW::FileId, COLLADABU::URI> FileIdURIMap;
-
- /** Maps the id of a collada element to the corresponding sit tree node.*/
- typedef std::map<String /*id*/, SidTreeNode*> IdStringSidTreeNodeMap;
-
- /** Maps unique ids of animation list to the corresponding animation list.*/
- typedef std::map< COLLADAFW::UniqueId , COLLADAFW::AnimationList* > UniqueIdAnimationListMap;
-
- /** List of visual scenes.*/
- typedef std::vector<COLLADAFW::VisualScene*> VisualSceneList;
-
- /** List of library nodes.*/
- typedef std::vector<COLLADAFW::LibraryNodes*> LibraryNodesList;
-
- /** List of effects.*/
- typedef std::vector<COLLADAFW::Effect*> EffectList;
-
- /** List of lights.*/
- typedef std::vector<COLLADAFW::Light*> LightList;
-
- /** List of cameras.*/
- typedef std::vector<COLLADAFW::Camera*> CameraList;
-
- /** List of morph controller.*/
- typedef std::vector<COLLADAFW::MorphController*> MorphControllerList;
-
- struct JointSidsOrIds
- {
- JointSidsOrIds():areIds(true){}
-
- /** List of sids or ids.*/
- StringList sidsOrIds;
- /** True if sidsOrIds contains ids, false if sidsOrIds contains sids.*/
- bool areIds;
- };
-
- /** Maps unique ids of skin data to the sids or ids of the joints of this skin controller.*/
- typedef std::map< COLLADAFW::UniqueId, JointSidsOrIds> SkinDataJointSidsMap;
-
- /** Maps unique ids of skin data to the source uri string.*/
- typedef std::map< COLLADAFW::UniqueId/*skin controller data*/, COLLADABU::URI/*source uri string*/> SkinDataSkinSourceMap;
-
- /** Set of SkinControllers.*/
- typedef std::set< COLLADAFW::SkinController, bool(*)(const COLLADAFW::SkinController& lhs, const COLLADAFW::SkinController& rhs)> SkinControllerSet;
-
- /** Data that needs to be store, intermediately, to assign controllers. One struct for each
- instance controller.*/
- struct InstanceControllerData
- {
- /** List of URIs of the skeleton roots, ie the uris in the COLLADA skeleton element.*/
- URIList skeletonRoots;
-
- /** The instance controller that instantiates the controller.*/
- COLLADAFW::InstanceController* instanceController;
- };
-
- /** List of all instance controllers that reference the same controller, ie share the same skin
- data for skin controllers.*/
- typedef std::list<InstanceControllerData> InstanceControllerDataList;
-
- /** Maps each controller data unique id to the list of nodes instantiating it.*/
- typedef std::map<COLLADAFW::UniqueId,InstanceControllerDataList> InstanceControllerDataListMap;
-
-
- /** List of formulas.*/
- typedef std::map<COLLADAFW::UniqueId, COLLADAFW::Formula*> UniqueIdFormulaMap;
-
- /** Contains the binding of an animation to the referenced object. Required to create animation lists*/
- struct AnimationSidAddressBinding
- {
- AnimationSidAddressBinding( const AnimationInfo& _animationInfo, const SidAddress& _sidAddress)
- : animationInfo(_animationInfo), sidAddress(_sidAddress) {}
- AnimationInfo animationInfo;
-
- SidAddress sidAddress;
- };
-
- /** List of UniqueIdSidAddressPairs.*/
- typedef std::vector< AnimationSidAddressBinding > AnimationSidAddressBindingList;
-
- /** Function pointer to functions provided to registerExternalReferenceDeciderCallbackFunction.*/
- typedef bool (*ExternalReferenceDeciderCallbackFunction)( const COLLADABU::URI&, COLLADAFW::FileId );
-
- public:
- const static InstanceControllerDataList EMPTY_INSTANCE_CONTROLLER_DATALIST;
- static const JointSidsOrIds EMPTY_JOINTSIDSORIDS;
-
- private:
- /** The version of the collada document.*/
- COLLADAVersion mCOLLADAVersion;
-
- FileLoader * mFileLoader;
-
- /** Loader utils that will help us to fill the model.*/
- COLLADAFW::LoaderUtils mLoaderUtil;
-
- /** The writer that will be fed by this loader.*/
- COLLADAFW::IWriter* mWriter;
-
- /** List of registered extra data callback handlers. */
- ExtraDataCallbackHandlerList mExtraDataCallbackHandlerList;
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list