Browse Source

[Deferred] detech v3.7 and fallback to the latest shader

Nikos Kastellanos 6 năm trước cách đây
mục cha
commit
c44d981698

+ 11 - 4
Shaders/Deferred/DeferredBasicEffect.cs

@@ -54,17 +54,24 @@ namespace tainicom.Aether.Shaders
 
         internal static Stream LoadEffectResourceStream(string name)
         {
-            // Detect MG version            
+            // Detect MG version     
+            var version = "";
+#if !XNA
+            version = ".8";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
                 if (mgVersion.Minor == 4)
-                    name += ".6";
+                    version = ".6";
                 if (mgVersion.Minor == 5)
-                    name += ".7";
+                    version = ".7";
                 if (mgVersion.Minor == 6)
-                    name += ".8";
+                    version = ".8";
+                if (mgVersion.Minor == 7)
+                    version = ".8";
             }
+            name = name + version;
+#endif
 
             Stream stream = GetAssembly(typeof(DeferredBasicEffect)).GetManifestResourceStream(name);
             return stream;

+ 10 - 3
Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -50,16 +50,23 @@ namespace tainicom.Aether.Shaders
         internal static Stream LoadEffectResourceStream(string name)
         {
             // Detect MG version            
+            var version = "";
+#if !XNA
+            version = ".8";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
                 if (mgVersion.Minor == 4)
-                    name += ".6";
+                    version = ".6";
                 if (mgVersion.Minor == 5)
-                    name += ".7";
+                    version = ".7";
                 if (mgVersion.Minor == 6)
-                    name += ".8";
+                    version = ".8";
+                if (mgVersion.Minor == 7)
+                    version = ".8";
             }
+            name = name + version;
+#endif
 
             Stream stream = GetAssembly(typeof(DeferredClearGBufferEffect)).GetManifestResourceStream(name);
             return stream;

+ 10 - 3
Shaders/Deferred/DeferredCombineEffect.cs

@@ -54,16 +54,23 @@ namespace tainicom.Aether.Shaders
         internal static Stream LoadEffectResourceStream(string name)
         {
             // Detect MG version            
+            var version = "";
+#if !XNA
+            version = ".8";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
                 if (mgVersion.Minor == 4)
-                    name += ".6";
+                    version = ".6";
                 if (mgVersion.Minor == 5)
-                    name += ".7";
+                    version = ".7";
                 if (mgVersion.Minor == 6)
-                    name += ".8";
+                    version = ".8";
+                if (mgVersion.Minor == 7)
+                    version = ".8";
             }
+            name = name + version;
+#endif
 
             Stream stream = GetAssembly(typeof(DeferredCombineEffect)).GetManifestResourceStream(name);
             return stream;

+ 10 - 3
Shaders/Deferred/DeferredPointLightEffect.cs

@@ -67,16 +67,23 @@ namespace tainicom.Aether.Shaders
         internal static Stream LoadEffectResourceStream(string name)
         {
             // Detect MG version            
+            var version = "";
+#if !XNA
+            version = ".8";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
                 if (mgVersion.Minor == 4)
-                    name += ".6";
+                    version = ".6";
                 if (mgVersion.Minor == 5)
-                    name += ".7";
+                    version = ".7";
                 if (mgVersion.Minor == 6)
-                    name += ".8";
+                    version = ".8";
+                if (mgVersion.Minor == 7)
+                    version = ".8";
             }
+            name = name + version;
+#endif
 
             Stream stream = GetAssembly(typeof(DeferredPointLightEffect)).GetManifestResourceStream(name);
             return stream;

+ 10 - 3
Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -71,16 +71,23 @@ namespace tainicom.Aether.Shaders
         internal static Stream LoadEffectResourceStream(string name)
         {
             // Detect MG version            
+            var version = "";
+#if !XNA
+            version = ".8";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
                 if (mgVersion.Minor == 4)
-                    name += ".6";
+                    version = ".6";
                 if (mgVersion.Minor == 5)
-                    name += ".7";
+                    version = ".7";
                 if (mgVersion.Minor == 6)
-                    name += ".8";
+                    version = ".8";
+                if (mgVersion.Minor == 7)
+                    version = ".8";
             }
+            name = name + version;
+#endif
 
             Stream stream = GetAssembly(typeof(DeferredPointLightEffect)).GetManifestResourceStream(name);
             return stream;

BIN
bin/Release/W10/Aether.Shaders.Deferred.dll


BIN
bin/Release/W8_1/Aether.Shaders.Deferred.dll


BIN
bin/Release/Windows.XNA/Aether.Shaders.Deferred.dll


BIN
bin/Release/Windows/Aether.Shaders.Deferred.dll