Removed remaining texture/text shader variables from examples

FUSEEProjectTeam · Sep 21, 2021 · eef8e0b · eef8e0b
1 parent a85d562
commit eef8e0b
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 58 deletions.
diff --git a/Examples/Complete/BoneAnimation/Core/Bone.cs b/Examples/Complete/BoneAnimation/Core/Bone.cs
@@ -319,10 +319,6 @@ public override void RenderAFrame()
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/Camera/Core/Camera.cs b/Examples/Complete/Camera/Core/Camera.cs
@@ -237,10 +237,6 @@ private void UserSideFrustumCulling(IList<SceneNode> nodeChildren, FrustumF frus
 
         private SceneContainer CreateGui()
         {
-            string vsTex = AssetStorage.Get<string>("texture.vert");
-            string psTex = AssetStorage.Get<string>("texture.frag");
-            string psText = AssetStorage.Get<string>("text.frag");
-
             float canvasWidth = Width / 100f;
             float canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/ComputeFractal/Core/ComputeFractal.cs b/Examples/Complete/ComputeFractal/Core/ComputeFractal.cs
@@ -172,20 +172,6 @@ private float Sawtooth(float i, float m)
 
         private SceneContainer CreateGui()
         {
-
-/* Unmerged change from project 'Fusee.Examples.ComputeFractal.Core(net5.0)'
-Before:
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psText = AssetStorage.Get<string>("text.frag");
-After:
-            _ = AssetStorage.Get<string>("texture.vert");
-            string psText;
-            _ = AssetStorage.Get<string>("text.frag");
-*/
-            _ = AssetStorage.Get<string>("texture.vert");
-            string psText;
-            _ = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/Integrations/Core/Main.cs b/Examples/Complete/Integrations/Core/Main.cs
@@ -157,10 +157,6 @@ public void ChangeRocketZ(float z)
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/Labyrinth/Core/Labyrinth.cs b/Examples/Complete/Labyrinth/Core/Labyrinth.cs
@@ -359,10 +359,6 @@ public override void RenderAFrame()
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 
@@ -734,10 +730,6 @@ public void Winner()
         // Creates winning display
         public SceneContainer WinningDisplay()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/Picking/Core/Picking.cs b/Examples/Complete/Picking/Core/Picking.cs
@@ -171,10 +171,6 @@ public override void RenderAFrame()
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/Simple/Core/Simple.cs b/Examples/Complete/Simple/Core/Simple.cs
@@ -133,10 +133,6 @@ public override void RenderAFrame()
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/SimpleDeferred/Core/SimpleDeferred.cs b/Examples/Complete/SimpleDeferred/Core/SimpleDeferred.cs
@@ -270,10 +270,6 @@ public override void RenderAFrame()
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/Starkiller/Core/Starkiller.cs b/Examples/Complete/Starkiller/Core/Starkiller.cs
@@ -262,10 +262,6 @@ public override void RenderAFrame()
         }
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/Examples/Complete/SurfaceEffects/Core/SurfaceEffects.cs b/Examples/Complete/SurfaceEffects/Core/SurfaceEffects.cs
@@ -213,10 +213,6 @@ public override void RenderAFrame()
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;
 

diff --git a/src/Engine/Player/Core/Player.cs b/src/Engine/Player/Core/Player.cs
@@ -246,10 +246,6 @@ public override void Resize(ResizeEventArgs e)
 
         private SceneContainer CreateGui()
         {
-            var vsTex = AssetStorage.Get<string>("texture.vert");
-            var psTex = AssetStorage.Get<string>("texture.frag");
-            var psText = AssetStorage.Get<string>("text.frag");
-
             var canvasWidth = Width / 100f;
             var canvasHeight = Height / 100f;