Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9801/src/sim
Modified Files:
Game.cpp
Log Message:
minor gui updates
Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** Game.cpp 18 Dec 2005 04:10:33 -0000 1.146
--- Game.cpp 24 Dec 2005 07:41:20 -0000 1.147
***************
*** 311,314 ****
--- 311,315 ----
meGameMode = GM_START;
meScreenMode = START;
+ mbScenarioEdit = false;
}
***************
*** 900,904 ****
mrectMap.top = 0;
mrectMap.right = mnWidth; //GetSystemMetrics(SM_CXFULLSCREEN);
! mrectMap.bottom = mnHeight - 200; //GetSystemMetrics(SM_CYFULLSCREEN);
tacticalMap = new tcTacticalMapView(glCanvas, wxPoint(mrectMap.left,mrectMap.top),
wxSize(mrectMap.right-mrectMap.left, mrectMap.bottom-mrectMap.top));
--- 901,905 ----
mrectMap.top = 0;
mrectMap.right = mnWidth; //GetSystemMetrics(SM_CXFULLSCREEN);
! mrectMap.bottom = mnHeight - 0*200; //GetSystemMetrics(SM_CYFULLSCREEN);
tacticalMap = new tcTacticalMapView(glCanvas, wxPoint(mrectMap.left,mrectMap.top),
wxSize(mrectMap.right-mrectMap.left, mrectMap.bottom-mrectMap.top));
***************
*** 928,931 ****
--- 929,933 ----
{
mrectWorldMap = mrectMap;
+ mrectWorldMap.bottom -= 200;
mrectWorldMap.left = mrectWorldMap.right - 257;
mrectWorldMap.top = mrectWorldMap.bottom - 129;
***************
*** 1058,1062 ****
// tcDraggedIconDisplay init
draggedIconDisplay = new tcDraggedIconDisplay(glCanvas);
! draggedIconDisplay->SetBaseRenderBin(50);
wxASSERT(tacticalMap);
--- 1060,1064 ----
// tcDraggedIconDisplay init
draggedIconDisplay = new tcDraggedIconDisplay(glCanvas);
! draggedIconDisplay->SetBaseRenderBin(150);
wxASSERT(tacticalMap);
***************
*** 1420,1423 ****
--- 1422,1426 ----
static teScreenMode lastMode = NONE;
static bool musicStarted = false;
+ static unsigned lastTimeCount = 0;
tcTime::Get()->Update();
***************
*** 1478,1486 ****
viewer->SetActive(true);
- //test3DWindow->Draw();
-
- viewer->SetCameraAz(viewer->GetCameraAz() + 0.02f);
static float cameraTime = 0;
! cameraTime += 0.03f;
viewer->SetCameraEl(0.5f * sinf(0.1f*cameraTime));
--- 1481,1493 ----
viewer->SetActive(true);
static float cameraTime = 0;
! unsigned currentTimeCount = tcTime::Get()->Get30HzCount();
! if (currentTimeCount - lastTimeCount >= 1)
! {
! cameraTime += 0.03f;
! lastTimeCount = currentTimeCount;
! }
!
! viewer->SetCameraAz(cameraTime);
viewer->SetCameraEl(0.5f * sinf(0.1f*cameraTime));
|
