Nick Kastellanos 2 年之前
父节点
当前提交
1568dd26e9
共有 86 个文件被更改,包括 75 次插入75 次删除
  1. 15 15
      Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj
  2. 15 15
      Shaders/Deferred/Aether.Shaders.Deferred.UAP.csproj
  3. 1 1
      Shaders/Deferred/DeferredBasicEffect.cs
  4. 1 1
      Shaders/Deferred/DeferredClearGBufferEffect.cs
  5. 1 1
      Shaders/Deferred/DeferredCombineEffect.cs
  6. 1 1
      Shaders/Deferred/DeferredPointLightEffect.cs
  7. 1 1
      Shaders/Deferred/DeferredSpotLightEffect.cs
  8. 0 0
      Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.10
  9. 0 0
      Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.8
  10. 0 0
      Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.9
  11. 0 0
      Shaders/Deferred/Resources/DeferredBasicEffect.gl.fxo.10
  12. 0 0
      Shaders/Deferred/Resources/DeferredBasicEffect.gl.fxo.8
  13. 0 0
      Shaders/Deferred/Resources/DeferredBasicEffect.gl.fxo.9
  14. 0 0
      Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.10
  15. 0 0
      Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.8
  16. 0 0
      Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.9
  17. 0 0
      Shaders/Deferred/Resources/DeferredClearGBuffer.gl.fxo.10
  18. 0 0
      Shaders/Deferred/Resources/DeferredClearGBuffer.gl.fxo.8
  19. 0 0
      Shaders/Deferred/Resources/DeferredClearGBuffer.gl.fxo.9
  20. 0 0
      Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.10
  21. 0 0
      Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.8
  22. 0 0
      Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.9
  23. 0 0
      Shaders/Deferred/Resources/DeferredCombine.gl.fxo.10
  24. 0 0
      Shaders/Deferred/Resources/DeferredCombine.gl.fxo.8
  25. 0 0
      Shaders/Deferred/Resources/DeferredCombine.gl.fxo.9
  26. 0 0
      Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.10
  27. 0 0
      Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.8
  28. 0 0
      Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.9
  29. 0 0
      Shaders/Deferred/Resources/DeferredPointLight.gl.fxo.10
  30. 0 0
      Shaders/Deferred/Resources/DeferredPointLight.gl.fxo.8
  31. 0 0
      Shaders/Deferred/Resources/DeferredPointLight.gl.fxo.9
  32. 0 0
      Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.10
  33. 0 0
      Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.8
  34. 0 0
      Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.9
  35. 0 0
      Shaders/Deferred/Resources/DeferredSpotLight.gl.fxo.10
  36. 0 0
      Shaders/Deferred/Resources/DeferredSpotLight.gl.fxo.8
  37. 0 0
      Shaders/Deferred/Resources/DeferredSpotLight.gl.fxo.9
  38. 2 2
      Shaders/Deferred/Shaders/BuildShaders.bat
  39. 9 9
      Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj
  40. 9 9
      Shaders/FXAA/Aether.Shaders.FXAA.UAP.csproj
  41. 1 1
      Shaders/FXAA/FXAAGreenLumaHighEffect.cs
  42. 1 1
      Shaders/FXAA/FXAAGreenLumaLowEffect.cs
  43. 1 1
      Shaders/FXAA/FXAAGreenLumaMediumEffect.cs
  44. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.10
  45. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.8
  46. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.9
  47. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaHigh.gl.fxo.10
  48. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaHigh.gl.fxo.8
  49. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaHigh.gl.fxo.9
  50. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.10
  51. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.8
  52. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.9
  53. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaLow.gl.fxo.10
  54. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaLow.gl.fxo.8
  55. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaLow.gl.fxo.9
  56. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.10
  57. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.8
  58. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.9
  59. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaMedium.gl.fxo.10
  60. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaMedium.gl.fxo.8
  61. 0 0
      Shaders/FXAA/Resources/FXAAGreenLumaMedium.gl.fxo.9
  62. 2 2
      Shaders/FXAA/Shaders/BuildShaders.bat
  63. 6 6
      Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj
  64. 1 1
      Shaders/InfiniteGrid/InfiniteGridEffect.cs
  65. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.fxo.10
  66. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.fxo.8
  67. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.fxo.9
  68. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.gl.fxo.10
  69. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.gl.fxo.8
  70. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.gl.fxo.9
  71. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.fxo.10
  72. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.fxo.8
  73. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.fxo.9
  74. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.gl.fxo.10
  75. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.gl.fxo.8
  76. 0 0
      Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.gl.fxo.9
  77. 2 2
      Shaders/InfiniteGrid/Shaders/BuildShaders.bat
  78. 3 3
      Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj
  79. 0 0
      Shaders/Tilemap/Resources/TilemapEffect.dx11.fxo.10
  80. 0 0
      Shaders/Tilemap/Resources/TilemapEffect.dx11.fxo.8
  81. 0 0
      Shaders/Tilemap/Resources/TilemapEffect.dx11.fxo.9
  82. 0 0
      Shaders/Tilemap/Resources/TilemapEffect.gl.fxo.10
  83. 0 0
      Shaders/Tilemap/Resources/TilemapEffect.gl.fxo.8
  84. 0 0
      Shaders/Tilemap/Resources/TilemapEffect.gl.fxo.9
  85. 2 2
      Shaders/Tilemap/Shaders/BuildShaders.bat
  86. 1 1
      Shaders/Tilemap/TilemapEffect.cs

