Debugging culling and tree splitting

modules/globebrowsing/globes/chunknode.cpp

@@ -96,7 +96,6 @@ bool ChunkNode::internalUpdateChunkTree(const RenderData& data, ChunkIndex& trav
         return false;
     }
     else {
-        
         int requestedMergeMask = 0;
         std::vector<ChunkIndex> childIndices = traverseData.childIndices();
         for (int i = 0; i < 4; ++i) {
@@ -181,6 +180,11 @@ int ChunkNode::calculateDesiredLevelAndUpdateIsVisible(
     }
     */
 
+    if (traverseData == ChunkIndex(0, 0, 1))
+        int hej = 0;
+
+    LDEBUG("traverseData = " << traverseData);
+
     if (!HorizonCuller::isVisible(
         data,
         _patch,
@@ -231,8 +235,8 @@ void ChunkNode::split(int depth) {
         // Create new chunk nodes
 
         _children[Quad::NORTH_WEST] = std::unique_ptr<ChunkNode>(new ChunkNode(_owner, nwBounds, this));
-        _children[Quad::SOUTH_WEST] = std::unique_ptr<ChunkNode>(new ChunkNode(_owner, swBounds, this));
         _children[Quad::NORTH_EAST] = std::unique_ptr<ChunkNode>(new ChunkNode(_owner, neBounds, this));
+        _children[Quad::SOUTH_WEST] = std::unique_ptr<ChunkNode>(new ChunkNode(_owner, swBounds, this));
         _children[Quad::SOUTH_EAST] = std::unique_ptr<ChunkNode>(new ChunkNode(_owner, seBounds, this));
     }
 

modules/globebrowsing/rendering/culling.cpp

@@ -47,8 +47,7 @@ namespace openspace {
 
     bool FrustumCuller::isVisible(
         const RenderData& data,
-        const vec3& point,
-        const glm::vec2& marginScreenSpace) {
+        const vec3& point) {
 
         mat4 modelTransform = translate(mat4(1), data.position.vec3());
         mat4 viewTransform = data.camera.combinedViewMatrix();
@@ -57,7 +56,7 @@ namespace openspace {
 
         vec2 pointScreenSpace =
             transformToScreenSpace(point, modelViewProjectionTransform);
-        return testPoint(pointScreenSpace, marginScreenSpace);
+        return testPoint(pointScreenSpace, vec2(0));
     }
 
     bool FrustumCuller::isVisible(
@@ -67,6 +66,10 @@ namespace openspace {
         // An axis aligned bounding box based on the patch's minimum boudning sphere is
         // used for testnig
 
+        //mat4 viewTransform = glm::lookAt(vec3(6378137.0 + 1000, 0, 0), vec3(0, 5e6, 1e7), vec3(0, 0, 1)); //data.camera.combinedViewMatrix
+        //Vec3 cameraPosition = vec3(inverse(viewTransform) * vec4(0, 0, 0, 1));// data.camera.position().dvec3();
+
+
         // Calculate the MVP matrix
         mat4 modelTransform = translate(mat4(1), data.position.vec3());
         mat4 viewTransform = data.camera.combinedViewMatrix();
@@ -76,18 +79,18 @@ namespace openspace {
         // Calculate the patch's center point in screen space
         vec4 patchCenterModelSpace =
             vec4(ellipsoid.geodetic2ToCartesian(patch.center()), 1);
-        vec4 patchCenterProjectionSpace =
+        vec4 patchCenterClippingSpace =
             modelViewProjectionTransform * patchCenterModelSpace;
         vec2 pointScreenSpace =
-            (1.0f / patchCenterProjectionSpace.w) * patchCenterProjectionSpace.xy();
+            (1.0f / patchCenterClippingSpace.w) * patchCenterClippingSpace.xy();
 
         // Calculate the screen space margin that represents an axis aligned bounding 
         // box based on the patch's minimum boudning sphere
         double boundingRadius = patch.minimalBoundingRadius(ellipsoid);
-        vec4 marginProjectionSpace =
+        vec4 marginClippingSpace =
             vec4(vec3(boundingRadius), 0) * data.camera.projectionMatrix();
         vec2 marginScreenSpace =
-            (1.0f / patchCenterProjectionSpace.w) * marginProjectionSpace.xy();
+            (1.0f / patchCenterClippingSpace.w) * marginClippingSpace.xy();
 
         // Test the bounding box by testing the center point and the corresponding margin
         return testPoint(pointScreenSpace, marginScreenSpace);
@@ -96,7 +99,6 @@ namespace openspace {
     bool FrustumCuller::testPoint(const glm::vec2& pointScreenSpace,
         const glm::vec2& marginScreenSpace)
     {
-
         const vec2& p = pointScreenSpace;
 
         vec2 cullBounds = vec2(1) + marginScreenSpace;

modules/globebrowsing/rendering/culling.h

@@ -56,8 +56,7 @@ namespace openspace {
         */
         static bool isVisible(
             const RenderData& data,
-            const vec3& point,
-            const vec2& marginScreenSpace = vec2(0));
+            const vec3& point);
 
         /**
         Returns false if the patch element is guaranteed to be outside the view