FUSEEProjectTeam · RedImp1470 · Jul 12, 2022 · Mar 3, 2022 · Mar 4, 2022 · Mar 4, 2022
diff --git a/Examples/Complete/AdvancedUI/Android/Fusee.Examples.AdvancedUI.Android.csproj b/Examples/Complete/AdvancedUI/Android/Fusee.Examples.AdvancedUI.Android.csproj
@@ -89,10 +89,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/AdvancedUI/Core/AdvancedUI.cs b/Examples/Complete/AdvancedUI/Core/AdvancedUI.cs
@@ -5,7 +5,6 @@
 using Fusee.Engine.Core.Effects;
 using Fusee.Engine.Core.Primitives;
 using Fusee.Engine.Core.Scene;
-using Fusee.Engine.Core.ShaderShards;
 using Fusee.Engine.Gui;
 using Fusee.Math.Core;
 using Fusee.Xene;

diff --git a/Examples/Complete/Camera/Android/Fusee.Examples.Camera.Android.csproj b/Examples/Complete/Camera/Android/Fusee.Examples.Camera.Android.csproj
@@ -91,10 +91,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/ComputeFractal/Core/ComputeFractal.cs b/Examples/Complete/ComputeFractal/Core/ComputeFractal.cs
@@ -15,7 +15,7 @@ public class ComputeFractal : RenderCanvas
     {
         private readonly Plane _plane = new();
         private WritableTexture RWTexture;
-        private ComputeShader _computeShader;
+        private ComputeEffect _computeShader;
         private ShaderEffect _renderEffect;
         private bool _move;
         private bool _inputChange;
@@ -65,7 +65,7 @@ public override void Init()
                     _colorData[i] += new float4(Sawtooth(i * 4, 256) / 256, 0, 0, 1);
                 i++;
             }
-            _computeShader = new ComputeShader(
+            _computeShader = new ComputeEffect(
             shaderCode: AssetStorage.Get<string>("MandelbrotFractal.comp"),
             effectParameters: new IFxParamDeclaration[]
             {
@@ -76,20 +76,17 @@ public override void Init()
             });
 
             _renderEffect = new ShaderEffect(
-            new FxPassDeclaration
-            {
-                VS = AssetStorage.Get<string>("RenderTexToScreen.vert"),
-                PS = AssetStorage.Get<string>("RenderTexToScreen.frag"),
-                StateSet = new RenderStateSet
-                {
-                    AlphaBlendEnable = false,
-                    ZEnable = true,
-                }
-            },
             new IFxParamDeclaration[]
             {
                 new FxParamDeclaration<WritableTexture> { Name = "srcTex", Value = RWTexture}
-            });
+            },
+            new RenderStateSet
+            {
+                AlphaBlendEnable = false,
+                ZEnable = true,
+            },
+            AssetStorage.Get<string>("RenderTexToScreen.vert"),
+            AssetStorage.Get<string>("RenderTexToScreen.frag"));
 
             RC.SetEffect(_computeShader);
             _rect.SetData(_rectData);

