forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move shaders to std resources of dlangui

This commit is contained in:
Vadim Lopatin 2016-04-06 14:57:45 +03:00
parent e1b1056d31
commit 3ccfb70fb8
14 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlangui-monod-linux.dproj
View File

@ -30,6 +30,7 @@
<ExtraCompilerArguments>-Jviews <ExtraCompilerArguments>-Jviews
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/shaders
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
</PropertyGroup> </PropertyGroup>
@ -49,6 +50,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -73,6 +75,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>true</UnittestMode> <UnittestMode>true</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -95,6 +98,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -117,6 +121,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -139,6 +144,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -168,6 +174,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -191,6 +198,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -214,6 +222,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>
@ -237,6 +246,7 @@
-Jviews/res -Jviews/res
-Jviews/res/i18n -Jviews/res/i18n
-Jviews/res/mdpi -Jviews/res/mdpi
-Jviews/res/shaders
-Jviews/res/hdpi</ExtraCompilerArguments> -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-linux</OutputName> <OutputName>libdlangui-monod-linux</OutputName>

10
dlangui-monod-osx.dproj
View File

@ -27,7 +27,7 @@
</VersionIds> </VersionIds>
<ObjectsDirectory>obj/Debug</ObjectsDirectory> <ObjectsDirectory>obj/Debug</ObjectsDirectory>
<LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries> <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> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-osx</OutputName> <OutputName>libdlangui-monod-osx</OutputName>
<Target>StaticLibrary</Target> <Target>StaticLibrary</Target>
@ -43,7 +43,7 @@
<Target>StaticLibrary</Target> <Target>StaticLibrary</Target>
<Externalconsole>true</Externalconsole> <Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel> <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>
<VersionIds> <VersionIds>
<String>USE_SDL</String> <String>USE_SDL</String>
@ -63,7 +63,7 @@
<Target>Executable</Target> <Target>Executable</Target>
<Externalconsole>true</Externalconsole> <Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel> <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>
<VersionIds> <VersionIds>
<String>USE_SDL</String> <String>USE_SDL</String>
@ -84,7 +84,7 @@
</VersionIds> </VersionIds>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory> <ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries> <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> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-osx</OutputName> <OutputName>libdlangui-monod-osx</OutputName>
<Target>StaticLibrary</Target> <Target>StaticLibrary</Target>
@ -95,7 +95,7 @@
<OutputPath>bin\DebugX11</OutputPath> <OutputPath>bin\DebugX11</OutputPath>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory> <ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries> <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> <UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-osx</OutputName> <OutputName>libdlangui-monod-osx</OutputName>
<Target>StaticLibrary</Target> <Target>StaticLibrary</Target>

1
dub.json
View File

@ -22,6 +22,7 @@
"views/res", "views/res",
"views/res/mdpi", "views/res/mdpi",
"views/res/hdpi", "views/res/hdpi",
"views/res/shaders",
"views/res/i18n" "views/res/i18n"
], ],

2
examples/d3d/dub.json
View File

@ -5,7 +5,7 @@
"license": "Boost", "license": "Boost",
"authors": ["Vadim Lopatin"], "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", "targetPath": "bin",
"targetName": "d3d", "targetName": "d3d",

8
examples/d3d/views/resources.list
View File

@ -8,11 +8,3 @@ res/mdpi/brick.png
res/mdpi/brickn.png res/mdpi/brickn.png
res/models/suzanne.obj res/models/suzanne.obj
res/models/suzanne.fbx 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

0
examples/d3d/views/res/shaders/colored.frag → views/res/shaders/colored.frag
View File

0
examples/d3d/views/res/shaders/colored.vert → views/res/shaders/colored.vert
View File

0
examples/d3d/views/res/shaders/lighting.frag → views/res/shaders/lighting.frag
View File

0
examples/d3d/views/res/shaders/lighting.vert → views/res/shaders/lighting.vert
View File

0
examples/d3d/views/res/shaders/skinning-none.vert → views/res/shaders/skinning-none.vert
View File

0
examples/d3d/views/res/shaders/skinning.vert → views/res/shaders/skinning.vert
View File

0
examples/d3d/views/res/shaders/textured.frag → views/res/shaders/textured.frag
View File

0
examples/d3d/views/res/shaders/textured.vert → views/res/shaders/textured.vert
View File

8
views/standard_resources.list
View File

@ -275,3 +275,11 @@ res/toolbar_control_background.xml
res/toolbar_control_background_dark.xml res/toolbar_control_background_dark.xml
res/transparent_button_background.xml res/transparent_button_background.xml
res/transparent_button_background_dark.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