Skip to content

Commit 5451b18

Browse files
committed
- don't use pink transparency key for Unity
1 parent d020255 commit 5451b18

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

DriverLevelTool/exporter/export_textures.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ extern bool g_export_overmap;
2121
extern int g_overlaymap_width;
2222
extern bool g_explode_tpages;
2323
extern bool g_export_world;
24-
extern bool g_originalTransparencyKey;
2524
extern char* g_overlayMapData;
25+
extern bool g_export_worldUnityScript;
2626

2727
void GetTPageDetailPalettes(Array<TEXCLUT*>& out, CTexturePage* tpage, TexDetailInfo_t* detail)
2828
{
@@ -215,7 +215,7 @@ void ExportTexturePage(CTexturePage* tpage)
215215

216216
for (int i = 0; i < numDetails; i++)
217217
{
218-
tpage->ConvertIndexedTextureToRGBA(color_data, i, nullptr, true, true);
218+
tpage->ConvertIndexedTextureToRGBA(color_data, i, nullptr, true, !g_export_worldUnityScript);
219219
}
220220

221221
MsgInfo("Writing texture '%s/PAGE_%d.tga'\n", (char*)g_levname_texdir, tpage->GetId());
@@ -232,7 +232,7 @@ void ExportTexturePage(CTexturePage* tpage)
232232

233233
if(detail->extraCLUTs[pal])
234234
{
235-
tpage->ConvertIndexedTextureToRGBA(color_data, j, detail->extraCLUTs[pal], true, true);
235+
tpage->ConvertIndexedTextureToRGBA(color_data, j, detail->extraCLUTs[pal], true, !g_export_worldUnityScript);
236236
anyMatched = true;
237237
}
238238
}

DriverLevelTool/viewer/viewer.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,15 +1076,18 @@ void DisplayExportUI()
10761076
Directory::create(g_levname_moddir);
10771077
SaveModelPagesMTL();
10781078

1079+
// idk why, but some regions are bugged while exporting
1080+
SpoolAllAreaDatas();
1081+
10791082
// export model files as well
10801083
if (g_export_worldUnityScript)
10811084
{
10821085
g_extract_dmodels = false;
1086+
g_explode_tpages = false;
1087+
10831088
ExportAllModels();
1089+
ExportAllTextures();
10841090
}
1085-
1086-
// idk why, but some regions are bugged while exporting
1087-
SpoolAllAreaDatas();
10881091

10891092
ExportRegions();
10901093
MsgInfo("Job done!\n");
@@ -1096,6 +1099,7 @@ void DisplayExportUI()
10961099

10971100
if (ImGui::Button("Export models"))
10981101
{
1102+
g_export_worldUnityScript = false;
10991103
Directory::create(g_levname_moddir);
11001104
SaveModelPagesMTL();
11011105
ExportAllModels();
@@ -1108,6 +1112,7 @@ void DisplayExportUI()
11081112

11091113
if (ImGui::Button("Export models"))
11101114
{
1115+
g_export_worldUnityScript = false;
11111116
Directory::create(g_levname_moddir);
11121117
SaveModelPagesMTL();
11131118
ExportAllCarModels();
@@ -1120,6 +1125,7 @@ void DisplayExportUI()
11201125

11211126
if (ImGui::Button("Export textures"))
11221127
{
1128+
g_export_worldUnityScript = false;
11231129
Directory::create(g_levname_texdir);
11241130
ExportAllTextures();
11251131
MsgInfo("Job done!\n");
@@ -1131,6 +1137,7 @@ void DisplayExportUI()
11311137

11321138
if (ImGui::Button("Export textures"))
11331139
{
1140+
g_export_worldUnityScript = false;
11341141
Directory::create(g_levname_texdir);
11351142
ExportOverlayMap();
11361143
MsgInfo("Job done!\n");

0 commit comments

Comments
 (0)