diff --git a/Examples/Complete/Deferred/Android/Fusee.Examples.Deferred.Android.csproj b/Examples/Complete/Deferred/Android/Fusee.Examples.Deferred.Android.csproj
@@ -97,10 +97,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/Deferred/Core/Deferred.cs b/Examples/Complete/Deferred/Core/Deferred.cs
@@ -178,15 +178,15 @@ public override void Update()
             if (Mouse.LeftButton)
             {
                 _keys = false;
-                _angleVelHorz = -RotationSpeed * Mouse.XVel * DeltaTime * 0.0005f;
-                _angleVelVert = -RotationSpeed * Mouse.YVel * DeltaTime * 0.0005f;
+                _angleVelHorz = -RotationSpeed * Mouse.XVel * DeltaTimeUpdate * 0.0005f;
+                _angleVelVert = -RotationSpeed * Mouse.YVel * DeltaTimeUpdate * 0.0005f;
             }
             else if (Touch != null && Touch.GetTouchActive(TouchPoints.Touchpoint_0))
             {
                 _keys = false;
                 var touchVel = Touch.GetVelocity(TouchPoints.Touchpoint_0);
-                _angleVelHorz = -RotationSpeed * touchVel.x * DeltaTime * 0.0005f;
-                _angleVelVert = -RotationSpeed * touchVel.y * DeltaTime * 0.0005f;
+                _angleVelHorz = -RotationSpeed * touchVel.x * DeltaTimeUpdate * 0.0005f;
+                _angleVelVert = -RotationSpeed * touchVel.y * DeltaTimeUpdate * 0.0005f;
             }
             else
             {
@@ -219,6 +219,7 @@ public override void Update()
         // RenderAFrame is called once a frame
         public override void RenderAFrame()
         {
+            //Diagnostics.Warn(FramesPerSecond);
             //_sunTransform.RotateAround(new float3(0, 0, 0), new float3(M.DegreesToRadians(0.5f) * DeltaTime * 50, 0 ,0));
 
             var deg = (M.RadiansToDegrees(_sunTransform.Rotation.x)) - 90;

diff --git a/Examples/Complete/GeometryEditing/Android/Fusee.Examples.GeometryEditing.Android.csproj b/Examples/Complete/GeometryEditing/Android/Fusee.Examples.GeometryEditing.Android.csproj
@@ -87,10 +87,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/ImGui/Desktop/Core.cs b/Examples/Complete/ImGui/Desktop/Core.cs
@@ -2,7 +2,7 @@
 using Fusee.Engine.Common;
 using Fusee.Engine.Core;
 using Fusee.Engine.Imp.Graphics.Desktop;
-using Fusee.ImGuiDesktop;
+using Fusee.ImGuiImp.Desktop;
 using ImGuiNET;
 using System;
 using System.IO;
@@ -15,7 +15,6 @@ namespace Fusee.Examples.FuseeImGui.Desktop
         Description = "A very simple example how to use ImGui within a Fusee application.")]
     public class Core : RenderCanvas
     {
-
         #region StaticBindingVars
 
         private static bool _dockspaceOpen = true;
@@ -55,7 +54,6 @@ public override async Task InitAsync()
         {
             Load();
             await base.InitAsync();
-
         }
 
         public override void Update()
@@ -66,7 +64,6 @@ public override void Update()
         public override void Resize(ResizeEventArgs e)
         {
             _fuControl.UpdateOriginalGameWindowDimensions(e.Width, e.Height);
-
         }
 
         public override async void RenderAFrame()
@@ -135,16 +132,14 @@ public override async void RenderAFrame()
 
             ImGui.Begin("ImageWnd");
 
-            var hndl = ((TextureHandle)_imageTexture.TextureHandle).TexHandle;
+            var hndl = ((TextureHandle)_imageTexture.TextureHandle).TexId;
             ImGui.Image(new IntPtr(hndl), new Vector2(_imageTexture.Width, _imageTexture.Height));
 
             ImGui.End();
 
             DrawGUI();
         }
 
-
-
         internal void DrawGUI()
         {
             ImGui.Begin("Sidebar");

diff --git a/Examples/Complete/ImGui/Desktop/CoreControl.cs b/Examples/Complete/ImGui/Desktop/CoreControl.cs
@@ -3,6 +3,7 @@
 using Fusee.Engine.Core;
 using Fusee.Engine.Core.Effects;
 using Fusee.Engine.Core.Scene;
+using Fusee.ImGuiImp.Desktop.Templates;
 using Fusee.Math.Core;
 using System;
 using System.Collections.Generic;
@@ -17,7 +18,7 @@ internal struct SceneElement
         public string Value;
     }
 
-    internal class CoreControl : ImGuiDesktop.Templates.FuseeControlToTexture, IDisposable
+    internal class CoreControl : FuseeControlToTexture, IDisposable
     {
         private SceneContainer _rocketScene;
         private SceneRendererForward _renderer;
@@ -175,7 +176,7 @@ protected override ITextureHandle RenderAFrame()
             _camPivotTransform.RotationQuaternion = QuaternionF.FromEuler(_angleVert, _angleHorz, 0);
             _renderer.Render(_rc);
 
-            return _renderTexture.TextureHandle;
+            return _renderTexture.TextureHandleResult;
         }
 
         protected override void Resize(int width, int height)
@@ -199,8 +200,6 @@ protected virtual void Dispose(bool disposing)
                 {
                     _renderTexture.Dispose();
                 }
-
-
                 disposedValue = true;
             }
         }

