Skip to content
Permalink
Browse files

[Editor] Temporarily moved game studio shaders to Engine, until we ha…

…ve proper design-time package references
  • Loading branch information
xen2 committed Oct 25, 2018
1 parent 0869d45 commit 34c504ea5cc0e4bca327d60a38890de0984a06c3
Showing with 66 additions and 70 deletions.
  1. +0 −70 sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj
  2. 0 ...nko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/CompilationErrorShader.cs
  3. 0 ...o.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/CompilationErrorShader.xksl
  4. 0 ...itor/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/EffectCompiling.cs
  5. 0 ...or/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/EffectCompiling.xksl
  6. 0 ...r/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/LightConstantWhite.cs
  7. 0 ...Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/LightConstantWhite.xksl
  8. +1 −0 sources/engine/Xenko.Engine/Rendering/Editor/README.md
  9. 0 ...Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/SelectedSpriteShader.cs
  10. 0 ...nko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/SelectedSpriteShader.xksl
  11. 0 ...ko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/SharedTextureCoordinate.cs
  12. 0 ....Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/SharedTextureCoordinate.xksl
  13. 0 ...{editor/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/Sprite3DBase.cs
  14. 0 ...ditor/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/Sprite3DBase.xksl
  15. 0 ...editor/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/SpritePicking.cs
  16. 0 ...itor/Xenko.Assets.Presentation/Shaders → engine/Xenko.Engine/Rendering/Editor}/SpritePicking.xksl
  17. +65 −0 sources/engine/Xenko.Engine/Xenko.Engine.csproj
@@ -144,16 +144,6 @@
<DependentUpon>StaticThumbnails.resx</DependentUpon>
</Compile>
<None Include="AssetEditors.cd" />
<None Include="Shaders\LightConstantWhite.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>LightConstantWhite.cs</LastGenOutput>
</None>
<Compile Update="Shaders\LightConstantWhite.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>LightConstantWhite.xksl</DependentUpon>
</Compile>
<Compile Update="Templates\ModelAssetTemplateWindow.xaml.cs">
<DependentUpon>ModelAssetTemplateWindow.xaml</DependentUpon>
</Compile>
@@ -174,12 +164,6 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SelectedSprite.xkfx</DependentUpon>
</Compile>
<Compile Update="Shaders\CompilationErrorShader.cs">
<DependentUpon>CompilationErrorShader.xksl</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DesignTime>True</DesignTime>
</Compile>
<Compile Update="Shaders\XenkoEditorHighlightingEffect.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -192,35 +176,11 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>XenkoEditorMaterialPreviewEffect.xkfx</DependentUpon>
</Compile>
<Compile Update="Shaders\SelectedSpriteShader.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SelectedSpriteShader.xksl</DependentUpon>
</Compile>
<Compile Update="Shaders\SharedTextureCoordinate.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SharedTextureCoordinate.xksl</DependentUpon>
</Compile>
<Compile Update="Shaders\SpritePicking.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SpritePicking.xksl</DependentUpon>
</Compile>
<Compile Update="Resources\Strings\Scene.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Scene.resx</DependentUpon>
</Compile>
<Compile Update="Shaders\EffectCompiling.cs">
<DependentUpon>EffectCompiling.xksl</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DesignTime>True</DesignTime>
</Compile>
<Compile Update="Shaders\XenkoEditorForwardShadingEffect.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -239,25 +199,11 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SceneEditorParameters.xkfx</DependentUpon>
</Compile>
<Compile Update="Shaders\Sprite3DBase.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Sprite3DBase.xksl</DependentUpon>
</Compile>
<None Include="CurveEditor.cd" />
<None Include="Shaders\SelectedSprite.xkfx">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>SelectedSprite.cs</LastGenOutput>
</None>
<None Include="Shaders\CompilationErrorShader.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>CompilationErrorShader.cs</LastGenOutput>
</None>
<None Include="Shaders\EffectCompiling.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>EffectCompiling.cs</LastGenOutput>
</None>
<None Include="Shaders\XenkoEditorHighlightingEffect.xkfx">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>XenkoEditorHighlightingEffect.cs</LastGenOutput>
@@ -351,27 +297,11 @@
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>SceneEditorParameters.cs</LastGenOutput>
</None>
<None Include="Shaders\SelectedSpriteShader.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>SelectedSpriteShader.cs</LastGenOutput>
</None>
<None Include="Shaders\SharedTextureCoordinate.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>SharedTextureCoordinate.cs</LastGenOutput>
</None>
<None Include="Shaders\Sprite3DBase.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>Sprite3DBase.cs</LastGenOutput>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
<None Include="Shaders\SpritePicking.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
<LastGenOutput>SpritePicking.cs</LastGenOutput>
</None>
<Compile Remove="Templates\Core\**" />
<Compile Remove="Templates\Assets\**" />
<None Include="Templates\Core\**" />
@@ -0,0 +1 @@
Those files were originally in Xenko.Assets.Presentation/Shaders and have been moved here until we can have "design-time" package references (for assets that are not part of normal compilation but exists when editing project in Game Studio).
@@ -116,6 +116,48 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>LambertianPrefilteringSHNoComputePass2.xksl</DependentUpon>
</Compile>
<Compile Update="Rendering\Editor\CompilationErrorShader.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>CompilationErrorShader.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Editor\EffectCompiling.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>EffectCompiling.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Editor\LightConstantWhite.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>LightConstantWhite.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Editor\SelectedSpriteShader.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SelectedSpriteShader.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Editor\SharedTextureCoordinate.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SharedTextureCoordinate.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Editor\Sprite3DBase.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Sprite3DBase.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Editor\SpritePicking.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>SpritePicking.xksl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="Rendering\Materials\Hair\DiscardFunction\IMaterialHairDiscardFunction1.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -4052,6 +4094,29 @@
<LastGenOutput>Properties.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Rendering\Editor\CompilationErrorShader.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
<None Update="Rendering\Editor\EffectCompiling.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
<None Update="Rendering\Editor\LightConstantWhite.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
<None Update="Rendering\Editor\SelectedSpriteShader.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
<None Update="Rendering\Editor\SharedTextureCoordinate.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
<None Update="Rendering\Editor\Sprite3DBase.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
<None Update="Rendering\Editor\SpritePicking.xksl">
<Generator>XenkoShaderKeyGenerator</Generator>
</None>
</ItemGroup>
<Import Project="..\Xenko.Shared\Refactor\Xenko.Refactor.projitems" Label="Shared" />
<Choose>
<When Condition="'$(XenkoEffectCompiler)' == 'true'">

0 comments on commit 34c504e

Please sign in to comment.
You can’t perform that action at this time.