- free car models

- ConvertIndexedTextureToRGBA to output RGBA or BGRA

Author: SoapyMan

DriverLevelTool/driver_routines/d2_types.h

@@ -21,11 +21,9 @@ struct TEXINF {
 
 enum EPageStorage
 {
-	TPAGE_PERMANENT = (1 << 0),		// pre-loaded page.
-	TPAGE_AREADATA = (1 << 1),		// demand-loaded
-	TPAGE_SPECPAGES = (1 << 2),		// pre-loaded page  However, it doesn't indicate texture compression
-	PAGE_FLAG_UNK1 = (1 << 3),
-	PAGE_FLAG_UNK2 = (1 << 4),
+	TPAGE_PERMANENT = (1 << 0),		// permanently loaded into VRAM
+	TPAGE_AREADATA = (1 << 1),		// spooled and uncompressed
+	TPAGE_SPECPAGES = (1 << 2),		// special car texture page
 };
 
 typedef struct texpage_pos_t

DriverLevelTool/driver_routines/level.cpp

@@ -578,30 +578,42 @@ void FreeLevelData()
 
 	FreeSpoolData();
 
-	for (int i = 0; i < 1536; i++)
+	for (int i = 0; i < MAX_MODELS; i++)
 	{
 		if (g_levelModels[i].model)
 			free(g_levelModels[i].model);
 	}
 
+	for (int i = 0; i < MAX_CAR_MODELS; i++)
+	{
+		if (g_carModels[i].cleanmodel)
+			free(g_carModels[i].cleanmodel);
+
+		if (g_carModels[i].dammodel)
+			free(g_carModels[i].dammodel);
+
+		if (g_carModels[i].lowmodel)
+			free(g_carModels[i].lowmodel);
+	}
+
 	delete[] g_textureNamesData;
 
 	// delete texture data
 	for (int i = 0; i < g_numTexPages; i++)
 	{
-		if (g_pageDatas[i].data)
-			delete[] g_pageDatas[i].data;
+		if (g_texPageData[i].data)
+			delete[] g_texPageData[i].data;
 
 		delete[] g_texPages[i].details;
 	}
 
-	delete[] g_pageDatas;
+	delete[] g_texPageData;
 	delete[] g_texPagePos;
 	delete[] g_texPages;
 	delete[] g_extraPalettes;
 	delete[] g_overlayMapData;
 
-	g_pageDatas = NULL;
+	g_texPageData = NULL;
 	g_texPagePos = NULL;
 	g_texPagePos = NULL;
 	g_extraPalettes = NULL;

DriverLevelTool/driver_routines/models.h

@@ -42,7 +42,7 @@ struct ModelRef_t
 	int		size;
 	bool	swap;
 
-	void*	userData;
+	void*	userData; // might contain a hardware model pointer
 };
 
 //------------------------------------------------------------------------------------------------------------

DriverLevelTool/driver_routines/regions.cpp

