move shaders to std resources of dlangui

2016-04-06 14:57:45 +03:00 · 2016-04-06 14:57:45 +03:00 · 3ccfb70fb8
parent e1b1056d31
commit 3ccfb70fb8
14 changed files with 25 additions and 14 deletions
--- a/dlangui-monod-linux.dproj
+++ b/dlangui-monod-linux.dproj
@ -30,6 +30,7 @@
    <ExtraCompilerArguments>-Jviews
 -Jviews/res
 -Jviews/res/i18n
+-Jviews/res/shaders
 -Jviews/res/mdpi
 -Jviews/res/hdpi</ExtraCompilerArguments>
  </PropertyGroup>
@ -49,6 +50,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -73,6 +75,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>true</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -95,6 +98,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -117,6 +121,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -139,6 +144,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -168,6 +174,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -191,6 +198,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -214,6 +222,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
@ -237,6 +246,7 @@
 -Jviews/res
 -Jviews/res/i18n
 -Jviews/res/mdpi
+-Jviews/res/shaders
 -Jviews/res/hdpi</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-linux</OutputName>
--- a/dlangui-monod-osx.dproj
+++ b/dlangui-monod-osx.dproj
@ -27,7 +27,7 @@
    </VersionIds>
    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-osx</OutputName>
    <Target>StaticLibrary</Target>
@ -43,7 +43,7 @@
    <Target>StaticLibrary</Target>
    <Externalconsole>true</Externalconsole>
    <DebugLevel>0</DebugLevel>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders</ExtraCompilerArguments>
    <VersionIds>
      <VersionIds>
        <String>USE_SDL</String>
@ -63,7 +63,7 @@
    <Target>Executable</Target>
    <Externalconsole>true</Externalconsole>
    <DebugLevel>0</DebugLevel>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders</ExtraCompilerArguments>
    <VersionIds>
      <VersionIds>
        <String>USE_SDL</String>
@ -84,7 +84,7 @@
    </VersionIds>
    <ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-osx</OutputName>
    <Target>StaticLibrary</Target>
@ -95,7 +95,7 @@
    <OutputPath>bin\DebugX11</OutputPath>
    <ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi -Jviews/res/shaders</ExtraCompilerArguments>
    <UnittestMode>false</UnittestMode>
    <OutputName>libdlangui-monod-osx</OutputName>
    <Target>StaticLibrary</Target>
--- a/dub.json
+++ b/dub.json
@ -22,6 +22,7 @@
        "views/res",
        "views/res/mdpi",
        "views/res/hdpi",
+        "views/res/shaders",
        "views/res/i18n"
    ],

--- 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",
--- 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
--- a/examples/d3d/views/res/shaders/colored.frag
+++ b/examples/d3d/views/res/shaders/colored.frag
--- a/examples/d3d/views/res/shaders/colored.vert
+++ b/examples/d3d/views/res/shaders/colored.vert
--- a/examples/d3d/views/res/shaders/lighting.frag
+++ b/examples/d3d/views/res/shaders/lighting.frag
--- a/examples/d3d/views/res/shaders/lighting.vert
+++ b/examples/d3d/views/res/shaders/lighting.vert
--- a/examples/d3d/views/res/shaders/skinning-none.vert
+++ b/examples/d3d/views/res/shaders/skinning-none.vert
--- a/examples/d3d/views/res/shaders/skinning.vert
+++ b/examples/d3d/views/res/shaders/skinning.vert
--- a/examples/d3d/views/res/shaders/textured.frag
+++ b/examples/d3d/views/res/shaders/textured.frag
--- a/examples/d3d/views/res/shaders/textured.vert
+++ b/examples/d3d/views/res/shaders/textured.vert
--- 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