From 85d5fc2169d499c693d657b5f7d35f6a9b9cda5f Mon Sep 17 00:00:00 2001
From: Alexandr Arutjunov <smal.root@gmail.com>
Date: Thu, 6 Oct 2016 17:04:08 +0300
Subject: [PATCH] [-] Removed unneeded logging. [F] Invalid metadata type used
 in postprocessing.

---
 code/X3DImporter.cpp             |  4 ----
 code/X3DImporter.hpp             |  8 --------
 code/X3DImporter_Postprocess.cpp | 15 +++++++++------
 code/X3DImporter_Rendering.cpp   |  2 --
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/code/X3DImporter.cpp b/code/X3DImporter.cpp
index 5812f10..49a26ed 100644
--- a/code/X3DImporter.cpp
+++ b/code/X3DImporter.cpp
@@ -1303,13 +1303,11 @@ std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
 
 void X3DImporter::ParseNode_Root()
 {
-LogInfo("ParseNode_Root b");
 	// search for root tag <X3D>
 	if(!XML_SearchNode("X3D")) throw DeadlyImportError("Root node \"X3D\" not found.");
 
 	ParseHelper_Group_Begin();// create root node element.
 	// parse other contents
-LogInfo("ParseNode_Root. read loop");
 	while(mReader->read())
 	{
 		if(mReader->getNodeType() != irr::io::EXN_ELEMENT) continue;
@@ -1321,11 +1319,9 @@ LogInfo("ParseNode_Root. read loop");
 		else
 			XML_CheckNode_SkipUnsupported("Root");
 	}
-LogInfo("ParseNode_Root. end loop");
 
 	// exit from root node element.
 	ParseHelper_Node_Exit();
-LogInfo("ParseNode_Root e");
 }
 
 void X3DImporter::ParseNode_Head()
diff --git a/code/X3DImporter.hpp b/code/X3DImporter.hpp
index 6e605c9..74585b9 100644
--- a/code/X3DImporter.hpp
+++ b/code/X3DImporter.hpp
@@ -379,14 +379,6 @@ private:
 	/// Short variant for calling \ref DefaultLogger::get()->info()
 	void LogInfo(const std::string& pMessage) { DefaultLogger::get()->info(pMessage); }
 
-	/// \fn void LogWarning(const std::string& pMessage)
-	/// Short variant for calling \ref DefaultLogger::get()->warn()
-	void LogWarning(const std::string& pMessage) { DefaultLogger::get()->warn(pMessage); }
-
-	/// \fn void LogError(const std::string& pMessage)
-	/// Short variant for calling \ref DefaultLogger::get()->error()
-	void LogError(const std::string& pMessage) { DefaultLogger::get()->error(pMessage); }
-
 	/***********************************************/
 	/************** Functions: XML set *************/
 	/***********************************************/
diff --git a/code/X3DImporter_Postprocess.cpp b/code/X3DImporter_Postprocess.cpp
index ddc5aa9..e65c188 100644
--- a/code/X3DImporter_Postprocess.cpp
+++ b/code/X3DImporter_Postprocess.cpp
@@ -741,24 +741,27 @@ size_t meta_idx;
 			}
 			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaDouble)
 			{
-				// at this case also converting double to float.
-				if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0)
+				if(((CX3DImporter_NodeElement_MetaDouble*)cur_meta)->Value.size() > 0)
 					pSceneNode.mMetaData->Set(meta_idx, cur_meta->Name, (float)*(((CX3DImporter_NodeElement_MetaDouble*)cur_meta)->Value.begin()));
 			}
 			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaFloat)
 			{
-				if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0)
+				if(((CX3DImporter_NodeElement_MetaFloat*)cur_meta)->Value.size() > 0)
 					pSceneNode.mMetaData->Set(meta_idx, cur_meta->Name, *(((CX3DImporter_NodeElement_MetaFloat*)cur_meta)->Value.begin()));
 			}
 			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaInteger)
 			{
-				if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0)
+				if(((CX3DImporter_NodeElement_MetaInteger*)cur_meta)->Value.size() > 0)
 					pSceneNode.mMetaData->Set(meta_idx, cur_meta->Name, *(((CX3DImporter_NodeElement_MetaInteger*)cur_meta)->Value.begin()));
 			}
 			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaString)
 			{
-				if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0)
-					pSceneNode.mMetaData->Set(meta_idx, cur_meta->Name, ((CX3DImporter_NodeElement_MetaString*)cur_meta)->Value.begin()->data());
+				if(((CX3DImporter_NodeElement_MetaString*)cur_meta)->Value.size() > 0)
+				{
+					aiString tstr(((CX3DImporter_NodeElement_MetaString*)cur_meta)->Value.begin()->data());
+
+					pSceneNode.mMetaData->Set(meta_idx, cur_meta->Name, tstr);
+				}
 			}
 			else
 			{
diff --git a/code/X3DImporter_Rendering.cpp b/code/X3DImporter_Rendering.cpp
index bb35f0a..e694e72 100644
--- a/code/X3DImporter_Rendering.cpp
+++ b/code/X3DImporter_Rendering.cpp
@@ -902,7 +902,6 @@ void X3DImporter::ParseNode_Rendering_Normal()
 std::string use, def;
 std::list<aiVector3D> vector;
 CX3DImporter_NodeElement* ne;
-LogInfo("TRACE: scene rendering Normal b");
 
 	MACRO_ATTRREAD_LOOPBEG;
 		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
@@ -929,7 +928,6 @@ LogInfo("TRACE: scene rendering Normal b");
 
 		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
 	}// if(!use.empty()) else
-LogInfo("TRACE: scene rendering Normal e");
 }
 
 }// namespace Assimp
-- 
2.7.4