[Igarden-commit] Garden/source/LayoutDB Layout.cpp, 1.27.2.2, 1.27.2.3

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

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

Modified Files:
      Tag: Release_branch_v1
	Layout.cpp 
Log Message:
Fix palettes on file open

Index: Layout.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Layout.cpp,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -C2 -d -r1.27.2.2 -r1.27.2.3
*** Layout.cpp	26 Nov 2006 01:22:52 -0000	1.27.2.2
--- Layout.cpp	2 Dec 2006 05:33:01 -0000	1.27.2.3
***************
*** 72,75 ****
--- 72,77 ----
  Layout::Layout()
  {
+ 	MaterialCollection	*palette;
+ 
  	_database = NULL;
  	_document = NULL;
***************
*** 82,85 ****
--- 84,90 ----
  	_translateToGL = false;
  	InitPaletteGroups();
+ 	palette = new MaterialCollection(this);
+ 	palette->SetName(L"Default Palette");
+ 	AddPalette(kRegenAllPlantsGroup, palette);	
  }
  
***************
*** 548,552 ****
  	
  	PRECONDITION(NumPalettes(kRegenAllPlantsGroup) == 1);
! 	printf("LoadInitialPalettes\n");
  	palette = GetPaletteByGroupAndIndex(kRegenAllPlantsGroup, 0);
  	if(allMaterials != NULL)
--- 553,557 ----
  	
  	PRECONDITION(NumPalettes(kRegenAllPlantsGroup) == 1);
! //	printf("LoadInitialPalettes\n");
  	palette = GetPaletteByGroupAndIndex(kRegenAllPlantsGroup, 0);
  	if(allMaterials != NULL)
***************
*** 605,608 ****
--- 610,614 ----
  void Layout::EliminateBogusPaletteEntries()
  {
+ #if 0
  	MaterialCollection	*palette;
  
***************
*** 632,635 ****
--- 638,642 ----
  		}	
  	}
+ #endif
  }
  
***************
*** 651,655 ****
  			palette = new MaterialCollection(this);
  			palette->ParseXML(subTree);
! 			printf("Adding palette '%s' to group %ld of region %s\n", palette->GetName().c_str(), group, region != NULL ? region : "");
  			AddPalette(group, palette);
  		}						
--- 658,662 ----
  			palette = new MaterialCollection(this);
  			palette->ParseXML(subTree);
! //			printf("Adding palette '%s' to group %ld of region %s\n", palette->GetName().c_str(), group, region != NULL ? region : "");
  			AddPalette(group, palette);
  		}						
***************
*** 657,661 ****
  		{									
  			region = data->GetArgValue("name");
! 			printf("Entering region %s\n", region ? region : "");
  			if(strcmp(region, "any") == 0)
  				ParseOnePaletteEntry(data->GetChild(), region, group);
--- 664,668 ----
  		{									
  			region = data->GetArgValue("name");
! //			printf("Entering region %s\n", region ? region : "");
  			if(strcmp(region, "any") == 0)
  				ParseOnePaletteEntry(data->GetChild(), region, group);
***************
*** 666,670 ****
  			if(val != NULL)
  			{
! 				printf("Entering group %s\n", val);
  				String	str(val);
  				group = GetGroupIndex(str);
--- 673,677 ----
  			if(val != NULL)
  			{
! //				printf("Entering group %s\n", val);
  				String	str(val);
  				group = GetGroupIndex(str);