From eef8e0bfe499ff895563c412fde99a164d79395b Mon Sep 17 00:00:00 2001 From: Sarah Busert Date: Tue, 21 Sep 2021 16:24:01 +0200 Subject: [PATCH] Removed remaining texture/text shader variables from examples --- Examples/Complete/BoneAnimation/Core/Bone.cs | 4 ---- Examples/Complete/Camera/Core/Camera.cs | 4 ---- .../Complete/ComputeFractal/Core/ComputeFractal.cs | 14 -------------- Examples/Complete/Integrations/Core/Main.cs | 4 ---- Examples/Complete/Labyrinth/Core/Labyrinth.cs | 8 -------- Examples/Complete/Picking/Core/Picking.cs | 4 ---- Examples/Complete/Simple/Core/Simple.cs | 4 ---- .../Complete/SimpleDeferred/Core/SimpleDeferred.cs | 4 ---- Examples/Complete/Starkiller/Core/Starkiller.cs | 4 ---- .../Complete/SurfaceEffects/Core/SurfaceEffects.cs | 4 ---- src/Engine/Player/Core/Player.cs | 4 ---- 11 files changed, 58 deletions(-) diff --git a/Examples/Complete/BoneAnimation/Core/Bone.cs b/Examples/Complete/BoneAnimation/Core/Bone.cs index 1b4c07be37..d3fcf4f4c6 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index b2d9d5e978..9c56e4a958 100644 --- a/Examples/Complete/Camera/Core/Camera.cs +++ b/Examples/Complete/Camera/Core/Camera.cs @@ -237,10 +237,6 @@ private void UserSideFrustumCulling(IList nodeChildren, FrustumF frus private SceneContainer CreateGui() { - string vsTex = AssetStorage.Get("texture.vert"); - string psTex = AssetStorage.Get("texture.frag"); - string psText = AssetStorage.Get("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 index 6d94a44e18..ae3f5fa6eb 100644 --- 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("texture.vert"); - var psText = AssetStorage.Get("text.frag"); -After: - _ = AssetStorage.Get("texture.vert"); - string psText; - _ = AssetStorage.Get("text.frag"); -*/ - _ = AssetStorage.Get("texture.vert"); - string psText; - _ = AssetStorage.Get("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 index 7e39458701..34093c81e6 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index 95588da08a..85f94bec0e 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index 693e25e9a2..59957dd06b 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index f4d4bf504a..1936675b02 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index 21f1601dfd..e5abefe1db 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index ce4544ebeb..78e34768eb 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index 6f5daad180..b79abcc902 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("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 index 3281d3b41a..83f3715685 100644 --- 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("texture.vert"); - var psTex = AssetStorage.Get("texture.frag"); - var psText = AssetStorage.Get("text.frag"); - var canvasWidth = Width / 100f; var canvasHeight = Height / 100f;