[Gcblue-commits] gcb_wx/src/graphics tc3DModel.cpp,1.17,1.18

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1667/src/graphics

Modified Files:
	tc3DModel.cpp 
Log Message:
Group selection Ctrl and Alt+number commands

Index: tc3DModel.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tc3DModel.cpp	7 Dec 2004 04:00:28 -0000	1.17
--- tc3DModel.cpp	30 Dec 2004 17:26:07 -0000	1.18
***************
*** 68,72 ****
  		std::string name = node.getName();
  #ifdef _DEBUG
!         if (tcOptions::Get()->log3DModelDetails)
          {
              std::cout << " - "<< name << "\n";
--- 68,72 ----
  		std::string name = node.getName();
  #ifdef _DEBUG
!         if (tcOptions::Get()->OptionStringExists("Log3DModelDetails"))
          {
              std::cout << " - "<< name << "\n";
***************
*** 140,144 ****
  
                  animationInfo.push_back(ai);
!                 if (tcOptions::Get()->log3DModelDetails)
                  {
                      std::cout << "added animation info for: " << name <<"\n";
--- 140,144 ----
  
                  animationInfo.push_back(ai);
!                 if (tcOptions::Get()->OptionStringExists("Log3DModelDetails"))
                  {
                      std::cout << "added animation info for: " << name <<"\n";
***************
*** 400,415 ****
  {
      if (modelNode.valid()) return; // model already loaded
!     if (tcOptions::Get()->log3DModelDetails)
      {
          std::cout << "Loading 3D model: " << model_name << " \n";
      }
  
!     model_name = model_name + ".3ds";
!     modelNode = osgDB::readNodeFile(model_name.c_str());
      if (!modelNode.valid())
      {
!         std::cout << "Load of 3D model: " << model_name << " failed.\n";
!         std::cerr << "Load of 3D model: " << model_name << " failed.\n";
!         return;
      }
      if (useSmoothing)
--- 400,422 ----
  {
      if (modelNode.valid()) return; // model already loaded
!     if (tcOptions::Get()->OptionStringExists("Log3DModelDetails"))
      {
          std::cout << "Loading 3D model: " << model_name << " \n";
      }
  
!     // try ive load first
!     std::string full_name = model_name + ".ive";
! 
!     modelNode = osgDB::readNodeFile(full_name.c_str());
      if (!modelNode.valid())
      {
!         full_name = model_name + ".3ds";
!         modelNode = osgDB::readNodeFile(full_name.c_str());
!         if (!modelNode.valid())
!         {
!             std::cout << "Load of 3D model: " << model_name << " failed.\n";
!             std::cerr << "Load of 3D model: " << model_name << " failed.\n";
!             return;
!         }
      }
      if (useSmoothing)
***************
*** 418,425 ****
          modelNode->accept(smoothingVisitor);
      }
!     if (tcOptions::Get()->log3DModelDetails)
!     {
!         fprintf(stdout,"tc3DModel--Loaded 3D model: %s\n", model_name.c_str());
!     }
  }
  
--- 425,431 ----
          modelNode->accept(smoothingVisitor);
      }
! 
!     fprintf(stdout,"tc3DModel--Loaded 3D model: %s\n", full_name.c_str());
!     
  }