Ogre Importer: Small fixes

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1228 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/OgreImporter.hpp

@@ -5,6 +5,13 @@
 #include "OgreXmlHelper.hpp"
 #include "irrXMLWrapper.h"
 
+/// Ogre Importer TODO
+/*	- Read Vertex Colors
+	- Read multiple TexCoords
+*/
+
+
+
 namespace Assimp
 {
 namespace Ogre

code/OgreMesh.cpp

@@ -193,7 +193,8 @@ void OgreImporter::ReadVertexBuffer(SubMesh &theSubMesh, XmlReader *Reader, unsi
 		||Reader->getNodeName()==string("position")
 		||Reader->getNodeName()==string("normal")
 		||Reader->getNodeName()==string("tangent")
-		||Reader->getNodeName()==string("texcoord"))
+		||Reader->getNodeName()==string("texcoord")
+		||Reader->getNodeName()==string("colour_diffuse"))
 	{
 		if(Reader->getNodeName()==string("vertex"))
 			XmlRead(Reader);//Read an attribute tag
@@ -242,6 +243,13 @@ void OgreImporter::ReadVertexBuffer(SubMesh &theSubMesh, XmlReader *Reader, unsi
 			continue;//don't read another line at the end of the loop
 		}
 
+		//Color:
+		//TODO: actually save this data!
+		else if(Reader->getNodeName()==string("colour_diffuse"))
+		{
+			//do nothing, because we not yet support them
+		}
+
 		//Attribute could not be read
 		else
 		{

code/OgreSkeleton.cpp

@@ -244,7 +244,7 @@ void OgreImporter::LoadSkeleton(std::string FileName, vector<Bone> &Bones, vecto
 							RotationAxis.y=GetAttribute<float>(SkeletonFile, "y");
 							RotationAxis.z=GetAttribute<float>(SkeletonFile, "z");
 
-							if(0==RotationAxis.x==RotationAxis.y==RotationAxis.z)//we have an invalid rotation axis
+							if(0==RotationAxis.x && 0==RotationAxis.y && 0==RotationAxis.z)//we have an invalid rotation axis
 							{
 								RotationAxis.x=1.0f;
 								if(0!=RotationAngle)//if we don't rotate at all, the axis does not matter