Merge pull request #614 from FUSEEProjectTeam/feature/612-visibility-…

…tester-honors-transform

Feature/612 visibility tester honors transform

src/Engine/Core/Effects/SurfaceEffectPointCloud.cs

@@ -190,7 +190,7 @@ private static List<string> CalculateVaryings(bool doRenderInstanced)
             else
             {
                 return new List<string>() {
-                    $"mat4 mv = FUSEE_V * {UniformNameDeclarations.InstanceModelMat};",
+                    $"mat4 mv = FUSEE_V * FUSEE_M * {UniformNameDeclarations.InstanceModelMat};",
 
                     //assumption: position x and y are in range [-0.5, 0.5].
                     $"{VaryingNameDeclarations.PointCoord} = vec2(0.5) / {UniformNameDeclarations.Vertex}.xy;",
@@ -208,14 +208,14 @@ private static List<string> CalculateVaryings(bool doRenderInstanced)
                     "   // Fixed pixel size",
                     "   case 0:",
                     "   {",
-                    $"      sizeInPx = (billboardHeight / (2.0 * slope * z)) * float({UniformNameDeclarations.ViewportPx});",
+                    $"      sizeInPx = (billboardHeight / (2.0 * slope * z)) * float({UniformNameDeclarations.ViewportPx}.y);",
                     "       break;",
                     "   }",
                     "   //Fixed world size",
                     "   case 1:",
                     "   {",
                     "       //In this scenario the PointSize is the given point radius in world space - the point size in pixel will shrink if the camera moves farther away",                    "",
-                    $"      sizeInPx = (billboardHeight / (2.0 * slope)) * float({UniformNameDeclarations.ViewportPx});",
+                    $"      sizeInPx = (billboardHeight / (2.0 * slope)) * float({UniformNameDeclarations.ViewportPx}.y);",
                     "       break;",
                     "   }",
                     "}",

src/Engine/Core/SceneRendererForward.cs

@@ -282,6 +282,9 @@ public virtual void SetContext(RenderContext rc)
             }
         }
 
+        /// <summary>
+        /// Updates the state in each registered <see cref="IRendererModule"/>.
+        /// </summary>
         protected void NotifyStateChanges()
         {
             foreach (var module in VisitorModules)
@@ -290,6 +293,9 @@ protected void NotifyStateChanges()
             }
         }
 
+        /// <summary>
+        /// Updates the camera in each registered <see cref="IRendererModule"/>.
+        /// </summary>
         protected void NotifyCameraChanges(Camera cam)
         {
             foreach (var module in VisitorModules)

src/PointCloud/Common/Assets/PointCloudInstanced.vert

@@ -24,7 +24,7 @@ in mat4 fuInstanceModelMat;
 
 void main(void)
 {	
-	mat4 mv = FUSEE_V * fuInstanceModelMat;
+	mat4 mv = FUSEE_V * FUSEE_M * fuInstanceModelMat;
 
     //vColor = fuInstanceColor;
 
@@ -52,7 +52,7 @@ void main(void)
         case 1:
         {
             //In this scenario the PointSize is the given point radius in world space - the point size in pixel will shrink if the camera moves farther away"                    "",
-            sizeInPx = (billboardHeight / (2.0 * slope)) * float(FUSEE_ViewportPx);               
+            sizeInPx = (billboardHeight / (2.0 * slope)) * float(FUSEE_ViewportPx);
             break;
         }
     }
@@ -62,5 +62,5 @@ void main(void)
               + vec4(fuVertex.x, fuVertex.y, 0.0, 0.0)
               * vec4(scaleFactor, scaleFactor, 1.0, 1.0);
 
-    gl_Position =  FUSEE_P * FUSEE_M * vViewPos;
+    gl_Position =  FUSEE_P * vViewPos;
 }

src/PointCloud/Common/IPointCloudImp.cs

@@ -1,6 +1,5 @@
 using Fusee.Engine.Core;
 using Fusee.Math.Core;
-using System;
 using System.Collections.Generic;
 
 namespace Fusee.PointCloud.Common
@@ -60,7 +59,8 @@ public float UpdateRate
         /// <param name="viewportHeight">The current viewport height.</param>
         /// <param name="renderFrustum">The current viewport width.</param>
         /// <param name="camPos">The current camera position in world coordinates.</param>
-        public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3 camPos);
+        /// <param name="modelMat">The model matrix of the SceneNode the PointCloud(Component) is part of.</param>
+        public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3 camPos, float4x4 modelMat);
     }
 
     /// <summary>

src/PointCloud/Core/PointCloudOctant.cs

