[Igarden-commit] Garden/source/PlanTool ActiveMaterial.h, 1.10.2.2, 1.10.2.3 ActiveMaterial.cpp, 1.45.2.3, 1.45.2.4

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

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

Modified Files:
      Tag: Release_branch_v1
	ActiveMaterial.h ActiveMaterial.cpp 
Log Message:
Unify plant and hardscape palettes & improve speed

Index: ActiveMaterial.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/ActiveMaterial.cpp,v
retrieving revision 1.45.2.3
retrieving revision 1.45.2.4
diff -C2 -d -r1.45.2.3 -r1.45.2.4
*** ActiveMaterial.cpp	5 Nov 2006 03:37:33 -0000	1.45.2.3
--- ActiveMaterial.cpp	26 Nov 2006 01:25:40 -0000	1.45.2.4
***************
*** 46,50 ****
  using yaaf::XGBroadcast;
  
! #define POPUP_HEIGHT	20
  #define NAME_HEIGHT		40
  #define BORDER_WIDTH	2
--- 46,50 ----
  using yaaf::XGBroadcast;
  
! #define POPUP_HEIGHT	22
  #define NAME_HEIGHT		40
[...1277 lines suppressed...]
! 		plot->getPlotID(plotID);
! 		
! 		for(n = 0; n < count; n++)
! 		{
! 			layer = plot->GetIndexedLayer(n);
! 			layer->AddToMaterialArray(&_currentPlotItems, plotID);
! 		}
! 		
! 		layer = _topLayout->GetUnusedLayer();
! 		layer->AddToMaterialArray(&_currentPlotItems, plotID);
! 		
! 		count = _currentPlotItems.Length();
! 		for(n = count-1; n >= 0 ; n--)
! 		{
! 			if(!_currentPlotItems[n]->IsNamed(kUsePreferencesSetting))
! 				_currentPlotItems.Delete(n);
! 		}
! 	}
  }
+ 

Index: ActiveMaterial.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/ActiveMaterial.h,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -d -r1.10.2.2 -r1.10.2.3
*** ActiveMaterial.h	4 Nov 2006 01:54:33 -0000	1.10.2.2
--- ActiveMaterial.h	26 Nov 2006 01:25:40 -0000	1.10.2.3
***************
*** 52,56 ****
  	kUsePalette = 1,
  	kBackgroundItems = 2,
! 	kHardscapeItems = 3
  } paletteType_t;
  
--- 52,56 ----
  	kUsePalette = 1,
  	kBackgroundItems = 2,
! 	kMaterialCollection = 3
  } paletteType_t;
  
***************
*** 96,100 ****
  		Material*			GetIndexedMaterial(UInt32 index);
  		void				RebuildPlotPalette();
- 		void				RebuildHardscapeMenu();
  	private:
  		// methods
--- 96,99 ----
***************
*** 115,120 ****
  		MaterialCollection*	_topPalette;
  		XGDynArray<Material*>	_backgrounds;
! 		uint32				_hardscapeIndex;
! 		hardscapeElem_t		_hardscape[10];
  		bool				_needsUIUpdate;
  		materialID_t		_newUpdateID;
--- 114,119 ----
  		MaterialCollection*	_topPalette;
  		XGDynArray<Material*>	_backgrounds;
! 		uint32				_paletteIndex;
! 		uint32				_paletteGroup;
  		bool				_needsUIUpdate;
  		materialID_t		_newUpdateID;