mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0026936: Drawbacks of inlining in new type system in OCCT 7.0 -- automatic
Automatic restore of IMPLEMENT_STANDARD_RTTIEXT macro (upgrade -rtti)
This commit is contained in:
@@ -19,6 +19,8 @@
|
||||
#include <SelectMgr_ListIteratorOfListOfFilter.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_AndFilter,SelectMgr_CompositionFilter)
|
||||
|
||||
SelectMgr_AndFilter::SelectMgr_AndFilter()
|
||||
{
|
||||
}
|
||||
|
@@ -45,7 +45,7 @@ public:
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_AndFilter,SelectMgr_CompositionFilter)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_AndFilter,SelectMgr_CompositionFilter)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -15,6 +15,8 @@
|
||||
|
||||
#include <SelectMgr_BaseFrustum.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_BaseFrustum,Standard_Transient)
|
||||
|
||||
//=======================================================================
|
||||
// function : SelectMgr_SelectingVolume
|
||||
// purpose : Creates new selecting volume with pixel toletance set to 2,
|
||||
|
@@ -158,7 +158,7 @@ public:
|
||||
Standard_EXPORT virtual Standard_Boolean IsClipped (const Graphic3d_SequenceOfHClipPlane& thePlanes,
|
||||
const Standard_Real theDepth);
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_BaseFrustum, Standard_Transient)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_BaseFrustum,Standard_Transient)
|
||||
|
||||
protected:
|
||||
Standard_Integer myPixelTolerance; //!< Pixel tolerance
|
||||
|
@@ -20,6 +20,8 @@
|
||||
#include <SelectMgr_ListIteratorOfListOfFilter.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
|
||||
|
||||
void SelectMgr_CompositionFilter::Add(const Handle(SelectMgr_Filter)& afilter)
|
||||
{
|
||||
myFilters.Append(afilter);
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_CompositionFilter,SelectMgr_Filter)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -22,6 +22,8 @@
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TopLoc_Location.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_EntityOwner,SelectBasics_EntityOwner)
|
||||
|
||||
//==================================================
|
||||
// Function:
|
||||
// Purpose :
|
||||
|
@@ -133,7 +133,7 @@ public:
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_EntityOwner,SelectBasics_EntityOwner)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_EntityOwner,SelectBasics_EntityOwner)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -19,5 +19,7 @@
|
||||
#include <SelectMgr_Filter.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_Filter,MMgt_TShared)
|
||||
|
||||
Standard_Boolean SelectMgr_Filter::ActsOn(const TopAbs_ShapeEnum /*aStandardMode*/) const
|
||||
{return Standard_False;}
|
||||
|
@@ -69,7 +69,7 @@ public:
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_Filter,MMgt_TShared)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_Filter,MMgt_TShared)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -15,6 +15,8 @@
|
||||
|
||||
#include <SelectMgr_FrustumBuilder.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_FrustumBuilder,Standard_Transient)
|
||||
|
||||
#define DOT(A, B) (A.x() * B.x() + A.y() * B.y() + A.z() * B.z())
|
||||
#define LENGTH(A) (std::sqrt (A.x() * A.x() + A.y() * A.y() + A.z() * A.z()))
|
||||
|
||||
|
@@ -74,7 +74,7 @@ public:
|
||||
const Standard_Real& theY,
|
||||
const Standard_Real& theZ) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_FrustumBuilder, Standard_Transient)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_FrustumBuilder,Standard_Transient)
|
||||
|
||||
private:
|
||||
|
||||
|
@@ -20,6 +20,8 @@
|
||||
#include <SelectMgr_SelectableObject.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_OrFilter,SelectMgr_CompositionFilter)
|
||||
|
||||
//=============================================================================
|
||||
//function : SelectMgr_OrFilter
|
||||
//purpose :
|
||||
|
@@ -48,7 +48,7 @@ public:
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_OrFilter,SelectMgr_CompositionFilter)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_OrFilter,SelectMgr_CompositionFilter)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -39,6 +39,8 @@
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TopLoc_Location.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SelectableObject,PrsMgr_PresentableObject)
|
||||
|
||||
static Standard_Integer Search (const SelectMgr_SequenceOfSelection& seq,
|
||||
const Handle (SelectMgr_Selection)& theSel)
|
||||
{
|
||||
|
@@ -199,7 +199,7 @@ public:
|
||||
friend class SelectMgr_SelectionManager;
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_SelectableObject,PrsMgr_PresentableObject)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_SelectableObject,PrsMgr_PresentableObject)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -19,6 +19,8 @@
|
||||
#include <SelectBasics_EntityOwner.hxx>
|
||||
#include <SelectMgr_Selection.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_Selection,MMgt_TShared)
|
||||
|
||||
//==================================================
|
||||
// Function: SelectMgr_Selection
|
||||
// Purpose :
|
||||
|
@@ -137,7 +137,7 @@ public:
|
||||
//! proper updates use SelectMgr_SelectionManager::SetSelectionSensitivity method.
|
||||
Standard_EXPORT void SetSensitivity (const Standard_Integer theNewSens);
|
||||
|
||||
DEFINE_STANDARD_RTTI (SelectMgr_Selection, MMgt_TShared)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_Selection,MMgt_TShared)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -28,6 +28,8 @@
|
||||
#include <TColStd_ListOfInteger.hxx>
|
||||
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SelectionManager,MMgt_TShared)
|
||||
|
||||
static Standard_Integer FindIndex (const SelectMgr_SequenceOfSelector& theSelectorsSeq,
|
||||
const Handle(SelectMgr_ViewerSelector)& theSelector)
|
||||
{
|
||||
|
@@ -125,7 +125,7 @@ public:
|
||||
const Standard_Integer theMode,
|
||||
const Standard_Integer theNewSens);
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_SelectionManager,MMgt_TShared)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_SelectionManager,MMgt_TShared)
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -16,6 +16,8 @@
|
||||
#include <SelectMgr_SensitiveEntity.hxx>
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SensitiveEntity,Standard_Transient)
|
||||
|
||||
//=======================================================================
|
||||
// function : SelectMgr_SensitiveEntity
|
||||
// purpose : Creates new inactive for selection object with base entity
|
||||
|
@@ -47,7 +47,7 @@ public:
|
||||
//! Marks entity as active for selection
|
||||
Standard_EXPORT void SetActiveForSelection() const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_SensitiveEntity, Standard_Transient) // Type definition
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_SensitiveEntity,Standard_Transient) // Type definition
|
||||
|
||||
private:
|
||||
|
||||
|
@@ -15,6 +15,8 @@
|
||||
|
||||
#include <SelectMgr_TriangularFrustum.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_TriangularFrustum,Standard_Transient)
|
||||
|
||||
SelectMgr_TriangularFrustum::~SelectMgr_TriangularFrustum()
|
||||
{
|
||||
Clear();
|
||||
|
@@ -88,7 +88,7 @@ private:
|
||||
|
||||
void cacheVertexProjections (SelectMgr_TriangularFrustum* theFrustum);
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_TriangularFrustum,Standard_Transient)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_TriangularFrustum,Standard_Transient)
|
||||
};
|
||||
|
||||
#endif // _SelectMgr_TriangularFrustum_HeaderFile
|
||||
|
@@ -18,6 +18,7 @@
|
||||
#include <NCollection_IncAllocator.hxx>
|
||||
|
||||
#include <SelectMgr_TriangularFrustumSet.hxx>
|
||||
#include <SelectMgr_TriangularFrustum.hxx>
|
||||
|
||||
#define MEMORY_BLOCK_SIZE 512 * 7
|
||||
|
||||
|
@@ -36,6 +36,8 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_ViewerSelector,MMgt_TShared)
|
||||
|
||||
namespace {
|
||||
// Comparison operator for sorting selection results
|
||||
class CompareResults
|
||||
|
@@ -261,7 +261,7 @@ public:
|
||||
|
||||
friend class SelectMgr_SelectionManager;
|
||||
|
||||
DEFINE_STANDARD_RTTI(SelectMgr_ViewerSelector, MMgt_TShared)
|
||||
DEFINE_STANDARD_RTTIEXT(SelectMgr_ViewerSelector,MMgt_TShared)
|
||||
|
||||
protected:
|
||||
|
||||
|
Reference in New Issue
Block a user