[Gemrb-commits] gemrb/gemrb/plugins/WEDImporter WEDImp.cpp, 1.23, 1.24 WEDImp.h, 1.13, 1.14

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/WEDImporter
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1001/WEDImporter

Modified Files:
	WEDImp.cpp WEDImp.h 
Log Message:
implemented rain overlays
improved weather particles


Index: WEDImp.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/WEDImporter/WEDImp.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WEDImp.h	22 Jul 2006 12:39:55 -0000	1.13
--- WEDImp.h	26 Nov 2006 23:19:19 -0000	1.14
***************
*** 50,53 ****
--- 50,54 ----
  private:
  	void GetDoorPolygonCount(ieWord count, ieDword offset);
+ 	int AddOverlay(TileMap *tm, Overlay *overlays, bool rain);
  public:
  	WEDImp(void);

Index: WEDImp.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/WEDImporter/WEDImp.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** WEDImp.cpp	9 Aug 2006 18:59:35 -0000	1.23
--- WEDImp.cpp	26 Nov 2006 23:19:19 -0000	1.24
***************
*** 93,146 ****
  }
  
! TileMap* WEDImp::GetTileMap()
  {
  	int usedoverlays = 0;
  
! 	TileMap* tm = new TileMap();
! 	//TODO: Implement Multi Overlay
! 	TileOverlay* over = new TileOverlay( overlays[0].Width, overlays[0].Height );
! 	DataStream* tisfile = core->GetResourceMgr()->GetResource( overlays[0].TilesetResRef, IE_TIS_CLASS_ID );
! 	if (!core->IsAvailable( IE_TIS_CLASS_ID )) {
! 		printf( "[WEDImporter]: No TileSet Importer Available.\n" );
! 		return NULL;
  	}
  	TileSetMgr* tis = ( TileSetMgr* ) core->GetInterface( IE_TIS_CLASS_ID );
  	tis->Open( tisfile );
! 	for (int y = 0; y < overlays[0].Height; y++) {
! 		for (int x = 0; x < overlays[0].Width; x++) {
! 			str->Seek( overlays[0].TilemapOffset +
! 					( y * overlays[0].Width * 10 ) +
! 					( x * 10 ),
! 					GEM_STREAM_START );
  			ieWord startindex, count, secondary;
  			ieByte overlaymask;
  			str->ReadWord( &startindex );
  			str->ReadWord( &count );
  			str->ReadWord( &secondary );
! 			//now we are not sure if this is a real byte
! 			//could be a dword, so endian problems may happen!!!
  			str->Read( &overlaymask, 1 );
! 			//TODO: Consider Alternative Tile and Overlay Mask
! 			str->Seek( overlays[0].TILOffset + ( startindex * 2 ),
! 					GEM_STREAM_START );
! 			ieWord* indexes = ( ieWord* ) calloc( count, sizeof(ieWord) );
! 			str->Read( indexes, count * sizeof(ieWord) );
  			if( DataStream::IsEndianSwitch()) {
! 				swab( (char*) indexes, (char*) indexes, count * sizeof(ieWord) );
  			}
  			Tile* tile;
! 			if (secondary == 0xffff)
! 				tile = tis->GetTile( indexes, count );
! 			else {
! 				tile = tis->GetTile( indexes, 1, &secondary );
  			}
  			tile->om = overlaymask;
- 			//getting used overlays
  			usedoverlays |= overlaymask;
  			over->AddTile( tile );
! 			free( indexes );
  		}
  	}
! 	tm->AddOverlay( over );
  
  	//reading additional overlays
--- 93,167 ----
  }
  