@@ -91,7 +91,7 @@ void LoadRegionData(IVirtualStream* pFile, RegionModels_t* models, AreaDataStr*
 		int pageIdx = pages->pageIndexes[i];
 
 		// region textures are non-compressed due to loading speeds
-		LoadTPageAndCluts(pFile, &g_pageDatas[pageIdx], pageIdx, false);
+		LoadTPageAndCluts(pFile, &g_texPageData[pageIdx], pageIdx, false);
 
 		if(pFile->Tell() % 2048)
 			pFile->Seek(2048 - (pFile->Tell() % 2048),VS_SEEK_CUR);

DriverLevelTool/driver_routines/textures.cpp

@@ -21,12 +21,12 @@ bool						g_originalTransparencyKey = true;
 
 XYPAIR						g_permsList[16];
 XYPAIR						g_specList[16];
-texdata_t*					g_pageDatas = NULL;
+texdata_t*					g_texPageData = NULL;
 TexPage_t*					g_texPages = NULL;
 extclutdata_t*				g_extraPalettes = NULL;
 int							g_numExtraPalettes = 0;
 
-// legacy format converter
+// 16 bit color to BGRA
 TVec4D<ubyte> bgr5a1_ToRGBA8(ushort color)
 {
 	ubyte b = (color & 0x1F) * 8;
@@ -44,6 +44,77 @@ TVec4D<ubyte> bgr5a1_ToRGBA8(ushort color)
 	return TVec4D<ubyte>(r,g,b,a);
 }
 
+// 16 bit color to RGBA
+TVec4D<ubyte> rgb5a1_ToRGBA8(ushort color)
+{
+	ubyte r = (color & 0x1F) * 8;
+	ubyte g = ((color >> 5) & 0x1F) * 8;
+	ubyte b = ((color >> 10) & 0x1F) * 8;
+
+	ubyte a = (color >> 15);
+
+	// restore source transparency key
+	if (g_originalTransparencyKey && color == 0)
+	{
+		return TVec4D<ubyte>(255, 0, 255, 0);
+	}
+
+	return TVec4D<ubyte>(r, g, b, a);
+}
+
+//-------------------------------------------------------------
+// Conversion of indexed palettized texture to 32bit RGBA
+//-------------------------------------------------------------
+void ConvertIndexedTextureToRGBA(int nPage, uint* dest_color_data, int detail, TEXCLUT* clut, bool outputBGR)
+{
+	texdata_t* page = &g_texPageData[nPage];
+
+	if (!(detail < g_texPages[nPage].numDetails))
+	{
+		MsgError("Cannot apply palette to non-existent detail! Programmer error?\n");
+		return;
+	}
+
+	int ox = g_texPages[nPage].details[detail].x;
+	int oy = g_texPages[nPage].details[detail].y;
+	int w = g_texPages[nPage].details[detail].width;
+	int h = g_texPages[nPage].details[detail].height;
+
+	if (w == 0)
+		w = 256;
+
+	if (h == 0)
+		h = 256;
+
+	char* textureName = g_textureNamesData + g_texPages[nPage].details[detail].nameoffset;
+	//MsgWarning("Applying detail %d '%s' (xywh: %d %d %d %d)\n", detail, textureName, ox, oy, w, h);
+
+	int tp_wx = ox + w;
+	int tp_hy = oy + h;
+
+	for (int y = oy; y < tp_hy; y++)
+	{
+		for (int x = ox; x < tp_wx; x++)
+		{
+			ubyte clindex = page->data[y * 128 + x / 2];
+
+			if (0 != (x & 1))
+				clindex >>= 4;
+
+			clindex &= 0xF;
+
+			TVec4D<ubyte> color = outputBGR ?
+				bgr5a1_ToRGBA8(clut->colors[clindex]) :
+				rgb5a1_ToRGBA8(clut->colors[clindex]);
+
+			// flip texture by Y because of TGA
+			int ypos = (TEXPAGE_SIZE_Y - y - 1) * TEXPAGE_SIZE_Y;
+
+			dest_color_data[ypos + x] = *(uint*)(&color);
+		}
+	}
+}
+
 //-------------------------------------------------------------------------------
 
 // unpacks texture, returns new source pointer
@@ -168,8 +239,8 @@ void LoadPermanentTPages(IVirtualStream* pFile)
 	pFile->Seek( g_levInfo.texdata_offset, VS_SEEK_SET );
 
 	// allocate page data
-	g_pageDatas = new texdata_t[g_numTexPages];
-	memset(g_pageDatas, 0, sizeof(texdata_t)*g_numTexPages);
+	g_texPageData = new texdata_t[g_numTexPages];
+	memset(g_texPageData, 0, sizeof(texdata_t)*g_numTexPages);
 
 	//-----------------------------------
 
@@ -190,7 +261,7 @@ void LoadPermanentTPages(IVirtualStream* pFile)
 		int tpage = g_permsList[i].x;
 
 		// permanents are also compressed
-		LoadTPageAndCluts(pFile, &g_pageDatas[tpage], tpage, true);
+		LoadTPageAndCluts(pFile, &g_texPageData[tpage], tpage, true);
 
 		pFile->Seek(curOfs + ((g_permsList[i].y + 2047) & -2048), VS_SEEK_SET);
 	}
@@ -208,9 +279,9 @@ void LoadPermanentTPages(IVirtualStream* pFile)
 	{
 		long curOfs = pFile->Tell();
 		int tpage = g_specList[i].x;
-		
+
 		// permanents are compressed
-		LoadTPageAndCluts(pFile, &g_pageDatas[tpage], tpage, true);
+		LoadTPageAndCluts(pFile, &g_texPageData[tpage], tpage, true);
 
 		pFile->Seek(curOfs + ((g_specList[i].y + 2047) & -2048), VS_SEEK_SET);
 	}

