@ -54,7 +54,7 @@ namespace R2
class CCtrlPolygonSelectable : public CCtrlPolygon , public IDisplayerUIHandle
class CCtrlPolygonSelectable : public CCtrlPolygon , public IDisplayerUIHandle
{
{
public :
public :
CCtrlPolygonSelectable ( CInstance & instance ) : Instance ( instance ) { }
CCtrlPolygonSelectable ( CViewBase : : TCtorParam & param , CInstance & instance ) : Instance ( instance ) , CCtrlPolygon ( param ) { }
// from IDisplayerUIHandle
// from IDisplayerUIHandle
virtual CInstance & getDisplayedInstance ( ) { return Instance ; }
virtual CInstance & getDisplayedInstance ( ) { return Instance ; }
// from IDisplayerUIHandle
// from IDisplayerUIHandle
@ -99,7 +99,7 @@ protected:
class CCtrlQuadSelectable : public CCtrlQuad , public IDisplayerUIHandle
class CCtrlQuadSelectable : public CCtrlQuad , public IDisplayerUIHandle
{
{
public :
public :
CCtrlQuadSelectable ( CInstance & instance , uint edgeIndex ) : Instance ( instance ) , EdgeIndex ( edgeIndex ) { }
CCtrlQuadSelectable ( CViewBase : : TCtorParam & param , CInstance & instance , uint edgeIndex ) : Instance ( instance ) , EdgeIndex ( edgeIndex ) , CCtrlQuad ( param ) { }
// from IDisplayerUIHandle
// from IDisplayerUIHandle
virtual CInstance & getDisplayedInstance ( ) { return Instance ; }
virtual CInstance & getDisplayedInstance ( ) { return Instance ; }
// from IDisplayerUIHandle
// from IDisplayerUIHandle
@ -179,7 +179,8 @@ CCtrlPolygon *CDisplayerVisualGroup::CSelectablePrimRender::newCtrlPolygon() con
{
{
//H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender)
//H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender)
nlassert ( DisplayedInstance ) ;
nlassert ( DisplayedInstance ) ;
CCtrlPolygonSelectable * result = new CCtrlPolygonSelectable ( * DisplayedInstance ) ;
CViewBase : : TCtorParam param ;
CCtrlPolygonSelectable * result = new CCtrlPolygonSelectable ( param , * DisplayedInstance ) ;
result - > setId ( DisplayedInstance - > getId ( ) ) ;
result - > setId ( DisplayedInstance - > getId ( ) ) ;
result - > setToolTipParent ( CCtrlBase : : TTMouse ) ;
result - > setToolTipParent ( CCtrlBase : : TTMouse ) ;
result - > setToolTipParentPosRef ( Hotspot_BR ) ;
result - > setToolTipParentPosRef ( Hotspot_BR ) ;
@ -192,7 +193,8 @@ CCtrlQuad *CDisplayerVisualGroup::CSelectablePrimRender::newCtrlQuad(uint edgeIn
{
{
//H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender)
//H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender)
nlassert ( DisplayedInstance ) ;
nlassert ( DisplayedInstance ) ;
CCtrlQuadSelectable * result = new CCtrlQuadSelectable ( * DisplayedInstance , edgeIndex ) ;
CViewBase : : TCtorParam param ;
CCtrlQuadSelectable * result = new CCtrlQuadSelectable ( param , * DisplayedInstance , edgeIndex ) ;
result - > setToolTipParent ( CCtrlBase : : TTMouse ) ;
result - > setToolTipParent ( CCtrlBase : : TTMouse ) ;
result - > setToolTipParentPosRef ( Hotspot_BR ) ;
result - > setToolTipParentPosRef ( Hotspot_BR ) ;
result - > setToolTipPosRef ( Hotspot_TL ) ;
result - > setToolTipPosRef ( Hotspot_TL ) ;