! int WEDImp::AddOverlay(TileMap *tm, Overlay *overlays, bool rain)
  {
+ 	ieResRef res;
  	int usedoverlays = 0;
  
! 	memcpy(res, overlays->TilesetResRef,sizeof(ieResRef));
! 	if (rain) {
! 		strncat(res,"R",8);
! 		//no rain tileset available, rolling back
! 		if (!core->Exists(res,IE_TIS_CLASS_ID)) {
! 			memcpy(res, overlays->TilesetResRef,sizeof(ieResRef));
! 		}
  	}
+ 	TileOverlay *over = new TileOverlay( overlays->Width, overlays->Height );
+ 	DataStream* tisfile = core->GetResourceMgr()->GetResource(res, IE_TIS_CLASS_ID);
  	TileSetMgr* tis = ( TileSetMgr* ) core->GetInterface( IE_TIS_CLASS_ID );
  	tis->Open( tisfile );
! 	for (int y = 0; y < overlays->Height; y++) {
! 		for (int x = 0; x < overlays->Width; x++) {
! 			str->Seek( overlays->TilemapOffset +
! 				( y * overlays->Width * 10 ) + ( x * 10 ),
! 				GEM_STREAM_START );
  			ieWord startindex, count, secondary;
  			ieByte overlaymask;
  			str->ReadWord( &startindex );
  			str->ReadWord( &count );
+ 			//should be always 0xffff
  			str->ReadWord( &secondary );
! 			//should be always 0
  			str->Read( &overlaymask, 1 );
! 			str->Seek( overlays->TILOffset + ( startindex * 2 ),
! 				GEM_STREAM_START );
! 			ieWord* indices = ( ieWord* ) calloc( count, sizeof(ieWord) );
! 			str->Read( indices, count * sizeof(ieWord) );
  			if( DataStream::IsEndianSwitch()) {
! 				swab( (char*) indices, (char*) indices, count * sizeof(ieWord) );
  			}
  			Tile* tile;
! 			if (secondary == 0xffff) {
! 				tile = tis->GetTile( indices, count );
! 			} else {
! 				tile = tis->GetTile( indices, 1, &secondary );
  			}
  			tile->om = overlaymask;
  			usedoverlays |= overlaymask;
  			over->AddTile( tile );
! 			free( indices );
  		}
  	}
! 	
! 	if (rain) {
! 		tm->AddRainOverlay( over );
! 	} else {
! 		tm->AddOverlay( over );
! 	}
! 	core->FreeInterface( tis );
! 	return usedoverlays;
! }
! 
! TileMap* WEDImp::GetTileMap()
! {
! 	int usedoverlays;
! 
! 	if (!core->IsAvailable( IE_TIS_CLASS_ID )) {
! 		printf( "[WEDImporter]: No TileSet Importer Available.\n" );
! 		return NULL;
! 	}
! 	TileMap* tm = new TileMap();
! 
! 	usedoverlays = AddOverlay(tm, &overlays.at(0), false);
! 	AddOverlay(tm, &overlays.at(0), true);
  
  	//reading additional overlays
***************
*** 150,197 ****
  		if (!(mask&usedoverlays)) {
  			tm->AddOverlay( NULL );
  			mask<<=1;
  			continue;
  		}
  		mask<<=1;
- 		//don't declare these again, especially don't redeclare tis
- 		over = new TileOverlay( overlays[i].Width, overlays[i].Height );
- 		tisfile = core->GetResourceMgr()->GetResource( overlays[i].TilesetResRef, IE_TIS_CLASS_ID );
- 		tis->Open( tisfile );
- 		for (int y = 0; y < overlays[i].Height; y++) {
- 			for (int x = 0; x < overlays[i].Width; x++) {
- 				str->Seek( overlays[i].TilemapOffset +
- 				( y * overlays[i].Width * 10 ) + ( x * 10 ),
- 				GEM_STREAM_START );
- 				ieWord startindex, count, secondary;
- 				ieByte overlaymask;
- 				str->ReadWord( &startindex );
- 				str->ReadWord( &count );
- 				//should be always 0xffff
- 				str->ReadWord( &secondary );
- 				//should be always 0
- 				str->Read( &overlaymask, 1 );
- 				str->Seek( overlays[i].TILOffset + ( startindex * 2 ),
- 					GEM_STREAM_START );
- 				ieWord* indexes = ( ieWord* ) calloc( count, sizeof(ieWord) );
- 				str->Read( indexes, count * sizeof(ieWord) );
- 				if( DataStream::IsEndianSwitch()) {
- 					swab( (char*) indexes, (char*) indexes, count * sizeof(ieWord) );
- 				}
- 				Tile* tile;
- 				if (secondary == 0xffff) {
- 					tile = tis->GetTile( indexes, count );
- 				} else {
- 					tile = tis->GetTile( indexes, 1, &secondary );
- 				}
- 				tile->om = overlaymask;
- 				over->AddTile( tile );
- 				free( indexes );
- 			}
- 		}
  
! 		tm->AddOverlay( over );
  	}
- 
- 	core->FreeInterface( tis );
  	return tm;
  }
--- 171,183 ----
  		if (!(mask&usedoverlays)) {
  			tm->AddOverlay( NULL );
+ 			tm->AddRainOverlay( NULL );
  			mask<<=1;
  			continue;
  		}
  		mask<<=1;
  
! 		AddOverlay(tm, &overlays.at(i), false);
! 		AddOverlay(tm, &overlays.at(i), true);
  	}
  	return tm;
  }