split off the AABB from the Position View range

devsh · devsh · commit 787212feffba · 2025-07-02T17:47:24.000+02:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 4ed18fa6d52a47bca3c2755a4756895961002e25
+Subproject commit 66e486ca1a33932c498d849effe9af3358ac1095
diff --git a/include/nbl/asset/ICPUGeometryCollection.h b/include/nbl/asset/ICPUGeometryCollection.h
@@ -51,7 +51,7 @@ class NBL_API2 ICPUGeometryCollection : public IAsset, public IGeometryCollectio
         }
 
         // 
-        inline bool setAABB(const IGeometryBase::SAABBStorage& aabb)
+        inline bool setAABB(const decltype(base_t::m_aabb)& aabb)
         {
             if (isMutable())
             {
diff --git a/include/nbl/asset/ICPUPolygonGeometry.h b/include/nbl/asset/ICPUPolygonGeometry.h
@@ -34,6 +34,7 @@ class NBL_API2 ICPUPolygonGeometry final : public IPolygonGeometry<ICPUBuffer>
             retval->m_positionView = m_positionView.clone(nextDepth);
             retval->m_jointOBBView = m_jointOBBView.clone(nextDepth);
             retval->m_indexView = m_indexView.clone(nextDepth);
+            retval->m_aabb = m_aabb;
             retval->m_jointWeightViews.reserve(m_jointWeightViews.size());
             for (const auto& pair : m_jointWeightViews)
                 retval->m_jointWeightViews.push_back({
@@ -96,6 +97,22 @@ class NBL_API2 ICPUPolygonGeometry final : public IPolygonGeometry<ICPUBuffer>
             return false;
         }
 
+        //
+        template<typename Visitor>
+        inline void visitAABB(Visitor&& visitor) const {return base_t::visitAABB(std::forward<Visitor>(visitor));}
+        template<typename Visitor>
+        inline bool visitAABB(Visitor&& visitor)
+        {
+            if (isMutable())
+            {
+                getAABBStorage().visit(getAABBFormat(),std::forward<Visitor>(visitor));
+                return true;
+            }
+            return false;
+        }
+        template<typename Scalar>
+        inline bool setAABB(const hlsl::shapes::AABB<3,Scalar>& aabb) {return visitAABB([&aabb](auto&& ref)->void{ref=aabb;});}
+
         //
         inline bool setJointCount(const uint32_t count)
         {
diff --git a/include/nbl/asset/IGeometry.h b/include/nbl/asset/IGeometry.h
@@ -47,6 +47,7 @@ class IGeometryBase : public virtual core::IReferenceCounted
             U8_NORM,
             S8,
             S8_NORM,
+            Count,
             BitCount=4
         };
         //
@@ -155,6 +156,11 @@ class IGeometryBase : public virtual core::IReferenceCounted
                 const_cast<SAABBStorage*>(this)->visit(format,std::forward<Visitor>(visitor));
             }
 
+            inline void reset(const EAABBFormat format)
+            {
+                visit(format,[](auto& aabb)->void{aabb = aabb.create();});
+            }
+
             hlsl::shapes::AABB<4,hlsl::float64_t> f64 = hlsl::shapes::AABB<4,hlsl::float64_t>::create();
             hlsl::shapes::AABB<4,uint64_t> u64;
             hlsl::shapes::AABB<4,int64_t> s64;
@@ -206,30 +212,23 @@ class IGeometryBase : public virtual core::IReferenceCounted
 
             //
             template<typename Visitor>
-            inline void visitAABB(Visitor&& visitor) {encodedDataRange.visit(rangeFormat,std::forward<Visitor>(visitor));}
+            inline void visitRange(Visitor&& visitor) {encodedDataRange.visit(rangeFormat,std::forward<Visitor>(visitor));}
             template<typename Visitor>
-            inline void visitAABB(Visitor&& visitor) const {encodedDataRange.visit(rangeFormat,std::forward<Visitor>(visitor));}
+            inline void visitRange(Visitor&& visitor) const {encodedDataRange.visit(rangeFormat,std::forward<Visitor>(visitor));}
 
             //
-            inline void resetRange(const EAABBFormat newFormat)
-            {
-                rangeFormat = newFormat;
-                auto tmp = [](auto& aabb)->void{aabb = aabb.create();};
-                visitAABB(tmp);
-            }
-            inline void resetRange() {resetRange(rangeFormat);}
+            inline void resetRange() {encodedDataRange.reset(rangeFormat);}
 
             //
             template<typename AABB>
             inline AABB getRange() const
             {
                 AABB retval = AABB::create();
-                auto tmp = [&retval](const auto& aabb)->void
+                visitRange([&retval](const auto& aabb)->void
                 {
                     retval.minVx = aabb.minVx;
                     retval.maxVx = aabb.maxVx;
-                };
-                visitAABB(tmp);
+                });
                 return retval;
             }
 
@@ -245,11 +244,23 @@ class IGeometryBase : public virtual core::IReferenceCounted
         };
 
         virtual EAABBFormat getAABBFormat() const = 0;