@@ -86,13 +86,17 @@ public PointCloudOctant(double3 center, double size, OctantId octId, PointCloudO
         /// <param name="camPos">Position of the camera.</param>
         /// <param name="screenHeight">Hight of the canvas.</param>
         /// <param name="fov">Field of view.</param>
-        public void ComputeScreenProjectedSize(double3 camPos, int screenHeight, float fov)
+        public void ComputeScreenProjectedSize(double3 camPos, int screenHeight, float fov, float3 translation, float3 scale)
         {
-            var distance = (Center - camPos).Length;
-            if (Center == camPos)
+            var translatedCenter = Center + new double3(translation);
+            var scaledRad = Size / 2f * new double3(scale);
+            var distance = (translatedCenter - camPos).Length;
+            if (translatedCenter == camPos)
                 distance = 0.0001f;
             var slope = (float)System.Math.Tan(fov / 2d);
-            ProjectedScreenSize = screenHeight / 2d * Size / (slope * distance);
+
+            var maxRad = System.Math.Max(System.Math.Max(scaledRad.x, scaledRad.y), scaledRad.z);
+            ProjectedScreenSize = screenHeight / 2d * maxRad / (slope * distance);
         }
 
         /// <summary>
@@ -104,6 +108,24 @@ public IEmptyOctant<double3, double> CreateChild(int atPosInParent)
             throw new System.NotImplementedException();
         }
 
+        /// <summary>
+        /// Checks if this Octant lies within or intersects a Frustum.
+        /// Returns true if one of the Frustum planes is intersecting this octant.
+        /// </summary>
+        /// <param name="frustum">The frustum to test against.</param>
+        /// <returns>false if fully outside, true if inside or intersecting.</returns>
+        public bool InsideOrIntersectingFrustum(FrustumF frustum, float3 translation, float3 scale)
+        {
+            var translatedCenter = new float3(Center) + translation;
+            var scaledSize = new float3((float)Size) * scale;
+            return frustum.Near.InsideOrIntersecting(translatedCenter, scaledSize) &
+                frustum.Far.InsideOrIntersecting(translatedCenter, scaledSize) &
+                frustum.Left.InsideOrIntersecting(translatedCenter, scaledSize) &
+                frustum.Right.InsideOrIntersecting(translatedCenter, scaledSize) &
+                frustum.Top.InsideOrIntersecting(translatedCenter, scaledSize) &
+                frustum.Bottom.InsideOrIntersecting(translatedCenter, scaledSize);
+        }
+
         /// <summary>
         /// Checks if this Octant lies within or intersects a Frustum.
         /// Returns true if one of the Frustum planes is intersecting this octant.

src/PointCloud/Core/Scene/PointCloudRenderModule.cs

@@ -41,10 +41,7 @@ public void UpdateContext(RenderContext rc)
             if (rc == null)
                 throw new ArgumentNullException(nameof(rc));
 
-            if (rc != _rc)
-            {
-                _rc = rc;
-            }
+            _rc = rc;
         }
 
         /// <summary>
@@ -56,10 +53,7 @@ public void UpdateState(RendererState state)
             if (state == null)
                 throw new ArgumentNullException(nameof(state));
 
-            if (state != _state)
-            {
-                _state = state;
-            }
+            _state = state;
         }
 
         /// <summary>
@@ -110,7 +104,7 @@ public void RenderPointCloud(PointCloudComponent pointCloud)
             else if (pointCloud.Camera == _camera)
             {
                 var fov = (float)_rc.ViewportWidth / _rc.ViewportHeight;
-                pointCloud.PointCloudImp.Update(fov, _rc.ViewportHeight, _rc.RenderFrustum, _rc.InvView.Column4.xyz);
+                pointCloud.PointCloudImp.Update(fov, _rc.ViewportHeight, _rc.RenderFrustum, _rc.InvView.Column4.xyz, _rc.Model);
             }
 
             switch (pointCloud.RenderMode)

src/PointCloud/Core/VisibilityTester.cs

@@ -1,3 +1,4 @@
+using Fusee.Base.Core;
 using Fusee.Engine.Core;
 using Fusee.Math.Core;
 using Fusee.PointCloud.Common;
@@ -21,10 +22,25 @@ public class VisibilityTester
         /// </summary>
         public float Fov { get; set; }
 
+        /// <summary>
+        /// Model matrix of the SceneNode the point cloud (component) is part of.
+        /// </summary>
+        public float4x4 Model { get; set; } = float4x4.Identity;
+
         /// <summary>
         /// Current camera position - set by the SceneRenderer if a PointCloud Component is visited.
         /// </summary>
-        public float3 CamPos { get; set; }
+        public float3 CamPos
+        {
+            get => _camPos;
+            set
+            {
+                _camPos = value;
+                _camPosD = new double3(_camPos.x, _camPos.y, _camPos.z);
+            }
+        }
+        private float3 _camPos;
+
 
         /// <summary>
         /// Current height of the viewport - set by the SceneRenderer if a PointCloud Component is visited.
@@ -81,7 +97,6 @@ public float MinProjSizeModifier
         private readonly SortedDictionary<double, PointCloudOctant> _visibleNodesOrderedByProjectionSize;
 
         private double3 _camPosD;
-        private float _fov;
         private float _minProjSizeModifier = 0.1f;
         private readonly TriggerPointLoading _triggerPointLoading;
         private float _deltaTimeSinceLastUpdate;
