[simspark-cvs] simspark/spark/oxygen/geometryserver geometryserver.cpp, 1.2, 1.2.4.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/geometryserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9328

Modified Files:
      Tag: projectx
	geometryserver.cpp 
Log Message:
whitespace changes


Index: geometryserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/geometryserver/geometryserver.cpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** geometryserver.cpp	23 Feb 2006 13:38:36 -0000	1.2
--- geometryserver.cpp	30 Mar 2007 03:19:05 -0000	1.2.4.1
***************
*** 67,72 ****
  }
  
! shared_ptr<TriMesh> GeometryServer::GetMesh
! (const string& name, const::ParameterList& parameter)
  {
      // try a direct match
--- 67,72 ----
  }
  
! shared_ptr<TriMesh> 
! GeometryServer::GetMesh(const string& name, const::ParameterList& parameter)
  {
      // try a direct match
***************
*** 75,81 ****
  
      if (meshIter != mMeshMap.end())
!         {
!             return (*meshIter).second;
!         }
  
      TLeafList importer;
--- 75,81 ----
  
      if (meshIter != mMeshMap.end())
!     {
!         return (*meshIter).second;
!     }
  
      TLeafList importer;
***************
*** 83,92 ****
  
      if (importer.size() == 0)
!         {
!             GetLog()->Error()
!                 << "(GeometryServer) Warning: no MeshImporter registered\n";
  
!             return shared_ptr<TriMesh>();
!         }
  
      // try to mangle the name
--- 83,92 ----
  
      if (importer.size() == 0)
!     {
!         GetLog()->Error() 
!             << "(GeometryServer) Warning: no MeshImporter registered\n";
  
!         return shared_ptr<TriMesh>();
!     }
  
      // try to mangle the name
***************
*** 96,115 ****
           ++iter
           )
!         {
!             shared_ptr<MeshImporter> importer =
!                 shared_static_cast<MeshImporter>(*iter);
! 
!             string str = importer->MangleName(name, parameter);
  
!             if (str != meshName)
!                 {
!                     meshName = str;
!                     meshIter = mMeshMap.find(meshName);
!                     if (meshIter != mMeshMap.end())
!                         {
!                             return (*meshIter).second;
!                         }
!                 }
          }
  
      // try to import the mesh
--- 96,115 ----
           ++iter
           )
!     {
!         shared_ptr<MeshImporter> importer =
!             shared_static_cast<MeshImporter>(*iter);
  
!         string str = importer->MangleName(name, parameter);
!         
!         if (str != meshName)
!         {
!             meshName = str;
!             meshIter = mMeshMap.find(meshName);
!             if (meshIter != mMeshMap.end())
!             {
!                 return (*meshIter).second;
!             }
          }
+     }
  
      // try to import the mesh
***************
*** 119,149 ****
           ++iter
           )
!         {
!             shared_ptr<MeshImporter> importer =
!                 shared_static_cast<MeshImporter>(*iter);
  
!             shared_ptr<TriMesh> mesh = importer->ImportMesh(name,parameter);
  
!             if (mesh.get() == 0)
!                 {
!                     continue;
!                 }
  
!             string meshName = mesh->GetName();
!             if (meshName == "")
!                 {
!                     meshName = name;
!                     mesh->SetName(name);
!                 }
  
!             GetLog()->Normal()
!                 << "(GeometryServer) imported mesh '"
!                 << meshName << " with '"
!                 << importer->GetName() << "'\n";
  
!             RegisterMesh(mesh);
  
!             return mesh;
!         }
  
      GetLog()->Error() << "(GeometryServer) ERROR: cannot import mesh '"
--- 119,147 ----
           ++iter
           )
!     {
!         shared_ptr<MeshImporter> importer = 
!             shared_static_cast<MeshImporter>(*iter);
  
!         shared_ptr<TriMesh> mesh = importer->ImportMesh(name,parameter);
  
!         if (mesh.get() == 0)
!         {
!             continue;
!         }
  
!         string meshName = mesh->GetName();
!         if (meshName.empty())
!         {
!             meshName = name;
!             mesh->SetName(name);
!         }
  
!         GetLog()->Normal() << "(GeometryServer) imported mesh '" << meshName
!                            << " with '" << importer->GetName() << "'\n";
  
!         RegisterMesh(mesh);
  
!         return mesh;
!     }
  
      GetLog()->Error() << "(GeometryServer) ERROR: cannot import mesh '"
***************
*** 153,176 ****
  }
  
! void GeometryServer::RegisterMesh(shared_ptr<TriMesh> mesh)
  {
      if (mesh.get() == 0)
!         {
!             GetLog()->Debug() << "(GeometryServer) RegisterMesh called with NULL mesh\n";
!             return;
!         }
  
      std::string name = mesh->GetName();
      if (name.empty())
!         {
!             GetLog()->Error() << "(GeometryServer) Cannot register a mesh without a name\n";
!             return;
!         }
  
      TMeshMap::iterator iter = mMeshMap.find(name);
      if (iter != mMeshMap.end())
!         {
!             GetLog()->Debug() << "(GeometryServer) replacing mesh " << name << "\n";
!         }
  
      mMeshMap[name] = mesh;
--- 151,177 ----
  }
  
! void 
! GeometryServer::RegisterMesh(shared_ptr<TriMesh> mesh)
  {
      if (mesh.get() == 0)
!     {
!         GetLog()->Debug() 
!             << "(GeometryServer) RegisterMesh called with NULL mesh\n";
!         return;
!     }
  
      std::string name = mesh->GetName();
      if (name.empty())
!     {
!         GetLog()->Error() 
!             << "(GeometryServer) Cannot register a mesh without a name\n";
!         return;
!     }
  
      TMeshMap::iterator iter = mMeshMap.find(name);
      if (iter != mMeshMap.end())
!     {
!         GetLog()->Debug() << "(GeometryServer) replacing mesh " << name << "\n";
!     }
  
      mMeshMap[name] = mesh;