[Gcblue-commits] gcb_wx/src/graphics tc3DViewer.cpp,1.12,1.13 tcGameView.cpp,1.6,1.7 tcStartView.cpp
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-03-11 02:35:08
|
Update of /cvsroot/gcblue/gcb_wx/src/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24340/src/graphics Modified Files: tc3DViewer.cpp tcGameView.cpp tcStartView.cpp tcTerrainView.cpp Log Message: Index: tcStartView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStartView.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcStartView.cpp 27 Jan 2005 01:01:51 -0000 1.6 --- tcStartView.cpp 11 Mar 2005 02:34:57 -0000 1.7 *************** *** 35,38 **** --- 35,39 ---- #include "tcOptions.h" #include "AError.h" + #include "tcTime.h" #include "wxcommands.h" *************** *** 89,92 **** --- 90,101 ---- } + osg::Vec4 color(1.0, 1.0, 0.6, 1.0); + unsigned int count = tcTime::Get()->Get30HzCount(); + float alpha = 0.4f + 0.4f * sinf(0.01f * float(count)); + color._v[3] = alpha; + + DrawTextR("March 10, 2005 Build", 85.0, 150.0, + GetDefaultFont(), color, 24.0, LEFT_BASE_LINE); + DrawBorder(); Index: tcTerrainView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcTerrainView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcTerrainView.cpp 20 Feb 2005 21:54:33 -0000 1.3 --- tcTerrainView.cpp 11 Mar 2005 02:34:57 -0000 1.4 *************** *** 253,256 **** --- 253,258 ---- SetResizeable2D(false); // do not resize 2D surface on resize mapImage = new osg::Texture2D(); + // mapImage->setUseHardwareMipMapGeneration(true); + // mapImage->setInternalFormatMode(osg::Texture::USE_IMAGE_DATA_FORMAT); SetBlend(false); Index: tc3DViewer.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DViewer.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tc3DViewer.cpp 10 Mar 2005 03:28:28 -0000 1.12 --- tc3DViewer.cpp 11 Mar 2005 02:34:57 -0000 1.13 *************** *** 1039,1043 **** else { ! if (cameraPosition._v[2] < 1) cameraPosition._v[2] = 1; } // workaround for sky issue, deactivate sky when camera underwater --- 1039,1044 ---- else { ! float min_z = max(1.0f, cameraTarget._v[2] + 2.0f); ! if (cameraPosition._v[2] < min_z) cameraPosition._v[2] = min_z; } // workaround for sky issue, deactivate sky when camera underwater Index: tcGameView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcGameView.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcGameView.cpp 5 Mar 2005 22:38:02 -0000 1.6 --- tcGameView.cpp 11 Mar 2005 02:34:57 -0000 1.7 *************** *** 624,627 **** --- 624,629 ---- mpMapView->maMapObj[rnIndex].mnID = po->mnID; mpMapView->maMapObj[rnIndex].mnColor = 0; + mpMapView->maMapObj[rnIndex].isStaleTrack = false; + mpMapView->maMapObj[rnIndex].isDestroyed = false; if ((mpMapView->maMapObj[rnIndex].meSymbol != SYMBOL_FIXED) && |