Added texture support for collada meshes. Fixed const parameters in MeshManipulator.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@827 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CColladaFileLoader.h

@@ -31,6 +31,7 @@ enum ECOLLADA_PARAM_NAME
 	ECPN_DIFFUSE,
 	ECPN_SPECULAR,
 	ECPN_SHININESS,
+	ECPN_TRANSPARENCY,
 	ECPN_YFOV,
 	ECPN_ZNEAR,
 	ECPN_ZFAR,
@@ -71,6 +72,8 @@ enum ECOLLADA_INPUT_SEMANTIC
 	ECIS_TEXCOORD,
 	ECIS_UV,
 	ECIS_TANGENT,
+	ECIS_IMAGE,
+	ECIS_TEXTURE,
 
 	ECIS_COUNT
 };
@@ -87,6 +90,22 @@ struct SColladaInput
 	core::stringc Source;
 };
 
+//! Collada images
+struct SColladaImage
+{
+	core::stringc Filename;
+	core::stringc Id;
+};
+
+
+//! Collada texture
+struct SColladaTexture
+{
+	video::ITexture* Texture;
+	core::stringc Id;
+};
+
+
 //! Collada material
 struct SColladaMaterial
 {
@@ -196,6 +215,12 @@ private:
 	//! reads a <camera> element and stores it as prefab
 	void readCameraPrefab(io::IXMLReaderUTF8* reader);
 
+	//! reads a <image> element and stores it in the image section
+	void readImage(io::IXMLReaderUTF8* reader);
+
+	//! reads a <texture> element and stores it in the texture section
+	void readTexture(io::IXMLReaderUTF8* reader);
+
 	//! reads a <material> element and stores it in the material section
 	void readMaterial(io::IXMLReaderUTF8* reader);
 
@@ -214,7 +239,7 @@ private:
 	void findNextNoneWhiteSpace(const c8** p);
 
 	//! reads floats from inside of xml element until end of xml element
-	void readFloatsInsideElement(io::IXMLReaderUTF8* reader, f32* floats, s32 count);
+	void readFloatsInsideElement(io::IXMLReaderUTF8* reader, f32* floats, u32 count);
 
 	//! clears all loaded data
 	void clearData();
@@ -225,7 +250,7 @@ private:
 	//! returns a collada parameter or none if not found
 	SColladaParam* getColladaParameter(ECOLLADA_PARAM_NAME name);
 
-	//! parses all collada inuts inside an element and stores them in Inputs. Reads
+	//! parses all collada inputs inside an element and stores them in Inputs. Reads
 	//! until first tag which is not an input tag or the end of the parent is reached
 	void readColladaInputs(io::IXMLReaderUTF8* reader, const core::stringc& parentName);
 
@@ -256,6 +281,8 @@ private:
 
 	core::array<IColladaPrefab*> Prefabs;
 	core::array<SColladaParam> Parameters;
+	core::array<SColladaImage> Images;
+	core::array<SColladaTexture> Textures;
 	core::array<SColladaMaterial> Materials;
 	core::array<SColladaInput> Inputs;
 

source/Irrlicht/CMeshManipulator.cpp

@@ -803,8 +803,8 @@ void CMeshManipulator::calculateTangents(
 	core::vector3df& normal,
 	core::vector3df& tangent,
 	core::vector3df& binormal,
-	core::vector3df& vt1, core::vector3df& vt2, core::vector3df& vt3, // vertices
-	core::vector2df& tc1, core::vector2df& tc2, core::vector2df& tc3) // texture coords
+	const core::vector3df& vt1, const core::vector3df& vt2, const core::vector3df& vt3, // vertices
+	const core::vector2df& tc1, const core::vector2df& tc2, const core::vector2df& tc3) // texture coords
 {
 	// choose one of them:
 	//#define USE_NVIDIA_GLH_VERSION // use version used by nvidia in glh headers

source/Irrlicht/CMeshManipulator.h

@@ -98,8 +98,8 @@ private:
 	static void calculateTangents(core::vector3df& normal, 
 		core::vector3df& tangent, 
 		core::vector3df& binormal, 
-		core::vector3df& vt1, core::vector3df& vt2, core::vector3df& vt3,
-		core::vector2df& tc1, core::vector2df& tc2, core::vector2df& tc3);
+		const core::vector3df& vt1, const core::vector3df& vt2, const core::vector3df& vt3,
+		const core::vector2df& tc1, const core::vector2df& tc2, const core::vector2df& tc3);
 };
 
 } // end namespace scene