Merge pull request #114 from FishingCactus/Max2012

3DSMax fixes + support for 2012

COLLADAFramework/include/COLLADAFWMesh.h

@@ -71,6 +71,18 @@ namespace COLLADAFW
         */
         MeshVertexData mUVCoords;
 
+        /**
+        * The Tangent array
+        */
+
+        MeshVertexData mTangents;
+
+        /**
+        * The Binormal array
+        */
+
+        MeshVertexData mBinormals;
+
         /**
         * Geometric primitives, which assemble values from the inputs into vertex attribute data. 
         * Each primitive element holds the index arrays of the used input elements
@@ -215,6 +227,30 @@ namespace COLLADAFW
             return 0;
         }
 
+        /** 
+        * The 3 dimensional tangent coordinates array. 
+        * Tangent coordinates can be stored as float or double values.
+        */
+        const MeshVertexData& getTangents () const { return mTangents; }
+
+        /** 
+        * The 3 dimensional tangent coordinates array. 
+        * Tangent coordinates can be stored as float or double values.
+        */
+        MeshVertexData& getTangents () { return mTangents; }
+
+        /** 
+        * The 3 dimensional binormal coordinates array. 
+        * Binormal coordinates can be stored as float or double values.
+        */
+        const MeshVertexData& getBinormals () const { return mBinormals; }
+
+        /** 
+        * The 3 dimensional binormal coordinates array. 
+        * Binormal coordinates can be stored as float or double values.
+        */
+        MeshVertexData& getBinormals () { return mBinormals; }
+
         /**
         * Geometric primitives, which assemble values from the inputs into vertex attribute data. 
         * Can be any combination of the following in any order:

COLLADAFramework/include/COLLADAFWMeshPrimitive.h

@@ -108,6 +108,17 @@ namespace COLLADAFW
         */
         UIntValuesArray mNormalIndices;
 
+        /** 
+        * The index list of the tangent array (support of multiple uv sets). 
+        */
+        UIntValuesArray mTangentIndices;
+
+        /** 
+        * The index list of the binormal array (support of multiple uv sets). 
+        */
+        UIntValuesArray mBinormalIndices;
+
+
         /** 
         * The index list of the colors array  (support of multiple colors). 
         */
@@ -117,7 +128,7 @@ namespace COLLADAFW
         * The index list of the uv coordinates array (support of multiple uv sets). 
         */
         IndexListArray mUVCoordIndicesArray;
-        
+
     public:	
 
         /**
@@ -200,6 +211,42 @@ namespace COLLADAFW
 		/**Returns true if the mesh primitive has normals.*/
 		bool hasNormalIndices() const { return !mNormalIndices.empty(); }
 
+        /** 
+		* The index list of the normals array. 
+		*/
+		UIntValuesArray& getTangentIndices () { return mTangentIndices; }
+
+		/** 
+		* The index list of the normals array. 
+		*/
+        const UIntValuesArray& getTangentIndices () const{ return mTangentIndices; }
+
+        /** 
+        * The index list of the normals array. 
+        */
+        void setTagentIndices ( const UIntValuesArray& TangentIndices ) { mTangentIndices = TangentIndices; }
+
+		/**Returns true if the mesh primitive has normals.*/
+		bool hasTangentIndices() const { return !mTangentIndices.empty(); }
+
+        		/** 
+		* The index list of the normals array. 
+		*/
+		UIntValuesArray& getBinormalIndices () { return mBinormalIndices; }
+
+		/** 
+		* The index list of the normals array. 
+		*/
+		const UIntValuesArray& getBinormalIndices () const{ return mBinormalIndices; }
+
+        /** 
+        * The index list of the normals array. 
+        */
+        void setBinormalIndices ( const UIntValuesArray& BinormalIndices ) { mBinormalIndices = BinormalIndices; }
+
+		/**Returns true if the mesh primitive has normals.*/
+		bool hasBinormalIndices() const { return !mBinormalIndices.empty(); }
+
         /** 
         * The index list of the colors array. 
         */

COLLADAMax/include/COLLADAMaxDocumentExporter.h

@@ -36,6 +36,8 @@ namespace COLLADAMax
 
     class AnimationExporter;
 
+    typedef std::map<String, String> StringToStringMap;
+
 	/** Class that uniquely identifies object.*/
 	class ObjectIdentifier
 	{
@@ -164,6 +166,12 @@ namespace COLLADAMax
             return mOptions;
         }
 
+        /**
+        * Returns a pointer to the collada stream writer.
+        * @return StreamWriter* Pointer to the collada stream writer
+        */
+        COLLADASW::StreamWriter & getStreamWriter() { return mStreamWriter; };
+
 		/** The uri of the main output file.*/
 		const COLLADASW::URI& getOutputFileUri()const { return mOutputFileUri; }
 

COLLADAMax/include/COLLADAMaxEffectExporter.h

@@ -28,6 +28,7 @@
 
 #include "COLLADAMaxExportSceneGraph.h"
 #include "COLLADAMaxMaterialExporter.h"
+#include "COLLADAMaxEffectTextureExporter.h"
 #include "COLLADAMaxExtra.h"
 #include "COLLADAMaxTypes.h"
 
@@ -174,6 +175,8 @@ namespace COLLADAMax
 
 		AnimationExporter * mAnimationExporter;
 
+        EffectTextureExporter mTextureExporter;
+
         /** List of ids of the already exported materials that are used in the COLLADASW file.*/
         ExportedEffectIdAndNameList * mExportedEffectIdList;
 
@@ -189,6 +192,10 @@ namespace COLLADAMax
 		/** Maps material and channels to the IParamBlock of the corresponding StdUVGen*/
 		MaterialChannelPairParamBlockMap mMaterialChannelPairParamBlockMap;
 
+        /**
+         * The max id with the collada id.
+         */
+        StringToStringMap mMaxIdColladaImageIdMap;
 
     public:
         /** Constructor
@@ -221,6 +228,9 @@ namespace COLLADAMax
             return mExportedImageMap;
         }
 
+		/** Returns the TextureExporter of the effect exporter.*/
+		 EffectTextureExporter* getTextureExporter () { return &mTextureExporter; }
+
 		/** Returns the MaterialChannelPairParamBlockMap used by the effect exporter*/
 		const MaterialChannelPairParamBlockMap & getMaterialChannelPairParamBlockMap() const
 		{
@@ -260,6 +270,9 @@ namespace COLLADAMax
         /** Exports am common COLLADASW effect created from  @a material.*/
         void exportCommonEffect ( COLLADASW::EffectProfile & effectProfile, ExportNode* exportNode, Mtl* material, const String & effectId, float weight = 1.0, bool inited = false );
 
+        /** Exports a HLSL COLLADASW effect created from  @a material.*/
+        void exportHLSLEffect ( COLLADASW::EffectProfile & effectProfile, ExportNode* exportNode, Mtl* material, const String & effectId, float weight = 1.0, bool inited = false );
+
         /** Exports the material @a material.*/
         void exportSimpleEffect ( ExportNode* exportNode, Mtl* material );