OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-07-20 12:45:50 +03:00
Code

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

Browse Source 
Correction of merge error

Fix for compilation
This commit is contained in:
kgv 2014-10-23 18:40:12 +04:00 committed by bugmaster
parent 9256a43d09
commit 5e6a855aa9
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenGl/OpenGl_SceneGeometry.hxx
View File

@ -174,26 +174,14 @@ public:
void SetMaterialIndex (Standard_Integer theMatID) void SetMaterialIndex (Standard_Integer theMatID)
{ {
for (Standard_Size anIdx = 0; anIdx < Elements.size(); ++anIdx) 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; Elements[anIdx].w() = theMatID;
} }
} }
//! Returns AABB of the given object.
using BVH_Triangulation<Standard_ShortReal, 3>::Box;
//! Returns AABB of primitive set. //! Returns AABB of primitive set.
BVH_BoxNt Box() const; BVH_BoxNt Box() const;