DriverLevelTool/driver_routines/textures.h

@@ -40,7 +40,7 @@ struct extclutdata_t
 
 //---------------------------------------------------------------------------------------------------------------------------------
 
-extern texdata_t*				g_pageDatas;
+extern texdata_t*				g_texPageData;
 extern TexPage_t*				g_texPages;
 extern extclutdata_t*			g_extraPalettes;
 extern int						g_numExtraPalettes;
@@ -58,10 +58,12 @@ extern char*					g_overlayMapData;
 
 TVec4D<ubyte>	bgr5a1_ToRGBA8(ushort color);
 
-int				GetCarPalIndex(int tpage);
+void			ConvertIndexedTextureToRGBA(int nPage, uint* dest_color_data, int detail, TEXCLUT* clut, bool outputBGR = true);
 
 //---------------------------------------------------------------------------------------------------------------------------------
 
+int				GetCarPalIndex(int tpage);
+
 // unpacks compressed texture
 char*			unpackTexture(char* src, char* dest);
 

DriverLevelTool/exporter/export_textures.cpp

@@ -85,65 +85,14 @@ void SaveTGA(const char* filename, ubyte* data, int w, int h, int c)
 	fclose(pFile);
 }
 
-//-------------------------------------------------------------
-// Conversion of indexed palettized texture to 32bit RGBA
-//-------------------------------------------------------------
-void ConvertIndexedTextureToRGBA(int nPage, uint* dest_color_data, int detail, TEXCLUT* clut)
-{
-	texdata_t* page = &g_pageDatas[nPage];
-
-	if (!(detail < g_texPages[nPage].numDetails))
-	{
-		MsgError("Cannot apply palette to non-existent detail! Programmer error?\n");
-		return;
-	}
-
-	int ox = g_texPages[nPage].details[detail].x;
-	int oy = g_texPages[nPage].details[detail].y;
-	int w = g_texPages[nPage].details[detail].width;
-	int h = g_texPages[nPage].details[detail].height;
-
-	if (w == 0)
-		w = 256;
-
-	if (h == 0)
-		h = 256;
-
-	char* textureName = g_textureNamesData + g_texPages[nPage].details[detail].nameoffset;
-	//MsgWarning("Applying detail %d '%s' (xywh: %d %d %d %d)\n", detail, textureName, ox, oy, w, h);
-
-	int tp_wx = ox + w;
-	int tp_hy = oy + h;
-
-	for (int y = oy; y < tp_hy; y++)
-	{
-		for (int x = ox; x < tp_wx; x++)
-		{
-			ubyte clindex = page->data[y * 128 + x / 2];
-
-			if (0 != (x & 1))
-				clindex >>= 4;
-
-			clindex &= 0xF;
-
-			TVec4D<ubyte> color = bgr5a1_ToRGBA8(clut->colors[clindex]);
-
-			// flip texture by Y because of TGA
-			int ypos = (TEXPAGE_SIZE_Y - y - 1) * TEXPAGE_SIZE_Y;
-
-			dest_color_data[ypos + x] = *(uint*)(&color);
-		}
-	}
-}
-
 int clutSortFunc(extclutdata_t* const& i, extclutdata_t* const& j)
 {
 	return (i->palette - j->palette);
 }
 
 void GetTPageDetailPalettes(DkList<TEXCLUT*>& out, int nPage, int detail)
 {
-	texdata_t* page = &g_pageDatas[nPage];
+	texdata_t* page = &g_texPageData[nPage];
 
 	// ofc, add default
 	out.append(&page->clut[detail]);
@@ -181,7 +130,7 @@ void GetTPageDetailPalettes(DkList<TEXCLUT*>& out, int nPage, int detail)
 //-------------------------------------------------------------
 void ExportTIM(int nPage, int detail)
 {
-	texdata_t* page = &g_pageDatas[nPage];
+	texdata_t* page = &g_texPageData[nPage];
 
 	if (!(detail < g_texPages[nPage].numDetails))
 	{
@@ -308,7 +257,7 @@ void ExportTexturePage(int nPage)
 	// Also saving to LEVEL_texture/PAGE_*
 	//
 
-	texdata_t* page = &g_pageDatas[nPage];
+	texdata_t* page = &g_texPageData[nPage];
 
 	if (!page->data)
 		return;		// NO DATA