+ 15 - 15
Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj

@@ -48,21 +48,21 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.10" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.10" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 15 - 15
Shaders/Deferred/Aether.Shaders.Deferred.UAP.csproj

@@ -131,21 +131,21 @@
     <Content Include="Properties\Aether.Shaders.Deferred.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.10" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.10" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">

+ 1 - 1
Shaders/Deferred/DeferredBasicEffect.cs

@@ -37,7 +37,7 @@ namespace nkast.Aether.Shaders
 
 
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredBasicEffect.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredBasicEffect.dx11.fxo";
 #else
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredBasicEffect.xna.WinReach";
 #endif

+ 1 - 1
Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -32,7 +32,7 @@ namespace nkast.Aether.Shaders
 
 
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredClearGBuffer.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredClearGBuffer.dx11.fxo";
 #else
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredClearGBuffer.xna.WinReach";
 #endif

+ 1 - 1
Shaders/Deferred/DeferredCombineEffect.cs

@@ -36,7 +36,7 @@ namespace nkast.Aether.Shaders
 
 
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredCombine.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredCombine.dx11.fxo";
 #else
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredCombine.xna.WinReach";
 #endif

+ 1 - 1
Shaders/Deferred/DeferredPointLightEffect.cs

@@ -49,7 +49,7 @@ namespace nkast.Aether.Shaders
 
 
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredPointLight.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredPointLight.dx11.fxo";
 #else
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredPointLight.xna.WinReach";
 #endif

+ 1 - 1
Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -53,7 +53,7 @@ namespace nkast.Aether.Shaders
 
 
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredSpotLight.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredSpotLight.dx11.fxo";
 #else
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.DeferredSpotLight.xna.WinReach";
 #endif

+ 0 - 0
Shaders/Deferred/Resources/DeferredBasicEffect.dx11.mgfxo.10 → Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredBasicEffect.dx11.mgfxo.8 → Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredBasicEffect.dx11.mgfxo.9 → Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredBasicEffect.ogl.mgfxo.10 → Shaders/Deferred/Resources/DeferredBasicEffect.gl.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredBasicEffect.ogl.mgfxo.8 → Shaders/Deferred/Resources/DeferredBasicEffect.gl.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredBasicEffect.ogl.mgfxo.9 → Shaders/Deferred/Resources/DeferredBasicEffect.gl.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.mgfxo.10 → Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.mgfxo.8 → Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.mgfxo.9 → Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredClearGBuffer.ogl.mgfxo.10 → Shaders/Deferred/Resources/DeferredClearGBuffer.gl.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredClearGBuffer.ogl.mgfxo.8 → Shaders/Deferred/Resources/DeferredClearGBuffer.gl.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredClearGBuffer.ogl.mgfxo.9 → Shaders/Deferred/Resources/DeferredClearGBuffer.gl.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredCombine.dx11.mgfxo.10 → Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredCombine.dx11.mgfxo.8 → Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredCombine.dx11.mgfxo.9 → Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredCombine.ogl.mgfxo.10 → Shaders/Deferred/Resources/DeferredCombine.gl.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredCombine.ogl.mgfxo.8 → Shaders/Deferred/Resources/DeferredCombine.gl.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredCombine.ogl.mgfxo.9 → Shaders/Deferred/Resources/DeferredCombine.gl.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredPointLight.dx11.mgfxo.10 → Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredPointLight.dx11.mgfxo.8 → Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredPointLight.dx11.mgfxo.9 → Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredPointLight.ogl.mgfxo.10 → Shaders/Deferred/Resources/DeferredPointLight.gl.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredPointLight.ogl.mgfxo.8 → Shaders/Deferred/Resources/DeferredPointLight.gl.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredPointLight.ogl.mgfxo.9 → Shaders/Deferred/Resources/DeferredPointLight.gl.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredSpotLight.dx11.mgfxo.10 → Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredSpotLight.dx11.mgfxo.8 → Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredSpotLight.dx11.mgfxo.9 → Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.9


