[Igarden-commit] Garden/source/PlanTool PlanCanvasView.h, 1.11, 1.11.2.1 PlanCanvasView.cpp, 1.13, 1.13.2.1

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

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

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

Index: PlanCanvasView.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanCanvasView.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** PlanCanvasView.h	22 Jun 2006 01:26:33 -0000	1.11
--- PlanCanvasView.h	29 Oct 2006 03:31:24 -0000	1.11.2.1
***************
*** 70,76 ****
  	void		StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale);
  	void		EndItemDraw();
! 	void		SetItemSize(double height, double width, bool forcePastBounds = false);
  	void		SetItemName(String &name, RGGLBitmapFont *bitmapFont);
! 	void		SetItemPlantSize(double height, double width, double fullSpread);
  	void		SetItemColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone);
  	void		SetItemPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth);
--- 70,76 ----
  	void		StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale);
  	void		EndItemDraw();
! 	void		SetItemSize(double xSize, double ySize, double zSize, bool forcePastBounds/* = false*/);
  	void		SetItemName(String &name, RGGLBitmapFont *bitmapFont);
! 	void		SetItemPlantSize(double xSize, double ySize, double zSize, double fullSpread);
  	void		SetItemColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone);
  	void		SetItemPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth);

Index: PlanCanvasView.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanCanvasView.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** PlanCanvasView.cpp	18 Sep 2005 12:41:51 -0000	1.13
--- PlanCanvasView.cpp	29 Oct 2006 03:31:24 -0000	1.13.2.1
***************
*** 549,555 ****
  /// SetItemSize
  //
! void PlanCanvasView::SetItemSize(double height, double width, bool forcePastBounds)
  {
! 	_curMD->SetSize(height, width, forcePastBounds);
  }
  
--- 549,555 ----
  /// SetItemSize
  //
! void PlanCanvasView::SetItemSize(double xSize, double ySize, double zSize, bool forcePastBounds)
  {
! 	_curMD->SetSize(xSize, ySize, zSize, forcePastBounds);
  }
  
***************
*** 565,571 ****
  /// SetPlantSize
  //
! void PlanCanvasView::SetItemPlantSize(double height, double width, double fullSpread)
  {
! 	_curMD->SetPlantSize(height, width, fullSpread);
  }
  
--- 565,571 ----
  /// SetPlantSize
  //
! void PlanCanvasView::SetItemPlantSize(double xSize, double ySize, double zSize, double fullSpread)
  {
! 	_curMD->SetPlantSize(xSize, ySize, zSize, fullSpread);
  }