-        virtual const SAABBStorage& getAABB() const = 0;
+        virtual const SAABBStorage& getAABBStorage() const = 0;
         template<typename Visitor>
         inline void visitAABB(Visitor&& visitor) const
         {
-            getAABB().visit(getAABBFormat(),std::forward<Visitor>(visitor));
+            getAABBStorage().visit(getAABBFormat(),std::forward<Visitor>(visitor));
+        }
+        //
+        template<typename AABB>
+        inline AABB getAABB() const
+        {
+            auto retval = AABB::create();
+            visitAABB([&retval](const auto& aabb)->void
+            {
+                retval.minVx = aabb.minVx;
+                retval.maxVx = aabb.maxVx;
+            });
+            return retval;
         }
 
     protected:
@@ -278,6 +289,9 @@ class IGeometry : public std::conditional_t<std::is_same_v<BufferType,ICPUBuffer
             return true;
         }
 
+        //
+        inline IGeometryBase::EAABBFormat getAABBFormat() const override final {return m_positionView.composed.rangeFormat;}
+
         struct SDataView
         {
             inline operator bool() const {return src && composed;}
@@ -488,7 +502,7 @@ struct blake3_hasher::update_impl<asset::IGeometryBase::SDataViewBase,Dummy>
         hasher << input.stride;
         hasher << input.format;
         hasher << input.rangeFormat;
-        input.visitAABB([&hasher](auto& aabb)->void{hasher.update(&aabb,sizeof(aabb));});
+        input.visitRange([&hasher](auto& aabb)->void{hasher.update(&aabb,sizeof(aabb));});
 	}
 };
 }
diff --git a/include/nbl/asset/IGeometryCollection.h b/include/nbl/asset/IGeometryCollection.h
@@ -116,7 +116,7 @@ class NBL_API2 IGeometryCollection : public virtual core::IReferenceCounted
 
 
         // For the entire collection, as always it should NOT include any geometry which is affected by a joint.
-        IGeometryBase::SAABBStorage m_aabb;
+        hlsl::shapes::AABB<3,hlsl::float64_t> m_aabb;
         SDataView m_inverseBindPoseView = {};
         // The AABBs gathered from all geometries (optional) and are in "bone-space" so there's no need for OBB option,
         // joint influence is usually aligned to the covariance matrix of geometry affected by it.
diff --git a/include/nbl/asset/IPolygonGeometry.h b/include/nbl/asset/IPolygonGeometry.h
@@ -160,8 +160,7 @@ class IPolygonGeometry : public IIndexableGeometry<BufferType>, public IPolygonG
         inline EPrimitiveType getPrimitiveType() const override final {return PrimitiveType;}
 
         //
