Commits

Frederic De Groef committed 91fa3f4

moved everything to "cologreng" namespace

  • Participants
  • Parent commits 6ab7e56

Comments (0)

Files changed (17)

File cologre-ng/include/ColladaDatabase.h

 
 #include "common.h"
 
-
+namespace cologreng{
 ///Base class to load collada files and convert resources and scenes to Ogre
 /**
   This class serves as the entry point. In fact, if you just want to convert a whole collada scene into Ogre, this
 
 };
 
+}//namespace cologreng
+
 #endif //_COLLADA_DATABASE_H_

File cologre-ng/include/ControllerConverter.h

 
 #include "ResourceConverter.h"
 
+namespace cologreng{
 ///Parses collada controller libraries.
 /**
   Parses collada controller libraries. Specifically, it takes collada "<skin>s" and applies
   void transformVertices(Ogre::MeshPtr pOgreMesh, Ogre::Matrix4* pMatTransform);
 };
 
+} // namespace cologreng
+
 #endif //_CONTROLLER_CONVERTER_H_

File cologre-ng/include/Converter.h

 
 #include "Ogre.h"
 
+namespace cologreng{
 ///errors which may occur during conversion
 enum conversion_errors
 {
   double timeStamp();
 };
 
+} // namespace cologreng
+
 #endif //_CONVERTER_H_

File cologre-ng/include/GeometryConverter.h

 
 #include <string>
 
+namespace cologreng{
+
 struct IntermediateVertexData
 {
   unsigned int vertexCount;
 
 };
 
+} //namespace cologreng
+
 #endif //_GEOMETRY_COONVERTER_H_

File cologre-ng/include/IntermediateMesh.h

 
 #include <vector>
 
+namespace cologreng{
+
 struct vertexElementFloat
 {
   std::vector<float> data;
   std::vector<std::string> m_vSubMeshNames;
 };
 
+} // namespace cologreng
+
 #endif //_INTERMEDIATE_MESH_H_

File cologre-ng/include/MaterialConverter.h

 #include <Ogre.h>
 #include "common.h"
 
-
+namespace cologreng{
 ///Class for converting collada materials into ogre materials.
 /**Class for converting collada materials into ogre materials. Creates Ogre materials for each collada "<material>" and 
   passes for each collada technique. Also loads texture files.
     LocationsPtr m_spLocations;
 };
 
+} // namespace cologreng
+
 #endif //_MATERIAL_CONVERTER_H_

File cologre-ng/include/ResourceConverter.h

 #define _RESOURCE_CONVERTER_H_
 
 #include "Converter.h"
-#include "dae.h"
+#include <dae.h>
+
+namespace cologreng{
 
 ///abstract base class for all resource converters
 class CResourceConverter : public CConverter
   static unsigned int m_uiElementCounter;
 };
 
+} // namespace cologreng
+
 #endif //_RESOURCE_CONVERTER_H_

File cologre-ng/include/SceneConverter.h

 #define _SCENE_CONVERTER_H_
 
 #include "Converter.h"
-#include "dae.h"
-#include "dom.h"
-#include "dom/domVisual_scene.h"
-
+#include <dae.h>
+#include <dom.h>
+#include <dom/domVisual_scene.h>
+         
+namespace cologreng{
 ///Class for converting collada scenes into ogre scenegraphs. 
 class CSceneConverter : public CConverter
 {
   bool m_hasLight;
 };
 
+} // namespace cologreng
+
 #endif //_SCENE_CONVERTER_H_

File cologre-ng/include/common.h

 #include <string>
 #include <boost/shared_ptr.hpp>
 
+namespace cologreng{
+
 typedef std::set<std::string>   Locations;
 typedef boost::shared_ptr<Locations>   LocationsPtr;
-
+	
 typedef std::pair<std::string, std::string>   PathBasename;
 
+} //namespace cologreng
+
 #endif 

File cologre-ng/src/ColladaDatabase.cpp

 #include "ControllerConverter.h"
 #include "SceneConverter.h"
 
+namespace cologreng{
 //------------------------------------------------------------------------------
 const std::string CColladaDatabase::s_LogFilename("cologre_ng.log");
 //------------------------------------------------------------------------------
 #endif
     m_pLog->logMessage(_msg);
 }
+
+} // namespace cologreng

File cologre-ng/src/ControllerConverter.cpp

 #include "ControllerConverter.h"
 #include "dom/domController.h"
 
+namespace cologreng{
+
 using namespace Ogre;
 
-
 CControllerConverter::CControllerConverter(void)
 {
 }
       vbuf->unlock();
     }
   }
-}
+}
+
+}// namespace cologreng

File cologre-ng/src/Converter.cpp

 #include "cologre_ng_precompiled.h"
 #include "Converter.h"
 
+namespace cologreng{
+
 CConverter::CConverter(void)
 {
 }
   static long secsFirstCall=time.tv_sec;
   return (double)(time.tv_sec-secsFirstCall) + (double)time.tv_usec/(1000.0*1000.0);
 #endif
-}
+}
+
+} // namespace cologreng

File cologre-ng/src/GeometryConverter.cpp

 
 #include "../Utility/Utility.h"
 
+namespace cologreng{
 //------------------------------------------------------------------------------
 CGeometryConverter::CGeometryConverter(Ogre::Log *_log) 
     :CResourceConverter()
     }
 }
 //------------------------------------------------------------------------------
+
+} // namespace cologreng

File cologre-ng/src/IntermediateMesh.cpp

 #include "cologre_ng_precompiled.h"
 #include "IntermediateMesh.h"
 
+namespace cologreng{
 CIntermediateMesh::CIntermediateMesh(void) : m_subMeshCount(0)
 {
 }
 CIntermediateMesh::~CIntermediateMesh(void)
 {
 }
+
+} // namespace cologreng

File cologre-ng/src/MaterialConverter.cpp

 
 #include "../Utility/Utility.h"
 
+namespace cologreng{
 //-----------------------------------------------------------------------------
 CMaterialConverter::CMaterialConverter(Ogre::Log *_log, LocationsPtr _locations)  
     :CResourceConverter()
     return PathBasename(path, basename);
 }
 //-----------------------------------------------------------------------------
+} // namespace cologreng

File cologre-ng/src/ResourceConverter.cpp

 #include "cologre_ng_precompiled.h"
 #include "ResourceConverter.h"
 
+namespace cologreng{
+
 unsigned int CResourceConverter::m_uiElementCounter = 0;
 
 conversionOptions CConverter::m_convOptions(false, false);
   }
   return 0;
 }
+
+} //namespace cologreng

File cologre-ng/src/SceneConverter.cpp

 #include "dom/domLight.h"
 #include "dae/domAny.h"
 
+namespace cologreng{
 
 CSceneConverter::CSceneConverter()
 {
     pOgreLight->setDiffuseColour(colorRef->getValue().get(0), colorRef->getValue().get(1), colorRef->getValue().get(2));
   }
   return pOgreLight;
-}
+}
+
+} // namespace cologreng