From 3ccfb70fb84b89892016645654a7b134d186a338 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Wed, 6 Apr 2016 14:57:45 +0300 Subject: [PATCH] move shaders to std resources of dlangui --- dlangui-monod-linux.dproj | 10 ++++++++++ dlangui-monod-osx.dproj | 10 +++++----- dub.json | 1 + examples/d3d/dub.json | 2 +- examples/d3d/views/resources.list | 8 -------- {examples/d3d/views => views}/res/shaders/colored.frag | 0 {examples/d3d/views => views}/res/shaders/colored.vert | 0 .../d3d/views => views}/res/shaders/lighting.frag | 0 .../d3d/views => views}/res/shaders/lighting.vert | 0 .../d3d/views => views}/res/shaders/skinning-none.vert | 0 .../d3d/views => views}/res/shaders/skinning.vert | 0 .../d3d/views => views}/res/shaders/textured.frag | 0 .../d3d/views => views}/res/shaders/textured.vert | 0 views/standard_resources.list | 8 ++++++++ 14 files changed, 25 insertions(+), 14 deletions(-) rename {examples/d3d/views => views}/res/shaders/colored.frag (100%) rename {examples/d3d/views => views}/res/shaders/colored.vert (100%) rename {examples/d3d/views => views}/res/shaders/lighting.frag (100%) rename {examples/d3d/views => views}/res/shaders/lighting.vert (100%) rename {examples/d3d/views => views}/res/shaders/skinning-none.vert (100%) rename {examples/d3d/views => views}/res/shaders/skinning.vert (100%) rename {examples/d3d/views => views}/res/shaders/textured.frag (100%) rename {examples/d3d/views => views}/res/shaders/textured.vert (100%) diff --git a/dlangui-monod-linux.dproj b/dlangui-monod-linux.dproj index f82b740b..48da5792 100644 --- a/dlangui-monod-linux.dproj +++ b/dlangui-monod-linux.dproj @@ -30,6 +30,7 @@ -Jviews -Jviews/res -Jviews/res/i18n +-Jviews/res/shaders -Jviews/res/mdpi -Jviews/res/hdpi @@ -49,6 +50,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -73,6 +75,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi true libdlangui-monod-linux @@ -95,6 +98,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -117,6 +121,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -139,6 +144,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -168,6 +174,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -191,6 +198,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -214,6 +222,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux @@ -237,6 +246,7 @@ -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi +-Jviews/res/shaders -Jviews/res/hdpi false libdlangui-monod-linux diff --git a/dlangui-monod-osx.dproj b/dlangui-monod-osx.dproj index 25df2eff..f5275a69 100644 --- a/dlangui-monod-osx.dproj +++ b/dlangui-monod-osx.dproj @@ -27,7 +27,7 @@ obj/Debug true - -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders false libdlangui-monod-osx StaticLibrary @@ -43,7 +43,7 @@ StaticLibrary true 0 - -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders USE_SDL @@ -63,7 +63,7 @@ Executable true 0 - -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders USE_SDL @@ -84,7 +84,7 @@ obj/DebugX11 true - -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders false libdlangui-monod-osx StaticLibrary @@ -95,7 +95,7 @@ bin\DebugX11 obj/DebugX11 false - -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders false libdlangui-monod-osx StaticLibrary diff --git a/dub.json b/dub.json index a8bc8b76..868539f3 100644 --- a/dub.json +++ b/dub.json @@ -22,6 +22,7 @@ "views/res", "views/res/mdpi", "views/res/hdpi", + "views/res/shaders", "views/res/i18n" ], diff --git a/examples/d3d/dub.json b/examples/d3d/dub.json index 94b57412..1c609ab9 100644 --- a/examples/d3d/dub.json +++ b/examples/d3d/dub.json @@ -5,7 +5,7 @@ "license": "Boost", "authors": ["Vadim Lopatin"], - "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/shaders", "views/res/models"], + "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/models"], "targetPath": "bin", "targetName": "d3d", diff --git a/examples/d3d/views/resources.list b/examples/d3d/views/resources.list index c3a28ed0..49e2f24f 100644 --- a/examples/d3d/views/resources.list +++ b/examples/d3d/views/resources.list @@ -8,11 +8,3 @@ res/mdpi/brick.png res/mdpi/brickn.png res/models/suzanne.obj res/models/suzanne.fbx -res/shaders/colored.vert -res/shaders/colored.frag -res/shaders/lighting.vert -res/shaders/lighting.frag -res/shaders/skinning.vert -res/shaders/skinning-none.vert -res/shaders/textured.vert -res/shaders/textured.frag diff --git a/examples/d3d/views/res/shaders/colored.frag b/views/res/shaders/colored.frag similarity index 100% rename from examples/d3d/views/res/shaders/colored.frag rename to views/res/shaders/colored.frag diff --git a/examples/d3d/views/res/shaders/colored.vert b/views/res/shaders/colored.vert similarity index 100% rename from examples/d3d/views/res/shaders/colored.vert rename to views/res/shaders/colored.vert diff --git a/examples/d3d/views/res/shaders/lighting.frag b/views/res/shaders/lighting.frag similarity index 100% rename from examples/d3d/views/res/shaders/lighting.frag rename to views/res/shaders/lighting.frag diff --git a/examples/d3d/views/res/shaders/lighting.vert b/views/res/shaders/lighting.vert similarity index 100% rename from examples/d3d/views/res/shaders/lighting.vert rename to views/res/shaders/lighting.vert diff --git a/examples/d3d/views/res/shaders/skinning-none.vert b/views/res/shaders/skinning-none.vert similarity index 100% rename from examples/d3d/views/res/shaders/skinning-none.vert rename to views/res/shaders/skinning-none.vert diff --git a/examples/d3d/views/res/shaders/skinning.vert b/views/res/shaders/skinning.vert similarity index 100% rename from examples/d3d/views/res/shaders/skinning.vert rename to views/res/shaders/skinning.vert diff --git a/examples/d3d/views/res/shaders/textured.frag b/views/res/shaders/textured.frag similarity index 100% rename from examples/d3d/views/res/shaders/textured.frag rename to views/res/shaders/textured.frag diff --git a/examples/d3d/views/res/shaders/textured.vert b/views/res/shaders/textured.vert similarity index 100% rename from examples/d3d/views/res/shaders/textured.vert rename to views/res/shaders/textured.vert diff --git a/views/standard_resources.list b/views/standard_resources.list index da2d5d93..329f62d9 100644 --- a/views/standard_resources.list +++ b/views/standard_resources.list @@ -275,3 +275,11 @@ res/toolbar_control_background.xml res/toolbar_control_background_dark.xml res/transparent_button_background.xml res/transparent_button_background_dark.xml +res/shaders/colored.vert +res/shaders/colored.frag +res/shaders/lighting.vert +res/shaders/lighting.frag +res/shaders/skinning.vert +res/shaders/skinning-none.vert +res/shaders/textured.vert +res/shaders/textured.frag