diff --git a/FLARDATA/Textures/NormalMaps/DX9/Alien_organic000.dds.dds b/DX9/Alien_organic000.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/Alien_organic000.dds.dds rename to DX9/Alien_organic000.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/K_panel02.TGA.dds b/DX9/K_panel02.TGA.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/K_panel02.TGA.dds rename to DX9/K_panel02.TGA.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/STADTL1_256.tga.dds b/DX9/STADTL1_256.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/STADTL1_256.tga.dds rename to DX9/STADTL1_256.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/STADTL3_256.TGA.dds b/DX9/STADTL3_256.TGA.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/STADTL3_256.TGA.dds rename to DX9/STADTL3_256.TGA.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/ast_ice01_outside.dds.dds b/DX9/ast_ice01_outside.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/ast_ice01_outside.dds.dds rename to DX9/ast_ice01_outside.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/ast_icecrystal.tga.dds b/DX9/ast_icecrystal.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/ast_icecrystal.tga.dds rename to DX9/ast_icecrystal.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bad_obsidian.tga.dds b/DX9/bad_obsidian.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bad_obsidian.tga.dds rename to DX9/bad_obsidian.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_lt_albedo.dds.dds b/DX9/bhvhf01_eng_in_lt_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_lt_albedo.dds.dds rename to DX9/bhvhf01_eng_in_lt_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_lt_lod1_albedo.dds.dds b/DX9/bhvhf01_eng_in_lt_lod1_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_lt_lod1_albedo.dds.dds rename to DX9/bhvhf01_eng_in_lt_lod1_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_rt_albedo.dds.dds b/DX9/bhvhf01_eng_in_rt_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_rt_albedo.dds.dds rename to DX9/bhvhf01_eng_in_rt_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_rt_lod1_albedo.dds.dds b/DX9/bhvhf01_eng_in_rt_lod1_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_eng_in_rt_lod1_albedo.dds.dds rename to DX9/bhvhf01_eng_in_rt_lod1_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb1_albedo.dds.dds b/DX9/bhvhf01_turb1_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb1_albedo.dds.dds rename to DX9/bhvhf01_turb1_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb1_lod1_albedo.dds.dds b/DX9/bhvhf01_turb1_lod1_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb1_lod1_albedo.dds.dds rename to DX9/bhvhf01_turb1_lod1_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb2_albedo.dds.dds b/DX9/bhvhf01_turb2_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb2_albedo.dds.dds rename to DX9/bhvhf01_turb2_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb2_lod1_albedo.dds.dds b/DX9/bhvhf01_turb2_lod1_albedo.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/bhvhf01_turb2_lod1_albedo.dds.dds rename to DX9/bhvhf01_turb2_lod1_albedo.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/g_fighter01.TGA.dds b/DX9/g_fighter01.TGA.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/g_fighter01.TGA.dds rename to DX9/g_fighter01.TGA.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/g_fighter01.TGA.png b/DX9/g_fighter01.TGA.png similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/g_fighter01.TGA.png rename to DX9/g_fighter01.TGA.png diff --git a/FLARDATA/Textures/NormalMaps/DX9/ice asteroid.tga.dds b/DX9/ice asteroid.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/ice asteroid.tga.dds rename to DX9/ice asteroid.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/ice_block.dds.dds b/DX9/ice_block.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/ice_block.dds.dds rename to DX9/ice_block.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/ice_block.tga.dds b/DX9/ice_block.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/ice_block.tga.dds rename to DX9/ice_block.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/ice_carbon.tga.dds b/DX9/ice_carbon.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/ice_carbon.tga.dds rename to DX9/ice_carbon.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/lavastroid.tga.dds b/DX9/lavastroid.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/lavastroid.tga.dds rename to DX9/lavastroid.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/m_hatch01.dds.dds b/DX9/m_hatch01.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/m_hatch01.dds.dds rename to DX9/m_hatch01.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/m_panels.dds.dds b/DX9/m_panels.dds.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/m_panels.dds.dds rename to DX9/m_panels.dds.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/mineable.tga.dds b/DX9/mineable.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/mineable.tga.dds rename to DX9/mineable.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/mineable_beryl.tga.dds b/DX9/mineable_beryl.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/mineable_beryl.tga.dds rename to DX9/mineable_beryl.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/mineable_plain.tga.dds b/DX9/mineable_plain.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/mineable_plain.tga.dds rename to DX9/mineable_plain.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/minedout.tga.dds b/DX9/minedout.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/minedout.tga.dds rename to DX9/minedout.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/nomad_01.tga.dds b/DX9/nomad_01.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/nomad_01.tga.dds rename to DX9/nomad_01.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/rock3c.tga.dds b/DX9/rock3c.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/rock3c.tga.dds rename to DX9/rock3c.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/uranium_tile.tga.dds b/DX9/uranium_tile.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/uranium_tile.tga.dds rename to DX9/uranium_tile.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/DX9/uranium_tile1.tga.dds b/DX9/uranium_tile1.tga.dds similarity index 100% rename from FLARDATA/Textures/NormalMaps/DX9/uranium_tile1.tga.dds rename to DX9/uranium_tile1.tga.dds diff --git a/FLARDATA/Textures/NormalMaps/K_panel02.TGA.dds b/FLARDATA/Textures/NormalMaps/K_panel02.TGA.dds deleted file mode 100644 index f30e42df..00000000 Binary files a/FLARDATA/Textures/NormalMaps/K_panel02.TGA.dds and /dev/null differ diff --git a/FLARDATA/Textures/NormalMaps/backup/STADTL1_256.tga.dds b/FLARDATA/Textures/NormalMaps/backup/STADTL1_256.tga.dds deleted file mode 100644 index cdf79248..00000000 Binary files a/FLARDATA/Textures/NormalMaps/backup/STADTL1_256.tga.dds and /dev/null differ diff --git a/FLARDATA/Textures/NormalMaps/backup/g_fighter01.TGA.dds b/FLARDATA/Textures/NormalMaps/backup/g_fighter01.TGA.dds deleted file mode 100644 index dd2481a5..00000000 Binary files a/FLARDATA/Textures/NormalMaps/backup/g_fighter01.TGA.dds and /dev/null differ diff --git a/FLARDATA/Textures/NormalMaps/bad_obsidian.tga.dds b/FLARDATA/Textures/NormalMaps/bad_obsidian.tga.dds index 6863cec8..658488b7 100644 Binary files a/FLARDATA/Textures/NormalMaps/bad_obsidian.tga.dds and b/FLARDATA/Textures/NormalMaps/bad_obsidian.tga.dds differ diff --git a/FLARDATA/materials.json b/FLARDATA/materials.json index 8d1c3f6e..18129a71 100644 --- a/FLARDATA/materials.json +++ b/FLARDATA/materials.json @@ -9,12 +9,20 @@ "TextureNames": [ "atmosphere", "cratermoon", + "mercury_side", + "desert_clouds_cap1", + "desert_clouds_cap2", + "desert_clouds_side", + "desert_red_single", + "desert_rock_single", + "desert_rock_cap", "desert_clouds_01", "desert_clouds_02", "desert_clouds_cap", "desert_med_01", "desert_med_02", "desert_med_cap", + "desert_med_new", "desert_red_01", "desert_red_02", "desert_red_cap", @@ -35,17 +43,20 @@ "earthcity01", "earthcity02", "earthcitycap", + "earthcity_new", "earthgaia", "earthgaiacap", "earthgrncld01", "earthgrncld02", "earthgrncldcap", + "earthlike_new", "earthlike01", "earthlike02", "earthlikecap", "earthsnwcld01", "earthsnwcld02", "earthsnwcldcap", + "earthsnwcld_side", "gasblucld01", "gasblucld02", "gasblucldcap", @@ -53,14 +64,23 @@ "gasgrncld01", "gasgrncld02", "gasgrncldcap", + "gasgrncld_single", "gasicecld", + "gasicecld_side", + "gasicecld_cap_top", + "gasicecld_cap_btm", + "gasorgcld_single", "gasorgcld01", "gasorgcld02", "gasorgcldcap", "gaspurcld01", "gaspurcld02", "gaspurcldcap", + "gaspur_single", "gasyelcld", + "gasyelcld_new_sides", + "gasyelcld_new_cap_top", + "gasyelcld_new_cap_btm", "greenwater01", "greenwater02", "greenwatercap", @@ -70,6 +90,10 @@ "icelndwat01", "icelndwat02", "icelndwatcap", + "icelndwat_cap", + "icelndwat_side", + "icewatcld_side", + "icemntcld_new", "icemntcld01", "icemntcld02", "icemntcldcap", @@ -83,6 +107,7 @@ "icewatind01", "icewatind02", "icewatindcap", + "icewatind_side", "icewhiteblue01", "icewhiteblue02", "icewhitebluecap", @@ -121,6 +146,9 @@ "NUPS_planet_scorpio01_side3.tga", "NUPS_planet_scorpio01_side4.tga", "NUPS_planet_scorpio01_top.tga", + "ocean_drkclds_cap1", + "ocean_drkclds_cap2", + "ocean_drkclds_single", "ocean_bluclds_01", "ocean_bluclds_02", "ocean_bluclds_cap", @@ -130,16 +158,22 @@ "ocean_blusmlcld_01", "ocean_blusmlcld_02", "ocean_blusmlcld_cap", + "ocean_blusmlcld_side", "ocean_drkclds_01", "ocean_drkclds_02", "ocean_drkclds_cap", "ocean_grnclds_01", "ocean_grnclds_02", "ocean_grnclds_cap", + "ocean_grnclds_side", "plutoside", + "rckbrn_cap1", + "rckbrn_cap2", + "rckbrn_single", "rckbrn_01", "rckbrn_02", "rckbrn_cap", + "rockdes", "rockdes_01", "rockdes_02", "rockdes_cap", @@ -1011,16 +1045,6 @@ "Roughness" : 0.4, "Metalness" : 0.9, "RoughnessTextureBias" : 0.03 - }, - { - "TextureNames": [ - "purple_crystal.dds", - "blue_crystal.dds", - "red_crystal.dds" - ], - "Roughness" : 0.1, - "Metalness" : 0.5, - "RoughnessTextureBias" : 0.8 }, { "TextureNames": [ @@ -1078,6 +1102,16 @@ "Metalness" : 0.0, "RoughnessTextureBias" : 0.5 }, + { + "TextureNames": [ + "purple_crystal.dds", + "blue_crystal.dds", + "red_crystal.dds" + ], + "Roughness" : 0.9, + "Metalness" : 0.9, + "RoughnessTextureBias" : 0.03 + }, { "TextureNames": [ "lavastroid.tga",