Removed development changed from main branch

Author: abenedik

Ab4d.SharpEngine.Samples.BlazorWebAssembly/Ab4d.SharpEngine.Samples.BlazorWebAssembly.csproj

@@ -39,12 +39,12 @@
   </PropertyGroup>
 
 
-  <ItemGroup Condition="$(SHARPENGINE_PRIVATE_DIR)==''">
+  <ItemGroup>
     <PackageReference Include="Ab4d.SharpEngine.Web" Version="0.8.9400-beta1" />
   </ItemGroup>
-  <ItemGroup Condition="$(SHARPENGINE_PRIVATE_DIR)!=''">
+  <!--<ItemGroup Condition="$(SHARPENGINE_PRIVATE_DIR)!=''">
     <ProjectReference Include="$(SHARPENGINE_PRIVATE_DIR)\Ab4d.SharpEngine.Web\Ab4d.SharpEngine.Web.csproj" />
-  </ItemGroup>
+  </ItemGroup>-->
   <ItemGroup>
     <PackageReference Include="Silk.NET.OpenGLES" Version="2.22.0" />
   </ItemGroup>

Ab4d.SharpEngine.Samples.BlazorWebAssembly/CanvasInterop.cs

@@ -27,8 +27,6 @@ public partial class CanvasInterop : ICanvasInterop
     private static CanvasInterop? _initialInterop;
     private static List<CanvasInterop>? _additionalInteropObjects;
 
-    private Dictionary<string, Action<int,int,byte[]?>> _imageBytesLoadedCallbacks = new();
-    
     /// <summary>
     /// Returns true when the <see cref="InitializeInterop"/> method was called and successfully initialized the browser interop.
     /// </summary>
@@ -44,11 +42,6 @@ public partial class CanvasInterop : ICanvasInterop
     /// Returns true after the <see cref="InitWebGL"/> method was called, the WebGL context was created and connection with the canvas elements was successfully established.
     /// </summary>
     public bool IsWebGLInitialized { get; private set; }
-
-    /// <summary>
-    /// Returns true when WebGL 2.0 is used. When false, then WebGL 1.0 is used. In this case some features may not be available.
-    /// </summary>
-    public bool IsWebGL2 { get; private set; }
 
     /// <summary>
     /// Gets the width of the canvas in pixels (defines width of the back buffer that is used for rendering).
@@ -196,10 +189,9 @@ public void InitWebGL(bool useMultisampleAntiAliasing = true)
         }
 
         var dataParts = result.Substring(3).Split(';'); // Skip "OK:" and then split
-        this.IsWebGL2 = dataParts[0] == "v2";
-        this.Width    = int.Parse(dataParts[1]);
-        this.Height   = int.Parse(dataParts[2]);
-        this.DpiScale = float.Parse(dataParts[3], CultureInfo.InvariantCulture);
+        this.Width    = int.Parse(dataParts[0]);
+        this.Height   = int.Parse(dataParts[1]);
+        this.DpiScale = float.Parse(dataParts[2], CultureInfo.InvariantCulture);
         this.IsUsingMultisampleAntiAliasing = useMultisampleAntiAliasing;
 
         // Set static instances of CanvasInterop so that the static callback functions from javascript can find the target CanvasInterop
