[Igarden-commit] Garden/source/LayoutDB MaterialRef.cpp, 1.119.2.9, 1.119.2.10

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

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

Modified Files:
      Tag: Release_branch_v1
	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.9
retrieving revision 1.119.2.10
diff -C2 -d -r1.119.2.9 -r1.119.2.10
*** MaterialRef.cpp	28 Jan 2007 23:20:16 -0000	1.119.2.9
--- MaterialRef.cpp	30 Jan 2007 03:24:42 -0000	1.119.2.10
***************
*** 1532,1538 ****
--- 1532,1542 ----
  			view->SetItemRotation(_rotation, point);
  			view->DrawItem(mtype, centerPoint, spec);
+ //			printf("Printing '%s' at height %lf\n", _material->GetDisplayName(kPreferBoth).c_str(), centerPoint.zOffset);
  		}
  		else
+ 		{
  			view->DrawGenericItem(GetMaterialType(), point);
+ //			printf("Printing '%s' at height %lf\n", _material->GetDisplayName(kPreferBoth).c_str(), point.zOffset);
+ 		}
  		view->EndItemDraw();
  	}
***************
*** 1549,1552 ****
--- 1553,1557 ----
  		glPushMatrix();
  			glTranslatef(point.xOffset, point.yOffset, point.zOffset);
+ //			printf("Printing2 '%s' at height %lf\n", _material->GetDisplayName(kPreferBoth).c_str(), point.zOffset);
  			err = glGetError();
  			gluDisk(quad, 0, actualSize/2, 64, 16);
***************
*** 3567,3571 ****
  displayOrder_t MaterialRef::GetDisplayOrder()
  {
! 	return kOrderWalksDefault;
  }
  
--- 3572,3601 ----
  displayOrder_t MaterialRef::GetDisplayOrder()
  {
! 	Material		*mat;
! 	displayOrder_t	result;
! 	
! 	mat = GetMaterial(ifMissingNULL);
! 	if(mat != NULL)
! 	{
! 		materialType_t	mtype = mat->GetMaterialType();
! 		
! 		if(mtype == kMaterialTypeDeckPatio)
! 			result = kOrderPatio;
! 		else if((mtype & kMajorMaterialType) == kMaterialTypePlant)
! 			result = kOrderPlants;
! 		else if(mtype == kMaterialTypeHardscape)
! 			result = kOrderPlants;
! 		else if(mtype == kMaterialTypeBackground || mtype == kMaterialTypeMulch)
! 			result = kOrderBackground;
! 		else if(mtype == kMaterialTypeAccents || mtype == kMaterialTypeWallsFences || mtype == kMaterialTypeStructure)
! 			result = kOrderContainer;
! 		else	//	kMaterialTypeWalks	kMaterialTypeSteps	
! 				//	kMaterialTypeWaterFeature	kMaterialTypeNaturalItems	
! 			result = kOrderWalksDefault;		
! 	}
! 	else
! 		result = kOrderWalksDefault;
! 		
! 	return result;
  }