+ 0 - 0
Shaders/Deferred/Resources/DeferredSpotLight.ogl.mgfxo.10 → Shaders/Deferred/Resources/DeferredSpotLight.gl.fxo.10


+ 0 - 0
Shaders/Deferred/Resources/DeferredSpotLight.ogl.mgfxo.8 → Shaders/Deferred/Resources/DeferredSpotLight.gl.fxo.8


+ 0 - 0
Shaders/Deferred/Resources/DeferredSpotLight.ogl.mgfxo.9 → Shaders/Deferred/Resources/DeferredSpotLight.gl.fxo.9


+ 2 - 2
Shaders/Deferred/Shaders/BuildShaders.bat

@@ -8,12 +8,12 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
 
 @echo Build dx11
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.mgfxo /Platform:Windows
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.fxo /Platform:Windows
 )
 
 @echo Build ogl
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.mgfxo /Platform:DesktopGL
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gl.fxo /Platform:DesktopGL
 )
 
 @echo Build dx9/xna Reach

+ 9 - 9
Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj

@@ -47,15 +47,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.10" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 9 - 9
Shaders/FXAA/Aether.Shaders.FXAA.UAP.csproj

@@ -130,15 +130,15 @@
     <Content Include="Properties\Aether.Shaders.FXAA.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.10" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">

+ 1 - 1
Shaders/FXAA/FXAAGreenLumaHighEffect.cs

@@ -22,7 +22,7 @@ namespace nkast.Aether.Shaders
     public class FXAAGreenLumaHighEffect : FXAAEffect 
     {
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaHigh.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaHigh.dx11.fxo";
 #elif (XNA && WINDOWS)
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaHigh.xna.WinHiDef";
 #endif

+ 1 - 1
Shaders/FXAA/FXAAGreenLumaLowEffect.cs

@@ -22,7 +22,7 @@ namespace nkast.Aether.Shaders
     public class FXAAGreenLumaLowEffect : FXAAEffect 
     {
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaLow.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaLow.dx11.fxo";
 #elif (XNA && WINDOWS)
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaLow.xna.WinHiDef";
 #endif

+ 1 - 1
Shaders/FXAA/FXAAGreenLumaMediumEffect.cs

@@ -22,7 +22,7 @@ namespace nkast.Aether.Shaders
     public class FXAAGreenLumaMediumEffect : FXAAEffect 
     {
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaMedium.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaMedium.dx11.fxo";
 #elif (XNA && WINDOWS)
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.FXAAGreenLumaMedium.xna.WinHiDef";
 #endif

+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.mgfxo.10 → Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.10


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.mgfxo.8 → Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.8


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.mgfxo.9 → Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.9


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaHigh.ogl.mgfxo.10 → Shaders/FXAA/Resources/FXAAGreenLumaHigh.gl.fxo.10


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaHigh.ogl.mgfxo.8 → Shaders/FXAA/Resources/FXAAGreenLumaHigh.gl.fxo.8


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaHigh.ogl.mgfxo.9 → Shaders/FXAA/Resources/FXAAGreenLumaHigh.gl.fxo.9


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.mgfxo.10 → Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.10


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.mgfxo.8 → Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.8


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.mgfxo.9 → Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.9


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaLow.ogl.mgfxo.10 → Shaders/FXAA/Resources/FXAAGreenLumaLow.gl.fxo.10


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaLow.ogl.mgfxo.8 → Shaders/FXAA/Resources/FXAAGreenLumaLow.gl.fxo.8


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaLow.ogl.mgfxo.9 → Shaders/FXAA/Resources/FXAAGreenLumaLow.gl.fxo.9


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.mgfxo.10 → Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.10


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.mgfxo.8 → Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.8


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.mgfxo.9 → Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.9


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaMedium.ogl.mgfxo.10 → Shaders/FXAA/Resources/FXAAGreenLumaMedium.gl.fxo.10


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaMedium.ogl.mgfxo.8 → Shaders/FXAA/Resources/FXAAGreenLumaMedium.gl.fxo.8


+ 0 - 0
Shaders/FXAA/Resources/FXAAGreenLumaMedium.ogl.mgfxo.9 → Shaders/FXAA/Resources/FXAAGreenLumaMedium.gl.fxo.9


+ 2 - 2
Shaders/FXAA/Shaders/BuildShaders.bat

@@ -8,12 +8,12 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
 
 @echo Build dx11
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.mgfxo /Platform:Windows
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.fxo /Platform:Windows
 )
 
 @echo Build ogl
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.mgfxo /Platform:DesktopGL
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gl.fxo /Platform:DesktopGL
 )
 
 @echo Build dx9/xna HiDef

+ 6 - 6
Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj

@@ -45,12 +45,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.10" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.mgfxo.10" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.fxo.10" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 1 - 1
Shaders/InfiniteGrid/InfiniteGridEffect.cs

@@ -43,7 +43,7 @@ namespace nkast.Aether.Shaders
 #if XNA
         static readonly String PlatformName = ".xna";
 #elif ((MG && WINDOWS) || W10)
-         static readonly String PlatformName = ".dx11.mgfxo";
+         static readonly String PlatformName = ".dx11.fxo";
 #endif
 
         private static string GetResourceName(GraphicsDevice graphicsDevice)

+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.mgfxo.10 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.fxo.10


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.mgfxo.8 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.fxo.8


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.mgfxo.9 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.dx11.fxo.9


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.ogl.mgfxo.10 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.gl.fxo.10


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.ogl.mgfxo.8 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.gl.fxo.8


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.ogl.mgfxo.9 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.HiDef.gl.fxo.9


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.mgfxo.10 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.fxo.10


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.mgfxo.8 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.fxo.8


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.mgfxo.9 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.dx11.fxo.9


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.ogl.mgfxo.10 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.gl.fxo.10


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.ogl.mgfxo.8 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.gl.fxo.8


+ 0 - 0
Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.ogl.mgfxo.9 → Shaders/InfiniteGrid/Resources/InfiniteGridEffect.Reach.gl.fxo.9


+ 2 - 2
Shaders/InfiniteGrid/Shaders/BuildShaders.bat

@@ -8,12 +8,12 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
 
 @echo Build dx11
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.mgfxo /Platform:Windows
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.fxo /Platform:Windows
 )
 
 @echo Build ogl
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.mgfxo /Platform:DesktopGL
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gl.fxo /Platform:DesktopGL
 )
 
 @echo Build dx9/xna Reach

