From 2bdceaecda0b73c7e42d9c2e64e328cf83b43b12 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Thu, 21 Feb 2013 01:25:50 +0100 Subject: [PATCH] Resolved some build errors occuring after previous commit. --- code/ryzom/client/src/interface_v3/group_map.cpp | 3 ++- .../src/r2/displayer_visual_activity_sequence.cpp | 3 ++- code/ryzom/client/src/r2/displayer_visual_group.cpp | 10 ++++++---- code/ryzom/client/src/r2/instance_map_deco.cpp | 7 +++++-- code/ryzom/client/src/r2/prim_render.cpp | 8 ++++++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp index efd9d83e8..8cf3e4a23 100644 --- a/code/ryzom/client/src/interface_v3/group_map.cpp +++ b/code/ryzom/client/src/interface_v3/group_map.cpp @@ -733,7 +733,8 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup) //if (pCB != NULL) pCB->setActive(false); } nlassert(!_FrustumView); - _FrustumView = new CCtrlQuad; + CViewBase::TCtorParam param; + _FrustumView = new CCtrlQuad( param ); _FrustumView->setActive(false); addView(_FrustumView); _FrustumView->setParent(this); diff --git a/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp b/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp index 1369e03db..cb00080dc 100644 --- a/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp +++ b/code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp @@ -548,9 +548,10 @@ void CDisplayerVisualActivitySequence::setWorldMapNumEdges(uint count) else { uint left = count - (uint)_WorldMapEdges.size(); + CViewBase::TCtorParam param; while (left --) { - CCtrlQuad *cq = new CCtrlQuad; + CCtrlQuad *cq = new CCtrlQuad( param ); cq->setModulateGlobalColor(false); cq->setActive(true); gm->addCtrl(cq); diff --git a/code/ryzom/client/src/r2/displayer_visual_group.cpp b/code/ryzom/client/src/r2/displayer_visual_group.cpp index 7376e1832..6d80530a4 100644 --- a/code/ryzom/client/src/r2/displayer_visual_group.cpp +++ b/code/ryzom/client/src/r2/displayer_visual_group.cpp @@ -54,7 +54,7 @@ namespace R2 class CCtrlPolygonSelectable : public CCtrlPolygon, public IDisplayerUIHandle { public: - CCtrlPolygonSelectable(CInstance &instance) : Instance(instance) {} + CCtrlPolygonSelectable( CViewBase::TCtorParam ¶m, CInstance &instance) : Instance(instance), CCtrlPolygon( param ) {} // from IDisplayerUIHandle virtual CInstance &getDisplayedInstance() { return Instance; } // from IDisplayerUIHandle @@ -99,7 +99,7 @@ protected: class CCtrlQuadSelectable : public CCtrlQuad, public IDisplayerUIHandle { public: - CCtrlQuadSelectable(CInstance &instance, uint edgeIndex) : Instance(instance), EdgeIndex(edgeIndex) {} + CCtrlQuadSelectable( CViewBase::TCtorParam ¶m, CInstance &instance, uint edgeIndex) : Instance(instance), EdgeIndex(edgeIndex), CCtrlQuad( param ){} // from IDisplayerUIHandle virtual CInstance &getDisplayedInstance() { return Instance; } // from IDisplayerUIHandle @@ -179,7 +179,8 @@ CCtrlPolygon *CDisplayerVisualGroup::CSelectablePrimRender::newCtrlPolygon() con { //H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender) nlassert(DisplayedInstance); - CCtrlPolygonSelectable *result = new CCtrlPolygonSelectable(*DisplayedInstance); + CViewBase::TCtorParam param; + CCtrlPolygonSelectable *result = new CCtrlPolygonSelectable( param, *DisplayedInstance); result->setId(DisplayedInstance->getId()); result->setToolTipParent(CCtrlBase::TTMouse); result->setToolTipParentPosRef(Hotspot_BR); @@ -192,7 +193,8 @@ CCtrlQuad *CDisplayerVisualGroup::CSelectablePrimRender::newCtrlQuad(uint edgeIn { //H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender) nlassert(DisplayedInstance); - CCtrlQuadSelectable *result = new CCtrlQuadSelectable(*DisplayedInstance, edgeIndex); + CViewBase::TCtorParam param; + CCtrlQuadSelectable *result = new CCtrlQuadSelectable( param, *DisplayedInstance, edgeIndex); result->setToolTipParent(CCtrlBase::TTMouse); result->setToolTipParentPosRef(Hotspot_BR); result->setToolTipPosRef(Hotspot_TL); diff --git a/code/ryzom/client/src/r2/instance_map_deco.cpp b/code/ryzom/client/src/r2/instance_map_deco.cpp index 45f8c5e7f..fc5fe314b 100644 --- a/code/ryzom/client/src/r2/instance_map_deco.cpp +++ b/code/ryzom/client/src/r2/instance_map_deco.cpp @@ -110,7 +110,8 @@ CCtrlQuad *CInstanceMapDeco::newQuad(CGroupMap &owner) { //H_AUTO(R2_CInstanceMapDeco_newQuad) nlassert(_Instance); - CCtrlQuad *q = new CCtrlQuad; + CViewBase::TCtorParam param; + CCtrlQuad *q = new CCtrlQuad( param ); q->setActive(false); q->setModulateGlobalColor(false); owner.addCtrl(q); @@ -156,9 +157,11 @@ void CInstanceMapDeco::onAdd(CGroupMap &owner) CInterfaceGroup *window = owner.getParentContainer(); if (window) { + CViewBase::TCtorParam param; + for(uint k = 0; k < 2; ++k) { - _GlowStar[k] = new CCtrlQuad; + _GlowStar[k] = new CCtrlQuad( param ); _GlowStar[k]->setActive(false); _GlowStar[k]->setModulateGlobalColor(false); window->addCtrl(_GlowStar[k]); diff --git a/code/ryzom/client/src/r2/prim_render.cpp b/code/ryzom/client/src/r2/prim_render.cpp index f4a04f726..246f3f98e 100644 --- a/code/ryzom/client/src/r2/prim_render.cpp +++ b/code/ryzom/client/src/r2/prim_render.cpp @@ -188,6 +188,8 @@ CCtrlPolygon *CPrimRender::newCtrlPolygon() const //H_AUTO(R2_CPrimRender_newCtrlPolygon) class CCtrlMapPolygon : public CCtrlPolygon { + public: + CCtrlMapPolygon( CViewBase::TCtorParam ¶m ) : CCtrlPolygon( param ){} protected: // from CCtrlPolygon void computeScaledVertex(NLMISC::CVector2f &dest, const NLMISC::CVector2f &src) @@ -197,14 +199,16 @@ CCtrlPolygon *CPrimRender::newCtrlPolygon() const gm->worldToWindow(dest, src); } }; - return new CCtrlMapPolygon; + CViewBase::TCtorParam param; + return new CCtrlMapPolygon( param ); } // ********************************************************* CCtrlQuad *CPrimRender::newCtrlQuad(uint /* edgeIndex */) const { //H_AUTO(R2_CPrimRender_newCtrlQuad) - return new CCtrlQuad; + CViewBase::TCtorParam param; + return new CCtrlQuad( param ); } // *********************************************************