Improved Quake .map converter to get Makkon's samplemaps working

This commit is contained in:
Robert Beckebans 2022-09-11 15:34:29 +02:00
parent 9fa54bb38e
commit 5d5de028ea
5 changed files with 603 additions and 3 deletions

View file

@ -3191,6 +3191,28 @@ bool idMapFile::ConvertQuakeToDoom()
ent->epairs.Set( "classname", "func_static" );
}
if( idStr::Icmp( classname, "func_detail" ) == 0 )
{
ent->epairs.Set( "classname", "func_static" );
}
// fix light color range
if( idStr::Icmp( classname, "light" ) == 0 )
{
idVec3 color;
ent->epairs.GetVector( "_color", "1 1 1", color );
if( color.x > 1 || color.y > 1 || color.z > 1 )
{
color.x *= 1.0f / 255;
color.y *= 1.0f / 255;
color.z *= 1.0f / 255;
ent->epairs.SetVector( "_color", color );
}
}
if( ent->GetNumPrimitives() > 0 )
{
const idKeyValue* namePair = ent->epairs.FindKey( "name" );
@ -4108,6 +4130,563 @@ static quakeToDoom_t textureConvertNames[] =
{"textures/trigger", "textures/common/trigger"},
{"textures/void", "textures/prototype/void"},
// Makkon concrete 20
{"textures/conc_b01_blk", "textures/makkon_concrete/conc_b01_blk"},
{"textures/conc_b01_blu", "textures/makkon_concrete/conc_b01_blu"},
{"textures/conc_b01_brwn", "textures/makkon_concrete/conc_b01_brwn"},
{"textures/conc_b01_grn", "textures/makkon_concrete/conc_b01_grn"},
{"textures/conc_b01_gry1", "textures/makkon_concrete/conc_b01_gry1"},
{"textures/conc_b01_gry2", "textures/makkon_concrete/conc_b01_gry2"},
{"textures/conc_b01_gry3", "textures/makkon_concrete/conc_b01_gry3"},
{"textures/conc_b01_light", "textures/makkon_concrete/conc_b01_light"},
{"textures/conc_b01_pink", "textures/makkon_concrete/conc_b01_pink"},
{"textures/conc_b01_red", "textures/makkon_concrete/conc_b01_red"},
{"textures/conc_b01_red2", "textures/makkon_concrete/conc_b01_red2"},
{"textures/conc_b01_teal", "textures/makkon_concrete/conc_b01_teal"},
{"textures/conc_b01_wht", "textures/makkon_concrete/conc_b01_wht"},
{"textures/conc_b01_ylw", "textures/makkon_concrete/conc_b01_ylw"},
{"textures/conc_b02_blk", "textures/makkon_concrete/conc_b02_blk"},
{"textures/conc_b02_blu", "textures/makkon_concrete/conc_b02_blu"},
{"textures/conc_b02_brwn", "textures/makkon_concrete/conc_b02_brwn"},
{"textures/conc_b02_grn", "textures/makkon_concrete/conc_b02_grn"},
{"textures/conc_b02_gry1", "textures/makkon_concrete/conc_b02_gry1"},
{"textures/conc_b02_gry2", "textures/makkon_concrete/conc_b02_gry2"},
{"textures/conc_b02_gry3", "textures/makkon_concrete/conc_b02_gry3"},
{"textures/conc_b02_light", "textures/makkon_concrete/conc_b02_light"},
{"textures/conc_b02_pink", "textures/makkon_concrete/conc_b02_pink"},
{"textures/conc_b02_red", "textures/makkon_concrete/conc_b02_red"},
{"textures/conc_b02_red2", "textures/makkon_concrete/conc_b02_red2"},
{"textures/conc_b02_teal", "textures/makkon_concrete/conc_b02_teal"},
{"textures/conc_b02_wht", "textures/makkon_concrete/conc_b02_wht"},
{"textures/conc_b02_ylw", "textures/makkon_concrete/conc_b02_ylw"},
{"textures/conc_b03_blk", "textures/makkon_concrete/conc_b03_blk"},
{"textures/conc_b03_blu", "textures/makkon_concrete/conc_b03_blu"},
{"textures/conc_b03_brwn", "textures/makkon_concrete/conc_b03_brwn"},
{"textures/conc_b03_grn", "textures/makkon_concrete/conc_b03_grn"},
{"textures/conc_b03_gry1", "textures/makkon_concrete/conc_b03_gry1"},
{"textures/conc_b03_gry2", "textures/makkon_concrete/conc_b03_gry2"},
{"textures/conc_b03_gry3", "textures/makkon_concrete/conc_b03_gry3"},
{"textures/conc_b03_light", "textures/makkon_concrete/conc_b03_light"},
{"textures/conc_b03_pink", "textures/makkon_concrete/conc_b03_pink"},
{"textures/conc_b03_red", "textures/makkon_concrete/conc_b03_red"},
{"textures/conc_b03_red2", "textures/makkon_concrete/conc_b03_red2"},
{"textures/conc_b03_teal", "textures/makkon_concrete/conc_b03_teal"},
{"textures/conc_b03_wht", "textures/makkon_concrete/conc_b03_wht"},
{"textures/conc_b03_ylw", "textures/makkon_concrete/conc_b03_ylw"},
{"textures/conc_b04_blk", "textures/makkon_concrete/conc_b04_blk"},
{"textures/conc_b04_blu", "textures/makkon_concrete/conc_b04_blu"},
{"textures/conc_b04_brwn", "textures/makkon_concrete/conc_b04_brwn"},
{"textures/conc_b04_grn", "textures/makkon_concrete/conc_b04_grn"},
{"textures/conc_b04_gry1", "textures/makkon_concrete/conc_b04_gry1"},
{"textures/conc_b04_gry2", "textures/makkon_concrete/conc_b04_gry2"},
{"textures/conc_b04_gry3", "textures/makkon_concrete/conc_b04_gry3"},
{"textures/conc_b04_light", "textures/makkon_concrete/conc_b04_light"},
{"textures/conc_b04_pink", "textures/makkon_concrete/conc_b04_pink"},
{"textures/conc_b04_red", "textures/makkon_concrete/conc_b04_red"},
{"textures/conc_b04_red2", "textures/makkon_concrete/conc_b04_red2"},
{"textures/conc_b04_teal", "textures/makkon_concrete/conc_b04_teal"},
{"textures/conc_b04_wht", "textures/makkon_concrete/conc_b04_wht"},
{"textures/conc_b04_ylw", "textures/makkon_concrete/conc_b04_ylw"},
{"textures/conc_b05_blk", "textures/makkon_concrete/conc_b05_blk"},
{"textures/conc_b05_blu", "textures/makkon_concrete/conc_b05_blu"},
{"textures/conc_b05_brwn", "textures/makkon_concrete/conc_b05_brwn"},
{"textures/conc_b05_grn", "textures/makkon_concrete/conc_b05_grn"},
{"textures/conc_b05_gry1", "textures/makkon_concrete/conc_b05_gry1"},
{"textures/conc_b05_gry2", "textures/makkon_concrete/conc_b05_gry2"},
{"textures/conc_b05_gry3", "textures/makkon_concrete/conc_b05_gry3"},
{"textures/conc_b05_light", "textures/makkon_concrete/conc_b05_light"},
{"textures/conc_b05_pink", "textures/makkon_concrete/conc_b05_pink"},
{"textures/conc_b05_red", "textures/makkon_concrete/conc_b05_red"},
{"textures/conc_b05_red2", "textures/makkon_concrete/conc_b05_red2"},
{"textures/conc_b05_teal", "textures/makkon_concrete/conc_b05_teal"},
{"textures/conc_b05_wht", "textures/makkon_concrete/conc_b05_wht"},
{"textures/conc_b05_ylw", "textures/makkon_concrete/conc_b05_ylw"},
{"textures/conc_b06_blk", "textures/makkon_concrete/conc_b06_blk"},
{"textures/conc_b06_blu", "textures/makkon_concrete/conc_b06_blu"},
{"textures/conc_b06_brwn", "textures/makkon_concrete/conc_b06_brwn"},
{"textures/conc_b06_grn", "textures/makkon_concrete/conc_b06_grn"},
{"textures/conc_b06_gry1", "textures/makkon_concrete/conc_b06_gry1"},
{"textures/conc_b06_gry2", "textures/makkon_concrete/conc_b06_gry2"},
{"textures/conc_b06_gry3", "textures/makkon_concrete/conc_b06_gry3"},
{"textures/conc_b06_light", "textures/makkon_concrete/conc_b06_light"},
{"textures/conc_b06_pink", "textures/makkon_concrete/conc_b06_pink"},
{"textures/conc_b06_red", "textures/makkon_concrete/conc_b06_red"},
{"textures/conc_b06_red2", "textures/makkon_concrete/conc_b06_red2"},
{"textures/conc_b06_teal", "textures/makkon_concrete/conc_b06_teal"},
{"textures/conc_b06_wht", "textures/makkon_concrete/conc_b06_wht"},
{"textures/conc_b06_ylw", "textures/makkon_concrete/conc_b06_ylw"},
{"textures/conc_c01_blk", "textures/makkon_concrete/conc_c01_blk"},
{"textures/conc_c01_blu", "textures/makkon_concrete/conc_c01_blu"},
{"textures/conc_c01_brwn", "textures/makkon_concrete/conc_c01_brwn"},
{"textures/conc_c01_grn", "textures/makkon_concrete/conc_c01_grn"},
{"textures/conc_c01_gry1", "textures/makkon_concrete/conc_c01_gry1"},
{"textures/conc_c01_gry2", "textures/makkon_concrete/conc_c01_gry2"},
{"textures/conc_c01_gry3", "textures/makkon_concrete/conc_c01_gry3"},
{"textures/conc_c01_pink", "textures/makkon_concrete/conc_c01_pink"},
{"textures/conc_c01_red", "textures/makkon_concrete/conc_c01_red"},
{"textures/conc_c01_red2", "textures/makkon_concrete/conc_c01_red2"},
{"textures/conc_c01_teal", "textures/makkon_concrete/conc_c01_teal"},
{"textures/conc_c01_wht", "textures/makkon_concrete/conc_c01_wht"},
{"textures/conc_c01_ylw", "textures/makkon_concrete/conc_c01_ylw"},
{"textures/conc_c02_blk", "textures/makkon_concrete/conc_c02_blk"},
{"textures/conc_c02_blu", "textures/makkon_concrete/conc_c02_blu"},
{"textures/conc_c02_brwn", "textures/makkon_concrete/conc_c02_brwn"},
{"textures/conc_c02_grn", "textures/makkon_concrete/conc_c02_grn"},
{"textures/conc_c02_gry1", "textures/makkon_concrete/conc_c02_gry1"},
{"textures/conc_c02_gry2", "textures/makkon_concrete/conc_c02_gry2"},
{"textures/conc_c02_gry3", "textures/makkon_concrete/conc_c02_gry3"},
{"textures/conc_c02_pink", "textures/makkon_concrete/conc_c02_pink"},
{"textures/conc_c02_red", "textures/makkon_concrete/conc_c02_red"},
{"textures/conc_c02_red2", "textures/makkon_concrete/conc_c02_red2"},
{"textures/conc_c02_teal", "textures/makkon_concrete/conc_c02_teal"},
{"textures/conc_c02_wht", "textures/makkon_concrete/conc_c02_wht"},
{"textures/conc_c02_ylw", "textures/makkon_concrete/conc_c02_ylw"},
{"textures/conc_c03_blk", "textures/makkon_concrete/conc_c03_blk"},
{"textures/conc_c03_blu", "textures/makkon_concrete/conc_c03_blu"},
{"textures/conc_c03_brwn", "textures/makkon_concrete/conc_c03_brwn"},
{"textures/conc_c03_grn", "textures/makkon_concrete/conc_c03_grn"},
{"textures/conc_c03_gry1", "textures/makkon_concrete/conc_c03_gry1"},
{"textures/conc_c03_gry2", "textures/makkon_concrete/conc_c03_gry2"},
{"textures/conc_c03_gry3", "textures/makkon_concrete/conc_c03_gry3"},
{"textures/conc_c03_pink", "textures/makkon_concrete/conc_c03_pink"},
{"textures/conc_c03_red", "textures/makkon_concrete/conc_c03_red"},
{"textures/conc_c03_red2", "textures/makkon_concrete/conc_c03_red2"},
{"textures/conc_c03_teal", "textures/makkon_concrete/conc_c03_teal"},
{"textures/conc_c03_wht", "textures/makkon_concrete/conc_c03_wht"},
{"textures/conc_c03_ylw", "textures/makkon_concrete/conc_c03_ylw"},
{"textures/conc_c_04_brwn", "textures/makkon_concrete/conc_c_04_brwn"},
{"textures/conc_c_04_gre1", "textures/makkon_concrete/conc_c_04_gre1"},
{"textures/conc_c_04_gry1", "textures/makkon_concrete/conc_c_04_gry1"},
{"textures/conc_c_04_gry2", "textures/makkon_concrete/conc_c_04_gry2"},
{"textures/conc_c_04_gry3", "textures/makkon_concrete/conc_c_04_gry3"},
{"textures/conc_f01_blk", "textures/makkon_concrete/conc_f01_blk"},
{"textures/conc_f01_blu", "textures/makkon_concrete/conc_f01_blu"},
{"textures/conc_f01_brwn", "textures/makkon_concrete/conc_f01_brwn"},
{"textures/conc_f01_grn", "textures/makkon_concrete/conc_f01_grn"},
{"textures/conc_f01_gry1", "textures/makkon_concrete/conc_f01_gry1"},
{"textures/conc_f01_gry2", "textures/makkon_concrete/conc_f01_gry2"},
{"textures/conc_f01_gry3", "textures/makkon_concrete/conc_f01_gry3"},
{"textures/conc_f01_pink", "textures/makkon_concrete/conc_f01_pink"},
{"textures/conc_f01_red", "textures/makkon_concrete/conc_f01_red"},
{"textures/conc_f01_red2", "textures/makkon_concrete/conc_f01_red2"},
{"textures/conc_f01_teal", "textures/makkon_concrete/conc_f01_teal"},
{"textures/conc_f01_wht", "textures/makkon_concrete/conc_f01_wht"},
{"textures/conc_f01_ylw", "textures/makkon_concrete/conc_f01_ylw"},
{"textures/conc_f02_blk", "textures/makkon_concrete/conc_f02_blk"},
{"textures/conc_f02_blu", "textures/makkon_concrete/conc_f02_blu"},
{"textures/conc_f02_brwn", "textures/makkon_concrete/conc_f02_brwn"},
{"textures/conc_f02_grn", "textures/makkon_concrete/conc_f02_grn"},
{"textures/conc_f02_gry1", "textures/makkon_concrete/conc_f02_gry1"},
{"textures/conc_f02_gry2", "textures/makkon_concrete/conc_f02_gry2"},
{"textures/conc_f02_gry3", "textures/makkon_concrete/conc_f02_gry3"},
{"textures/conc_f02_pink", "textures/makkon_concrete/conc_f02_pink"},
{"textures/conc_f02_red", "textures/makkon_concrete/conc_f02_red"},
{"textures/conc_f02_red2", "textures/makkon_concrete/conc_f02_red2"},
{"textures/conc_f02_teal", "textures/makkon_concrete/conc_f02_teal"},
{"textures/conc_f02_wht", "textures/makkon_concrete/conc_f02_wht"},
{"textures/conc_f02_ylw", "textures/makkon_concrete/conc_f02_ylw"},
{"textures/conc_f03_blk", "textures/makkon_concrete/conc_f03_blk"},
{"textures/conc_f03_blu", "textures/makkon_concrete/conc_f03_blu"},
{"textures/conc_f03_brwn", "textures/makkon_concrete/conc_f03_brwn"},
{"textures/conc_f03_grn", "textures/makkon_concrete/conc_f03_grn"},
{"textures/conc_f03_gry1", "textures/makkon_concrete/conc_f03_gry1"},
{"textures/conc_f03_gry2", "textures/makkon_concrete/conc_f03_gry2"},
{"textures/conc_f03_gry3", "textures/makkon_concrete/conc_f03_gry3"},
{"textures/conc_f03_pink", "textures/makkon_concrete/conc_f03_pink"},
{"textures/conc_f03_red", "textures/makkon_concrete/conc_f03_red"},
{"textures/conc_f03_red2", "textures/makkon_concrete/conc_f03_red2"},
{"textures/conc_f03_teal", "textures/makkon_concrete/conc_f03_teal"},
{"textures/conc_f03_wht", "textures/makkon_concrete/conc_f03_wht"},
{"textures/conc_f03_ylw", "textures/makkon_concrete/conc_f03_ylw"},
{"textures/conc_f04_blk", "textures/makkon_concrete/conc_f04_blk"},
{"textures/conc_f04_blu", "textures/makkon_concrete/conc_f04_blu"},
{"textures/conc_f04_brwn", "textures/makkon_concrete/conc_f04_brwn"},
{"textures/conc_f04_grn", "textures/makkon_concrete/conc_f04_grn"},
{"textures/conc_f04_gry1", "textures/makkon_concrete/conc_f04_gry1"},
{"textures/conc_f04_gry2", "textures/makkon_concrete/conc_f04_gry2"},
{"textures/conc_f04_gry3", "textures/makkon_concrete/conc_f04_gry3"},
{"textures/conc_f04_pink", "textures/makkon_concrete/conc_f04_pink"},
{"textures/conc_f04_red", "textures/makkon_concrete/conc_f04_red"},
{"textures/conc_f04_red2", "textures/makkon_concrete/conc_f04_red2"},
{"textures/conc_f04_teal", "textures/makkon_concrete/conc_f04_teal"},
{"textures/conc_f04_wht", "textures/makkon_concrete/conc_f04_wht"},
{"textures/conc_f04_ylw", "textures/makkon_concrete/conc_f04_ylw"},
{"textures/conc_f05_blk", "textures/makkon_concrete/conc_f05_blk"},
{"textures/conc_f05_blu", "textures/makkon_concrete/conc_f05_blu"},
{"textures/conc_f05_brwn", "textures/makkon_concrete/conc_f05_brwn"},
{"textures/conc_f05_grn", "textures/makkon_concrete/conc_f05_grn"},
{"textures/conc_f05_gry1", "textures/makkon_concrete/conc_f05_gry1"},
{"textures/conc_f05_gry2", "textures/makkon_concrete/conc_f05_gry2"},
{"textures/conc_f05_gry3", "textures/makkon_concrete/conc_f05_gry3"},
{"textures/conc_f05_pink", "textures/makkon_concrete/conc_f05_pink"},
{"textures/conc_f05_red", "textures/makkon_concrete/conc_f05_red"},
{"textures/conc_f05_red2", "textures/makkon_concrete/conc_f05_red2"},
{"textures/conc_f05_teal", "textures/makkon_concrete/conc_f05_teal"},
{"textures/conc_f05_wht", "textures/makkon_concrete/conc_f05_wht"},
{"textures/conc_f05_ylw", "textures/makkon_concrete/conc_f05_ylw"},
{"textures/conc_t01_blk", "textures/makkon_concrete/conc_t01_blk"},
{"textures/conc_t01_blu", "textures/makkon_concrete/conc_t01_blu"},
{"textures/conc_t01_brwn", "textures/makkon_concrete/conc_t01_brwn"},
{"textures/conc_t01_grn", "textures/makkon_concrete/conc_t01_grn"},
{"textures/conc_t01_gry1", "textures/makkon_concrete/conc_t01_gry1"},
{"textures/conc_t01_gry2", "textures/makkon_concrete/conc_t01_gry2"},
{"textures/conc_t01_gry3", "textures/makkon_concrete/conc_t01_gry3"},
{"textures/conc_t01_pink", "textures/makkon_concrete/conc_t01_pink"},
{"textures/conc_t01_red", "textures/makkon_concrete/conc_t01_red"},
{"textures/conc_t01_red2", "textures/makkon_concrete/conc_t01_red2"},
{"textures/conc_t01_teal", "textures/makkon_concrete/conc_t01_teal"},
{"textures/conc_t01_wht", "textures/makkon_concrete/conc_t01_wht"},
{"textures/conc_t01_ylw", "textures/makkon_concrete/conc_t01_ylw"},
{"textures/conc_t02_blk", "textures/makkon_concrete/conc_t02_blk"},
{"textures/conc_t02_blu", "textures/makkon_concrete/conc_t02_blu"},
{"textures/conc_t02_brwn", "textures/makkon_concrete/conc_t02_brwn"},
{"textures/conc_t02_grn", "textures/makkon_concrete/conc_t02_grn"},
{"textures/conc_t02_gry1", "textures/makkon_concrete/conc_t02_gry1"},
{"textures/conc_t02_gry2", "textures/makkon_concrete/conc_t02_gry2"},
{"textures/conc_t02_gry3", "textures/makkon_concrete/conc_t02_gry3"},
{"textures/conc_t02_pink", "textures/makkon_concrete/conc_t02_pink"},
{"textures/conc_t02_red", "textures/makkon_concrete/conc_t02_red"},
{"textures/conc_t02_red2", "textures/makkon_concrete/conc_t02_red2"},
{"textures/conc_t02_teal", "textures/makkon_concrete/conc_t02_teal"},
{"textures/conc_t02_wht", "textures/makkon_concrete/conc_t02_wht"},
{"textures/conc_t02_ylw", "textures/makkon_concrete/conc_t02_ylw"},
{"textures/conc_t03_blk", "textures/makkon_concrete/conc_t03_blk"},
{"textures/conc_t03_blu", "textures/makkon_concrete/conc_t03_blu"},
{"textures/conc_t03_brwn", "textures/makkon_concrete/conc_t03_brwn"},
{"textures/conc_t03_grn", "textures/makkon_concrete/conc_t03_grn"},
{"textures/conc_t03_gry1", "textures/makkon_concrete/conc_t03_gry1"},
{"textures/conc_t03_gry2", "textures/makkon_concrete/conc_t03_gry2"},
{"textures/conc_t03_gry3", "textures/makkon_concrete/conc_t03_gry3"},
{"textures/conc_t03_pink", "textures/makkon_concrete/conc_t03_pink"},
{"textures/conc_t03_red", "textures/makkon_concrete/conc_t03_red"},
{"textures/conc_t03_red2", "textures/makkon_concrete/conc_t03_red2"},
{"textures/conc_t03_teal", "textures/makkon_concrete/conc_t03_teal"},
{"textures/conc_t03_wht", "textures/makkon_concrete/conc_t03_wht"},
{"textures/conc_t03_ylw", "textures/makkon_concrete/conc_t03_ylw"},
{"textures/conc_t04_blk", "textures/makkon_concrete/conc_t04_blk"},
{"textures/conc_t04_blu", "textures/makkon_concrete/conc_t04_blu"},
{"textures/conc_t04_brwn", "textures/makkon_concrete/conc_t04_brwn"},
{"textures/conc_t04_grn", "textures/makkon_concrete/conc_t04_grn"},
{"textures/conc_t04_gry1", "textures/makkon_concrete/conc_t04_gry1"},
{"textures/conc_t04_gry2", "textures/makkon_concrete/conc_t04_gry2"},
{"textures/conc_t04_gry3", "textures/makkon_concrete/conc_t04_gry3"},
{"textures/conc_t04_pink", "textures/makkon_concrete/conc_t04_pink"},
{"textures/conc_t04_red", "textures/makkon_concrete/conc_t04_red"},
{"textures/conc_t04_red2", "textures/makkon_concrete/conc_t04_red2"},
{"textures/conc_t04_teal", "textures/makkon_concrete/conc_t04_teal"},
{"textures/conc_t04_wht", "textures/makkon_concrete/conc_t04_wht"},
{"textures/conc_t04_ylw", "textures/makkon_concrete/conc_t04_ylw"},
{"textures/conc_t06_blk", "textures/makkon_concrete/conc_t06_blk"},
{"textures/conc_t06_blu", "textures/makkon_concrete/conc_t06_blu"},
{"textures/conc_t06_brwn", "textures/makkon_concrete/conc_t06_brwn"},
{"textures/conc_t06_grn", "textures/makkon_concrete/conc_t06_grn"},
{"textures/conc_t06_gry1", "textures/makkon_concrete/conc_t06_gry1"},
{"textures/conc_t06_gry2", "textures/makkon_concrete/conc_t06_gry2"},
{"textures/conc_t06_gry3", "textures/makkon_concrete/conc_t06_gry3"},
{"textures/conc_t06_pink", "textures/makkon_concrete/conc_t06_pink"},
{"textures/conc_t06_red", "textures/makkon_concrete/conc_t06_red"},
{"textures/conc_t06_red2", "textures/makkon_concrete/conc_t06_red2"},
{"textures/conc_t06_teal", "textures/makkon_concrete/conc_t06_teal"},
{"textures/conc_t06_wht", "textures/makkon_concrete/conc_t06_wht"},
{"textures/conc_t06_ylw", "textures/makkon_concrete/conc_t06_ylw"},
{"textures/conc_t07_blk", "textures/makkon_concrete/conc_t07_blk"},
{"textures/conc_t07_blu", "textures/makkon_concrete/conc_t07_blu"},
{"textures/conc_t07_brwn", "textures/makkon_concrete/conc_t07_brwn"},
{"textures/conc_t07_grn", "textures/makkon_concrete/conc_t07_grn"},
{"textures/conc_t07_gry1", "textures/makkon_concrete/conc_t07_gry1"},
{"textures/conc_t07_gry2", "textures/makkon_concrete/conc_t07_gry2"},
{"textures/conc_t07_gry3", "textures/makkon_concrete/conc_t07_gry3"},
{"textures/conc_t07_pink", "textures/makkon_concrete/conc_t07_pink"},
{"textures/conc_t07_red", "textures/makkon_concrete/conc_t07_red"},
{"textures/conc_t07_red2", "textures/makkon_concrete/conc_t07_red2"},
{"textures/conc_t07_teal", "textures/makkon_concrete/conc_t07_teal"},
{"textures/conc_t07_wht", "textures/makkon_concrete/conc_t07_wht"},
{"textures/conc_t07_ylw", "textures/makkon_concrete/conc_t07_ylw"},
{"textures/conc_t08_blk", "textures/makkon_concrete/conc_t08_blk"},
{"textures/conc_t08_blu", "textures/makkon_concrete/conc_t08_blu"},
{"textures/conc_t08_brwn", "textures/makkon_concrete/conc_t08_brwn"},
{"textures/conc_t08_grn", "textures/makkon_concrete/conc_t08_grn"},
{"textures/conc_t08_gry1", "textures/makkon_concrete/conc_t08_gry1"},
{"textures/conc_t08_gry2", "textures/makkon_concrete/conc_t08_gry2"},
{"textures/conc_t08_gry3", "textures/makkon_concrete/conc_t08_gry3"},
{"textures/conc_t08_pink", "textures/makkon_concrete/conc_t08_pink"},
{"textures/conc_t08_red", "textures/makkon_concrete/conc_t08_red"},
{"textures/conc_t08_red2", "textures/makkon_concrete/conc_t08_red2"},
{"textures/conc_t08_teal", "textures/makkon_concrete/conc_t08_teal"},
{"textures/conc_t08_wht", "textures/makkon_concrete/conc_t08_wht"},
{"textures/conc_t08_ylw", "textures/makkon_concrete/conc_t08_ylw"},
{"textures/conc_t09_blk", "textures/makkon_concrete/conc_t09_blk"},
{"textures/conc_t09_blu", "textures/makkon_concrete/conc_t09_blu"},
{"textures/conc_t09_brwn", "textures/makkon_concrete/conc_t09_brwn"},
{"textures/conc_t09_grn", "textures/makkon_concrete/conc_t09_grn"},
{"textures/conc_t09_gry1", "textures/makkon_concrete/conc_t09_gry1"},
{"textures/conc_t09_gry2", "textures/makkon_concrete/conc_t09_gry2"},
{"textures/conc_t09_gry3", "textures/makkon_concrete/conc_t09_gry3"},
{"textures/conc_t09_pink", "textures/makkon_concrete/conc_t09_pink"},
{"textures/conc_t09_red", "textures/makkon_concrete/conc_t09_red"},
{"textures/conc_t09_red2", "textures/makkon_concrete/conc_t09_red2"},
{"textures/conc_t09_teal", "textures/makkon_concrete/conc_t09_teal"},
{"textures/conc_t09_wht", "textures/makkon_concrete/conc_t09_wht"},
{"textures/conc_t09_ylw", "textures/makkon_concrete/conc_t09_ylw"},
{"textures/conc_w01_blk", "textures/makkon_concrete/conc_w01_blk"},
{"textures/conc_w01_blu", "textures/makkon_concrete/conc_w01_blu"},
{"textures/conc_w01_brwn", "textures/makkon_concrete/conc_w01_brwn"},
{"textures/conc_w01_grn", "textures/makkon_concrete/conc_w01_grn"},
{"textures/conc_w01_gry1", "textures/makkon_concrete/conc_w01_gry1"},
{"textures/conc_w01_gry2", "textures/makkon_concrete/conc_w01_gry2"},
{"textures/conc_w01_gry3", "textures/makkon_concrete/conc_w01_gry3"},
{"textures/conc_w01_pink", "textures/makkon_concrete/conc_w01_pink"},
{"textures/conc_w01_red", "textures/makkon_concrete/conc_w01_red"},
{"textures/conc_w01_red2", "textures/makkon_concrete/conc_w01_red2"},
{"textures/conc_w01_teal", "textures/makkon_concrete/conc_w01_teal"},
{"textures/conc_w01_wht", "textures/makkon_concrete/conc_w01_wht"},
{"textures/conc_w01_ylw", "textures/makkon_concrete/conc_w01_ylw"},
{"textures/conc_w02_blk", "textures/makkon_concrete/conc_w02_blk"},
{"textures/conc_w02_blu", "textures/makkon_concrete/conc_w02_blu"},
{"textures/conc_w02_brwn", "textures/makkon_concrete/conc_w02_brwn"},
{"textures/conc_w02_grn", "textures/makkon_concrete/conc_w02_grn"},
{"textures/conc_w02_gry1", "textures/makkon_concrete/conc_w02_gry1"},
{"textures/conc_w02_gry2", "textures/makkon_concrete/conc_w02_gry2"},
{"textures/conc_w02_gry3", "textures/makkon_concrete/conc_w02_gry3"},
{"textures/conc_w02_pink", "textures/makkon_concrete/conc_w02_pink"},
{"textures/conc_w02_red", "textures/makkon_concrete/conc_w02_red"},
{"textures/conc_w02_red2", "textures/makkon_concrete/conc_w02_red2"},
{"textures/conc_w02_teal", "textures/makkon_concrete/conc_w02_teal"},
{"textures/conc_w02_wht", "textures/makkon_concrete/conc_w02_wht"},
{"textures/conc_w02_ylw", "textures/makkon_concrete/conc_w02_ylw"},
{"textures/conc_w03_blk", "textures/makkon_concrete/conc_w03_blk"},
{"textures/conc_w03_blu", "textures/makkon_concrete/conc_w03_blu"},
{"textures/conc_w03_brwn", "textures/makkon_concrete/conc_w03_brwn"},
{"textures/conc_w03_grn", "textures/makkon_concrete/conc_w03_grn"},
{"textures/conc_w03_gry1", "textures/makkon_concrete/conc_w03_gry1"},
{"textures/conc_w03_gry2", "textures/makkon_concrete/conc_w03_gry2"},
{"textures/conc_w03_gry3", "textures/makkon_concrete/conc_w03_gry3"},
{"textures/conc_w03_pink", "textures/makkon_concrete/conc_w03_pink"},
{"textures/conc_w03_red", "textures/makkon_concrete/conc_w03_red"},
{"textures/conc_w03_red2", "textures/makkon_concrete/conc_w03_red2"},
{"textures/conc_w03_teal", "textures/makkon_concrete/conc_w03_teal"},
{"textures/conc_w03_wht", "textures/makkon_concrete/conc_w03_wht"},
{"textures/conc_w03_ylw", "textures/makkon_concrete/conc_w03_ylw"},
{"textures/conc_w04_blk", "textures/makkon_concrete/conc_w04_blk"},
{"textures/conc_w04_blu", "textures/makkon_concrete/conc_w04_blu"},
{"textures/conc_w04_brwn", "textures/makkon_concrete/conc_w04_brwn"},
{"textures/conc_w04_grn", "textures/makkon_concrete/conc_w04_grn"},
{"textures/conc_w04_gry1", "textures/makkon_concrete/conc_w04_gry1"},
{"textures/conc_w04_gry2", "textures/makkon_concrete/conc_w04_gry2"},
{"textures/conc_w04_gry3", "textures/makkon_concrete/conc_w04_gry3"},
{"textures/conc_w04_pink", "textures/makkon_concrete/conc_w04_pink"},
{"textures/conc_w04_red", "textures/makkon_concrete/conc_w04_red"},
{"textures/conc_w04_red2", "textures/makkon_concrete/conc_w04_red2"},
{"textures/conc_w04_teal", "textures/makkon_concrete/conc_w04_teal"},
{"textures/conc_w04_wht", "textures/makkon_concrete/conc_w04_wht"},
{"textures/conc_w04_ylw", "textures/makkon_concrete/conc_w04_ylw"},
{"textures/conc_w05_blk", "textures/makkon_concrete/conc_w05_blk"},
{"textures/conc_w05_blu", "textures/makkon_concrete/conc_w05_blu"},
{"textures/conc_w05_brwn", "textures/makkon_concrete/conc_w05_brwn"},
{"textures/conc_w05_grn", "textures/makkon_concrete/conc_w05_grn"},
{"textures/conc_w05_gry1", "textures/makkon_concrete/conc_w05_gry1"},
{"textures/conc_w05_gry2", "textures/makkon_concrete/conc_w05_gry2"},
{"textures/conc_w05_gry3", "textures/makkon_concrete/conc_w05_gry3"},
{"textures/conc_w05_pink", "textures/makkon_concrete/conc_w05_pink"},
{"textures/conc_w05_red", "textures/makkon_concrete/conc_w05_red"},
{"textures/conc_w05_red2", "textures/makkon_concrete/conc_w05_red2"},
{"textures/conc_w05_teal", "textures/makkon_concrete/conc_w05_teal"},
{"textures/conc_w05_wht", "textures/makkon_concrete/conc_w05_wht"},
{"textures/conc_w05_ylw", "textures/makkon_concrete/conc_w05_ylw"},
{"textures/conc_w06_blk", "textures/makkon_concrete/conc_w06_blk"},
{"textures/conc_w06_blu", "textures/makkon_concrete/conc_w06_blu"},
{"textures/conc_w06_brwn", "textures/makkon_concrete/conc_w06_brwn"},
{"textures/conc_w06_grn", "textures/makkon_concrete/conc_w06_grn"},
{"textures/conc_w06_gry1", "textures/makkon_concrete/conc_w06_gry1"},
{"textures/conc_w06_gry2", "textures/makkon_concrete/conc_w06_gry2"},
{"textures/conc_w06_gry3", "textures/makkon_concrete/conc_w06_gry3"},
{"textures/conc_w06_pink", "textures/makkon_concrete/conc_w06_pink"},
{"textures/conc_w06_red", "textures/makkon_concrete/conc_w06_red"},
{"textures/conc_w06_red2", "textures/makkon_concrete/conc_w06_red2"},
{"textures/conc_w06_teal", "textures/makkon_concrete/conc_w06_teal"},
{"textures/conc_w06_wht", "textures/makkon_concrete/conc_w06_wht"},
{"textures/conc_w06_ylw", "textures/makkon_concrete/conc_w06_ylw"},
{"textures/conc_w07_blk", "textures/makkon_concrete/conc_w07_blk"},
{"textures/conc_w07_blu", "textures/makkon_concrete/conc_w07_blu"},
{"textures/conc_w07_brwn", "textures/makkon_concrete/conc_w07_brwn"},
{"textures/conc_w07_grn", "textures/makkon_concrete/conc_w07_grn"},
{"textures/conc_w07_gry1", "textures/makkon_concrete/conc_w07_gry1"},
{"textures/conc_w07_gry2", "textures/makkon_concrete/conc_w07_gry2"},
{"textures/conc_w07_gry3", "textures/makkon_concrete/conc_w07_gry3"},
{"textures/conc_w07_pink", "textures/makkon_concrete/conc_w07_pink"},
{"textures/conc_w07_red", "textures/makkon_concrete/conc_w07_red"},
{"textures/conc_w07_red2", "textures/makkon_concrete/conc_w07_red2"},
{"textures/conc_w07_teal", "textures/makkon_concrete/conc_w07_teal"},
{"textures/conc_w07_wht", "textures/makkon_concrete/conc_w07_wht"},
{"textures/conc_w07_ylw", "textures/makkon_concrete/conc_w07_ylw"},
{"textures/conc_w08_blk", "textures/makkon_concrete/conc_w08_blk"},
{"textures/conc_w08_blu", "textures/makkon_concrete/conc_w08_blu"},
{"textures/conc_w08_brwn", "textures/makkon_concrete/conc_w08_brwn"},
{"textures/conc_w08_grn", "textures/makkon_concrete/conc_w08_grn"},
{"textures/conc_w08_gry1", "textures/makkon_concrete/conc_w08_gry1"},
{"textures/conc_w08_gry2", "textures/makkon_concrete/conc_w08_gry2"},
{"textures/conc_w08_gry3", "textures/makkon_concrete/conc_w08_gry3"},
{"textures/conc_w08_pink", "textures/makkon_concrete/conc_w08_pink"},
{"textures/conc_w08_red", "textures/makkon_concrete/conc_w08_red"},
{"textures/conc_w08_red2", "textures/makkon_concrete/conc_w08_red2"},
{"textures/conc_w08_teal", "textures/makkon_concrete/conc_w08_teal"},
{"textures/conc_w08_wht", "textures/makkon_concrete/conc_w08_wht"},
{"textures/conc_w08_ylw", "textures/makkon_concrete/conc_w08_ylw"},
{"textures/conc_w09_blk", "textures/makkon_concrete/conc_w09_blk"},
{"textures/conc_w09_blu", "textures/makkon_concrete/conc_w09_blu"},
{"textures/conc_w09_brwn", "textures/makkon_concrete/conc_w09_brwn"},
{"textures/conc_w09_grn", "textures/makkon_concrete/conc_w09_grn"},
{"textures/conc_w09_gry1", "textures/makkon_concrete/conc_w09_gry1"},
{"textures/conc_w09_gry2", "textures/makkon_concrete/conc_w09_gry2"},
{"textures/conc_w09_gry3", "textures/makkon_concrete/conc_w09_gry3"},
{"textures/conc_w09_pink", "textures/makkon_concrete/conc_w09_pink"},
{"textures/conc_w09_red", "textures/makkon_concrete/conc_w09_red"},
{"textures/conc_w09_red2", "textures/makkon_concrete/conc_w09_red2"},
{"textures/conc_w09_teal", "textures/makkon_concrete/conc_w09_teal"},
{"textures/conc_w09_wht", "textures/makkon_concrete/conc_w09_wht"},
{"textures/conc_w09_ylw", "textures/makkon_concrete/conc_w09_ylw"},
{"textures/conc_w10_blk", "textures/makkon_concrete/conc_w10_blk"},
{"textures/conc_w10_blu", "textures/makkon_concrete/conc_w10_blu"},
{"textures/conc_w10_brwn", "textures/makkon_concrete/conc_w10_brwn"},
{"textures/conc_w10_grn", "textures/makkon_concrete/conc_w10_grn"},
{"textures/conc_w10_gry1", "textures/makkon_concrete/conc_w10_gry1"},
{"textures/conc_w10_gry2", "textures/makkon_concrete/conc_w10_gry2"},
{"textures/conc_w10_gry3", "textures/makkon_concrete/conc_w10_gry3"},
{"textures/conc_w10_pink", "textures/makkon_concrete/conc_w10_pink"},
{"textures/conc_w10_red", "textures/makkon_concrete/conc_w10_red"},
{"textures/conc_w10_red2", "textures/makkon_concrete/conc_w10_red2"},
{"textures/conc_w10_teal", "textures/makkon_concrete/conc_w10_teal"},
{"textures/conc_w10_wht", "textures/makkon_concrete/conc_w10_wht"},
{"textures/conc_w10_ylw", "textures/makkon_concrete/conc_w10_ylw"},
{"textures/conc_w11_blk", "textures/makkon_concrete/conc_w11_blk"},
{"textures/conc_w11_blu", "textures/makkon_concrete/conc_w11_blu"},
{"textures/conc_w11_brwn", "textures/makkon_concrete/conc_w11_brwn"},
{"textures/conc_w11_grn", "textures/makkon_concrete/conc_w11_grn"},
{"textures/conc_w11_gry1", "textures/makkon_concrete/conc_w11_gry1"},
{"textures/conc_w11_gry2", "textures/makkon_concrete/conc_w11_gry2"},
{"textures/conc_w11_gry3", "textures/makkon_concrete/conc_w11_gry3"},
{"textures/conc_w11_pink", "textures/makkon_concrete/conc_w11_pink"},
{"textures/conc_w11_red", "textures/makkon_concrete/conc_w11_red"},
{"textures/conc_w11_red2", "textures/makkon_concrete/conc_w11_red2"},
{"textures/conc_w11_teal", "textures/makkon_concrete/conc_w11_teal"},
{"textures/conc_w11_wht", "textures/makkon_concrete/conc_w11_wht"},
{"textures/conc_w11_ylw", "textures/makkon_concrete/conc_w11_ylw"},
{"textures/conc_w12_blk", "textures/makkon_concrete/conc_w12_blk"},
{"textures/conc_w12_blu", "textures/makkon_concrete/conc_w12_blu"},
{"textures/conc_w12_brwn", "textures/makkon_concrete/conc_w12_brwn"},
{"textures/conc_w12_grn", "textures/makkon_concrete/conc_w12_grn"},
{"textures/conc_w12_gry1", "textures/makkon_concrete/conc_w12_gry1"},
{"textures/conc_w12_gry2", "textures/makkon_concrete/conc_w12_gry2"},
{"textures/conc_w12_gry3", "textures/makkon_concrete/conc_w12_gry3"},
{"textures/conc_w12_pink", "textures/makkon_concrete/conc_w12_pink"},
{"textures/conc_w12_red", "textures/makkon_concrete/conc_w12_red"},
{"textures/conc_w12_red2", "textures/makkon_concrete/conc_w12_red2"},
{"textures/conc_w12_teal", "textures/makkon_concrete/conc_w12_teal"},
{"textures/conc_w12_wht", "textures/makkon_concrete/conc_w12_wht"},
{"textures/conc_w12_ylw", "textures/makkon_concrete/conc_w12_ylw"},
{"textures/conc_w13_blk", "textures/makkon_concrete/conc_w13_blk"},
{"textures/conc_w13_blu", "textures/makkon_concrete/conc_w13_blu"},
{"textures/conc_w13_brwn", "textures/makkon_concrete/conc_w13_brwn"},
{"textures/conc_w13_grn", "textures/makkon_concrete/conc_w13_grn"},
{"textures/conc_w13_gry1", "textures/makkon_concrete/conc_w13_gry1"},
{"textures/conc_w13_gry2", "textures/makkon_concrete/conc_w13_gry2"},
{"textures/conc_w13_gry3", "textures/makkon_concrete/conc_w13_gry3"},
{"textures/conc_w13_pink", "textures/makkon_concrete/conc_w13_pink"},
{"textures/conc_w13_red", "textures/makkon_concrete/conc_w13_red"},
{"textures/conc_w13_red2", "textures/makkon_concrete/conc_w13_red2"},
{"textures/conc_w13_teal", "textures/makkon_concrete/conc_w13_teal"},
{"textures/conc_w13_wht", "textures/makkon_concrete/conc_w13_wht"},
{"textures/conc_w13_ylw", "textures/makkon_concrete/conc_w13_ylw"},
{"textures/conc_w14_blk", "textures/makkon_concrete/conc_w14_blk"},
{"textures/conc_w14_blu", "textures/makkon_concrete/conc_w14_blu"},
{"textures/conc_w14_brwn", "textures/makkon_concrete/conc_w14_brwn"},
{"textures/conc_w14_grn", "textures/makkon_concrete/conc_w14_grn"},
{"textures/conc_w14_gry1", "textures/makkon_concrete/conc_w14_gry1"},
{"textures/conc_w14_gry2", "textures/makkon_concrete/conc_w14_gry2"},
{"textures/conc_w14_gry3", "textures/makkon_concrete/conc_w14_gry3"},
{"textures/conc_w14_pink", "textures/makkon_concrete/conc_w14_pink"},
{"textures/conc_w14_red", "textures/makkon_concrete/conc_w14_red"},
{"textures/conc_w14_red2", "textures/makkon_concrete/conc_w14_red2"},
{"textures/conc_w14_teal", "textures/makkon_concrete/conc_w14_teal"},
{"textures/conc_w14_wht", "textures/makkon_concrete/conc_w14_wht"},
{"textures/conc_w14_ylw", "textures/makkon_concrete/conc_w14_ylw"},
{"textures/conc_w_15_blk", "textures/makkon_concrete/conc_w_15_blk"},
{"textures/conc_w_15_blu", "textures/makkon_concrete/conc_w_15_blu"},
{"textures/conc_w_15_brwn", "textures/makkon_concrete/conc_w_15_brwn"},
{"textures/conc_w_15_grn", "textures/makkon_concrete/conc_w_15_grn"},
{"textures/conc_w_15_gry1", "textures/makkon_concrete/conc_w_15_gry1"},
{"textures/conc_w_15_gry2", "textures/makkon_concrete/conc_w_15_gry2"},
{"textures/conc_w_15_gry3", "textures/makkon_concrete/conc_w_15_gry3"},
{"textures/conc_w_15_pink", "textures/makkon_concrete/conc_w_15_pink"},
{"textures/conc_w_15_red", "textures/makkon_concrete/conc_w_15_red"},
{"textures/conc_w_15_red2", "textures/makkon_concrete/conc_w_15_red2"},
{"textures/conc_w_15_teal", "textures/makkon_concrete/conc_w_15_teal"},
{"textures/conc_w_15_wht", "textures/makkon_concrete/conc_w_15_wht"},
{"textures/conc_w_15_ylw", "textures/makkon_concrete/conc_w_15_ylw"},
{"textures/conc_w_16_blk", "textures/makkon_concrete/conc_w_16_blk"},
{"textures/conc_w_16_blu", "textures/makkon_concrete/conc_w_16_blu"},
{"textures/conc_w_16_brwn", "textures/makkon_concrete/conc_w_16_brwn"},
{"textures/conc_w_16_grn", "textures/makkon_concrete/conc_w_16_grn"},
{"textures/conc_w_16_gry1", "textures/makkon_concrete/conc_w_16_gry1"},
{"textures/conc_w_16_gry2", "textures/makkon_concrete/conc_w_16_gry2"},
{"textures/conc_w_16_gry3", "textures/makkon_concrete/conc_w_16_gry3"},
{"textures/conc_w_16_pink", "textures/makkon_concrete/conc_w_16_pink"},
{"textures/conc_w_16_red", "textures/makkon_concrete/conc_w_16_red"},
{"textures/conc_w_16_red2", "textures/makkon_concrete/conc_w_16_red2"},
{"textures/conc_w_16_teal", "textures/makkon_concrete/conc_w_16_teal"},
{"textures/conc_w_16_wht", "textures/makkon_concrete/conc_w_16_wht"},
{"textures/conc_w_16_ylw", "textures/makkon_concrete/conc_w_16_ylw"},
{"textures/conc_w_17_blk", "textures/makkon_concrete/conc_w_17_blk"},
{"textures/conc_w_17_blu", "textures/makkon_concrete/conc_w_17_blu"},
{"textures/conc_w_17_brwn", "textures/makkon_concrete/conc_w_17_brwn"},
{"textures/conc_w_17_grn", "textures/makkon_concrete/conc_w_17_grn"},
{"textures/conc_w_17_gry1", "textures/makkon_concrete/conc_w_17_gry1"},
{"textures/conc_w_17_gry2", "textures/makkon_concrete/conc_w_17_gry2"},
{"textures/conc_w_17_gry3", "textures/makkon_concrete/conc_w_17_gry3"},
{"textures/conc_w_17_pink", "textures/makkon_concrete/conc_w_17_pink"},
{"textures/conc_w_17_red", "textures/makkon_concrete/conc_w_17_red"},
{"textures/conc_w_17_red2", "textures/makkon_concrete/conc_w_17_red2"},
{"textures/conc_w_17_teal", "textures/makkon_concrete/conc_w_17_teal"},
{"textures/conc_w_17_wht", "textures/makkon_concrete/conc_w_17_wht"},
{"textures/conc_w_17_ylw", "textures/makkon_concrete/conc_w_17_ylw"},
{"textures/_conc_d01_brwn", "textures/makkon_concrete/_conc_d01_brwn"},
{"textures/_conc_d01_gry1", "textures/makkon_concrete/_conc_d01_gry1"},
{"textures/_conc_d01_gry2", "textures/makkon_concrete/_conc_d01_gry2"},
{"textures/_conc_d01_gry3", "textures/makkon_concrete/_conc_d01_gry3"},
{"textures/_conc_d01_rebar", "textures/makkon_concrete/_conc_d01_rebar"},
{"textures/_conc_d02_brwn", "textures/makkon_concrete/_conc_d02_brwn"},
{"textures/_conc_d02_gry1", "textures/makkon_concrete/_conc_d02_gry1"},
{"textures/_conc_d02_gry2", "textures/makkon_concrete/_conc_d02_gry2"},
{"textures/_conc_d02_gry3", "textures/makkon_concrete/_conc_d02_gry3"},
{"textures/_conc_d02_rebar", "textures/makkon_concrete/_conc_d02_rebar"},
{"textures/_conc_d03_brwn", "textures/makkon_concrete/_conc_d03_brwn"},
{"textures/_conc_d03_gry1", "textures/makkon_concrete/_conc_d03_gry1"},
{"textures/_conc_d03_gry2", "textures/makkon_concrete/_conc_d03_gry2"},
{"textures/_conc_d03_gry3", "textures/makkon_concrete/_conc_d03_gry3"},
{"textures/_conc_d04_brwn", "textures/makkon_concrete/_conc_d04_brwn"},
{"textures/_conc_d04_gry1", "textures/makkon_concrete/_conc_d04_gry1"},
{"textures/_conc_d04_gry2", "textures/makkon_concrete/_conc_d04_gry2"},
{"textures/_conc_d04_gry3", "textures/makkon_concrete/_conc_d04_gry3"},
{"textures/_conc_d05_brwn", "textures/makkon_concrete/_conc_d05_brwn"},
{"textures/_conc_d05_gry1", "textures/makkon_concrete/_conc_d05_gry1"},
{"textures/_conc_d05_gry2", "textures/makkon_concrete/_conc_d05_gry2"},
{"textures/_conc_d05_gry3", "textures/makkon_concrete/_conc_d05_gry3"},
{"textures/_conc_d06_brwn", "textures/makkon_concrete/_conc_d06_brwn"},
{"textures/_conc_d06_gry1", "textures/makkon_concrete/_conc_d06_gry1"},
{"textures/_conc_d06_gry2", "textures/makkon_concrete/_conc_d06_gry2"},
{"textures/_conc_d06_gry3", "textures/makkon_concrete/_conc_d06_gry3"},
{"textures/_conc_d07_brwn", "textures/makkon_concrete/_conc_d07_brwn"},
{"textures/_conc_d07_gry1", "textures/makkon_concrete/_conc_d07_gry1"},
{"textures/_conc_d07_gry2", "textures/makkon_concrete/_conc_d07_gry2"},
{"textures/_conc_d07_gry3", "textures/makkon_concrete/_conc_d07_gry3"},
{"textures/_conc_d08_brwn", "textures/makkon_concrete/_conc_d08_brwn"},
{"textures/_conc_d08_gry1", "textures/makkon_concrete/_conc_d08_gry1"},
{"textures/_conc_d08_gry2", "textures/makkon_concrete/_conc_d08_gry2"},
{"textures/_conc_d08_gry3", "textures/makkon_concrete/_conc_d08_gry3"},
// TODO add more wads like Makkon et cetera
};