+ 3 - 3
Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj

@@ -40,9 +40,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\TilemapEffect.dx11.mgfxo.8" />
-    <EmbeddedResource Include="Resources\TilemapEffect.dx11.mgfxo.9" />
-    <EmbeddedResource Include="Resources\TilemapEffect.dx11.mgfxo.10" />
+    <EmbeddedResource Include="Resources\TilemapEffect.dx11.fxo.8" />
+    <EmbeddedResource Include="Resources\TilemapEffect.dx11.fxo.9" />
+    <EmbeddedResource Include="Resources\TilemapEffect.dx11.fxo.10" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9101">

+ 0 - 0
Shaders/Tilemap/Resources/TilemapEffect.dx11.mgfxo.10 → Shaders/Tilemap/Resources/TilemapEffect.dx11.fxo.10


+ 0 - 0
Shaders/Tilemap/Resources/TilemapEffect.dx11.mgfxo.8 → Shaders/Tilemap/Resources/TilemapEffect.dx11.fxo.8


+ 0 - 0
Shaders/Tilemap/Resources/TilemapEffect.dx11.mgfxo.9 → Shaders/Tilemap/Resources/TilemapEffect.dx11.fxo.9


+ 0 - 0
Shaders/Tilemap/Resources/TilemapEffect.ogl.mgfxo.10 → Shaders/Tilemap/Resources/TilemapEffect.gl.fxo.10


+ 0 - 0
Shaders/Tilemap/Resources/TilemapEffect.ogl.mgfxo.8 → Shaders/Tilemap/Resources/TilemapEffect.gl.fxo.8


+ 0 - 0
Shaders/Tilemap/Resources/TilemapEffect.ogl.mgfxo.9 → Shaders/Tilemap/Resources/TilemapEffect.gl.fxo.9


+ 2 - 2
Shaders/Tilemap/Shaders/BuildShaders.bat

@@ -8,12 +8,12 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
 
 @echo Build dx11
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.mgfxo /Platform:Windows
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.fxo /Platform:Windows
 )
 
 @echo Build ogl
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.mgfxo /Platform:DesktopGL
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gl.fxo /Platform:DesktopGL
 )
 
 @echo Build dx9/xna Reach

+ 1 - 1
Shaders/Tilemap/TilemapEffect.cs

@@ -64,7 +64,7 @@ namespace nkast.Aether.Shaders
         EffectDirtyFlags dirtyFlags = EffectDirtyFlags.All;
 
 #if ((MG && WINDOWS) || W10)
-        static readonly String resourceName = "nkast.Aether.Shaders.Resources.TilemapEffect.dx11.mgfxo";
+        static readonly String resourceName = "nkast.Aether.Shaders.Resources.TilemapEffect.dx11.fxo";
 #else
         static readonly String resourceName = "nkast.Aether.Shaders.Resources.TilemapEffect.xna.WinReach";
 #endif