From 6d2e75e5e8d87e055419653f490a90e304b8cccc Mon Sep 17 00:00:00 2001 From: Shu Date: Fri, 29 Jan 2021 18:00:46 +0100 Subject: [PATCH] Textures update --- .gitignore | 2 +- README.md | 13 ++++--- .../1024-realistic/sky/Debug.cube.back.dds | 3 -- .../1024-realistic/sky/Debug.cube.bottom.dds | 3 -- .../1024-realistic/sky/Debug.cube.front.dds | 3 -- .../1024-realistic/sky/Debug.cube.left.dds | 3 -- .../1024-realistic/sky/Debug.cube.right.dds | 3 -- .../1024-realistic/sky/Debug.cube.top.dds | 3 -- .../sky/Space_orange.cube.back.dds | 3 -- .../sky/Space_orange.cube.bottom.dds | 3 -- .../sky/Space_orange.cube.front.dds | 3 -- .../sky/Space_orange.cube.left.dds | 3 -- .../sky/Space_orange.cube.right.dds | 3 -- .../sky/Space_orange.cube.top.dds | 3 -- .../sky/Space_tray.cube.back.dds | 3 -- .../sky/Space_tray.cube.bottom.dds | 3 -- .../sky/Space_tray.cube.front.dds | 3 -- .../sky/Space_tray.cube.left.dds | 3 -- .../sky/Space_tray.cube.right.dds | 3 -- .../sky/Space_tray.cube.top.dds | 3 -- .../textures/1024-realistic/terrain/Alien.dds | 3 -- .../1024-realistic/terrain/Alien.hos.dds | 3 -- .../1024-realistic/terrain/Alien.nrm.dds | 3 -- .../textures/1024-realistic/terrain/Debug.dds | 3 -- .../1024-realistic/terrain/Debug.hos.dds | 3 -- .../1024-realistic/terrain/Debug.nrm.dds | 3 -- .../textures/1024-realistic/terrain/Dirt.dds | 3 -- .../1024-realistic/terrain/Dirt.hos.dds | 3 -- .../1024-realistic/terrain/Dirt.nrm.dds | 3 -- .../1024-realistic/terrain/Forest_grass.dds | 3 -- .../terrain/Forest_grass.hos.dds | 3 -- .../terrain/Forest_grass.nrm.dds | 3 -- .../textures/1024-realistic/terrain/Grass.dds | 3 -- .../1024-realistic/terrain/Grass.hos.dds | 3 -- .../1024-realistic/terrain/Grass.nrm.dds | 3 -- .../textures/1024-realistic/terrain/Mapl.dds | 3 -- .../1024-realistic/terrain/Mapl.hos.dds | 3 -- .../1024-realistic/terrain/Mapl.nrm.dds | 3 -- .../1024-realistic/terrain/Plain_grass.dds | 3 -- .../terrain/Plain_grass.hos.dds | 3 -- .../terrain/Plain_grass.nrm.dds | 3 -- .../1024-realistic/terrain/Rough_rock.dds | 3 -- .../1024-realistic/terrain/Rough_rock.hos.dds | 3 -- .../1024-realistic/terrain/Rough_rock.nrm.dds | 3 -- .../textures/1024-realistic/terrain/Sand.dds | 3 -- .../1024-realistic/terrain/Sand.hos.dds | 3 -- .../1024-realistic/terrain/Sand.nrm.dds | 3 -- .../1024-realistic/terrain/Seaside_rock.dds | 3 -- .../terrain/Seaside_rock.hos.dds | 3 -- .../terrain/Seaside_rock.nrm.dds | 3 -- .../1024-realistic/terrain/Stone_path.dds | 3 -- .../1024-realistic/terrain/Stone_path.hos.dds | 3 -- .../1024-realistic/terrain/Stone_path.nrm.dds | 3 -- .../1024-realistic/terrain/Stone_wall.dds | 3 -- .../1024-realistic/terrain/Stone_wall.hos.dds | 3 -- .../1024-realistic/terrain/Stone_wall.nrm.dds | 3 -- .../textures/1024-realistic/terrain/Water.dds | 3 -- .../1024-realistic/terrain/Water.hos.dds | 3 -- .../1024-realistic/terrain/Water.nrm.dds | 3 -- .../realistic/sky/Debug.cube.back.dds | 3 ++ .../realistic/sky/Debug.cube.bottom.dds | 3 ++ .../realistic/sky/Debug.cube.front.dds | 3 ++ .../realistic/sky/Debug.cube.left.dds | 3 ++ .../realistic/sky/Debug.cube.right.dds | 3 ++ .../textures/realistic/sky/Debug.cube.top.dds | 3 ++ .../realistic/sky/Space_orange.cube.back.dds | 3 ++ .../sky/Space_orange.cube.bottom.dds | 3 ++ .../realistic/sky/Space_orange.cube.front.dds | 3 ++ .../realistic/sky/Space_orange.cube.left.dds | 3 ++ .../realistic/sky/Space_orange.cube.right.dds | 3 ++ .../realistic/sky/Space_orange.cube.top.dds | 3 ++ .../realistic/sky/Space_tray.cube.back.dds | 3 ++ .../realistic/sky/Space_tray.cube.bottom.dds | 3 ++ .../realistic/sky/Space_tray.cube.front.dds | 3 ++ .../realistic/sky/Space_tray.cube.left.dds | 3 ++ .../realistic/sky/Space_tray.cube.right.dds | 3 ++ .../realistic/sky/Space_tray.cube.top.dds | 3 ++ .../textures/realistic/terrain/Alien.dds | 3 ++ .../textures/realistic/terrain/Alien.hos.dds | 3 ++ .../textures/realistic/terrain/Alien.nrm.dds | 3 ++ .../terrain/Credits.txt | 0 .../textures/realistic/terrain/Debug.dds | 3 ++ .../textures/realistic/terrain/Debug.hos.dds | 3 ++ .../textures/realistic/terrain/Debug.nrm.dds | 3 ++ .../textures/realistic/terrain/Dirt.dds | 3 ++ .../textures/realistic/terrain/Dirt.hos.dds | 3 ++ .../textures/realistic/terrain/Dirt.nrm.dds | 3 ++ .../realistic/terrain/Forest_grass.dds | 3 ++ .../realistic/terrain/Forest_grass.hos.dds | 3 ++ .../realistic/terrain/Forest_grass.nrm.dds | 3 ++ .../textures/realistic/terrain/Grass.dds | 3 ++ .../textures/realistic/terrain/Grass.hos.dds | 3 ++ .../textures/realistic/terrain/Grass.nrm.dds | 3 ++ .../textures/realistic/terrain/Mapl.dds | 3 ++ .../textures/realistic/terrain/Mapl.hos.dds | 3 ++ .../textures/realistic/terrain/Mapl.nrm.dds | 3 ++ .../realistic/terrain/Plain_grass.dds | 3 ++ .../realistic/terrain/Plain_grass.hos.dds | 3 ++ .../realistic/terrain/Plain_grass.nrm.dds | 3 ++ .../textures/realistic/terrain/Rough_rock.dds | 3 ++ .../realistic/terrain/Rough_rock.hos.dds | 3 ++ .../realistic/terrain/Rough_rock.nrm.dds | 3 ++ .../textures/realistic/terrain/Sand.dds | 3 ++ .../textures/realistic/terrain/Sand.hos.dds | 3 ++ .../textures/realistic/terrain/Sand.nrm.dds | 3 ++ .../realistic/terrain/Seaside_rock.dds | 3 ++ .../realistic/terrain/Seaside_rock.hos.dds | 3 ++ .../realistic/terrain/Seaside_rock.nrm.dds | 3 ++ .../textures/realistic/terrain/Stone_path.dds | 3 ++ .../realistic/terrain/Stone_path.hos.dds | 3 ++ .../realistic/terrain/Stone_path.nrm.dds | 3 ++ .../textures/realistic/terrain/Stone_wall.dds | 3 ++ .../realistic/terrain/Stone_wall.hos.dds | 3 ++ .../realistic/terrain/Stone_wall.nrm.dds | 3 ++ .../textures/realistic/terrain/Water.dds | 3 ++ .../textures/realistic/terrain/Water.hos.dds | 3 ++ .../textures/realistic/terrain/Water.nrm.dds | 3 ++ resource/content/textures/ui/Aim.dds | 2 +- resource/textures/compile.sh | 3 +- .../Abstract_006_COLOR.jpg | 0 .../Abstract_006_DISP.png | 0 .../Abstract_006_HOS.png | 0 .../Abstract_006_NORM.jpg | 0 .../Abstract_006_OCC.jpg | 0 .../Abstract_006_SPEC.jpg | 0 .../Bark_005_HOS.png | 0 .../Bark_005_baseColor.jpg | 0 .../Bark_005_normal.jpg | 0 .../Debug.cube.back.png | 0 .../Debug.cube.bottom.png | 0 .../Debug.cube.front.png | 0 .../Debug.cube.left.png | 0 .../Debug.cube.right.png | 0 .../Debug.cube.top.png | 0 .../Debug_COLOR.jpg | 0 .../Debug_HOS.png | 0 .../Debug_NORM.jpg | 0 .../Dirt_003_COLOR.png | 0 .../Dirt_003_DISP.png | 0 .../Dirt_003_HOS.png | 0 .../Dirt_003_NRM.png | 0 .../Dirt_003_OCC.png | 0 .../Dirt_003_SPEC.png | 0 .../Grass_001_COLOR.jpg | 0 .../Grass_001_DISP.png | 0 .../Grass_001_HOS.jpg | 0 .../Grass_001_NORM.jpg | 0 .../Grass_001_OCC.jpg | 0 .../Grass_001_ROUGH.jpg | 0 .../Ground_Forest_002_ambientOcclusion.jpg | 0 .../Ground_Forest_002_baseColor.jpg | 0 .../Ground_Forest_002_height.png | 0 .../Ground_Forest_002_hos.jpg | 0 .../Ground_Forest_002_normal.jpg | 0 .../Ground_Forest_002_roughness.jpg | 0 .../Ground_Forest_003_ROUGH.jpg | 0 .../Ground_Forest_003_ambientOcclusion.jpg | 0 .../Ground_Forest_003_baseColor.jpg | 0 .../Ground_Forest_003_height.png | 0 .../Ground_Forest_003_hos.jpg | 0 .../Ground_Forest_003_normal.jpg | 0 .../Rough_rock_019_COLOR.jpg | 0 .../Rough_rock_019_DISP.jpg | 0 .../Rough_rock_019_HOS.jpg | 0 .../Rough_rock_019_NRM.jpg | 0 .../Rough_rock_019_OCC.jpg | 0 .../Rough_rock_019_SPEC.jpg | 0 .../Sand_005_ambientOcclusion.jpg | 0 .../Sand_005_baseColor.jpg | 0 .../Sand_005_height.png | 0 .../Sand_005_hos.jpg | 0 .../Sand_005_normal.jpg | 0 .../Sand_005_roughness.jpg | 0 .../Seaside_rocks_01_1K_AO.png | 0 .../Seaside_rocks_01_1K_Base_Color.png | 0 .../Seaside_rocks_01_1K_HOS.png | 0 .../Seaside_rocks_01_1K_Height.png | 0 .../Seaside_rocks_01_1K_Normal.png | 0 .../Seaside_rocks_01_1K_Roughness.png | 0 .../Space_orange.cube.back.png | 0 .../Space_orange.cube.bottom.png | 0 .../Space_orange.cube.front.png | 0 .../Space_orange.cube.left.png | 0 .../Space_orange.cube.right.png | 0 .../Space_orange.cube.top.png | 0 .../Space_tray.cube.back.png | 0 .../Space_tray.cube.bottom.png | 0 .../Space_tray.cube.front.png | 0 .../Space_tray.cube.left.png | 0 .../Space_tray.cube.right.png | 0 .../Space_tray.cube.top.png | 0 .../Stone_Path_004_HOS.jpg | 0 .../Stone_Path_004_ambientOcclusion.jpg | 0 .../Stone_Path_004_baseColor.jpg | 0 .../Stone_Path_004_height.png | 0 .../Stone_Path_004_normal.jpg | 0 .../Stone_Path_004_roughness.jpg | 0 .../Stone_Wall_008_COLOR.jpg | 0 .../Stone_Wall_008_DISP.png | 0 .../Stone_Wall_008_HOS.jpg | 0 .../Stone_Wall_008_NORM.jpg | 0 .../Stone_Wall_008_OCC.jpg | 0 .../Stone_Wall_008_ROUGH.jpg | 0 .../Water_002_COLOR.png | 0 .../Water_002_DISP.png | 0 .../Water_002_HOS.jpg | 0 .../Water_002_NORM.jpg | 0 .../Water_002_OCC.jpg | 0 .../Water_002_ROUGH.jpg | 0 .../{1024-realistic => realistic}/index.txt | 0 src/client/Client.cpp | 2 +- src/client/config.hpp | 4 +-- src/client/contouring/FlatDualMC.cpp | 24 ++++++------- src/client/contouring/FlatDualMC.hpp | 1 - src/client/contouring/optimizer.hpp | 8 +++-- src/client/render/Renderer.hpp | 12 +++++-- src/client/render/UI.cpp | 34 ++++++++++--------- src/client/render/api/Images.cpp | 3 +- src/client/render/impl/gl/Renderer.cpp | 14 ++++---- src/client/render/impl/gl/Renderer.hpp | 4 +-- src/client/render/impl/vk/CommandCenter.cpp | 18 +++++----- src/client/render/impl/vk/CommandCenter.hpp | 5 ++- src/client/render/impl/vk/Renderer.cpp | 4 +-- src/client/render/impl/vk/Renderer.hpp | 2 +- 224 files changed, 258 insertions(+), 239 deletions(-) delete mode 100644 resource/content/textures/1024-realistic/sky/Debug.cube.back.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Debug.cube.bottom.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Debug.cube.front.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Debug.cube.left.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Debug.cube.right.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Debug.cube.top.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds delete mode 100644 resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Alien.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Alien.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Alien.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Debug.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Debug.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Debug.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Dirt.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Dirt.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Forest_grass.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Grass.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Grass.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Grass.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Mapl.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Mapl.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Plain_grass.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Rough_rock.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Sand.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Sand.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Sand.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Seaside_rock.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Stone_path.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Stone_wall.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Water.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Water.hos.dds delete mode 100644 resource/content/textures/1024-realistic/terrain/Water.nrm.dds create mode 100644 resource/content/textures/realistic/sky/Debug.cube.back.dds create mode 100644 resource/content/textures/realistic/sky/Debug.cube.bottom.dds create mode 100644 resource/content/textures/realistic/sky/Debug.cube.front.dds create mode 100644 resource/content/textures/realistic/sky/Debug.cube.left.dds create mode 100644 resource/content/textures/realistic/sky/Debug.cube.right.dds create mode 100644 resource/content/textures/realistic/sky/Debug.cube.top.dds create mode 100644 resource/content/textures/realistic/sky/Space_orange.cube.back.dds create mode 100644 resource/content/textures/realistic/sky/Space_orange.cube.bottom.dds create mode 100644 resource/content/textures/realistic/sky/Space_orange.cube.front.dds create mode 100644 resource/content/textures/realistic/sky/Space_orange.cube.left.dds create mode 100644 resource/content/textures/realistic/sky/Space_orange.cube.right.dds create mode 100644 resource/content/textures/realistic/sky/Space_orange.cube.top.dds create mode 100644 resource/content/textures/realistic/sky/Space_tray.cube.back.dds create mode 100644 resource/content/textures/realistic/sky/Space_tray.cube.bottom.dds create mode 100644 resource/content/textures/realistic/sky/Space_tray.cube.front.dds create mode 100644 resource/content/textures/realistic/sky/Space_tray.cube.left.dds create mode 100644 resource/content/textures/realistic/sky/Space_tray.cube.right.dds create mode 100644 resource/content/textures/realistic/sky/Space_tray.cube.top.dds create mode 100644 resource/content/textures/realistic/terrain/Alien.dds create mode 100644 resource/content/textures/realistic/terrain/Alien.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Alien.nrm.dds rename resource/content/textures/{1024-realistic => realistic}/terrain/Credits.txt (100%) create mode 100644 resource/content/textures/realistic/terrain/Debug.dds create mode 100644 resource/content/textures/realistic/terrain/Debug.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Debug.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Dirt.dds create mode 100644 resource/content/textures/realistic/terrain/Dirt.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Dirt.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Forest_grass.dds create mode 100644 resource/content/textures/realistic/terrain/Forest_grass.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Forest_grass.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Grass.dds create mode 100644 resource/content/textures/realistic/terrain/Grass.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Grass.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Mapl.dds create mode 100644 resource/content/textures/realistic/terrain/Mapl.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Mapl.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Plain_grass.dds create mode 100644 resource/content/textures/realistic/terrain/Plain_grass.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Plain_grass.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Rough_rock.dds create mode 100644 resource/content/textures/realistic/terrain/Rough_rock.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Rough_rock.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Sand.dds create mode 100644 resource/content/textures/realistic/terrain/Sand.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Sand.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Seaside_rock.dds create mode 100644 resource/content/textures/realistic/terrain/Seaside_rock.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Seaside_rock.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Stone_path.dds create mode 100644 resource/content/textures/realistic/terrain/Stone_path.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Stone_path.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Stone_wall.dds create mode 100644 resource/content/textures/realistic/terrain/Stone_wall.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Stone_wall.nrm.dds create mode 100644 resource/content/textures/realistic/terrain/Water.dds create mode 100644 resource/content/textures/realistic/terrain/Water.hos.dds create mode 100644 resource/content/textures/realistic/terrain/Water.nrm.dds rename resource/textures/{1024-realistic => realistic}/Abstract_006_COLOR.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Abstract_006_DISP.png (100%) rename resource/textures/{1024-realistic => realistic}/Abstract_006_HOS.png (100%) rename resource/textures/{1024-realistic => realistic}/Abstract_006_NORM.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Abstract_006_OCC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Abstract_006_SPEC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Bark_005_HOS.png (100%) rename resource/textures/{1024-realistic => realistic}/Bark_005_baseColor.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Bark_005_normal.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Debug.cube.back.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug.cube.bottom.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug.cube.front.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug.cube.left.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug.cube.right.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug.cube.top.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug_COLOR.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Debug_HOS.png (100%) rename resource/textures/{1024-realistic => realistic}/Debug_NORM.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Dirt_003_COLOR.png (100%) rename resource/textures/{1024-realistic => realistic}/Dirt_003_DISP.png (100%) rename resource/textures/{1024-realistic => realistic}/Dirt_003_HOS.png (100%) rename resource/textures/{1024-realistic => realistic}/Dirt_003_NRM.png (100%) rename resource/textures/{1024-realistic => realistic}/Dirt_003_OCC.png (100%) rename resource/textures/{1024-realistic => realistic}/Dirt_003_SPEC.png (100%) rename resource/textures/{1024-realistic => realistic}/Grass_001_COLOR.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Grass_001_DISP.png (100%) rename resource/textures/{1024-realistic => realistic}/Grass_001_HOS.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Grass_001_NORM.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Grass_001_OCC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Grass_001_ROUGH.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_002_ambientOcclusion.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_002_baseColor.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_002_height.png (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_002_hos.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_002_normal.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_002_roughness.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_003_ROUGH.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_003_ambientOcclusion.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_003_baseColor.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_003_height.png (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_003_hos.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Ground_Forest_003_normal.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Rough_rock_019_COLOR.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Rough_rock_019_DISP.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Rough_rock_019_HOS.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Rough_rock_019_NRM.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Rough_rock_019_OCC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Rough_rock_019_SPEC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Sand_005_ambientOcclusion.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Sand_005_baseColor.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Sand_005_height.png (100%) rename resource/textures/{1024-realistic => realistic}/Sand_005_hos.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Sand_005_normal.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Sand_005_roughness.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Seaside_rocks_01_1K_AO.png (100%) rename resource/textures/{1024-realistic => realistic}/Seaside_rocks_01_1K_Base_Color.png (100%) rename resource/textures/{1024-realistic => realistic}/Seaside_rocks_01_1K_HOS.png (100%) rename resource/textures/{1024-realistic => realistic}/Seaside_rocks_01_1K_Height.png (100%) rename resource/textures/{1024-realistic => realistic}/Seaside_rocks_01_1K_Normal.png (100%) rename resource/textures/{1024-realistic => realistic}/Seaside_rocks_01_1K_Roughness.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_orange.cube.back.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_orange.cube.bottom.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_orange.cube.front.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_orange.cube.left.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_orange.cube.right.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_orange.cube.top.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_tray.cube.back.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_tray.cube.bottom.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_tray.cube.front.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_tray.cube.left.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_tray.cube.right.png (100%) rename resource/textures/{1024-realistic => realistic}/Space_tray.cube.top.png (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Path_004_HOS.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Path_004_ambientOcclusion.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Path_004_baseColor.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Path_004_height.png (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Path_004_normal.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Path_004_roughness.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Wall_008_COLOR.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Wall_008_DISP.png (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Wall_008_HOS.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Wall_008_NORM.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Wall_008_OCC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Stone_Wall_008_ROUGH.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Water_002_COLOR.png (100%) rename resource/textures/{1024-realistic => realistic}/Water_002_DISP.png (100%) rename resource/textures/{1024-realistic => realistic}/Water_002_HOS.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Water_002_NORM.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Water_002_OCC.jpg (100%) rename resource/textures/{1024-realistic => realistic}/Water_002_ROUGH.jpg (100%) rename resource/textures/{1024-realistic => realistic}/index.txt (100%) diff --git a/.gitignore b/.gitignore index 57f5a3c..8433008 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ build* docs external -resource/*/.* \ No newline at end of file +resource/**/.* \ No newline at end of file diff --git a/README.md b/README.md index bf3dd0f..97c9bf6 100644 --- a/README.md +++ b/README.md @@ -33,14 +33,14 @@ Experimental project using OpenGL and Vulkan. * Vulkan * ImGui * PicoQUIC -* FasNoiseSIMD +* FasNoise2 * Love and insomnia ## Run it -Get a release compatible with your system window library and processor capabilities, or [build](#build) it +Get a release compatible with your system window library or [build](#build) it ### Prerequisites @@ -53,9 +53,6 @@ Get a release compatible with your system window library and processor capabilit ./univerxel ``` -Edit `config.toml` - - Profit ! ## Build @@ -76,6 +73,7 @@ To get a local copy up and running, follow these simple steps. * [glslc](https://github.com/KhronosGroup/glslang): build vk shaders * Imagemagick: build textures (convert jpg to png) * [Compressonator](https://github.com/GPUOpen-Tools/compressonator): build textures (compress dds) +* Doxygen, graphviz: generate documentation ### Installation @@ -101,6 +99,8 @@ PROFILING | Tracy profiling | `0` LOG_DEBUG | Debug logs | `0` LOG_TRACE | Trace logs | `0` IPO | Link time optimisation | `1` +LD_GOLD | Use gold linker | `1` +CCACHE | Use code cache | `1` NATIVE | Optimize for native CPU | `0` RENDER_VK | Include Vulkan renderer | `1` @@ -129,8 +129,7 @@ GLSL="glslValidator -V" ./compile.sh # Other glslang compiler 6. Rebuild textures ```sh cd resource/textures-src -./compile.sh # Build all texture dds -./merge.py # Combine grey images to RGB +PACK= ./compile.sh # Build texture pack dds ``` ### Windows diff --git a/resource/content/textures/1024-realistic/sky/Debug.cube.back.dds b/resource/content/textures/1024-realistic/sky/Debug.cube.back.dds deleted file mode 100644 index 67b7fa2..0000000 --- a/resource/content/textures/1024-realistic/sky/Debug.cube.back.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dad5dbdab5160c1e5b1526aacdd5a6b34e540f2a6fa31303f983a9d7b08c9e2 -size 22000 diff --git a/resource/content/textures/1024-realistic/sky/Debug.cube.bottom.dds b/resource/content/textures/1024-realistic/sky/Debug.cube.bottom.dds deleted file mode 100644 index da326bd..0000000 --- a/resource/content/textures/1024-realistic/sky/Debug.cube.bottom.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2ca239b6280426ba08c4d678b102a7d790fa54d704e97ae2668e1abe88bd112 -size 22000 diff --git a/resource/content/textures/1024-realistic/sky/Debug.cube.front.dds b/resource/content/textures/1024-realistic/sky/Debug.cube.front.dds deleted file mode 100644 index 5187388..0000000 --- a/resource/content/textures/1024-realistic/sky/Debug.cube.front.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce288773ccb475166e62e353f0731cd5acc5b55402a0c62da5893041d3a7b179 -size 22000 diff --git a/resource/content/textures/1024-realistic/sky/Debug.cube.left.dds b/resource/content/textures/1024-realistic/sky/Debug.cube.left.dds deleted file mode 100644 index 594c630..0000000 --- a/resource/content/textures/1024-realistic/sky/Debug.cube.left.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13518c91363b60fad644601eb0f4983b8e953fcaad0702857f6b98cbc5e7c921 -size 22000 diff --git a/resource/content/textures/1024-realistic/sky/Debug.cube.right.dds b/resource/content/textures/1024-realistic/sky/Debug.cube.right.dds deleted file mode 100644 index 172b090..0000000 --- a/resource/content/textures/1024-realistic/sky/Debug.cube.right.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3015426f960ac759f07d3dcecd5fce0a6c169d87bc5a41a995002f1f2e1ca69 -size 22000 diff --git a/resource/content/textures/1024-realistic/sky/Debug.cube.top.dds b/resource/content/textures/1024-realistic/sky/Debug.cube.top.dds deleted file mode 100644 index b0baa16..0000000 --- a/resource/content/textures/1024-realistic/sky/Debug.cube.top.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a10e057118b4f8f840615665807c98ddd0e03c9520bc8c29e559dd42a92064e -size 22000 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds deleted file mode 100644 index faad6d7..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcf59564bf0d0ef95ef281ae7f1dfd27422eeb79bfe4b9dadd351a4621685b7d -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds deleted file mode 100644 index d8476c8..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70b3b7fad0c6c43defe0655f8fc68e37390693e97c7846af77ae08685e483013 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds deleted file mode 100644 index 21d01f6..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34cd31f292f48bd6c07f64fdb339e68aaf4cda62bff6039a7bbcd34711a2a6e8 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds deleted file mode 100644 index 4191014..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab58677a2030527b36e124b11dc5cc87c46495f825cd471d4a9c72b566e44404 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds deleted file mode 100644 index 1a6b640..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e536895abf3dc308ed528aa0dea54bfd9e8f4eca3f18a003bbff2a795fc23ac3 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds deleted file mode 100644 index 6d86988..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1124f90e08b08f7cf6bd5f2a6c2d27e89824cd7fce433276a3279bb7ed51813 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds deleted file mode 100644 index ca24324..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e76fe2877af686f4eac8ee64ccea04a4a42a2846f4874fd1f124a1539485de1c -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds deleted file mode 100644 index 1a7ad70..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85dcab79af87b339e0b3121192fae30224968709b466dd41c4832f3e25d52043 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds deleted file mode 100644 index cbad89e..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4e804a8e2b629f597d12061cc4e099d2bab3e378898f0a41367d638d9a7db30 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds deleted file mode 100644 index 955154c..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe9df9f0ec45c4af4058a19f7a6d657028b62b001243dec907107e63183fec83 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds deleted file mode 100644 index f707324..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc1a0e135271c162cbb621ea9da94a1397121011a6aa0858f514f9d3cb4fb852 -size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds deleted file mode 100644 index 797b38e..0000000 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69acc3a4866d5f3dad8e8becf80c7b56d12b44e59fb5a611f37b26cc25be9435 -size 5592560 diff --git a/resource/content/textures/1024-realistic/terrain/Alien.dds b/resource/content/textures/1024-realistic/terrain/Alien.dds deleted file mode 100644 index 46f1651..0000000 --- a/resource/content/textures/1024-realistic/terrain/Alien.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3746a93556f518dca765f4e94e9fddd6724e97e5dec6e827f156e7725f226d9 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Alien.hos.dds b/resource/content/textures/1024-realistic/terrain/Alien.hos.dds deleted file mode 100644 index f32ab1c..0000000 --- a/resource/content/textures/1024-realistic/terrain/Alien.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58335a55e3ddb5a9a9355f592ac0d6e824749ac98d5cfc1a94f4c806186caf8b -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds b/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds deleted file mode 100644 index d83eaa9..0000000 --- a/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2e45e07a483c4c27cc4056bdef30e21652c1530f22a91cc1ce1d5dab951b727 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Debug.dds b/resource/content/textures/1024-realistic/terrain/Debug.dds deleted file mode 100644 index 3235c4b..0000000 --- a/resource/content/textures/1024-realistic/terrain/Debug.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f5ac0255f7583f405964822f7d4d71391d4b04c3345fdf72f267b5889df04bc -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Debug.hos.dds b/resource/content/textures/1024-realistic/terrain/Debug.hos.dds deleted file mode 100644 index cc4ed58..0000000 --- a/resource/content/textures/1024-realistic/terrain/Debug.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7004e5401c8f5d006178218e4da678ba8deea3b24c9097019575e8e99de01dba -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds b/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds deleted file mode 100644 index a4d5fd2..0000000 --- a/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd19462b9c1267bc916e3902056cd0ec3a8a475c1a2fbce4a26531041acc2bc3 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Dirt.dds b/resource/content/textures/1024-realistic/terrain/Dirt.dds deleted file mode 100644 index 9437a25..0000000 --- a/resource/content/textures/1024-realistic/terrain/Dirt.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:648719aa22c5428edd254231fa13c03898651facb64ea7b9fb69f98da58171c8 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds b/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds deleted file mode 100644 index 658b7af..0000000 --- a/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96374ef220b168eb6e58deb9649abdd9d63ea14fe816fe5efbd1aa490a48f50d -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds b/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds deleted file mode 100644 index ecbbce5..0000000 --- a/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7337b45f789f10ff23fcc0fda19b23a30d69fdb4a562d9bff8eae21d2d4fc669 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Forest_grass.dds b/resource/content/textures/1024-realistic/terrain/Forest_grass.dds deleted file mode 100644 index 682856c..0000000 --- a/resource/content/textures/1024-realistic/terrain/Forest_grass.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a10813e26c62adb07654de791cf77a7aceedb2ba796038a0f1d8da0ed5c8f16b -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds b/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds deleted file mode 100644 index 8c0646c..0000000 --- a/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70f8e444d172174f545d3b76836908b9c06284ffdeda62baafa922671cad5b59 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds b/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds deleted file mode 100644 index cb595b9..0000000 --- a/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71ec78a68402b6615370299c27ddfe25d910dd8a820f6dea61523c9f65bc1100 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Grass.dds b/resource/content/textures/1024-realistic/terrain/Grass.dds deleted file mode 100644 index 067574c..0000000 --- a/resource/content/textures/1024-realistic/terrain/Grass.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a51b288bfe51d6710a7d6677cea0345a569ef641275d2f6c6b69f8e57ed94b6 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Grass.hos.dds b/resource/content/textures/1024-realistic/terrain/Grass.hos.dds deleted file mode 100644 index 3148976..0000000 --- a/resource/content/textures/1024-realistic/terrain/Grass.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35b792534c8ca96d00aa2c035da599f4ab84b7095f52bfb7a1607fc81dbbf2f3 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds b/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds deleted file mode 100644 index 7412261..0000000 --- a/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a12f1ba6a1cee3e368860da74915bf05bb36b837d77def25dc52674b805eb51c -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Mapl.dds b/resource/content/textures/1024-realistic/terrain/Mapl.dds deleted file mode 100644 index a7a8d4d..0000000 --- a/resource/content/textures/1024-realistic/terrain/Mapl.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b8cd4f62b346a7cadb633e7f6d3a4b39dccea0dafee94935c5ef979aef3098b -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds b/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds deleted file mode 100644 index 978e11c..0000000 --- a/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43f6ff05d22860af2c48c80b3d00e17615726905cb8fcc45bebbff5d94a49329 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds b/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds deleted file mode 100644 index bb7643e..0000000 --- a/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59219f3d5a6d0a3e5e2261a1eaceb780e045b6ad8a16b239d0bb3de01ec60046 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Plain_grass.dds b/resource/content/textures/1024-realistic/terrain/Plain_grass.dds deleted file mode 100644 index dba69dc..0000000 --- a/resource/content/textures/1024-realistic/terrain/Plain_grass.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da7f936573c8e9e2a80e3beaa0c8eb2b2f8dac958c78a0db80e98b01fb6dac6d -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds b/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds deleted file mode 100644 index 0122840..0000000 --- a/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:227747a627a7287022aaf7ab8bfb119aba4ed1234a23b26c4e230cce28e74e6a -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds b/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds deleted file mode 100644 index a5cec1d..0000000 --- a/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0437c0f70ac0b57165229dfb497b24d80a5e2729fc839bc44cc65f78bfa358ec -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Rough_rock.dds b/resource/content/textures/1024-realistic/terrain/Rough_rock.dds deleted file mode 100644 index 4583b60..0000000 --- a/resource/content/textures/1024-realistic/terrain/Rough_rock.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba145dd6b174f61a2050dba140c6b147fb809267097dd8529fbfdc15312922eb -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds b/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds deleted file mode 100644 index cf016cb..0000000 --- a/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45ef0715178814a6c177c3c4823577574e0d15a83879ec7712406719914a18dc -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds b/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds deleted file mode 100644 index 33047f1..0000000 --- a/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d041183b42f8bd1106e0e8da715f136523527364d5fb323e4f368213a270b2fc -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Sand.dds b/resource/content/textures/1024-realistic/terrain/Sand.dds deleted file mode 100644 index d6602cd..0000000 --- a/resource/content/textures/1024-realistic/terrain/Sand.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0be41e245125facfeec6afc0a314cdbfb95b608845865974625c20ea4b67b5c3 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Sand.hos.dds b/resource/content/textures/1024-realistic/terrain/Sand.hos.dds deleted file mode 100644 index 8659edc..0000000 --- a/resource/content/textures/1024-realistic/terrain/Sand.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c084eefe0159a916d3c5eb3a02ac50ee78baca91b13d0112a51c782a6d0917c -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds b/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds deleted file mode 100644 index 6bd3599..0000000 --- a/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d58d5e6a79fce24a1f1046eb2ed1f101292b02d8bfdb80fb3985038c2f1a00e -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds b/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds deleted file mode 100644 index fde5671..0000000 --- a/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17b6772516b9bf40ec889f08a1bd43735ee3c118026c4741c5f4e5c06770c576 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds b/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds deleted file mode 100644 index d579a7f..0000000 --- a/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8af304f2b97ffa35d93190d01f24bba90a25fe6f6dce8d2caa9074c72559922 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds b/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds deleted file mode 100644 index e738a7e..0000000 --- a/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f130534922b6100c1a4dfeff2b209b26d6ed4d1fc083de948c51242257fe59d9 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_path.dds b/resource/content/textures/1024-realistic/terrain/Stone_path.dds deleted file mode 100644 index fd14da9..0000000 --- a/resource/content/textures/1024-realistic/terrain/Stone_path.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ecfddee87fc10a45f0710e823fdd41b54486677dbf3e6950c1dfaf0fa33099a -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds b/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds deleted file mode 100644 index 2d3fa06..0000000 --- a/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47dcfeb09193f748deff3298d31240cbbc4bbde90da08513ee4a8c44673366e0 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds b/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds deleted file mode 100644 index 62525a3..0000000 --- a/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9922af644e4e948975a05d55bcee3dad0e748da3570cf6dafbd3f098dab7c39c -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_wall.dds b/resource/content/textures/1024-realistic/terrain/Stone_wall.dds deleted file mode 100644 index ab69a39..0000000 --- a/resource/content/textures/1024-realistic/terrain/Stone_wall.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a767281a4a7cd91457e2b5b0b7044fac880841abcfbd38629042150745d6ead9 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds b/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds deleted file mode 100644 index 331c96c..0000000 --- a/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e81103a3dd87e331952f5faee283f4c4315d9c251e7fd859b7d5a229ac1405a -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds b/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds deleted file mode 100644 index 3fdd3cf..0000000 --- a/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60bbbac17bbf3a0392e69beb70addd90049286c6c51dee6de58d4c67edf612f0 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Water.dds b/resource/content/textures/1024-realistic/terrain/Water.dds deleted file mode 100644 index abe8d97..0000000 --- a/resource/content/textures/1024-realistic/terrain/Water.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:295df28613d038c84bd645adcb80728b6f5fc338c37eab897977cf522e5448ab -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Water.hos.dds b/resource/content/textures/1024-realistic/terrain/Water.hos.dds deleted file mode 100644 index d66c71b..0000000 --- a/resource/content/textures/1024-realistic/terrain/Water.hos.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:050430566f6ee1ba4612902a3f6cd0ddce365afdca5922955b4c40f84090e2a6 -size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Water.nrm.dds b/resource/content/textures/1024-realistic/terrain/Water.nrm.dds deleted file mode 100644 index 1b6a0bd..0000000 --- a/resource/content/textures/1024-realistic/terrain/Water.nrm.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbf64c5dedab38f84ac0d7147d9d430ab853f0e0f5b8aaeb347920d95afa0416 -size 1398256 diff --git a/resource/content/textures/realistic/sky/Debug.cube.back.dds b/resource/content/textures/realistic/sky/Debug.cube.back.dds new file mode 100644 index 0000000..87729aa --- /dev/null +++ b/resource/content/textures/realistic/sky/Debug.cube.back.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1677bcf64e4a95ba2a5d372d5cf3b25d2f68bd89365f0c3d7df3b0e1ffaf863b +size 22000 diff --git a/resource/content/textures/realistic/sky/Debug.cube.bottom.dds b/resource/content/textures/realistic/sky/Debug.cube.bottom.dds new file mode 100644 index 0000000..e8f81d0 --- /dev/null +++ b/resource/content/textures/realistic/sky/Debug.cube.bottom.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23babb3e2314bbb37cb444b9f616635989a39b158f2162323af2699f6f7d6ec5 +size 22000 diff --git a/resource/content/textures/realistic/sky/Debug.cube.front.dds b/resource/content/textures/realistic/sky/Debug.cube.front.dds new file mode 100644 index 0000000..9d5886e --- /dev/null +++ b/resource/content/textures/realistic/sky/Debug.cube.front.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7152e7663920bf55a301a4bbb3f5e3e06635c09e4f27affbdee69c5f694c741d +size 22000 diff --git a/resource/content/textures/realistic/sky/Debug.cube.left.dds b/resource/content/textures/realistic/sky/Debug.cube.left.dds new file mode 100644 index 0000000..cb0a0c7 --- /dev/null +++ b/resource/content/textures/realistic/sky/Debug.cube.left.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f65b42127b8197700fb7af70093e15b934f4351deab2bf731e85b584c500010b +size 22000 diff --git a/resource/content/textures/realistic/sky/Debug.cube.right.dds b/resource/content/textures/realistic/sky/Debug.cube.right.dds new file mode 100644 index 0000000..38de1fb --- /dev/null +++ b/resource/content/textures/realistic/sky/Debug.cube.right.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d398271c599da8ad39c99577f76ba924f93a53eb1afe222df41c45da69663bd +size 22000 diff --git a/resource/content/textures/realistic/sky/Debug.cube.top.dds b/resource/content/textures/realistic/sky/Debug.cube.top.dds new file mode 100644 index 0000000..3d50277 --- /dev/null +++ b/resource/content/textures/realistic/sky/Debug.cube.top.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f025c4baf3cf5788beaf5217a476b4167227ee2cc7f154aeebf4669ea0306d16 +size 22000 diff --git a/resource/content/textures/realistic/sky/Space_orange.cube.back.dds b/resource/content/textures/realistic/sky/Space_orange.cube.back.dds new file mode 100644 index 0000000..1fa4628 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_orange.cube.back.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e507f064073746bd81e140c2ef92bc0beab415ee04420f380f35f19d61c46e8f +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_orange.cube.bottom.dds b/resource/content/textures/realistic/sky/Space_orange.cube.bottom.dds new file mode 100644 index 0000000..eb27499 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_orange.cube.bottom.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8339548cdfba4f7a3eb3a2293c7499911ec5ac5938e4973112352d63956ed5ad +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_orange.cube.front.dds b/resource/content/textures/realistic/sky/Space_orange.cube.front.dds new file mode 100644 index 0000000..fe95bea --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_orange.cube.front.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dbb789794dddbe6288a056b7dee0bf00ffcd54eee309a7b894cd60d29113e73 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_orange.cube.left.dds b/resource/content/textures/realistic/sky/Space_orange.cube.left.dds new file mode 100644 index 0000000..2616642 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_orange.cube.left.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:154645e551db5c4f08265ef6521e2093602de4f2c2a5c9f4dcef38ed70f1b02e +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_orange.cube.right.dds b/resource/content/textures/realistic/sky/Space_orange.cube.right.dds new file mode 100644 index 0000000..6d17984 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_orange.cube.right.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9ea07d47dd53832aa85d2f15defcec89fa671fa3c541f657548843a09797790 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_orange.cube.top.dds b/resource/content/textures/realistic/sky/Space_orange.cube.top.dds new file mode 100644 index 0000000..b1ea988 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_orange.cube.top.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f20e28b6cfb47446f547f696d3e0cc51821d0f9168e3e6375fe4a34930010564 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_tray.cube.back.dds b/resource/content/textures/realistic/sky/Space_tray.cube.back.dds new file mode 100644 index 0000000..32afb54 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_tray.cube.back.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f69902b00b39f0d0a9ac41abdc28bb4e508d467dbdff0d3990dd8fc815323c99 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_tray.cube.bottom.dds b/resource/content/textures/realistic/sky/Space_tray.cube.bottom.dds new file mode 100644 index 0000000..9b05b33 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_tray.cube.bottom.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:297c6201747a9adaac5be58b777ea3f3621576069c36b1275e3b6dd12908f341 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_tray.cube.front.dds b/resource/content/textures/realistic/sky/Space_tray.cube.front.dds new file mode 100644 index 0000000..dc28968 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_tray.cube.front.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79e35f22b6f9dbc2fd2b53b49a3545928957b8ae9d13e9776099003e109c9793 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_tray.cube.left.dds b/resource/content/textures/realistic/sky/Space_tray.cube.left.dds new file mode 100644 index 0000000..cca9120 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_tray.cube.left.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:819198bafbfef1dbffa2980133be698b3d57929dcab2a5ffb56cf3cdaeec5494 +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_tray.cube.right.dds b/resource/content/textures/realistic/sky/Space_tray.cube.right.dds new file mode 100644 index 0000000..73dacf2 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_tray.cube.right.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c44667e3a558b4396602fc204a8ced4cad178dabd4738e511630241066fabbfd +size 5592560 diff --git a/resource/content/textures/realistic/sky/Space_tray.cube.top.dds b/resource/content/textures/realistic/sky/Space_tray.cube.top.dds new file mode 100644 index 0000000..83f1f95 --- /dev/null +++ b/resource/content/textures/realistic/sky/Space_tray.cube.top.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71aba2d980b13b3abb375d6cac8b72d159b9b6df971354ee118efe0da5a9c74e +size 5592560 diff --git a/resource/content/textures/realistic/terrain/Alien.dds b/resource/content/textures/realistic/terrain/Alien.dds new file mode 100644 index 0000000..9ccd749 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Alien.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41a2d8260acfcbe5117849cf967aba95bedbb751edd827f9cc0e110dc41df269 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Alien.hos.dds b/resource/content/textures/realistic/terrain/Alien.hos.dds new file mode 100644 index 0000000..f3cd437 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Alien.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1b78eceb5f8777b796c282061aae455286ead7806d8a1f6b4c8070ccbdb4de8 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Alien.nrm.dds b/resource/content/textures/realistic/terrain/Alien.nrm.dds new file mode 100644 index 0000000..5792d67 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Alien.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7201bfe7ee7c9493bcde1b7a34b53ce03bc0ff5855489bba66a4cac7982e8c4a +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Credits.txt b/resource/content/textures/realistic/terrain/Credits.txt similarity index 100% rename from resource/content/textures/1024-realistic/terrain/Credits.txt rename to resource/content/textures/realistic/terrain/Credits.txt diff --git a/resource/content/textures/realistic/terrain/Debug.dds b/resource/content/textures/realistic/terrain/Debug.dds new file mode 100644 index 0000000..dae0281 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Debug.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72c4c24665599e66c753665fbec045bb0951dd6f656abfdeb45eaf94f67e89a3 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Debug.hos.dds b/resource/content/textures/realistic/terrain/Debug.hos.dds new file mode 100644 index 0000000..b279c4a --- /dev/null +++ b/resource/content/textures/realistic/terrain/Debug.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b9000b52bdab909d7e33da72c338ddfb65e094c7d2992a69140efd09e700812 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Debug.nrm.dds b/resource/content/textures/realistic/terrain/Debug.nrm.dds new file mode 100644 index 0000000..c19eef4 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Debug.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f5c712b00c93487f2e121d9f5c89b0e2b508da450677fcc5606f4d81392fcdb +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Dirt.dds b/resource/content/textures/realistic/terrain/Dirt.dds new file mode 100644 index 0000000..7948bf3 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Dirt.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e24deccdd9136a944059f0dbb1730b4a66126a609691792fa091a67e56fe6322 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Dirt.hos.dds b/resource/content/textures/realistic/terrain/Dirt.hos.dds new file mode 100644 index 0000000..71978a9 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Dirt.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ceb9f7ad2bac8f36b1ff273138f459befb938a34b487fdedfe57be655e58351e +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Dirt.nrm.dds b/resource/content/textures/realistic/terrain/Dirt.nrm.dds new file mode 100644 index 0000000..e150e15 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Dirt.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a95c203e41874f7804ff49e1b9818bbe714c196d062817fa442083124d99615 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Forest_grass.dds b/resource/content/textures/realistic/terrain/Forest_grass.dds new file mode 100644 index 0000000..33aca43 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Forest_grass.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6be704bf31b87088ab78085952aabbbdd443862ff4b7ab17f4c94a082a35114e +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Forest_grass.hos.dds b/resource/content/textures/realistic/terrain/Forest_grass.hos.dds new file mode 100644 index 0000000..2246add --- /dev/null +++ b/resource/content/textures/realistic/terrain/Forest_grass.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5d7086176751250cbe322a4999315be08e1d3e04a795e9ae7500a5a3c0a7cda +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Forest_grass.nrm.dds b/resource/content/textures/realistic/terrain/Forest_grass.nrm.dds new file mode 100644 index 0000000..0394096 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Forest_grass.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09cd58b297301fc4e5c38f930bb4e234b4c9c977381cd20f936590004433cab0 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Grass.dds b/resource/content/textures/realistic/terrain/Grass.dds new file mode 100644 index 0000000..11ab065 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Grass.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86dfff873063494f211b11b2cc19094aba9d38a65946d23c58271857824b342b +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Grass.hos.dds b/resource/content/textures/realistic/terrain/Grass.hos.dds new file mode 100644 index 0000000..64565b6 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Grass.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96fac4009635247922081ee6cd87b6e0c6f1adcc4d1ec1d84e1cfd083faf793c +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Grass.nrm.dds b/resource/content/textures/realistic/terrain/Grass.nrm.dds new file mode 100644 index 0000000..c3d31fa --- /dev/null +++ b/resource/content/textures/realistic/terrain/Grass.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32ce8c60dddfc011feb9cd72ffa2240806a10ea741cf5f1ae633a23435b3e3ee +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Mapl.dds b/resource/content/textures/realistic/terrain/Mapl.dds new file mode 100644 index 0000000..682502a --- /dev/null +++ b/resource/content/textures/realistic/terrain/Mapl.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f411ef162bbede7c2677c460d948de1801d1fa3a374b7922ce60628ac14a06 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Mapl.hos.dds b/resource/content/textures/realistic/terrain/Mapl.hos.dds new file mode 100644 index 0000000..06d3490 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Mapl.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50cd4abc553cb6cbf146e04d9d28754028b767ba8436e4a0286be422d2b6dd3d +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Mapl.nrm.dds b/resource/content/textures/realistic/terrain/Mapl.nrm.dds new file mode 100644 index 0000000..915231d --- /dev/null +++ b/resource/content/textures/realistic/terrain/Mapl.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75bb666870291c4204af45f7874469395df4ed6277614bc58f92cf90f20c16b0 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Plain_grass.dds b/resource/content/textures/realistic/terrain/Plain_grass.dds new file mode 100644 index 0000000..e9a2715 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Plain_grass.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbdc00eb646c84d79186a5e44356546cd1ef368fb84b9469f695527ce0455786 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Plain_grass.hos.dds b/resource/content/textures/realistic/terrain/Plain_grass.hos.dds new file mode 100644 index 0000000..c8623e7 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Plain_grass.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10faa0d5828c011085c8bf7abec397ef90e7b55ced935bcf66aa18c509d9eaa6 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Plain_grass.nrm.dds b/resource/content/textures/realistic/terrain/Plain_grass.nrm.dds new file mode 100644 index 0000000..668f3fa --- /dev/null +++ b/resource/content/textures/realistic/terrain/Plain_grass.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e41cf6f990dbd023851db369374988db6283d777ae3c53ad5542d47bcbeb5ed +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Rough_rock.dds b/resource/content/textures/realistic/terrain/Rough_rock.dds new file mode 100644 index 0000000..089b8ca --- /dev/null +++ b/resource/content/textures/realistic/terrain/Rough_rock.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4981dd0d6e59c8850f8cc90c9243234f5ac47b6c76c02a73cfda8c9ca4cd91b +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Rough_rock.hos.dds b/resource/content/textures/realistic/terrain/Rough_rock.hos.dds new file mode 100644 index 0000000..ee91002 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Rough_rock.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ed91545f7c3e05d3df593da75c9ea9c6911a188586090af50691986d4c4b6c7 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Rough_rock.nrm.dds b/resource/content/textures/realistic/terrain/Rough_rock.nrm.dds new file mode 100644 index 0000000..58f75c8 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Rough_rock.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23db516a9df3638e308029105c59f451cc02de4e51f8e3e67484a2d11ff4671b +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Sand.dds b/resource/content/textures/realistic/terrain/Sand.dds new file mode 100644 index 0000000..4fa274f --- /dev/null +++ b/resource/content/textures/realistic/terrain/Sand.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7deea882b36b317e98a2b03bb0e95be75c0bd1a8b8fa11523aca0d193d91fbc8 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Sand.hos.dds b/resource/content/textures/realistic/terrain/Sand.hos.dds new file mode 100644 index 0000000..53d9511 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Sand.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3202b9d2231e81f7ebd8dc0d522502d3692a75fd3abddc6668601d625b616a72 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Sand.nrm.dds b/resource/content/textures/realistic/terrain/Sand.nrm.dds new file mode 100644 index 0000000..517d70a --- /dev/null +++ b/resource/content/textures/realistic/terrain/Sand.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87d59321b33d8309117e65c917671f3ecf151a9f07ab3dfb7824f750872ce470 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Seaside_rock.dds b/resource/content/textures/realistic/terrain/Seaside_rock.dds new file mode 100644 index 0000000..484e7aa --- /dev/null +++ b/resource/content/textures/realistic/terrain/Seaside_rock.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:416c9b19882d977c1c37430f671e4d015f8045c6f1cd5c4af8364bdec9e804eb +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Seaside_rock.hos.dds b/resource/content/textures/realistic/terrain/Seaside_rock.hos.dds new file mode 100644 index 0000000..9c6430d --- /dev/null +++ b/resource/content/textures/realistic/terrain/Seaside_rock.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a1098d734781a64138bf4c796e071f48cc500bbde77cd0b8c85fe8f79f2512a +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Seaside_rock.nrm.dds b/resource/content/textures/realistic/terrain/Seaside_rock.nrm.dds new file mode 100644 index 0000000..dcfc8d5 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Seaside_rock.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9cba82620e06137576cc02eb1c955207af96d5c459aca4fde1827ac50f46962 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Stone_path.dds b/resource/content/textures/realistic/terrain/Stone_path.dds new file mode 100644 index 0000000..a226cfe --- /dev/null +++ b/resource/content/textures/realistic/terrain/Stone_path.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e9883af0fc2a2420f57f15a3bbff39ea40e4885779c7eae5dcacd610a810b4d +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Stone_path.hos.dds b/resource/content/textures/realistic/terrain/Stone_path.hos.dds new file mode 100644 index 0000000..b5f578e --- /dev/null +++ b/resource/content/textures/realistic/terrain/Stone_path.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13ba73228900adae42b0f589988192740c518c34a99c342c7f0d85bbbd71f4d6 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Stone_path.nrm.dds b/resource/content/textures/realistic/terrain/Stone_path.nrm.dds new file mode 100644 index 0000000..c17c00a --- /dev/null +++ b/resource/content/textures/realistic/terrain/Stone_path.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1476838c54d4b302846a4ef81ed3302e80274fc209f1fb096f5765dd4c1bb7b8 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Stone_wall.dds b/resource/content/textures/realistic/terrain/Stone_wall.dds new file mode 100644 index 0000000..7f1f733 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Stone_wall.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c69f3b689cbcc437b21a9a4fc99918ea600c3b9ebc4069b361b0ea87cf43086d +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Stone_wall.hos.dds b/resource/content/textures/realistic/terrain/Stone_wall.hos.dds new file mode 100644 index 0000000..d0a3a90 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Stone_wall.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48f010c937b43160d7a80f84d834f0441da6e38582486dedc8d6c48bf76247e1 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Stone_wall.nrm.dds b/resource/content/textures/realistic/terrain/Stone_wall.nrm.dds new file mode 100644 index 0000000..2de3714 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Stone_wall.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83f52b5d40fed7fa2ef9903495d1ab8c91e39ed3372ef5cd1eb9b1779698ab95 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Water.dds b/resource/content/textures/realistic/terrain/Water.dds new file mode 100644 index 0000000..48c2818 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Water.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64a0d49a4658e1652e07a1079e0518be2511da08df45419c971c9f7c17837b00 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Water.hos.dds b/resource/content/textures/realistic/terrain/Water.hos.dds new file mode 100644 index 0000000..9b31c76 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Water.hos.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:553c1237391ef8c31fe988b29ec80b0ac2dca4581c3db1a9e23361d7b70796f1 +size 1398256 diff --git a/resource/content/textures/realistic/terrain/Water.nrm.dds b/resource/content/textures/realistic/terrain/Water.nrm.dds new file mode 100644 index 0000000..1fc3343 --- /dev/null +++ b/resource/content/textures/realistic/terrain/Water.nrm.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91b48c10aacefabf2f653d856c5b3b686c4d67000823fadd9ce0d9ab9f2f29fc +size 1398256 diff --git a/resource/content/textures/ui/Aim.dds b/resource/content/textures/ui/Aim.dds index 668e249..6eb9f4b 100644 --- a/resource/content/textures/ui/Aim.dds +++ b/resource/content/textures/ui/Aim.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:591a72137cd29d30aac33acbe8888f6be8922b11e5e67490367524a328c5d1b7 +oid sha256:c168cf983d031e811a88025abcd5ca3a0e3eb1b80bacb1a6252c0a4e842d1767 size 4224 diff --git a/resource/textures/compile.sh b/resource/textures/compile.sh index e62f320..7b4a7b8 100755 --- a/resource/textures/compile.sh +++ b/resource/textures/compile.sh @@ -4,11 +4,12 @@ BASEDIR=$(dirname "$0") TARGETDIR="$BASEDIR/../content/textures" TMPDIR=$(mktemp -d -t dds.build.XXX) CP=${CP:="CompressonatorCLI"} -PACK=${PACK:="1024-realistic"} +PACK=${PACK:="realistic"} function compile { tmp="$TMPDIR/$(basename -- $1).png" convert -colorspace SRGB -- "$BASEDIR/$1" $tmp + mkdir -p $(dirname "$TARGETDIR/$2") $CP -fd BC3 -miplevels $3 $tmp "$TARGETDIR/$2" &> /dev/null rm $tmp echo $2 diff --git a/resource/textures/1024-realistic/Abstract_006_COLOR.jpg b/resource/textures/realistic/Abstract_006_COLOR.jpg similarity index 100% rename from resource/textures/1024-realistic/Abstract_006_COLOR.jpg rename to resource/textures/realistic/Abstract_006_COLOR.jpg diff --git a/resource/textures/1024-realistic/Abstract_006_DISP.png b/resource/textures/realistic/Abstract_006_DISP.png similarity index 100% rename from resource/textures/1024-realistic/Abstract_006_DISP.png rename to resource/textures/realistic/Abstract_006_DISP.png diff --git a/resource/textures/1024-realistic/Abstract_006_HOS.png b/resource/textures/realistic/Abstract_006_HOS.png similarity index 100% rename from resource/textures/1024-realistic/Abstract_006_HOS.png rename to resource/textures/realistic/Abstract_006_HOS.png diff --git a/resource/textures/1024-realistic/Abstract_006_NORM.jpg b/resource/textures/realistic/Abstract_006_NORM.jpg similarity index 100% rename from resource/textures/1024-realistic/Abstract_006_NORM.jpg rename to resource/textures/realistic/Abstract_006_NORM.jpg diff --git a/resource/textures/1024-realistic/Abstract_006_OCC.jpg b/resource/textures/realistic/Abstract_006_OCC.jpg similarity index 100% rename from resource/textures/1024-realistic/Abstract_006_OCC.jpg rename to resource/textures/realistic/Abstract_006_OCC.jpg diff --git a/resource/textures/1024-realistic/Abstract_006_SPEC.jpg b/resource/textures/realistic/Abstract_006_SPEC.jpg similarity index 100% rename from resource/textures/1024-realistic/Abstract_006_SPEC.jpg rename to resource/textures/realistic/Abstract_006_SPEC.jpg diff --git a/resource/textures/1024-realistic/Bark_005_HOS.png b/resource/textures/realistic/Bark_005_HOS.png similarity index 100% rename from resource/textures/1024-realistic/Bark_005_HOS.png rename to resource/textures/realistic/Bark_005_HOS.png diff --git a/resource/textures/1024-realistic/Bark_005_baseColor.jpg b/resource/textures/realistic/Bark_005_baseColor.jpg similarity index 100% rename from resource/textures/1024-realistic/Bark_005_baseColor.jpg rename to resource/textures/realistic/Bark_005_baseColor.jpg diff --git a/resource/textures/1024-realistic/Bark_005_normal.jpg b/resource/textures/realistic/Bark_005_normal.jpg similarity index 100% rename from resource/textures/1024-realistic/Bark_005_normal.jpg rename to resource/textures/realistic/Bark_005_normal.jpg diff --git a/resource/textures/1024-realistic/Debug.cube.back.png b/resource/textures/realistic/Debug.cube.back.png similarity index 100% rename from resource/textures/1024-realistic/Debug.cube.back.png rename to resource/textures/realistic/Debug.cube.back.png diff --git a/resource/textures/1024-realistic/Debug.cube.bottom.png b/resource/textures/realistic/Debug.cube.bottom.png similarity index 100% rename from resource/textures/1024-realistic/Debug.cube.bottom.png rename to resource/textures/realistic/Debug.cube.bottom.png diff --git a/resource/textures/1024-realistic/Debug.cube.front.png b/resource/textures/realistic/Debug.cube.front.png similarity index 100% rename from resource/textures/1024-realistic/Debug.cube.front.png rename to resource/textures/realistic/Debug.cube.front.png diff --git a/resource/textures/1024-realistic/Debug.cube.left.png b/resource/textures/realistic/Debug.cube.left.png similarity index 100% rename from resource/textures/1024-realistic/Debug.cube.left.png rename to resource/textures/realistic/Debug.cube.left.png diff --git a/resource/textures/1024-realistic/Debug.cube.right.png b/resource/textures/realistic/Debug.cube.right.png similarity index 100% rename from resource/textures/1024-realistic/Debug.cube.right.png rename to resource/textures/realistic/Debug.cube.right.png diff --git a/resource/textures/1024-realistic/Debug.cube.top.png b/resource/textures/realistic/Debug.cube.top.png similarity index 100% rename from resource/textures/1024-realistic/Debug.cube.top.png rename to resource/textures/realistic/Debug.cube.top.png diff --git a/resource/textures/1024-realistic/Debug_COLOR.jpg b/resource/textures/realistic/Debug_COLOR.jpg similarity index 100% rename from resource/textures/1024-realistic/Debug_COLOR.jpg rename to resource/textures/realistic/Debug_COLOR.jpg diff --git a/resource/textures/1024-realistic/Debug_HOS.png b/resource/textures/realistic/Debug_HOS.png similarity index 100% rename from resource/textures/1024-realistic/Debug_HOS.png rename to resource/textures/realistic/Debug_HOS.png diff --git a/resource/textures/1024-realistic/Debug_NORM.jpg b/resource/textures/realistic/Debug_NORM.jpg similarity index 100% rename from resource/textures/1024-realistic/Debug_NORM.jpg rename to resource/textures/realistic/Debug_NORM.jpg diff --git a/resource/textures/1024-realistic/Dirt_003_COLOR.png b/resource/textures/realistic/Dirt_003_COLOR.png similarity index 100% rename from resource/textures/1024-realistic/Dirt_003_COLOR.png rename to resource/textures/realistic/Dirt_003_COLOR.png diff --git a/resource/textures/1024-realistic/Dirt_003_DISP.png b/resource/textures/realistic/Dirt_003_DISP.png similarity index 100% rename from resource/textures/1024-realistic/Dirt_003_DISP.png rename to resource/textures/realistic/Dirt_003_DISP.png diff --git a/resource/textures/1024-realistic/Dirt_003_HOS.png b/resource/textures/realistic/Dirt_003_HOS.png similarity index 100% rename from resource/textures/1024-realistic/Dirt_003_HOS.png rename to resource/textures/realistic/Dirt_003_HOS.png diff --git a/resource/textures/1024-realistic/Dirt_003_NRM.png b/resource/textures/realistic/Dirt_003_NRM.png similarity index 100% rename from resource/textures/1024-realistic/Dirt_003_NRM.png rename to resource/textures/realistic/Dirt_003_NRM.png diff --git a/resource/textures/1024-realistic/Dirt_003_OCC.png b/resource/textures/realistic/Dirt_003_OCC.png similarity index 100% rename from resource/textures/1024-realistic/Dirt_003_OCC.png rename to resource/textures/realistic/Dirt_003_OCC.png diff --git a/resource/textures/1024-realistic/Dirt_003_SPEC.png b/resource/textures/realistic/Dirt_003_SPEC.png similarity index 100% rename from resource/textures/1024-realistic/Dirt_003_SPEC.png rename to resource/textures/realistic/Dirt_003_SPEC.png diff --git a/resource/textures/1024-realistic/Grass_001_COLOR.jpg b/resource/textures/realistic/Grass_001_COLOR.jpg similarity index 100% rename from resource/textures/1024-realistic/Grass_001_COLOR.jpg rename to resource/textures/realistic/Grass_001_COLOR.jpg diff --git a/resource/textures/1024-realistic/Grass_001_DISP.png b/resource/textures/realistic/Grass_001_DISP.png similarity index 100% rename from resource/textures/1024-realistic/Grass_001_DISP.png rename to resource/textures/realistic/Grass_001_DISP.png diff --git a/resource/textures/1024-realistic/Grass_001_HOS.jpg b/resource/textures/realistic/Grass_001_HOS.jpg similarity index 100% rename from resource/textures/1024-realistic/Grass_001_HOS.jpg rename to resource/textures/realistic/Grass_001_HOS.jpg diff --git a/resource/textures/1024-realistic/Grass_001_NORM.jpg b/resource/textures/realistic/Grass_001_NORM.jpg similarity index 100% rename from resource/textures/1024-realistic/Grass_001_NORM.jpg rename to resource/textures/realistic/Grass_001_NORM.jpg diff --git a/resource/textures/1024-realistic/Grass_001_OCC.jpg b/resource/textures/realistic/Grass_001_OCC.jpg similarity index 100% rename from resource/textures/1024-realistic/Grass_001_OCC.jpg rename to resource/textures/realistic/Grass_001_OCC.jpg diff --git a/resource/textures/1024-realistic/Grass_001_ROUGH.jpg b/resource/textures/realistic/Grass_001_ROUGH.jpg similarity index 100% rename from resource/textures/1024-realistic/Grass_001_ROUGH.jpg rename to resource/textures/realistic/Grass_001_ROUGH.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_002_ambientOcclusion.jpg b/resource/textures/realistic/Ground_Forest_002_ambientOcclusion.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_002_ambientOcclusion.jpg rename to resource/textures/realistic/Ground_Forest_002_ambientOcclusion.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_002_baseColor.jpg b/resource/textures/realistic/Ground_Forest_002_baseColor.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_002_baseColor.jpg rename to resource/textures/realistic/Ground_Forest_002_baseColor.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_002_height.png b/resource/textures/realistic/Ground_Forest_002_height.png similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_002_height.png rename to resource/textures/realistic/Ground_Forest_002_height.png diff --git a/resource/textures/1024-realistic/Ground_Forest_002_hos.jpg b/resource/textures/realistic/Ground_Forest_002_hos.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_002_hos.jpg rename to resource/textures/realistic/Ground_Forest_002_hos.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_002_normal.jpg b/resource/textures/realistic/Ground_Forest_002_normal.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_002_normal.jpg rename to resource/textures/realistic/Ground_Forest_002_normal.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_002_roughness.jpg b/resource/textures/realistic/Ground_Forest_002_roughness.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_002_roughness.jpg rename to resource/textures/realistic/Ground_Forest_002_roughness.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_003_ROUGH.jpg b/resource/textures/realistic/Ground_Forest_003_ROUGH.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_003_ROUGH.jpg rename to resource/textures/realistic/Ground_Forest_003_ROUGH.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_003_ambientOcclusion.jpg b/resource/textures/realistic/Ground_Forest_003_ambientOcclusion.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_003_ambientOcclusion.jpg rename to resource/textures/realistic/Ground_Forest_003_ambientOcclusion.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_003_baseColor.jpg b/resource/textures/realistic/Ground_Forest_003_baseColor.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_003_baseColor.jpg rename to resource/textures/realistic/Ground_Forest_003_baseColor.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_003_height.png b/resource/textures/realistic/Ground_Forest_003_height.png similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_003_height.png rename to resource/textures/realistic/Ground_Forest_003_height.png diff --git a/resource/textures/1024-realistic/Ground_Forest_003_hos.jpg b/resource/textures/realistic/Ground_Forest_003_hos.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_003_hos.jpg rename to resource/textures/realistic/Ground_Forest_003_hos.jpg diff --git a/resource/textures/1024-realistic/Ground_Forest_003_normal.jpg b/resource/textures/realistic/Ground_Forest_003_normal.jpg similarity index 100% rename from resource/textures/1024-realistic/Ground_Forest_003_normal.jpg rename to resource/textures/realistic/Ground_Forest_003_normal.jpg diff --git a/resource/textures/1024-realistic/Rough_rock_019_COLOR.jpg b/resource/textures/realistic/Rough_rock_019_COLOR.jpg similarity index 100% rename from resource/textures/1024-realistic/Rough_rock_019_COLOR.jpg rename to resource/textures/realistic/Rough_rock_019_COLOR.jpg diff --git a/resource/textures/1024-realistic/Rough_rock_019_DISP.jpg b/resource/textures/realistic/Rough_rock_019_DISP.jpg similarity index 100% rename from resource/textures/1024-realistic/Rough_rock_019_DISP.jpg rename to resource/textures/realistic/Rough_rock_019_DISP.jpg diff --git a/resource/textures/1024-realistic/Rough_rock_019_HOS.jpg b/resource/textures/realistic/Rough_rock_019_HOS.jpg similarity index 100% rename from resource/textures/1024-realistic/Rough_rock_019_HOS.jpg rename to resource/textures/realistic/Rough_rock_019_HOS.jpg diff --git a/resource/textures/1024-realistic/Rough_rock_019_NRM.jpg b/resource/textures/realistic/Rough_rock_019_NRM.jpg similarity index 100% rename from resource/textures/1024-realistic/Rough_rock_019_NRM.jpg rename to resource/textures/realistic/Rough_rock_019_NRM.jpg diff --git a/resource/textures/1024-realistic/Rough_rock_019_OCC.jpg b/resource/textures/realistic/Rough_rock_019_OCC.jpg similarity index 100% rename from resource/textures/1024-realistic/Rough_rock_019_OCC.jpg rename to resource/textures/realistic/Rough_rock_019_OCC.jpg diff --git a/resource/textures/1024-realistic/Rough_rock_019_SPEC.jpg b/resource/textures/realistic/Rough_rock_019_SPEC.jpg similarity index 100% rename from resource/textures/1024-realistic/Rough_rock_019_SPEC.jpg rename to resource/textures/realistic/Rough_rock_019_SPEC.jpg diff --git a/resource/textures/1024-realistic/Sand_005_ambientOcclusion.jpg b/resource/textures/realistic/Sand_005_ambientOcclusion.jpg similarity index 100% rename from resource/textures/1024-realistic/Sand_005_ambientOcclusion.jpg rename to resource/textures/realistic/Sand_005_ambientOcclusion.jpg diff --git a/resource/textures/1024-realistic/Sand_005_baseColor.jpg b/resource/textures/realistic/Sand_005_baseColor.jpg similarity index 100% rename from resource/textures/1024-realistic/Sand_005_baseColor.jpg rename to resource/textures/realistic/Sand_005_baseColor.jpg diff --git a/resource/textures/1024-realistic/Sand_005_height.png b/resource/textures/realistic/Sand_005_height.png similarity index 100% rename from resource/textures/1024-realistic/Sand_005_height.png rename to resource/textures/realistic/Sand_005_height.png diff --git a/resource/textures/1024-realistic/Sand_005_hos.jpg b/resource/textures/realistic/Sand_005_hos.jpg similarity index 100% rename from resource/textures/1024-realistic/Sand_005_hos.jpg rename to resource/textures/realistic/Sand_005_hos.jpg diff --git a/resource/textures/1024-realistic/Sand_005_normal.jpg b/resource/textures/realistic/Sand_005_normal.jpg similarity index 100% rename from resource/textures/1024-realistic/Sand_005_normal.jpg rename to resource/textures/realistic/Sand_005_normal.jpg diff --git a/resource/textures/1024-realistic/Sand_005_roughness.jpg b/resource/textures/realistic/Sand_005_roughness.jpg similarity index 100% rename from resource/textures/1024-realistic/Sand_005_roughness.jpg rename to resource/textures/realistic/Sand_005_roughness.jpg diff --git a/resource/textures/1024-realistic/Seaside_rocks_01_1K_AO.png b/resource/textures/realistic/Seaside_rocks_01_1K_AO.png similarity index 100% rename from resource/textures/1024-realistic/Seaside_rocks_01_1K_AO.png rename to resource/textures/realistic/Seaside_rocks_01_1K_AO.png diff --git a/resource/textures/1024-realistic/Seaside_rocks_01_1K_Base_Color.png b/resource/textures/realistic/Seaside_rocks_01_1K_Base_Color.png similarity index 100% rename from resource/textures/1024-realistic/Seaside_rocks_01_1K_Base_Color.png rename to resource/textures/realistic/Seaside_rocks_01_1K_Base_Color.png diff --git a/resource/textures/1024-realistic/Seaside_rocks_01_1K_HOS.png b/resource/textures/realistic/Seaside_rocks_01_1K_HOS.png similarity index 100% rename from resource/textures/1024-realistic/Seaside_rocks_01_1K_HOS.png rename to resource/textures/realistic/Seaside_rocks_01_1K_HOS.png diff --git a/resource/textures/1024-realistic/Seaside_rocks_01_1K_Height.png b/resource/textures/realistic/Seaside_rocks_01_1K_Height.png similarity index 100% rename from resource/textures/1024-realistic/Seaside_rocks_01_1K_Height.png rename to resource/textures/realistic/Seaside_rocks_01_1K_Height.png diff --git a/resource/textures/1024-realistic/Seaside_rocks_01_1K_Normal.png b/resource/textures/realistic/Seaside_rocks_01_1K_Normal.png similarity index 100% rename from resource/textures/1024-realistic/Seaside_rocks_01_1K_Normal.png rename to resource/textures/realistic/Seaside_rocks_01_1K_Normal.png diff --git a/resource/textures/1024-realistic/Seaside_rocks_01_1K_Roughness.png b/resource/textures/realistic/Seaside_rocks_01_1K_Roughness.png similarity index 100% rename from resource/textures/1024-realistic/Seaside_rocks_01_1K_Roughness.png rename to resource/textures/realistic/Seaside_rocks_01_1K_Roughness.png diff --git a/resource/textures/1024-realistic/Space_orange.cube.back.png b/resource/textures/realistic/Space_orange.cube.back.png similarity index 100% rename from resource/textures/1024-realistic/Space_orange.cube.back.png rename to resource/textures/realistic/Space_orange.cube.back.png diff --git a/resource/textures/1024-realistic/Space_orange.cube.bottom.png b/resource/textures/realistic/Space_orange.cube.bottom.png similarity index 100% rename from resource/textures/1024-realistic/Space_orange.cube.bottom.png rename to resource/textures/realistic/Space_orange.cube.bottom.png diff --git a/resource/textures/1024-realistic/Space_orange.cube.front.png b/resource/textures/realistic/Space_orange.cube.front.png similarity index 100% rename from resource/textures/1024-realistic/Space_orange.cube.front.png rename to resource/textures/realistic/Space_orange.cube.front.png diff --git a/resource/textures/1024-realistic/Space_orange.cube.left.png b/resource/textures/realistic/Space_orange.cube.left.png similarity index 100% rename from resource/textures/1024-realistic/Space_orange.cube.left.png rename to resource/textures/realistic/Space_orange.cube.left.png diff --git a/resource/textures/1024-realistic/Space_orange.cube.right.png b/resource/textures/realistic/Space_orange.cube.right.png similarity index 100% rename from resource/textures/1024-realistic/Space_orange.cube.right.png rename to resource/textures/realistic/Space_orange.cube.right.png diff --git a/resource/textures/1024-realistic/Space_orange.cube.top.png b/resource/textures/realistic/Space_orange.cube.top.png similarity index 100% rename from resource/textures/1024-realistic/Space_orange.cube.top.png rename to resource/textures/realistic/Space_orange.cube.top.png diff --git a/resource/textures/1024-realistic/Space_tray.cube.back.png b/resource/textures/realistic/Space_tray.cube.back.png similarity index 100% rename from resource/textures/1024-realistic/Space_tray.cube.back.png rename to resource/textures/realistic/Space_tray.cube.back.png diff --git a/resource/textures/1024-realistic/Space_tray.cube.bottom.png b/resource/textures/realistic/Space_tray.cube.bottom.png similarity index 100% rename from resource/textures/1024-realistic/Space_tray.cube.bottom.png rename to resource/textures/realistic/Space_tray.cube.bottom.png diff --git a/resource/textures/1024-realistic/Space_tray.cube.front.png b/resource/textures/realistic/Space_tray.cube.front.png similarity index 100% rename from resource/textures/1024-realistic/Space_tray.cube.front.png rename to resource/textures/realistic/Space_tray.cube.front.png diff --git a/resource/textures/1024-realistic/Space_tray.cube.left.png b/resource/textures/realistic/Space_tray.cube.left.png similarity index 100% rename from resource/textures/1024-realistic/Space_tray.cube.left.png rename to resource/textures/realistic/Space_tray.cube.left.png diff --git a/resource/textures/1024-realistic/Space_tray.cube.right.png b/resource/textures/realistic/Space_tray.cube.right.png similarity index 100% rename from resource/textures/1024-realistic/Space_tray.cube.right.png rename to resource/textures/realistic/Space_tray.cube.right.png diff --git a/resource/textures/1024-realistic/Space_tray.cube.top.png b/resource/textures/realistic/Space_tray.cube.top.png similarity index 100% rename from resource/textures/1024-realistic/Space_tray.cube.top.png rename to resource/textures/realistic/Space_tray.cube.top.png diff --git a/resource/textures/1024-realistic/Stone_Path_004_HOS.jpg b/resource/textures/realistic/Stone_Path_004_HOS.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Path_004_HOS.jpg rename to resource/textures/realistic/Stone_Path_004_HOS.jpg diff --git a/resource/textures/1024-realistic/Stone_Path_004_ambientOcclusion.jpg b/resource/textures/realistic/Stone_Path_004_ambientOcclusion.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Path_004_ambientOcclusion.jpg rename to resource/textures/realistic/Stone_Path_004_ambientOcclusion.jpg diff --git a/resource/textures/1024-realistic/Stone_Path_004_baseColor.jpg b/resource/textures/realistic/Stone_Path_004_baseColor.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Path_004_baseColor.jpg rename to resource/textures/realistic/Stone_Path_004_baseColor.jpg diff --git a/resource/textures/1024-realistic/Stone_Path_004_height.png b/resource/textures/realistic/Stone_Path_004_height.png similarity index 100% rename from resource/textures/1024-realistic/Stone_Path_004_height.png rename to resource/textures/realistic/Stone_Path_004_height.png diff --git a/resource/textures/1024-realistic/Stone_Path_004_normal.jpg b/resource/textures/realistic/Stone_Path_004_normal.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Path_004_normal.jpg rename to resource/textures/realistic/Stone_Path_004_normal.jpg diff --git a/resource/textures/1024-realistic/Stone_Path_004_roughness.jpg b/resource/textures/realistic/Stone_Path_004_roughness.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Path_004_roughness.jpg rename to resource/textures/realistic/Stone_Path_004_roughness.jpg diff --git a/resource/textures/1024-realistic/Stone_Wall_008_COLOR.jpg b/resource/textures/realistic/Stone_Wall_008_COLOR.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Wall_008_COLOR.jpg rename to resource/textures/realistic/Stone_Wall_008_COLOR.jpg diff --git a/resource/textures/1024-realistic/Stone_Wall_008_DISP.png b/resource/textures/realistic/Stone_Wall_008_DISP.png similarity index 100% rename from resource/textures/1024-realistic/Stone_Wall_008_DISP.png rename to resource/textures/realistic/Stone_Wall_008_DISP.png diff --git a/resource/textures/1024-realistic/Stone_Wall_008_HOS.jpg b/resource/textures/realistic/Stone_Wall_008_HOS.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Wall_008_HOS.jpg rename to resource/textures/realistic/Stone_Wall_008_HOS.jpg diff --git a/resource/textures/1024-realistic/Stone_Wall_008_NORM.jpg b/resource/textures/realistic/Stone_Wall_008_NORM.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Wall_008_NORM.jpg rename to resource/textures/realistic/Stone_Wall_008_NORM.jpg diff --git a/resource/textures/1024-realistic/Stone_Wall_008_OCC.jpg b/resource/textures/realistic/Stone_Wall_008_OCC.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Wall_008_OCC.jpg rename to resource/textures/realistic/Stone_Wall_008_OCC.jpg diff --git a/resource/textures/1024-realistic/Stone_Wall_008_ROUGH.jpg b/resource/textures/realistic/Stone_Wall_008_ROUGH.jpg similarity index 100% rename from resource/textures/1024-realistic/Stone_Wall_008_ROUGH.jpg rename to resource/textures/realistic/Stone_Wall_008_ROUGH.jpg diff --git a/resource/textures/1024-realistic/Water_002_COLOR.png b/resource/textures/realistic/Water_002_COLOR.png similarity index 100% rename from resource/textures/1024-realistic/Water_002_COLOR.png rename to resource/textures/realistic/Water_002_COLOR.png diff --git a/resource/textures/1024-realistic/Water_002_DISP.png b/resource/textures/realistic/Water_002_DISP.png similarity index 100% rename from resource/textures/1024-realistic/Water_002_DISP.png rename to resource/textures/realistic/Water_002_DISP.png diff --git a/resource/textures/1024-realistic/Water_002_HOS.jpg b/resource/textures/realistic/Water_002_HOS.jpg similarity index 100% rename from resource/textures/1024-realistic/Water_002_HOS.jpg rename to resource/textures/realistic/Water_002_HOS.jpg diff --git a/resource/textures/1024-realistic/Water_002_NORM.jpg b/resource/textures/realistic/Water_002_NORM.jpg similarity index 100% rename from resource/textures/1024-realistic/Water_002_NORM.jpg rename to resource/textures/realistic/Water_002_NORM.jpg diff --git a/resource/textures/1024-realistic/Water_002_OCC.jpg b/resource/textures/realistic/Water_002_OCC.jpg similarity index 100% rename from resource/textures/1024-realistic/Water_002_OCC.jpg rename to resource/textures/realistic/Water_002_OCC.jpg diff --git a/resource/textures/1024-realistic/Water_002_ROUGH.jpg b/resource/textures/realistic/Water_002_ROUGH.jpg similarity index 100% rename from resource/textures/1024-realistic/Water_002_ROUGH.jpg rename to resource/textures/realistic/Water_002_ROUGH.jpg diff --git a/resource/textures/1024-realistic/index.txt b/resource/textures/realistic/index.txt similarity index 100% rename from resource/textures/1024-realistic/index.txt rename to resource/textures/realistic/index.txt diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 4447d86..e19d3ae 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -43,7 +43,7 @@ void Client::run() { pipeline->reloadShaders(options.renderer.voxel); } if(actions && render::UI::Actions::RendererTextures) { - pipeline->reloadTextures(options.renderer.textures, options.renderer.getMipmapLodBias(), options.renderer.getAnisotropy()); + pipeline->reloadTextures(options.renderer.getTextures()); } if(actions && render::UI::Actions::FillMode) { pipeline->setFillMode(options.renderer.wireframe); diff --git a/src/client/config.hpp b/src/client/config.hpp index 0ef0a5a..54a5273 100644 --- a/src/client/config.hpp +++ b/src/client/config.hpp @@ -36,7 +36,7 @@ public: renderer.inFlightFrames = config["window"]["parallel_frames"].value_or(renderer.inFlightFrames); preferVulkan = config["render"]["prefer_vulkan"].value_or(preferVulkan); - renderer.textures = config["render"]["textures"].value_or(renderer.textures); + renderer.texturePack = config["render"]["texture_pack"].value_or(renderer.texturePack); renderer.textureQuality = config["render"]["texture_quality"].value_or(renderer.textureQuality); renderer.textureSharpness = config["render"]["texture_angular_quality"].value_or(renderer.textureSharpness); renderer.voxel.pbr = config["render"]["pbr"].value_or(renderer.voxel.pbr); @@ -121,7 +121,7 @@ public: })); config.insert_or_assign("render", toml::table({ {"prefer_vulkan", preferVulkan}, - {"textures", renderer.textures}, + {"texture_pack", renderer.texturePack}, {"texture_quality", renderer.textureQuality}, {"texture_angular_quality", renderer.textureSharpness}, {"pbr", renderer.voxel.pbr}, diff --git a/src/client/contouring/FlatDualMC.cpp b/src/client/contouring/FlatDualMC.cpp index 5062b58..1ffe718 100644 --- a/src/client/contouring/FlatDualMC.cpp +++ b/src/client/contouring/FlatDualMC.cpp @@ -62,7 +62,7 @@ namespace contouring { surrounding::load(sur, job.second.size, glm::ucvec3(x, y, z), job.second.chunks); idx.clear(); render(sur, idx, tmp, Layer::Both); //MAYBE: write inplace with sub-vector - simplify(idx, tmp); + mesh_opt::simplify(idx, tmp); data.indices.reserve(data.indices.size() + idx.size()); const auto idx_start = data.vertices.size(); @@ -72,18 +72,25 @@ namespace contouring { std::transform(tmp.begin(), tmp.end(), std::back_inserter(data.vertices), [&](render::VertexData v) { v.Position += vert_offset; return PACK(v); }); }}} - optimize_fetch(data); + mesh_opt::optimize_fetch(data); partLoadedQueue.emplace(job.first, std::move(data)); } } else if (area_priority.has_value() && (!part_priority.has_value() || area_priority.value() >= part_priority.value())) { if (std::pair ctx; areaLoadQueue.pop(ctx)) { ZoneScopedN("Chunk"); + const auto renderLayer = [&](render::LodModel::LodData& out, Layer layer) { + render(ctx.second, out.first.indices, tmp, layer); + + out.second = mesh_opt::simplify_lod(out.first.indices, tmp, loadedLevels); + std::transform(tmp.begin(), tmp.end(), std::back_inserter(out.first.vertices), PACK); + mesh_opt::optimize_fetch(out.first); + }; area_models::data data; if (transparency) { - render(ctx.second, data.main, tmp, Layer::Solid); - render(ctx.second, data.transparent, tmp, Layer::Transparent); + renderLayer(data.main, Layer::Solid); + renderLayer(data.transparent, Layer::Transparent); } else { - render(ctx.second, data.main, tmp, Layer::Both); + renderLayer(data.main, Layer::Both); } //MAYBE: direct upload with vulkan areaLoadedQueue.emplace(ctx.first, std::move(data)); @@ -386,13 +393,6 @@ namespace contouring { } } } - void FlatDualMC::render(const surrounding::corners &surrounding, render::LodModel::LodData &out, std::vector &tmp, Layer layer) const { - render(surrounding, out.first.indices, tmp, layer); - - out.second = simplify_lod(out.first.indices, tmp, loadedLevels); - std::transform(tmp.begin(), tmp.end(), std::back_inserter(out.first.vertices), PACK); - optimize_fetch(out.first); - } void FlatDualMC::getTerrainModels(terrain_draw_call out, const std::optional &frustum, const world::cell_pos& offset, bool solid) const { for (const auto& area: areas) { diff --git a/src/client/contouring/FlatDualMC.hpp b/src/client/contouring/FlatDualMC.hpp index 76660e4..d576b61 100644 --- a/src/client/contouring/FlatDualMC.hpp +++ b/src/client/contouring/FlatDualMC.hpp @@ -99,6 +99,5 @@ namespace contouring { } void render(const surrounding::corners &surrounding, render::Model::Data::indices_t& idx, std::vector& ver, Layer layer) const; - void render(const surrounding::corners &surrounding, render::LodModel::LodData& out, std::vector& tmp, Layer layer) const; }; } diff --git a/src/client/contouring/optimizer.hpp b/src/client/contouring/optimizer.hpp index 67d09db..0928497 100644 --- a/src/client/contouring/optimizer.hpp +++ b/src/client/contouring/optimizer.hpp @@ -1,9 +1,11 @@ #pragma once #include +namespace mesh_opt { +//FIXME: set allocator + inline void optimize_fetch(render::Model::Data& out) { ZoneScopedN("Optimize"); - std::vector remap(out.indices.size()); size_t vertex_count = meshopt_optimizeVertexFetch(out.vertices.data(), out.indices.data(), out.indices.size(), out.vertices.data(), out.vertices.size(), sizeof(render::PackedVertexData)); out.vertices.resize(vertex_count, render::PackedVertexData(0, 0, 0, 0, 0, 0, 0)); } @@ -15,7 +17,7 @@ inline void simplify_buffer(std::vector &out, const std::vector &indices, out.resize(indices.size()); out.resize(meshopt_simplify(out.data(), indices.data(), indices.size(), &vertices.front().Position.x, vertices.size(), sizeof(render::VertexData), indices.size() * threshold, target_error)); } -#include + template inline std::vector simplify_lod(std::vector &indices, const std::vector &vertices, const std::vector> &levels) { @@ -41,4 +43,6 @@ inline void simplify(std::vector &indices, const std::vector= 1 ? (1 << (textureSharpness - 1)) : 0; } + texturesOptions getTextures() const { return texturesOptions{texturePack, getMipmapLodBias(), getAnisotropy()}; } }; /// Rendering plateform interface @@ -97,7 +105,7 @@ public: virtual void setClearColor(glm::vec4) = 0; virtual void reloadShaders(const passOptions &) = 0; - virtual void reloadTextures(const std::string &, float mipMapLOD, int anisotropy) = 0; + virtual void reloadTextures(const texturesOptions &) = 0; virtual void setFillMode(bool wireframe) = 0; virtual void setVSync(bool vSync) = 0; diff --git a/src/client/render/UI.cpp b/src/client/render/UI.cpp index 649870d..d95a668 100644 --- a/src/client/render/UI.cpp +++ b/src/client/render/UI.cpp @@ -433,25 +433,27 @@ UI::Actions drawCommon(config::client::options &options, state::state& state, co if (ImGui::Checkbox("Wireframe", &options.renderer.wireframe)) { actions |= UI::Actions::FillMode; } - if (ImGui::BeginCombo("Textures", options.renderer.textures.c_str())) { - for (auto& pack: texturePacks) { - const bool is_selected = (pack == options.renderer.textures); - if (ImGui::Selectable(pack.c_str(), is_selected)) { - options.renderer.textures = pack; - actions |= UI::Actions::RendererTextures; + if (ImGui::CollapsingHeader("Textures", ImGuiTreeNodeFlags_DefaultOpen)) { + if (ImGui::BeginCombo("Pack", options.renderer.texturePack.c_str())) { + for (auto& pack: texturePacks) { + const bool is_selected = (pack == options.renderer.texturePack); + if (ImGui::Selectable(pack.c_str(), is_selected)) { + options.renderer.texturePack = pack; + actions |= UI::Actions::RendererTextures; + } + if (is_selected) + ImGui::SetItemDefaultFocus(); } - if (is_selected) - ImGui::SetItemDefaultFocus(); + ImGui::EndCombo(); } - ImGui::EndCombo(); + std::string anisotropy = std::to_string(options.renderer.getAnisotropy()) + "x"; + if (ImGui::SliderInt("Quality", &options.renderer.textureQuality, 0, 200, "%d%%") | + ImGui::SliderInt("Sharpness", &options.renderer.textureSharpness, 0, 8, anisotropy.c_str())) { + actions |= UI::Actions::RendererTextures; + } + if(ImGui::IsItemHovered()) + ImGui::SetTooltip("Better texture quality especially at low angles"); } - std::string anisotropy = std::to_string(options.renderer.getAnisotropy()) + "x"; - if (ImGui::SliderInt("Quality", &options.renderer.textureQuality, 0, 200, "%d%%") | - ImGui::SliderInt("Sharpness", &options.renderer.textureSharpness, 0, 8, anisotropy.c_str())) { - actions |= UI::Actions::RendererTextures; - } - if(ImGui::IsItemHovered()) - ImGui::SetTooltip("Better texture quality especially at low angles"); ImGui::End(); } diff --git a/src/client/render/api/Images.cpp b/src/client/render/api/Images.cpp index d822937..98aa6fb 100644 --- a/src/client/render/api/Images.cpp +++ b/src/client/render/api/Images.cpp @@ -1,4 +1,5 @@ #include "Images.hpp" +#include "core/utils/logger.hpp" using namespace render; @@ -25,7 +26,7 @@ std::optional Image::Read(const std::string& imagepath, std:: /* try to open the file */ fp = fopen(imagepath.c_str(), "rb"); if (fp == NULL){ - printf("%s could not be opened.\n", imagepath.c_str()); getchar(); + LOG_E(imagepath << " could not be opened"); return {}; } diff --git a/src/client/render/impl/gl/Renderer.cpp b/src/client/render/impl/gl/Renderer.cpp index bc19206..b913f97 100644 --- a/src/client/render/impl/gl/Renderer.cpp +++ b/src/client/render/impl/gl/Renderer.cpp @@ -32,7 +32,7 @@ Renderer::Renderer(const render::renderOptions& options): IndicatorPass = std::make_unique(); FogColor = glm::vec3(options.clear_color.x, options.clear_color.y, options.clear_color.z); - loadTextures(options.textures, options.getMipmapLodBias(), options.getAnisotropy()); + loadTextures(options.getTextures()); setFillMode(options.wireframe); } @@ -165,9 +165,9 @@ void Renderer::reloadShaders(const pass::VoxelProgram::options& options) { TerrainPass = std::make_unique(options); EntityPass = std::make_unique(options); } -void Renderer::reloadTextures(const std::string& texturePath, float mipMapLOD, int anisotropy) { +void Renderer::reloadTextures(const texturesOptions & tt) { unloadTextures(); - loadTextures(texturePath, mipMapLOD, anisotropy); + loadTextures(tt); } void Renderer::unloadTextures() { @@ -175,23 +175,23 @@ void Renderer::unloadTextures() { NormalAtlas.reset(); TextureAtlas.reset(); } -void Renderer::loadTextures(const std::string& texturePath, float mipMapLOD, int anisotropy) { +void Renderer::loadTextures(const texturesOptions & tt) { std::vector terrainTextures; auto makePaths = [&](const std::string& suffix) { terrainTextures.clear(); const auto& textures = world::module::Registry::Get()->getTextures(); terrainTextures.reserve(textures.size()); for(const auto& texture: textures) { - terrainTextures.emplace_back(TEXTURES_DIR + texturePath + "/terrain/" + texture + suffix + ".dds"); + terrainTextures.emplace_back(TEXTURES_DIR + tt.path + "/terrain/" + texture + suffix + ".dds"); } return terrainTextures; }; - auto sampling = Texture::sampling{true, true, Texture::Wrap::REPEAT, anisotropy, true, mipMapLOD}; + const auto sampling = Texture::sampling{true, true, Texture::Wrap::REPEAT, tt.anisotropy, true, tt.mipMapLOD}; TextureAtlas = TextureArray::LoadFromFiles(makePaths(""), sampling); NormalAtlas = TextureArray::LoadFromFiles(makePaths(".nrm"), sampling); HOSAtlas = TextureArray::LoadFromFiles(makePaths(".hos"), sampling); - Skybox = TextureCube::LoadFromFiles(TEXTURES_DIR + texturePath + "/sky/Space_tray.cube", {}); + Skybox = TextureCube::LoadFromFiles(TEXTURES_DIR + tt.path + "/sky/Space_tray.cube", {}); } void Renderer::lookFrom(const Camera& camera) { diff --git a/src/client/render/impl/gl/Renderer.hpp b/src/client/render/impl/gl/Renderer.hpp index aa5f060..7717d7b 100644 --- a/src/client/render/impl/gl/Renderer.hpp +++ b/src/client/render/impl/gl/Renderer.hpp @@ -57,7 +57,7 @@ public: /// Apply camera matrices void lookFrom(const Camera&) override; void reloadShaders(const pass::VoxelProgram::options &) override; - void reloadTextures(const std::string &, float mipMapLOD, int anisotropy) override; + void reloadTextures(const texturesOptions &) override; void setFillMode(bool wireframe) override; void setVSync(bool vSync) override; @@ -88,7 +88,7 @@ private: /// Draw skybox bool SkyEnable; - void loadTextures(const std::string &, float mipMapLOD, int anisotropy); + void loadTextures(const texturesOptions &); void unloadTextures(); }; } \ No newline at end of file diff --git a/src/client/render/impl/vk/CommandCenter.cpp b/src/client/render/impl/vk/CommandCenter.cpp index 93e450c..0653673 100644 --- a/src/client/render/impl/vk/CommandCenter.cpp +++ b/src/client/render/impl/vk/CommandCenter.cpp @@ -33,17 +33,13 @@ CommandCenter::CommandCenter(VkDevice device, const PhysicalDeviceInfo &info, co if (!skyCubeBuffer) { FATAL("Failed to create vertex buffer!"); } - skyboxTexture = TextureCube::LoadFromFiles(TEXTURES_DIR + opt.textures + "/sky/Space_tray.cube", {}); - if (!skyboxTexture) { - FATAL("Failed to create texture sampler!"); - } colorFormat = info.getSurfaceFormat().format; colorSamples = info.samples; LOG_D("Samples: " << colorSamples); depthFormat = info.findDepthFormat(); - loadAtlases(opt.textures, opt.getAnisotropy(), opt.getMipmapLodBias()); + loadAtlases(opt.getTextures()); } CommandCenter::~CommandCenter() { if(!freed) @@ -51,10 +47,11 @@ CommandCenter::~CommandCenter() { vkDestroyCommandPool(device, graphicsPool, ALLOC); } -void CommandCenter::loadAtlases(const std::string& pack, int anisotropy, float lodBias) { +void CommandCenter::loadAtlases(const texturesOptions& tt) { voxelTextureAtlas.reset(); voxelNormalAtlas.reset(); voxelHOSAtlas.reset(); + skyboxTexture.reset(); std::vector paths; auto makePaths = [&](const std::string &suffix) { @@ -62,11 +59,11 @@ void CommandCenter::loadAtlases(const std::string& pack, int anisotropy, float l const auto &textures = world::module::Registry::Get()->getTextures(); paths.reserve(textures.size()); for (auto& texture: textures) { - paths.push_back(TEXTURES_DIR + pack + "/terrain/" + texture + suffix + ".dds"); + paths.push_back(TEXTURES_DIR + tt.path + "/terrain/" + texture + suffix + ".dds"); } return paths; }; - const auto sampling = Texture::sampling{true, true, Texture::Wrap::REPEAT, anisotropy, true, lodBias}; + const auto sampling = Texture::sampling{true, true, Texture::Wrap::REPEAT, tt.anisotropy, true, tt.mipMapLOD}; voxelTextureAtlas = TextureArray::LoadFromFiles(makePaths(""), sampling); voxelNormalAtlas = TextureArray::LoadFromFiles(makePaths(".nrm"), sampling, false); voxelHOSAtlas = TextureArray::LoadFromFiles(makePaths(".hos"), sampling); @@ -74,6 +71,11 @@ void CommandCenter::loadAtlases(const std::string& pack, int anisotropy, float l if(!(voxelTextureAtlas && voxelNormalAtlas && voxelHOSAtlas)) { FATAL("Failed to load texture pack!"); } + + skyboxTexture = TextureCube::LoadFromFiles(TEXTURES_DIR + tt.path + "/sky/Space_tray.cube", {}); + if (!skyboxTexture) { + FATAL("Failed to create texture sampler!"); + } } #include diff --git a/src/client/render/impl/vk/CommandCenter.hpp b/src/client/render/impl/vk/CommandCenter.hpp index b2f4bb7..3d79aca 100644 --- a/src/client/render/impl/vk/CommandCenter.hpp +++ b/src/client/render/impl/vk/CommandCenter.hpp @@ -12,6 +12,9 @@ namespace tracy { class VkCtx; } typedef tracy::VkCtx* TracyVkCtxPtr; +namespace render { + struct texturesOptions; +} namespace render::vk { class SwapChain; @@ -35,7 +38,7 @@ public: void recordUI(uint32_t idx, VkRenderPass uiPass, VkExtent2D, const std::function &); void submitGraphics(uint32_t, VkSemaphore, VkSemaphore, VkFence); - void loadAtlases(const std::string &texturePath, int anisotropy, float lodBias); + void loadAtlases(const render::texturesOptions&); void allocate(const std::vector&, const Pipeline&, VkPhysicalDevice, VkExtent2D); void free(); diff --git a/src/client/render/impl/vk/Renderer.cpp b/src/client/render/impl/vk/Renderer.cpp index c504320..0b8b10e 100644 --- a/src/client/render/impl/vk/Renderer.cpp +++ b/src/client/render/impl/vk/Renderer.cpp @@ -530,10 +530,10 @@ void Renderer::reloadShaders(const render::passOptions& opt) { options.voxel = opt; recreateSwapChain(); } -void Renderer::reloadTextures(const std::string& textures, float mipmap, int anisotropy) { +void Renderer::reloadTextures(const texturesOptions & tt) { vkDeviceWaitIdle(device); commandCenter->free(); - commandCenter->loadAtlases(textures, anisotropy, mipmap); + commandCenter->loadAtlases(tt); commandCenter->allocate(swapChain->getImageViews(), *pipeline.get(), getInfos().device, getInfos().swapDetails.capabilities.currentExtent); } diff --git a/src/client/render/impl/vk/Renderer.hpp b/src/client/render/impl/vk/Renderer.hpp index feec139..1df98c7 100644 --- a/src/client/render/impl/vk/Renderer.hpp +++ b/src/client/render/impl/vk/Renderer.hpp @@ -36,7 +36,7 @@ public: /// Apply camera matrices void lookFrom(const Camera &) override; void reloadShaders(const passOptions &) override; - void reloadTextures(const std::string &, float mipMapLOD, int anisotropy) override; + void reloadTextures(const texturesOptions &) override; void setFillMode(bool wireframe) override; void setVSync(bool vSync) override;