From 17d3f4afa4fef23007e4d95272093d12ae3c491a Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Wed, 8 Nov 2017 22:19:47 +0100 Subject: [PATCH] Put shaders into the data/ directory Simplifies a lot of things --- CMakeLists.txt | 4 +-- {shader => data/shader}/bordertile.frag | 0 {shader => data/shader}/bordertile.vert | 0 {shader => data/shader}/bordertileline.frag | 0 {shader => data/shader}/bordertileline.vert | 0 .../shader}/bordertilelinetex.frag | 0 .../shader}/bordertilelinetex.vert | 0 {shader => data/shader}/bordertiletex.frag | 0 {shader => data/shader}/bordertiletex.vert | 0 {shader => data/shader}/prim.frag | 0 {shader => data/shader}/prim.vert | 0 {shader => data/shader}/tile.frag | 0 {shader => data/shader}/tile.vert | 0 {shader => data/shader}/tiletex.frag | 0 {shader => data/shader}/tiletex.vert | 0 scripts/make_release.py | 4 --- src/engine/client/backend_sdl.cpp | 28 +++++++++---------- 17 files changed, 15 insertions(+), 21 deletions(-) rename {shader => data/shader}/bordertile.frag (100%) rename {shader => data/shader}/bordertile.vert (100%) rename {shader => data/shader}/bordertileline.frag (100%) rename {shader => data/shader}/bordertileline.vert (100%) rename {shader => data/shader}/bordertilelinetex.frag (100%) rename {shader => data/shader}/bordertilelinetex.vert (100%) rename {shader => data/shader}/bordertiletex.frag (100%) rename {shader => data/shader}/bordertiletex.vert (100%) rename {shader => data/shader}/prim.frag (100%) rename {shader => data/shader}/prim.vert (100%) rename {shader => data/shader}/tile.frag (100%) rename {shader => data/shader}/tile.vert (100%) rename {shader => data/shader}/tiletex.frag (100%) rename {shader => data/shader}/tiletex.vert (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01b2de824..54d795798 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,7 +422,6 @@ endif() ######################################################################## file(COPY data DESTINATION .) -file(COPY shader DESTINATION .) set(COPY_FILES ${CURL_COPY_FILES} ${FREETYPE_COPY_FILES} @@ -1160,7 +1159,6 @@ endforeach() set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME ${PROJECT_NAME}) install(TARGETS ${TARGET_CLIENT} ${TARGET_SERVER} DESTINATION bin) -install(DIRECTORY data shader DESTINATION share/DDNet) set(CPACK_TARGETS ${TARGET_CLIENT} @@ -1171,7 +1169,7 @@ set(CPACK_TARGETS map_diff map_extract ) -set(CPACK_DIRS data shader) +set(CPACK_DIRS data) set(CPACK_FILES license.txt storage.cfg diff --git a/shader/bordertile.frag b/data/shader/bordertile.frag similarity index 100% rename from shader/bordertile.frag rename to data/shader/bordertile.frag diff --git a/shader/bordertile.vert b/data/shader/bordertile.vert similarity index 100% rename from shader/bordertile.vert rename to data/shader/bordertile.vert diff --git a/shader/bordertileline.frag b/data/shader/bordertileline.frag similarity index 100% rename from shader/bordertileline.frag rename to data/shader/bordertileline.frag diff --git a/shader/bordertileline.vert b/data/shader/bordertileline.vert similarity index 100% rename from shader/bordertileline.vert rename to data/shader/bordertileline.vert diff --git a/shader/bordertilelinetex.frag b/data/shader/bordertilelinetex.frag similarity index 100% rename from shader/bordertilelinetex.frag rename to data/shader/bordertilelinetex.frag diff --git a/shader/bordertilelinetex.vert b/data/shader/bordertilelinetex.vert similarity index 100% rename from shader/bordertilelinetex.vert rename to data/shader/bordertilelinetex.vert diff --git a/shader/bordertiletex.frag b/data/shader/bordertiletex.frag similarity index 100% rename from shader/bordertiletex.frag rename to data/shader/bordertiletex.frag diff --git a/shader/bordertiletex.vert b/data/shader/bordertiletex.vert similarity index 100% rename from shader/bordertiletex.vert rename to data/shader/bordertiletex.vert diff --git a/shader/prim.frag b/data/shader/prim.frag similarity index 100% rename from shader/prim.frag rename to data/shader/prim.frag diff --git a/shader/prim.vert b/data/shader/prim.vert similarity index 100% rename from shader/prim.vert rename to data/shader/prim.vert diff --git a/shader/tile.frag b/data/shader/tile.frag similarity index 100% rename from shader/tile.frag rename to data/shader/tile.frag diff --git a/shader/tile.vert b/data/shader/tile.vert similarity index 100% rename from shader/tile.vert rename to data/shader/tile.vert diff --git a/shader/tiletex.frag b/data/shader/tiletex.frag similarity index 100% rename from shader/tiletex.frag rename to data/shader/tiletex.frag diff --git a/shader/tiletex.vert b/data/shader/tiletex.vert similarity index 100% rename from shader/tiletex.vert rename to data/shader/tiletex.vert diff --git a/scripts/make_release.py b/scripts/make_release.py index 1a2a4ac1d..f81037c0e 100644 --- a/scripts/make_release.py +++ b/scripts/make_release.py @@ -66,8 +66,6 @@ shutil.copy("autoexec_server.cfg", package_dir) if include_data and not use_bundle: os.mkdir(os.path.join(package_dir, "data")) copydir("data", package_dir) - os.mkdir(os.path.join(package_dir, "shader")) - copydir("shader", package_dir) if platform[:3] == "win": shutil.copy("other/config_directory.bat", package_dir) shutil.copy("SDL2.dll", package_dir) @@ -121,9 +119,7 @@ if use_bundle: os.mkdir(clientbundle_resource_dir) os.mkdir(clientbundle_framework_dir) os.mkdir(os.path.join(clientbundle_resource_dir, "data")) - os.mkdir(os.path.join(clientbundle_resource_dir, "shader")) copydir("data", clientbundle_resource_dir) - copydir("shader", clientbundle_resource_dir) shutil.copy("other/icons/DDNet.icns", clientbundle_resource_dir) diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp index 9734445c6..1654f353a 100644 --- a/src/engine/client/backend_sdl.cpp +++ b/src/engine/client/backend_sdl.cpp @@ -598,8 +598,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL PrimitiveVertexShader; CGLSL PrimitiveFragmentShader; - PrimitiveVertexShader.LoadShader("./shader/prim.vert", GL_VERTEX_SHADER); - PrimitiveFragmentShader.LoadShader("./shader/prim.frag", GL_FRAGMENT_SHADER); + PrimitiveVertexShader.LoadShader("data/shader/prim.vert", GL_VERTEX_SHADER); + PrimitiveFragmentShader.LoadShader("data/shader/prim.frag", GL_FRAGMENT_SHADER); m_pPrimitiveProgram->CreateProgram(); m_pPrimitiveProgram->AddShader(&PrimitiveVertexShader); @@ -615,8 +615,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL VertexShader; CGLSL FragmentShader; - VertexShader.LoadShader("./shader/tile.vert", GL_VERTEX_SHADER); - FragmentShader.LoadShader("./shader/tile.frag", GL_FRAGMENT_SHADER); + VertexShader.LoadShader("data/shader/tile.vert", GL_VERTEX_SHADER); + FragmentShader.LoadShader("data/shader/tile.frag", GL_FRAGMENT_SHADER); m_pTileProgram->CreateProgram(); m_pTileProgram->AddShader(&VertexShader); @@ -634,8 +634,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL VertexShader; CGLSL FragmentShader; - VertexShader.LoadShader("./shader/tiletex.vert", GL_VERTEX_SHADER); - FragmentShader.LoadShader("./shader/tiletex.frag", GL_FRAGMENT_SHADER); + VertexShader.LoadShader("data/shader/tiletex.vert", GL_VERTEX_SHADER); + FragmentShader.LoadShader("data/shader/tiletex.frag", GL_FRAGMENT_SHADER); m_pTileProgramTextured->CreateProgram(); m_pTileProgramTextured->AddShader(&VertexShader); @@ -653,8 +653,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL VertexShader; CGLSL FragmentShader; - VertexShader.LoadShader("./shader/bordertile.vert", GL_VERTEX_SHADER); - FragmentShader.LoadShader("./shader/bordertile.frag", GL_FRAGMENT_SHADER); + VertexShader.LoadShader("data/shader/bordertile.vert", GL_VERTEX_SHADER); + FragmentShader.LoadShader("data/shader/bordertile.frag", GL_FRAGMENT_SHADER); m_pBorderTileProgram->CreateProgram(); m_pBorderTileProgram->AddShader(&VertexShader); @@ -675,8 +675,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL VertexShader; CGLSL FragmentShader; - VertexShader.LoadShader("./shader/bordertiletex.vert", GL_VERTEX_SHADER); - FragmentShader.LoadShader("./shader/bordertiletex.frag", GL_FRAGMENT_SHADER); + VertexShader.LoadShader("data/shader/bordertiletex.vert", GL_VERTEX_SHADER); + FragmentShader.LoadShader("data/shader/bordertiletex.frag", GL_FRAGMENT_SHADER); m_pBorderTileProgramTextured->CreateProgram(); m_pBorderTileProgramTextured->AddShader(&VertexShader); @@ -697,8 +697,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL VertexShader; CGLSL FragmentShader; - VertexShader.LoadShader("./shader/bordertileline.vert", GL_VERTEX_SHADER); - FragmentShader.LoadShader("./shader/bordertileline.frag", GL_FRAGMENT_SHADER); + VertexShader.LoadShader("data/shader/bordertileline.vert", GL_VERTEX_SHADER); + FragmentShader.LoadShader("data/shader/bordertileline.frag", GL_FRAGMENT_SHADER); m_pBorderTileLineProgram->CreateProgram(); m_pBorderTileLineProgram->AddShader(&VertexShader); @@ -717,8 +717,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand { CGLSL VertexShader; CGLSL FragmentShader; - VertexShader.LoadShader("./shader/bordertilelinetex.vert", GL_VERTEX_SHADER); - FragmentShader.LoadShader("./shader/bordertilelinetex.frag", GL_FRAGMENT_SHADER); + VertexShader.LoadShader("data/shader/bordertilelinetex.vert", GL_VERTEX_SHADER); + FragmentShader.LoadShader("data/shader/bordertilelinetex.frag", GL_FRAGMENT_SHADER); m_pBorderTileLineProgramTextured->CreateProgram(); m_pBorderTileLineProgramTextured->AddShader(&VertexShader);