-        inline IGeometryBase::EAABBFormat getAABBFormat() const override final {return base_t::m_positionView.composed.rangeFormat;}
-        inline const IGeometryBase::SAABBStorage& getAABB() const override final {return base_t::m_positionView.composed.encodedDataRange;}
+        inline const IGeometryBase::SAABBStorage& getAABBStorage() const override final {return m_aabb;}
 
         //
         inline uint64_t getVertexReferenceCount() const {return base_t::getIndexView() ? base_t::getIndexCount():base_t::m_positionView.getElementCount();}
@@ -261,6 +260,8 @@ class IPolygonGeometry : public IIndexableGeometry<BufferType>, public IPolygonG
             return true;
         }
 
+        //
+        IGeometryBase::SAABBStorage m_aabb = {};
         //
         core::vector<SJointWeight> m_jointWeightViews = {};
         //
diff --git a/include/nbl/asset/utils/CGeometryManipulator.h b/include/nbl/asset/utils/CGeometryManipulator.h
@@ -40,9 +40,9 @@ class NBL_API2 CGeometryManipulator
 					aabb.addPoint(pt);
 				}
 			};
-			IGeometryBase::SDataViewBase tmp = {};
-			tmp.resetRange(view.composed.rangeFormat);
-			tmp.visitAABB(addToAABB);
+			IGeometryBase::SDataViewBase tmp = view.composed;
+			tmp.resetRange();
+			tmp.visitRange(addToAABB);
 			return tmp.encodedDataRange;
 		}
 
diff --git a/include/nbl/asset/utils/CPolygonGeometryManipulator.h b/include/nbl/asset/utils/CPolygonGeometryManipulator.h
@@ -60,6 +60,27 @@ class NBL_API2 CPolygonGeometryManipulator
 				recomputeRange(view);
 		}
 
+		//
+		static inline IGeometryBase::SAABBStorage computeAABB(const ICPUPolygonGeometry* geo)
+		{
+			if (!geo || !geo->getPositionView() || geo->getPositionView().composed.rangeFormat>=IGeometryBase::EAABBFormat::Count)
+				return {};
+			// the AABB shall be the same format as the Position View's range Format
+			IGeometryBase::SAABBStorage retval;
+			//if (geo->getIndexView() || geo->isSkinned())
+			{
+				// TODO: kevinyu
+			}
+			//else
+				retval = geo->getPositionView().composed.encodedDataRange;
+			return retval;
+		}
+		static inline void recomputeAABB(const ICPUPolygonGeometry* geo)
+		{
+			if (geo->isMutable())
+				const_cast<IGeometryBase::SAABBStorage&>(geo->getAABBStorage()) = computeAABB(geo);
+		}
+
 		//! Comparison methods
 		enum E_ERROR_METRIC
 		{
diff --git a/include/nbl/builtin/hlsl/shapes/aabb.hlsl b/include/nbl/builtin/hlsl/shapes/aabb.hlsl
@@ -38,20 +38,20 @@ struct AABB
         maxVx = hlsl::max<point_t>(pt,maxVx);
     }
     //
-    point_t getExtent()
+    point_t getExtent() NBL_CONST_MEMBER_FUNC
     {
         return maxVx - minVx;
     }
 
     //
-    Scalar getVolume()
+    Scalar getVolume() NBL_CONST_MEMBER_FUNC
     {
         const point_t extent = getExtent();
         return extent.x * extent.y * extent.z;
     }
 
     // returns the corner of the AABB which has the most positive dot product
-    point_t getFarthestPointInFront(const point_t planeNormal)
+    point_t getFarthestPointInFront(const point_t planeNormal) NBL_CONST_MEMBER_FUNC
     {
         return hlsl::mix(maxVx,minVx,planeNormal < promote<point_t>(0.f));
     }
diff --git a/include/nbl/video/IGPUPolygonGeometry.h b/include/nbl/video/IGPUPolygonGeometry.h
@@ -26,6 +26,7 @@ class IGPUPolygonGeometry final : public asset::IPolygonGeometry<const IGPUBuffe
             SDataView jointOBBView = {};
             SDataView indexView = {};
             const IIndexingCallback* indexing = nullptr;
+            asset::IGeometryBase::SAABBStorage aabb = {};
             SDataView normalView = {};
             std::span<const SJointWeight> jointWeightViews = {};
             std::span<const SDataView> auxAttributeViews = {};
@@ -39,6 +40,7 @@ class IGPUPolygonGeometry final : public asset::IPolygonGeometry<const IGPUBuffe
                 retval->m_jointOBBView = params.jointOBBView;
             retval->m_indexView = params.indexView;
             retval->m_indexing = params.indexing;
+            retval->m_aabb = params.aabb;
             if (params.jointCount)
                 retval->m_jointWeightViews.insert(retval->m_jointWeightViews.begin(),params.jointWeightViews.begin(),params.jointWeightViews.end());
             retval->m_normalView = params.normalView;
diff --git a/src/nbl/asset/interchange/CPLYMeshFileLoader.cpp b/src/nbl/asset/interchange/CPLYMeshFileLoader.cpp
@@ -872,6 +872,8 @@ SAssetBundle CPLYMeshFileLoader::loadAsset(system::IFile* _file, const IAssetLoa
 		geometry->setIndexView(std::move(view));
 	}
 
+	CPolygonGeometryManipulator::recomputeAABB(geometry.get());
+
 	auto meta = core::make_smart_refctd_ptr<CPLYMetadata>();
 	return SAssetBundle(std::move(meta),{std::move(geometry)});
 }
