[Igarden-commit] Garden/source/LayoutDB MaterialRef.cpp, 1.119, 1.119.2.1

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialRef.cpp 
Log Message:
Add color, rectangles, and depth to the rendering.  Add three new materials which make use of these features.

Index: MaterialRef.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v
retrieving revision 1.119
retrieving revision 1.119.2.1
diff -C2 -d -r1.119 -r1.119.2.1
*** MaterialRef.cpp	2 Jul 2006 02:52:50 -0000	1.119
--- MaterialRef.cpp	29 Oct 2006 03:31:35 -0000	1.119.2.1
***************
*** 1493,1497 ****
  #endif
  			
! 			view->SetItemSize(length, width, true);
  			view->SetItemRotation(_rotation, point);
  			view->DrawItem(mtype, point, spec);
--- 1493,1509 ----
  #endif
  			
! 			landscapeHeight_t	height;
! 			planLength_t		spread;
! 			if((GetMaterialType() & kMajorMaterialType) == kMaterialTypePlant)
! 			{
! 				short				minYear, maxYear, primaryYear;
! 				
! 				view->GetYearsDisplayed(minYear, maxYear, primaryYear);
! 				GetPlantDimensions(&height, &spread, primaryYear);
! 			}
! 			else
! 				GetLatestPlantDimensions(&height, &spread);
! 			
! 			view->SetItemSize(width, length, height, true);
  			view->SetItemRotation(_rotation, point);
  			view->DrawItem(mtype, point, spec);
***************
*** 1594,1597 ****
--- 1606,1613 ----
  		if((GetMaterialType() & kMajorMaterialType) == kMaterialTypePlant)
  		{
+ 			landscapeHeight_t	height;
+ 			planLength_t		spread;
+ 			GetPlantDimensions(&height, &spread, primaryYear);
+ 
  			if(state->GetBoolPref(kPlanFullSize))
  			{
***************
*** 1600,1609 ****
  			else
  			{
- 				landscapeHeight_t	height;
- 				planLength_t		spread;
- 				GetPlantDimensions(&height, &spread, primaryYear);
  				actualSize = spread;
  			}
! 			view->SetItemPlantSize(actualSize, actualSize, recommendedSize);
  		}
  	}
--- 1616,1622 ----
  			else
  			{
  				actualSize = spread;
  			}
! 			view->SetItemPlantSize(actualSize, actualSize, height, recommendedSize);
  		}
  	}