OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0025411: BVH package - eliminate warning about hidden overloaded method ::Box

Browse Source 
Conflicts:
	src/OpenGl/OpenGl_SceneGeometry.hxx
This commit is contained in:
kgv 2014-10-22 15:43:17 +04:00 committed by bugmaster
parent 75827e7628
commit 7c58a2abc0
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BVH/BVH_Geometry.hxx
View File

@ -39,6 +39,9 @@ public:
//! Marks geometry as outdated.
virtual void MarkDirty();
//! Returns AABB of the given object.
using BVH_ObjectSet<T, N>::Box;
//! Returns AABB of the whole geometry.
virtual BVH_Box<T, N> Box() const;

3
src/BVH/BVH_ObjectSet.hxx
View File

@ -54,6 +54,9 @@ public:
//! Return total number of objects.
virtual Standard_Integer Size() const;
//! Returns AABB of entire set of objects.
using BVH_Set<T, N>::Box;
//! Returns AABB of the given object.
virtual BVH_Box<T, N> Box (const Standard_Integer theIndex) const;

3
src/BVH/BVH_Triangulation.hxx
View File

@ -49,6 +49,9 @@ public:
//! Returns total number of triangles.
virtual Standard_Integer Size() const;
//! Returns AABB of entire set of objects.
using BVH_PrimitiveSet<T, N>::Box;
//! Returns AABB of the given triangle.
virtual BVH_Box<T, N> Box (const Standard_Integer theIndex) const;

15
src/OpenGl/OpenGl_SceneGeometry.hxx
View File

@ -174,6 +174,21 @@ public:
void SetMaterialIndex (Standard_Integer theMatID)
{
for (Standard_Size anIdx = 0; anIdx < Elements.size(); ++anIdx)
Elements[anIdx].w() = aMatID;
}
//! Returns AABB of the given object.
using BVH_Triangulation<Standard_ShortReal, 4>::Box;
//! Returns AABB of primitive set.
BVH_BoxNt Box() const
{
const BVH_Transform<Standard_ShortReal, 4>* aTransform =
dynamic_cast<const BVH_Transform<Standard_ShortReal, 4>* > (Properties().operator->());
BVH_BoxNt aBox = BVH_PrimitiveSet<Standard_ShortReal, 4>::Box();
if (aTransform)
{
Elements[anIdx].w() = theMatID;
}