[Igarden-commit] Garden/source/LayoutDB MaterialRef.h, 1.43.2.2, 1.43.2.3 MaterialRef.cpp, 1.119.2.8, 1.119.2.9

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/LayoutDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17033

Modified Files:
      Tag: Release_branch_v1
	MaterialRef.h MaterialRef.cpp 
Log Message:
Enforce ordering of different types of elements

Index: MaterialRef.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v
retrieving revision 1.119.2.8
retrieving revision 1.119.2.9
diff -C2 -d -r1.119.2.8 -r1.119.2.9
*** MaterialRef.cpp	27 Jan 2007 04:00:34 -0000	1.119.2.8
--- MaterialRef.cpp	28 Jan 2007 23:20:16 -0000	1.119.2.9
***************
*** 1531,1535 ****
  			view->SetItemSize(width, length, height, true);
  			view->SetItemRotation(_rotation, point);
! 			view->DrawItem(mtype, point, spec);
  		}
  		else
--- 1531,1535 ----
  			view->SetItemSize(width, length, height, true);
  			view->SetItemRotation(_rotation, point);
! 			view->DrawItem(mtype, centerPoint, spec);
  		}
  		else
***************
*** 3565,3568 ****
--- 3565,3573 ----
  }
  
+ displayOrder_t MaterialRef::GetDisplayOrder()
+ {
+ 	return kOrderWalksDefault;
+ }
+ 
  #pragma mark PRIVATE
  

Index: MaterialRef.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.h,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -C2 -d -r1.43.2.2 -r1.43.2.3
*** MaterialRef.h	27 Jan 2007 04:00:34 -0000	1.43.2.2
--- MaterialRef.h	28 Jan 2007 23:20:16 -0000	1.43.2.3
***************
*** 224,227 ****
--- 224,228 ----
  		virtual void		RefreshElement(PlanView* intoView);
  		virtual landscapeHeight_t TopElevation(PlanView* view);
+ 		virtual displayOrder_t GetDisplayOrder();
  		
  protected: