daily update on 20240613 by nitload youmu[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[C[4

2024-06-14 05:30:19 +08:00
parent be6c2e6b92
commit 7fb220c523
50 changed files with 991 additions and 700 deletions
@@ -45,51 +45,17 @@ namespace StgSharp.Graphics
 {
    public abstract class RenderStream : IConvertableToBlueprintNode
    {
-        private ViewPort primeArgs;

        private protected (int x, int y, int z) _coordStretch;

        private Camera nativeCamera;

-        public ViewPort Port => primeArgs;
-
-        internal IntPtr CanvasHandle { get => primeArgs.ViewPortID; }
-
-
-        internal IntPtr ContextHandle 
-        {
-            get => primeArgs.GraphicHandle; 
-            private protected set => primeArgs.GraphicHandle = value;
-        }
-
-        private IntPtr monitor;
-        private IntPtr sharedCanvas;
+        private ViewPort primeArgs;

        internal TimeSpanProvider timeProvider;
-        /*
-        protected RenderStream(View v, bool isSharing)
-        {
-            if (v == null)
-            {
-                throw new ArgumentNullException(nameof(v));
-            }
-            if (isSharing)
-            {
-                primeArgs = v;
-            }
-            else
-            {
-                View? newArgs = args.Clone() as View;
-                primeArgs = newArgs;
-            }
+        

-            monitor = args.Monitor;
-            _coordStretch = args.UnitCubeSize;
-            NativeCamera = new Camera();
-        }
-        /**/
-
-        public RenderStream(ViewPort v, (int,int,int) unitCubeSize)
+        public RenderStream(ViewPort v, (int, int, int) unitCubeSize)
        {
            if (v == null)
            {
@@ -97,48 +63,8 @@ namespace StgSharp.Graphics
            }
            primeArgs = v;

-            monitor = v!.Monitor;
            _coordStretch = unitCubeSize;
-            NativeCamera = new Camera();
-        }
-
-
-        public FrameBufferSizeHandler FrameSizeCallback
-        {
-            set
-            {
-                IntPtr handlerPtr = Marshal.GetFunctionPointerForDelegate(value);
-                InternalIO.glfwSetFramebufferSizeCallback(CanvasHandle, handlerPtr);
-            }
-        }
-
-        public vec2d GlobalCoordSize => ((Width * 1.0f) / _coordStretch.x, (Height * 1.0f) / _coordStretch.y);
-
-        public int Height
-        {
-            get => primeArgs.Height;
-            internal set
-            {
-                primeArgs.Height = value;
-                InternalIO.glfwSetWindowSize(this.CanvasHandle, Width, Height);
-            }
-        }
-
-        public IntPtr Monitor
-        {
-            get => monitor;
-            internal set => monitor = value;
-        }
-
-        public string Name
-        {
-            get => primeArgs.Name;
-        }
-
-        public IntPtr SharedCanvas
-        {
-            get => sharedCanvas;
-            internal set => sharedCanvas = value;
+            nativeCamera = new Camera();
        }

        public (int width, int height) Size
@@ -152,14 +78,55 @@ namespace StgSharp.Graphics
            }
        }

+
+        public string[] InputInterfacesName => InputPortsName;
+
+        public string[] OutputInterfacesName => OutputPortsName;
+
+
+        public FrameBufferSizeHandler FrameSizeCallback
+        {
+            set
+            {
+                IntPtr handlerPtr = Marshal.GetFunctionPointerForDelegate(value);
+                InternalIO.glfwSetFramebufferSizeCallback(CanvasHandle, handlerPtr);
+            }
+        }
+
+        public int Height
+        {
+            get => primeArgs.Height;
+            internal set { primeArgs.Height = value; }
+        }
+
        public int Width
        {
            get => primeArgs.Width;
-            internal set
-            {
-                primeArgs.Width = value;
-                InternalIO.glfwSetWindowSize(this.CanvasHandle, Width, Height);
-            }
+            internal set { primeArgs.Width = value; }
+        }
+
+        public IntPtr Monitor
+        {
+            get => primeArgs.Monitor;
+            internal set => primeArgs.Monitor = value;
+        }
+
+        public string Name
+        {
+            get => primeArgs.Name;
+        }
+
+        public vec2d GlobalCoordSize => ((Width * 1.0f) / _coordStretch.x, (Height * 1.0f) / _coordStretch.y);
+
+        public ViewPort Port => primeArgs;
+
+        internal IntPtr CanvasHandle { get => primeArgs.ViewPortID; }
+
+
+        internal IntPtr ContextHandle
+        {
+            get => primeArgs.GraphicHandle;
+            private protected set => primeArgs.GraphicHandle = value;
        }

        protected internal Camera NativeCamera
@@ -200,7 +167,9 @@ namespace StgSharp.Graphics
            where TSource : RenderStream
            where TTarget : RenderStream
        {
-            TTarget target = Activator.CreateInstance(typeof(TTarget), source.primeArgs, source._coordStretch) as TTarget;
+#nullable enable
+            TTarget? target = Activator.CreateInstance(typeof(TTarget), source.primeArgs, source._coordStretch) as TTarget;
+#nullable restore
            if (target == null)
            {
                throw new InvalidOperationException(
@@ -208,17 +177,12 @@ namespace StgSharp.Graphics
                    );
            }
            target.timeProvider = source.timeProvider;
-            target.Init();
+            target.InternalInit();
            return target;
        }

-
-        string[] IConvertableToBlueprintNode.InputInterfacesName => InputPortsName;
-
        BlueprintNodeAction IConvertableToBlueprintNode.MainExecution => InternalDraw;

-        string[] IConvertableToBlueprintNode.OutputInterfacesName => OutputPortsName;
-
        #region native camera operation
        protected abstract void NativeCameraViewRange(Radius fieldOfRange, vec2d offset, (float frontDepth, float backDepth) viewDepth);
        protected abstract void NativeCameraViewTarget(vec3d position, vec3d direction, vec3d up);
@@ -251,7 +215,6 @@ namespace StgSharp.Graphics
        protected abstract void Main(
            in Dictionary<string, BlueprintPipeline> input,
            in Dictionary<string, BlueprintPipeline> output);
-        protected abstract void ProcessInput();

        #endregion