[Gcblue-commits] gcb_wx/src/database tcDatabaseObject.cpp,1.14,1.15 tcGenericDBObject.cpp,1.17,1.18

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

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

Modified Files:
	tcDatabaseObject.cpp tcGenericDBObject.cpp 
Log Message:
Added xml 3D model wrapper for better modularity
Improved animation support

Index: tcDatabaseObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcDatabaseObject.cpp	30 Dec 2004 17:26:06 -0000	1.14
--- tcDatabaseObject.cpp	16 Jan 2005 18:36:28 -0000	1.15
***************
*** 150,154 ****
          model = new tc3DModel();
          wxASSERT(model);
!         model->Load(mz3DModelFileName.mz);
      }
      
--- 150,154 ----
          model = new tc3DModel();
          wxASSERT(model);
!         model->LoadXml(mz3DModelFileName.mz);
      }
      

Index: tcGenericDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcGenericDBObject.cpp	30 Dec 2004 17:26:06 -0000	1.17
--- tcGenericDBObject.cpp	16 Jan 2005 18:36:28 -0000	1.18
***************
*** 46,83 ****
  {
  
- /**
- * Search 3D model for animation nodes. Configure
- * animation data for matching nodes.
- */
- void tcGenericDBObject::Animate3DModel()
- {
-     //if (animationInfo.size()==0) return; // no animation in this model
-     if (model)
-     {
-         model->ProcessAnimations(animationInfo);
-     }
- }
  
- tc3DModel* tcGenericDBObject::Get3DModel()
- {
-     if (model)
-     {
-         return model->Clone();
-     }
-     else
-     {
-         Load3DModel();
-         Animate3DModel();
-         if (model)
-         {
-             return model->Clone();
-         }
-         else
-         {
-             return NULL;
-         }
-     }
  
- }
  
  tcFlightportDBObject* tcGenericDBObject::GetFlightport()
--- 46,51 ----
***************
*** 249,253 ****
           file.Read(&maSensorClass[i],sizeof(tcDBString));
        }
-       Animate3DModel();
     }
     else 
--- 217,220 ----
***************
*** 358,362 ****
              }
          }
-         Animate3DModel();
      }
      else 
--- 325,328 ----
***************
*** 796,800 ****
  		}
  	}
- 	Animate3DModel();
  
  }
--- 762,765 ----