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

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

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

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

Index: tcDatabaseObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcDatabaseObject.cpp	29 Nov 2004 03:55:04 -0000	1.13
--- tcDatabaseObject.cpp	30 Dec 2004 17:26:06 -0000	1.14
***************
*** 110,114 ****
      tc3DModel* tcDatabaseObject::Get3DModel() 
      {
-         wxASSERT(model);
          if (model)
          {
--- 110,113 ----
***************
*** 117,121 ****
          else
          {
!             return NULL;
          }
      }
--- 116,129 ----
          else
          {
!             Load3DModel();
!             if (model)
!             {
!                 return model->Clone();
!             }
!             else
!             {        
!                 wxASSERT(false);
!                 return NULL;
!             }
          }
      }
***************
*** 283,287 ****
  		strncpy(mzDescription, desc.c_str(),DESCRIPTION_STRING_LENGTH-1);
  
! 		Load3DModel();
  	}
  
--- 291,295 ----
  		strncpy(mzDescription, desc.c_str(),DESCRIPTION_STRING_LENGTH-1);
  
! 		//Load3DModel(); // do lazy load instead
  	}
  

Index: tcGenericDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcGenericDBObject.cpp	7 Dec 2004 04:00:28 -0000	1.16
--- tcGenericDBObject.cpp	30 Dec 2004 17:26:06 -0000	1.17
***************
*** 53,57 ****
  {
      //if (animationInfo.size()==0) return; // no animation in this model
!     model->ProcessAnimations(animationInfo);
  }
  
--- 53,82 ----
  {
      //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;
!         }
!     }
! 
  }