@@ -233,16 +225,6 @@ private void CheckIsInitialized(bool checkIfConnectedToCanvas = true, [CallerMem
             throw new SharpEngineException($"Cannot call {methodName} because the Connect method was not called or it failed to connect to the canvas element.");
     }
 
-    public void LoadImageBytes(string fileName, Action<int,int,byte[]?>? onTextureLoadedAction)
-    {
-        CheckIsInitialized();
-
-        if (onTextureLoadedAction != null)
-            _imageBytesLoadedCallbacks.Add(fileName, onTextureLoadedAction);
-
-        LoadImageBytesJs(this.CanvasId, fileName);
-    }
-    
     public void SetCursorStyle(string cursorStyle)
     {
         CheckIsInitialized();
@@ -317,9 +299,7 @@ public void Dispose()
         DisconnectWebGLCanvasJs(CanvasId);
         ArePointerEventsSubscribed = false;
         IsWebGLInitialized = false;
-
-        _imageBytesLoadedCallbacks.Clear();
-
+        
         if (_initialInterop == this)
         {
             _initialInterop = null;
@@ -411,18 +391,6 @@ private static void OnFrameUpdateJsCallback()
                 canvasInterop.OnBrowserAnimationFrameUpdated();
         }
     }
-    
-    [JSExport]
-    private static void OnImageBytesLoaded(string canvasId, string imageUrl, int width, int height, byte[]? imageBytes)
-    {
-        //if (IsLoggingInteropEvents)
-        //    Console.WriteLine($"OnImageBytesLoaded '{imageUrl}': {width} x {height} = {imageBytes?.Length ?? 0:N0} bytes");
-
-        var canvasInterop = GetCanvasInterop(canvasId);
-
-        if (canvasInterop._imageBytesLoadedCallbacks.Remove(imageUrl, out var callbackAction))
-            callbackAction(width, height, imageBytes);
-    }
 
     [JSExport]
     private static void OnPointerMovedJsCallback(string? canvasId, float x, float y, int buttons, int keyboardModifiers)
@@ -522,9 +490,6 @@ private static void OnCanvasResizedJsCallback(string? canvasId, float width, flo
     [JSImport("initWebGLCanvas", "sharp-engine.js")]
     private static partial string InitWebGLCanvasJs(string canvasId, bool useMSAA, bool subscribePointerEvents, bool subscribeRequestAnimationFrame);
 
-    [JSImport("loadImageBytes", "sharp-engine.js")]
-    private static partial void LoadImageBytesJs(string canvasId, string imageUrl);
-    
     [JSImport("subscribeBrowserEvents", "sharp-engine.js")]
     private static partial void SubscribeBrowserEventsJs(string canvasId, bool subscribePointerEvents, bool subscribeRequestAnimationFrame);
 

Ab4d.SharpEngine.Samples.BlazorWebAssembly/Pages/QuickStart.razor

@@ -135,8 +135,8 @@
         _targetPositionCamera = new TargetPositionCamera()
         {
             Heading = 30,
-            Attitude = -30,
-            Distance = 400,
+            Attitude = -40,
+            Distance = 300,
             TargetPosition = new Vector3(0, 0, 0),
             ShowCameraLight = ShowCameraLightType.Auto,
         };
@@ -164,12 +164,12 @@
         float hashModelBarOffset = 20;
 
         var hashSymbolMesh = MeshFactory.CreateHashSymbolMesh(centerPosition: new Vector3(0, hashModelBarThickness * 0.5f, 0),
-        shapeYVector: new Vector3(0, 0, 1),
-        extrudeVector: new Vector3(0, hashModelBarThickness, 0),
-        size: hashModelSize,
-        barThickness: hashModelBarThickness,
-        barOffset: hashModelBarOffset,
-        name: "HashSymbolMesh");
+                                                              shapeYVector: new Vector3(0, 0, 1),
+                                                              extrudeVector: new Vector3(0, hashModelBarThickness, 0),
+                                                              size: hashModelSize,
+                                                              barThickness: hashModelBarThickness,
+                                                              barOffset: hashModelBarOffset,
+                                                              name: "HashSymbolMesh");
 
         _hashMaterial = new StandardMaterial(diffuseColor: Color3.FromByteRgb(255, 197, 0));
         //_hashMaterial = new StandardMaterial(diffuseColor: Colors.Silver);
@@ -208,44 +208,9 @@
             scene.RootNode.Add(sphereModelNode1);
         }
 
-
-        if (sharpEngineSceneView.IsInitialized)
-            AddTexturePlane();
-        else
-            sharpEngineSceneView.SceneViewInitialized += (sender, args) => AddTexturePlane();
-
-
         ShowInfoMessage("Initial 3D scene shown");
     }
 
-    private void AddTexturePlane()
-    {
-        var gpuDevice = sharpEngineSceneView.Scene.GpuDevice;
-        if (gpuDevice == null)
-            return;
-
-        Ab4d.SharpEngine.Utilities.TextureLoader.CreateTexture("ab4d-logo-256.png", gpuDevice, gpuImage =>
-        {
-            var textureMaterial = new StandardMaterial(gpuImage)
-            {
-                HasTransparency = true,
-            };
-
-            var planeModelNode = new PlaneModelNode(centerPosition: new Vector3(0, 30, -150), 
-                                                    size: new Vector2(60, 60), 
-                                                    normal: new Vector3(0, 0, 1), 
-                                                    heightDirection: new Vector3(0, 1, 0), 
-                                                    name: "TexturePlane")
-            {
-                IsHitTestVisible = false,
-                Material = textureMaterial,
-                BackMaterial = textureMaterial,
-            };
-
-            sharpEngineSceneView.Scene.RootNode.Add(planeModelNode);
-        });
-    }
-
     private void UpdateRenderTime()
     {
         var statistics = sharpEngineSceneView.SceneView.Statistics;
@@ -273,8 +238,7 @@
             modelNode.Material = StandardMaterials.Red;
         }
     }
