[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.152,1.153
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2006-03-28 02:44:59
|
Update of /cvsroot/gcblue/gcb_wx/src/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1528/src/sim Modified Files: Game.cpp Log Message: Index: Game.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** Game.cpp 27 Mar 2006 01:08:17 -0000 1.152 --- Game.cpp 28 Mar 2006 02:44:56 -0000 1.153 *************** *** 878,881 **** --- 878,883 ---- throw exception(); } + + databaseViewer->Set3DViewer(viewer); databaseViewer->SetActive(false); *************** *** 1489,1492 **** --- 1491,1495 ---- briefingView->SetActive(false); gameWindow->SetActive(false); + viewer->SetDatabaseView(false); } *************** *** 1508,1511 **** --- 1511,1515 ---- databaseViewer->SetActive(true); databaseViewer->Draw(); + viewer->SetDatabaseView(true); break; case OPTIONS: *************** *** 1543,1594 **** viewer->SetCameraEl(0.5f * sinf(0.1f*cameraTime)); ! if (!viewer->TextObjectExists(0)) ! { ! viewer->AddDefaultTextObjects(); ! } ! ! long hookID = tacticalMap->GetHookID(); ! if (tcGameObject* obj = simState->GetObject(hookID)) ! { ! viewer->SetCameraRange(1.2f * obj->GetSpan()); ! wxString description; ! description = wxString::Format("%s\n%s", obj->mzClass.mz, obj->mzUnit.mz); ! wxString launcherDescription; ! wxString sensorDescription; ! if (tcPlatformObject* plat = dynamic_cast<tcPlatformObject*>(obj)) ! { ! launcherDescription = plat->GetLauncherDescription(); ! sensorDescription = plat->GetSensorDescription(); ! } ! else ! { ! launcherDescription = "No weapons\n"; ! sensorDescription = "No sensors\n"; ! } ! ! wxString scenarioDescription = ! wxString::Format("Scenario: %s", simState->msScenarioInfo.mzName); ! viewer->UpdateTextObject(2, description.c_str()); ! viewer->UpdateTextObject(0, launcherDescription.c_str()); ! viewer->UpdateTextObject(1, sensorDescription.c_str()); ! viewer->UpdateTextObject(3, scenarioDescription.c_str()); ! } ! else ! { ! HookRandomFriendly(); ! } ! if (cameraTime > 7) ! { ! cameraTime = 0; ! HookRandomFriendly(); ! } --- 1547,1599 ---- viewer->SetCameraEl(0.5f * sinf(0.1f*cameraTime)); ! if (meScreenMode != DATABASEVIEW) ! { ! if (!viewer->TextObjectExists(0)) ! { ! viewer->AddDefaultTextObjects(); ! } ! long hookID = tacticalMap->GetHookID(); ! if (tcGameObject* obj = simState->GetObject(hookID)) ! { ! viewer->SetCameraRange(1.2f * obj->GetSpan()); ! wxString description; ! description = wxString::Format("%s\n%s", obj->mzClass.mz, obj->mzUnit.mz); ! wxString launcherDescription; ! wxString sensorDescription; ! if (tcPlatformObject* plat = dynamic_cast<tcPlatformObject*>(obj)) ! { ! launcherDescription = plat->GetLauncherDescription(); ! sensorDescription = plat->GetSensorDescription(); ! } ! else ! { ! launcherDescription = "No weapons\n"; ! sensorDescription = "No sensors\n"; ! } ! wxString scenarioDescription = ! wxString::Format("Scenario: %s", simState->msScenarioInfo.mzName); ! viewer->UpdateTextObject(2, description.c_str()); + viewer->UpdateTextObject(0, launcherDescription.c_str()); + viewer->UpdateTextObject(1, sensorDescription.c_str()); + viewer->UpdateTextObject(3, scenarioDescription.c_str()); + } + else + { + HookRandomFriendly(); + } ! if (cameraTime > 7) ! { ! cameraTime = 0; ! HookRandomFriendly(); ! } ! } |