@@ -105,10 +120,7 @@ public VisibilityTester(IPointCloudOctree octree, TriggerPointLoading tryAddPoin
         /// </summary>
         public void Update()
         {
-            _camPosD = new double3(CamPos.x, CamPos.y, CamPos.z);
-            _fov = Fov;
-
-            SetMinScreenProjectedSize(_camPosD, _fov);
+            SetMinScreenProjectedSize(_camPosD, Fov);
 
             if (_deltaTimeSinceLastUpdate < UpdateRate)
                 _deltaTimeSinceLastUpdate += Time.DeltaTime;
@@ -129,7 +141,6 @@ private void DetermineVisibility()
             NumberOfVisiblePoints = 0;
             _visibleNodesOrderedByProjectionSize.Clear();
             VisibleNodes.Clear();
-
             DetermineVisibilityForNode((PointCloudOctant)Octree.Root);
 
             while (_visibleNodesOrderedByProjectionSize.Count > 0 && NumberOfVisiblePoints <= PointThreshold)
@@ -161,12 +172,14 @@ private void DetermineVisibilityForChildren(PointCloudOctant node)
 
         private void DetermineVisibilityForNode(PointCloudOctant node)
         {
+            var scale = float3.One; //Model.Scale()
+            var translation = Model.Translation();
             // gets pixel radius of the node
-            node.ComputeScreenProjectedSize(_camPosD, ViewportHeight, _fov);
+            node.ComputeScreenProjectedSize(_camPosD, ViewportHeight, Fov, translation, scale);
 
             //If node does not intersect the viewing frustum or is smaller than the minimal projected size:
             //Return -> will not be added to _visibleNodesOrderedByProjectionSize -> traversal of this branch stops.
-            if (!node.InsideOrIntersectingFrustum(RenderFrustum) || node.ProjectedScreenSize < _minScreenProjectedSize)
+            if (!node.InsideOrIntersectingFrustum(RenderFrustum, translation, scale) || node.ProjectedScreenSize < _minScreenProjectedSize)
             {
                 return;
             }
@@ -178,7 +191,7 @@ private void DetermineVisibilityForNode(PointCloudOctant node)
 
         private void SetMinScreenProjectedSize(double3 camPos, float fov)
         {
-            ((PointCloudOctant)Octree.Root).ComputeScreenProjectedSize(camPos, ViewportHeight, fov);
+            ((PointCloudOctant)Octree.Root).ComputeScreenProjectedSize(camPos, ViewportHeight, fov, Model.Translation(), float3.One);
             _minScreenProjectedSize = ((PointCloudOctant)Octree.Root).ProjectedScreenSize * _minProjSizeModifier;
         }
     }

src/PointCloud/Potree/Potree2Cloud.cs

@@ -2,7 +2,6 @@
 using Fusee.Math.Core;
 using Fusee.PointCloud.Common;
 using Fusee.PointCloud.Core;
-using System;
 using System.Collections.Generic;
 
 namespace Fusee.PointCloud.Potree
@@ -105,7 +104,8 @@ public Potree2Cloud(PointCloudDataHandlerBase<GpuMesh> dataHandler, IPointCloudO
         /// <param name="viewportHeight">The viewport height.</param>
         /// <param name="renderFrustum">The camera's frustum.</param>
         /// <param name="camPos">The camera position in world coordinates.</param>
-        public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3 camPos)
+        /// /// <param name="modelMat">The model matrix of the SceneNode the PointCloud(Component) is part of.</param>
+        public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3 camPos, float4x4 modelMat)
         {
             DataHandler.ProcessDisposeQueue();
 
@@ -121,6 +121,7 @@ public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3
             VisibilityTester.ViewportHeight = viewportHeight;
             VisibilityTester.Fov = fov;
             VisibilityTester.CamPos = camPos;
+            VisibilityTester.Model = modelMat;
 
             VisibilityTester.Update();
 

src/PointCloud/Potree/Potree2CloudInstanced.cs

@@ -2,7 +2,6 @@
 using Fusee.Math.Core;
 using Fusee.PointCloud.Common;
 using Fusee.PointCloud.Core;
-using System;
 using System.Collections.Generic;
 
 namespace Fusee.PointCloud.Potree
@@ -85,7 +84,6 @@ public float UpdateRate
 
         private readonly GetInstanceData _getInstanceData;
         private bool _doUpdate = true;
-        private bool _disposed;
 
         /// <summary>
         /// Creates a new instance of type <see cref="PointCloud"/>
@@ -106,7 +104,8 @@ public Potree2CloudInstanced(PointCloudDataHandlerBase<InstanceData> dataHandler
         /// <param name="viewportHeight">The viewport height.</param>
         /// <param name="renderFrustum">The camera's frustum.</param>
         /// <param name="camPos">The camera position in world coordinates.</param>
-        public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3 camPos)
+        /// <param name="modelMat">The model matrix of the SceneNode the PointCloud(Component) is part of.</param>
+        public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3 camPos, float4x4 modelMat)
         {
             DataHandler.ProcessDisposeQueue();
 
@@ -122,6 +121,7 @@ public void Update(float fov, int viewportHeight, FrustumF renderFrustum, float3
             VisibilityTester.ViewportHeight = viewportHeight;
             VisibilityTester.Fov = fov;
             VisibilityTester.CamPos = camPos;
+            VisibilityTester.Model = modelMat;
 
             VisibilityTester.Update();