-
-
+    
     private void AddManyObjects()
     {
         int objectsCount = 1000;

Ab4d.SharpEngine.Samples.BlazorWebAssembly/wwwroot/sharp-engine.js

@@ -30,27 +30,14 @@ export function initWebGLCanvas(canvasId, useMSAA, subscribeMouseEvents, subscri
 
     if (canvas)
     {
-        let webglVersion;
-
         var context = canvas.getContext('webgl2', { antialias: useMSAA });
 
-        if (context) {
-            webglVersion = "2";
-        }
-        else {
-            context = canvas.getContext('webgl', { antialias: useMSAA });
-
-            if (context) {
-                console.warn("WebGL 2.0 is not supported. Using WebGL 1.0 but some features may not work.")
-                webglVersion = "1";
-            }
-            else {
-                var errorMessage = "WebGL 1.0 is not supported";
-                console.error(errorMessage);
-                return errorMessage;
-            }
+        if (!context) {
+            var errorMessage = "WebGL is not supported";
+            console.error(errorMessage);
+            return errorMessage;
         }
-
+        
         if (!initialCanvas)
             initialCanvas = canvas;
 
@@ -82,7 +69,7 @@ export function initWebGLCanvas(canvasId, useMSAA, subscribeMouseEvents, subscri
         // It is not possible (at least in .Net 9) to pass an objects for JS to .Net
         // It was possible to encode width and height into an int, but we also need dpiScale,
         // so we need to pass it as a string
-        return "OK:v" + webglVersion + ";" + displayWidth + ";" + displayHeight + ";" + dpi;
+        return "OK:" + displayWidth + ";" + displayHeight + ";" + dpi;
     }
     else
     {
@@ -92,79 +79,6 @@ export function initWebGLCanvas(canvasId, useMSAA, subscribeMouseEvents, subscri
     }
 }
 
-export async function loadImageBytes(canvasId, url) {
-    log("js: loadImageBytes: start loading " + url);
-     
-    if (true || !createImageBitmap || typeof OffscreenCanvas === "undefined") {
-        // Before Safari 16.4 (2024-03-27)
-        await loadImageBytesOldWay(canvasId, url);
-        return;
-    }
-
-    const response = await fetch(url, { mode: 'cors' });
-    if (!response.ok)
-        console.error('Image could not be fetched, url: ' + url);
-
-    log("js: image loaded: " + url);
-
-    const blob = await response.blob();
-
-    const bitmap = await createImageBitmap(blob, { premultiplyAlpha: 'none' });
-
-    const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(bitmap, 0, 0);
-    const imageData = ctx.getImageData(0, 0, bitmap.width, bitmap.height);
-
-    // For large arrays prefer using transferable, otherwise fallback as array
-    const data = Array.from(imageData.data);
-    
-    log("js: image byte array retrieved: " + url);
-
-    if (interop)
-        interop.OnImageBytesLoaded(canvasId, url, bitmap.width, bitmap.height, data);
-}
-
-async function loadImageBytesOldWay(canvasId, url) {
-
-    const image = new Image();
-    image.src = url;
-
-    let data;
-    let width, height;
-
-    try {
-        await image.decode();
-
-        log("js: image loaded by using Image: " + url);
-
-        const canvas = document.createElement('canvas');
-        const ctx = canvas.getContext('2d');
-
-        width = image.width;
-        height = image.height;
-
-        canvas.width = width;
-        canvas.height = height;
-        ctx.drawImage(image, 0, 0);
-        // Get all pixels
-        const imageData = ctx.getImageData(0, 0, width, height);
-        data = Array.from(imageData.data); // Length = width * height * 4
-
-        log("js: image byte array retrieved: " + url);
-    }
-    catch (ex)
-    {
-        data = null;
-        width = 0;
-        height = 0;
-        console.error("js: Texture image '" + url + "' failed to load.", ex);
-    }
-
-    if (interop)
-        interop.OnImageBytesLoaded(canvasId, url, width, height, data);
-}
-
 // NOTE:
 // We cannot subscribe to mouse events in SetWebGLCanvas because this requires async method
 // because we need to call "await getAssemblyExports" (without awit the exports are empyt).