diff --git a/src/nbl/asset/utils/CGeometryCreator.cpp b/src/nbl/asset/utils/CGeometryCreator.cpp
@@ -67,6 +67,12 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCube(const h
 			shapes::AABB<4,float32_t> aabb;
 			aabb.maxVx = float32_t4(size*0.5f,0.f);
 			aabb.minVx = -aabb.maxVx;
+			retval->visitAABB([aabb](auto& ref)->void
+				{
+					ref.minVx = hlsl::trunc(aabb.minVx);
+					ref.maxVx = hlsl::trunc(aabb.maxVx);
+				}
+			);
 			retval->setPositionView({
 				.composed = {
 					.encodedDataRange = {.f32=aabb},
@@ -698,6 +704,12 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createRectangle(co
 			shapes::AABB<4,float32_t> aabb;
 			aabb.minVx = float32_t4(-size,0.f,0.f);
 			aabb.maxVx = float32_t4( size,0.f,0.f);
+			retval->visitAABB([aabb](auto& ref)->void
+				{
+					ref.minVx = hlsl::trunc(aabb.minVx);
+					ref.maxVx = hlsl::trunc(aabb.maxVx);
+				}
+			);
 			retval->setPositionView({
 				.composed = {
 					.encodedDataRange = {.f32=aabb},
@@ -784,6 +796,12 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createDisk(const f
 			shapes::AABB<4,float32_t> aabb;
 			aabb.maxVx = float32_t4(radius,radius,0.f,0.f);
 			aabb.minVx = -aabb.maxVx;
+			retval->visitAABB([aabb](auto& ref)->void
+				{
+					ref.minVx = hlsl::trunc(aabb.minVx);
+					ref.maxVx = hlsl::trunc(aabb.maxVx);
+				}
+			);
 			retval->setPositionView({
 				.composed = {
 					.encodedDataRange = {.f32=aabb},
diff --git a/src/nbl/ext/MitsubaLoader/CSerializedLoader.cpp b/src/nbl/ext/MitsubaLoader/CSerializedLoader.cpp
@@ -230,6 +230,7 @@ asset::SAssetBundle CSerializedLoader::loadAsset(system::IFile* _file, const ass
 			{
 				auto view = createView(sourceIsDoubles ? EF_R64G64B64_SFLOAT:EF_R32G32B32_SFLOAT,vertexCount,ptr);
 				ptr += view.src.actualSize();
+				const_cast<IGeometryBase::SAABBStorage&>(geo->getAABBStorage()) = view.composed.encodedDataRange;
 				geo->setPositionView(std::move(view));
 			}
 			// cannot adopt decompressed memory, because these can be different formats (64bit not needed no matter what)
diff --git a/src/nbl/video/utilities/CAssetConverter.cpp b/src/nbl/video/utilities/CAssetConverter.cpp
@@ -1606,7 +1606,12 @@ bool CAssetConverter::CHashCache::hash_impl::operator()(lookup_t<ICPUPolygonGeom
 		// the particular callback should be a static and we can rely on the pointer being unique for a particular indexing algorithm
 		hasher << ptrdiff_t(indexing);
 	}
-	// not hashing redundant things (which can be worked out from properties we hash) like AABB, Primitive Count, etc.
+	asset->visitAABB([&](const auto& aabb)->void
+		{
+			hasher.update(&aabb,sizeof(aabb));
+		}
+	);
+	// not hashing redundant things (which can be worked out from properties we hash) like Ranges, Primitive Count, etc.
 	auto hashView = [&](const IGeometry<ICPUBuffer>::SDataView& view)->void
 	{
 		if (!view)
@@ -2084,6 +2089,7 @@ class GetDependantVisit<ICPUPolygonGeometry> : public GetDependantVisitBase<ICPU
 				case EPolygonGeometryViewType::Position:
 					// obligatory attribute, handle basic setup here too
 					creationParams.indexing = asset->getIndexingCallback();
+					creationParams.aabb = asset->getAABBStorage();
 					creationParams.jointCount = asset->getJointCount();
 					creationParams.positionView = getView(asset->getPositionView(),std::move(depObj));
 					break;

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class NBL_API2 ICPUGeometryCollection : public IAsset, public IGeometryCollectio`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`//`
`54`		`- inline bool setAABB(const IGeometryBase::SAABBStorage& aabb)`
	`54`	`+ inline bool setAABB(const decltype(base_t::m_aabb)& aabb)`
`55`	`55`	`{`
`56`	`56`	`if (isMutable())`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ class NBL_API2 CGeometryManipulator`
`40`	`40`	`aabb.addPoint(pt);`
`41`	`41`	`}`
`42`	`42`	`};`
`43`		`- IGeometryBase::SDataViewBase tmp = {};`
`44`		`- tmp.resetRange(view.composed.rangeFormat);`
`45`		`- tmp.visitAABB(addToAABB);`
	`43`	`+ IGeometryBase::SDataViewBase tmp = view.composed;`
	`44`	`+ tmp.resetRange();`
	`45`	`+ tmp.visitRange(addToAABB);`
`46`	`46`	`return tmp.encodedDataRange;`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -38,20 +38,20 @@ struct AABB`
`38`	`38`	`maxVx = hlsl::max<point_t>(pt,maxVx);`
`39`	`39`	`}`
`40`	`40`	`//`
`41`		`- point_t getExtent()`
	`41`	`+ point_t getExtent() NBL_CONST_MEMBER_FUNC`
`42`	`42`	`{`
`43`	`43`	`return maxVx - minVx;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`//`
`47`		`- Scalar getVolume()`
	`47`	`+ Scalar getVolume() NBL_CONST_MEMBER_FUNC`
`48`	`48`	`{`
`49`	`49`	`const point_t extent = getExtent();`
`50`	`50`	`return extent.x * extent.y * extent.z;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// returns the corner of the AABB which has the most positive dot product`
`54`		`- point_t getFarthestPointInFront(const point_t planeNormal)`
	`54`	`+ point_t getFarthestPointInFront(const point_t planeNormal) NBL_CONST_MEMBER_FUNC`
`55`	`55`	`{`
`56`	`56`	`return hlsl::mix(maxVx,minVx,planeNormal < promote<point_t>(0.f));`
`57`	`57`	`}`