[Gcblue-commits] gcb_wx/src/graphics tc3DModel.cpp,1.18,1.19 tcLauncherPopup.cpp,1.3,1.4 tcMapView.c
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-01-10 00:31:07
|
Update of /cvsroot/gcblue/gcb_wx/src/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27845/src/graphics Modified Files: tc3DModel.cpp tcLauncherPopup.cpp tcMapView.cpp Log Message: Fixed group commands Index: tcMapView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcMapView.cpp 28 Dec 2004 23:51:24 -0000 1.13 --- tcMapView.cpp 10 Jan 2005 00:30:54 -0000 1.14 *************** *** 754,757 **** --- 754,765 ---- /** + * @return vector of hooked group indices + */ + std::vector<long>& tcTacticalMapView::GetHookedGroup() + { + return hookedId; + } + + /** * @return hook ID of hooked unit with index of idx, or -1 if invalid */ *************** *** 2307,2311 **** * Sets callback parameters to use when map command is completed */ ! void tcTacticalMapView::SetMapCmdCallback(const char *azCallback, long id, int param) { strcpy(mzMapCmdCallback,azCallback); --- 2315,2319 ---- * Sets callback parameters to use when map command is completed */ ! void tcTacticalMapView::SetMapCmdCallback(const char *azCallback, const std::vector<long>& id, int param) { strcpy(mzMapCmdCallback,azCallback); Index: tcLauncherPopup.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcLauncherPopup.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcLauncherPopup.cpp 21 Dec 2004 02:26:17 -0000 1.3 --- tcLauncherPopup.cpp 10 Jan 2005 00:30:54 -0000 1.4 *************** *** 167,171 **** const int widgetHeight = 12; const float widgetFontSize = 12.0; ! const float widgetAlpha = 0.9f; int x = 80; int y = 20; --- 167,171 ---- const int widgetHeight = 12; const float widgetFontSize = 12.0; ! const float widgetAlpha = 1.0f; int x = 80; int y = 20; *************** *** 288,292 **** if (tcLauncher* launcher = GetLauncher()) { ! tcCommandQueue::Get()->GetUserInputForID("SetDatum", "Datum", platformId, launcherIdx); } } --- 288,293 ---- if (tcLauncher* launcher = GetLauncher()) { ! tcCommandQueue::Get()->GetUserInputForID("SetDatum", "Datum", ! std::vector<long>(platformId), launcherIdx); } } Index: tc3DModel.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tc3DModel.cpp 30 Dec 2004 17:26:07 -0000 1.18 --- tc3DModel.cpp 10 Jan 2005 00:30:54 -0000 1.19 *************** *** 611,621 **** // add children with varying level of detail ! modelGroup->addChild(modelNode.get(),0,200.0); modelGroup->addChild( dynamic_cast<osg::Node*>(source->modelNode->clone(ModelCopyOp(this,false,2.0f))) , 200.0, 500.0); modelGroup->addChild( ! dynamic_cast<osg::Node*>(source->modelNode->clone(ModelCopyOp(this,false,5.0f))) ! , 500.0, 10000.0); modelGroup->addChild( dynamic_cast<osg::Node*>(source->modelNode->clone(ModelCopyOp(this,false,10.0f))) --- 611,625 ---- // add children with varying level of detail ! modelGroup->addChild(modelNode.get(),0,300.0); ! ! /* modelGroup->addChild( dynamic_cast<osg::Node*>(source->modelNode->clone(ModelCopyOp(this,false,2.0f))) , 200.0, 500.0); + */ modelGroup->addChild( ! dynamic_cast<osg::Node*>(source->modelNode->clone(ModelCopyOp(this,false,4.0f))) ! , 300.0, 10000.0); ! modelGroup->addChild( dynamic_cast<osg::Node*>(source->modelNode->clone(ModelCopyOp(this,false,10.0f))) |