diff --git a/Examples/Complete/ImGui/Desktop/Fusee.Examples.FuseeImGui.Desktop.csproj b/Examples/Complete/ImGui/Desktop/Fusee.Examples.FuseeImGui.Desktop.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
@@ -34,7 +34,7 @@
 	<ItemGroup>
 		<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
 		<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
-		<ProjectReference Include="$(FuseeEngineRoot)\src\ImGui\Desktop\Fusee.ImGui.Desktop\Fusee.ImGuiDesktop.csproj" />
+		<ProjectReference Include="$(FuseeEngineRoot)\src\ImGui\Desktop\Fusee.ImGui.Desktop\Fusee.ImGuiImp.Desktop.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/Examples/Complete/ImGui/Desktop/Main.cs b/Examples/Complete/ImGui/Desktop/Main.cs
@@ -56,9 +56,9 @@ public static void Main()
             var app = new Core();
 
             var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
-            app.CanvasImplementor = new Fusee.ImGuiDesktop.ImGuiRenderCanvasImp(icon);
+            app.CanvasImplementor = new Fusee.ImGuiImp.Desktop.ImGuiRenderCanvasImp(icon);
             app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
-            Input.AddDriverImp(new Fusee.ImGuiDesktop.ImGuiInputImp(app.CanvasImplementor));
+            Input.AddDriverImp(new Fusee.ImGuiImp.Desktop.ImGuiInputImp(app.CanvasImplementor));
 
             app.InitApp();
 

diff --git a/Examples/Complete/Labyrinth/Core/Labyrinth.cs b/Examples/Complete/Labyrinth/Core/Labyrinth.cs
@@ -5,7 +5,6 @@
 using Fusee.Engine.Core.Effects;
 using Fusee.Engine.Core.Primitives;
 using Fusee.Engine.Core.Scene;
-using Fusee.Engine.Core.ShaderShards;
 using Fusee.Engine.Gui;
 using Fusee.Math.Core;
 using Fusee.Xene;

diff --git a/Examples/Complete/Materials/Android/Fusee.Examples.Materials.Android.csproj b/Examples/Complete/Materials/Android/Fusee.Examples.Materials.Android.csproj
@@ -96,10 +96,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/MeshingAround/Android/Fusee.Examples.MeshingAround.Android.csproj b/Examples/Complete/MeshingAround/Android/Fusee.Examples.MeshingAround.Android.csproj
@@ -87,10 +87,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/Picking/Android/Fusee.Examples.Picking.Android.csproj b/Examples/Complete/Picking/Android/Fusee.Examples.Picking.Android.csproj
@@ -87,10 +87,6 @@
       <Project>{1228EB3F-8BCC-453F-8A2E-D9246495A118}</Project>
       <Name>Fusee.Engine.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\GUI\Fusee.Engine.Gui.csproj">
-      <Project>{26808b4a-9f15-47f0-b147-e744241b79d2}</Project>
-      <Name>Fusee.Engine.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj">
       <Project>{B3CE4F39-FCC4-4388-8130-9D0B9D65D034}</Project>
       <Name>Fusee.Engine.Imp.Graphics.Android</Name>

diff --git a/Examples/Complete/Picking/Android/MainActivity.cs b/Examples/Complete/Picking/Android/MainActivity.cs
@@ -88,7 +88,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                 Engine.Core.Input.AddDriverImp(
                     new Fusee.Engine.Imp.Graphics.Android.RenderCanvasInputDriverImp(app.CanvasImplementor));
                 // Engine.Core.Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Android.WindowsTouchInputDriverImp(app.CanvasImplementor));
-                // Deleayed into rendercanvas imp....app.Run() - SEE DELEGATE ABOVE;
+                // Delayed into rendercanvas imp....app.Run() - SEE DELEGATE ABOVE;
             }
             else
             {
@@ -100,7 +100,7 @@ protected override void OnCreate(Bundle savedInstanceState)
         /// <summary>
         /// Gets the supported OpenGL ES version of device.
         /// </summary>
-        /// <returns>Hieghest supported version of OpenGL ES</returns>
+        /// <returns> Highest supported version of OpenGL ES</returns>
         private long SupportedOpenGLVersion()
         {
             //based on https://android.googlesource.com/platform/cts/+/master/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java