View file

@ -245,6 +245,7 @@ typedef enum
CF_2D, // not a cube map
CF_NATIVE, // _px, _nx, _py, etc, directly sent to GL
CF_CAMERA, // _forward, _back, etc, rotated and flipped as needed before sending to GL
CF_QUAKE1, // _ft, _bk, etc, rotated and flipped as needed before sending to GL
CF_PANORAMA, // TODO latlong encoded HDRI panorama typically used by Substance or Blender
CF_2D_ARRAY, // not a cube map but not a single 2d texture either
CF_2D_PACKED_MIPCHAIN, // usually 2d but can be an octahedron, packed mipmaps into single 2d texture atlas and limited to dim^2

View file

@ -1518,6 +1518,9 @@ Loads six files with proper extensions
bool R_LoadCubeImages( const char* imgName, cubeFiles_t extensions, byte* pics[6], int* outSize, ID_TIME_T* timestamp, int cubeMapSize )
{
int i, j;
const char* quakeSides[6] = { "_ft.tga", "_bk.tga", "_lf.tga", "_rt.tga",
"_up.tga", "_dn.tga"
};
const char* cameraSides[6] = { "_forward.tga", "_back.tga", "_left.tga", "_right.tga",
"_up.tga", "_down.tga"
};
@ -1532,6 +1535,10 @@ bool R_LoadCubeImages( const char* imgName, cubeFiles_t extensions, byte* pics[6
{
sides = cameraSides;
}
else if( extensions == CF_QUAKE1 )
{
sides = quakeSides;
}
else
{
sides = axisSides;

View file

@ -332,7 +332,7 @@ void idImage::ActuallyLoadImage( bool fromBackEnd )
{
opts.textureType = TT_2D_ARRAY;
}
else if( cubeFiles == CF_NATIVE || cubeFiles == CF_CAMERA || cubeFiles == CF_SINGLE )
else if( cubeFiles == CF_NATIVE || cubeFiles == CF_CAMERA || cubeFiles == CF_QUAKE1 || cubeFiles == CF_SINGLE )
{
opts.textureType = TT_CUBIC;
repeat = TR_CLAMP;
@ -469,7 +469,7 @@ void idImage::ActuallyLoadImage( bool fromBackEnd )
//else if( toolUsage )
// binarizeReason = va( "binarize: tool usage '%s'", generatedName.c_str() );
if( cubeFiles == CF_NATIVE || cubeFiles == CF_CAMERA || cubeFiles == CF_SINGLE )
if( cubeFiles == CF_NATIVE || cubeFiles == CF_CAMERA || cubeFiles == CF_QUAKE1 || cubeFiles == CF_SINGLE )
{
int size;
byte* pics[6];
@ -774,7 +774,7 @@ void idImage::Reload( bool force )
if( !force )
{
ID_TIME_T current;
if( cubeFiles == CF_NATIVE || cubeFiles == CF_CAMERA || cubeFiles == CF_SINGLE )
if( cubeFiles == CF_NATIVE || cubeFiles == CF_CAMERA || cubeFiles == CF_QUAKE1 || cubeFiles == CF_SINGLE )
{
R_LoadCubeImages( imgName, cubeFiles, NULL, NULL, &current );
}

View file

@ -1275,6 +1275,11 @@ void idMaterial::ParseFragmentMap( idLexer& src, newShaderStage_t* newStage )
cubeMap = CF_CAMERA;
continue;
}
if( !token.Icmp( "quakeCubeMap" ) )
{
cubeMap = CF_QUAKE1;
continue;
}
if( !token.Icmp( "cubeMapSingle" ) )
{
cubeMap = CF_SINGLE;
@ -1812,6 +1817,14 @@ void idMaterial::ParseStage( idLexer& src, const textureRepeat_t trpDefault )
continue;
}
if( !token.Icmp( "quakeCubeMap" ) )
{
str = R_ParsePastImageProgram( src );
idStr::Copynz( imageName, str, sizeof( imageName ) );
cubeMap = CF_QUAKE1;
continue;
}
if( !token.Icmp( "ignoreAlphaTest" ) )
{
ss->ignoreAlphaTest = true;