[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.52,1.52.2.1 tc3DViewer.cpp,1.24,1.24.2.1 tcCreditView.cpp
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.52,1.52.2.1 tc3DViewer.cpp,1.24,1.24.2.1 tcCreditView.cpp,1.6.2.1,1.6.2.2 tcMapView.cpp,1.15,1.15.2.1 tcObjectControl.cpp,1.9,1.9.2.1
Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1:/tmp/cvs-serv29520/src/sim
Modified Files:
Tag: v0_5_0
Game.cpp tc3DViewer.cpp tcCreditView.cpp tcMapView.cpp
tcObjectControl.cpp
Log Message:
Fixed some bugs: popup menu loc, briefing view symbol placement, block artifacts
Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C2 -d -r1.52 -r1.52.2.1
*** Game.cpp 9 Jan 2004 21:48:40 -0000 1.52
--- Game.cpp 19 Jan 2004 21:20:58 -0000 1.52.2.1
***************
*** 91,94 ****
--- 91,96 ----
gameDateZulu(2000,4,10,5,0,0)
{
+ wxWindow::Show(false);
+ SetBackgroundColour(*wxBLACK);
viewer = NULL;
infoConsole = NULL;
***************
*** 373,376 ****
--- 375,380 ----
meGameMode = GM_START;
meScreenMode = START;
+
+ wxWindow::Show(true);
}
catch(std::string s)
***************
*** 756,759 ****
--- 760,764 ----
popupControl->AttachPythonInterface(pythonInterface);
popupControl->SetActive(false);
+ popupControl->Show(true); // to prevent artifact at first view
popupControl->SetBlend(true);
popupControl->SetSkipCount(0);
***************
*** 1020,1023 ****
--- 1025,1029 ----
}
+ viewer->SetActive(false);
viewer->Update(gameDateZulu);
mpGraphicsEngine->RenderAll();
***************
*** 1291,1302 ****
viewer->Update(gameDateZulu);
! mpGraphicsEngine->RenderAll();
! if (mcOptions.debugLevel > 1)
! {
! wxMessageBox("pre Frame()\n");
! }
!
! viewer->Frame();
if (mcOptions.debugLevel > 1)
--- 1297,1311 ----
viewer->Update(gameDateZulu);
! if (directorTime >= 0.1f)
! {
! mpGraphicsEngine->RenderAll();
! if (mcOptions.debugLevel > 1)
! {
! wxMessageBox("pre Frame()\n");
! }
!
! viewer->Frame();
! }
if (mcOptions.debugLevel > 1)
Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tc3DViewer.cpp,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** tc3DViewer.cpp 3 Jan 2004 00:45:13 -0000 1.24
--- tc3DViewer.cpp 19 Jan 2004 21:20:58 -0000 1.24.2.1
***************
*** 167,171 ****
void tc3DViewer::OnRButtonDown(wxMouseEvent& event)
{
! event.Skip();
}
--- 167,171 ----
void tc3DViewer::OnRButtonDown(wxMouseEvent& event)
{
! // event.Skip();
}
***************
*** 873,879 ****
tc3DViewer::tc3DViewer(wxWindow *parent, const wxPoint& pos, const wxSize& size,
const wxString& name) :
! wxWindow(parent, -1, pos, size, wxTRANSPARENT_WINDOW , name),
mnHeight(size.GetHeight()), mnWidth(size.GetWidth())
{
lonToGridX = C_RADTOM;
latToGridY = C_RADTOM;
--- 873,882 ----
tc3DViewer::tc3DViewer(wxWindow *parent, const wxPoint& pos, const wxSize& size,
const wxString& name) :
! wxWindow(parent, -1, pos, size, wxTRANSPARENT_WINDOW | wxNO_FULL_REPAINT_ON_RESIZE , name),
mnHeight(size.GetHeight()), mnWidth(size.GetWidth())
{
+ SetBackgroundColour(*wxBLACK);
+ wxWindow::Show(false);
+
lonToGridX = C_RADTOM;
latToGridY = C_RADTOM;
Index: tcCreditView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcCreditView.cpp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** tcCreditView.cpp 13 Jan 2004 00:07:40 -0000 1.6.2.1
--- tcCreditView.cpp 19 Jan 2004 21:20:58 -0000 1.6.2.2
***************
*** 76,81 ****
AddCredit(s, 60.0f, false);
! s = "Testers\n...\n";
! AddCredit(s, 60.0f, false);
s = "Some 2D art courtesy of U.S. Navy, www.news.navy.mil/view_galleries.asp \n";
--- 76,81 ----
AddCredit(s, 60.0f, false);
! // s = "Testers\n...\n";
! // AddCredit(s, 60.0f, false);
s = "Some 2D art courtesy of U.S. Navy, www.news.navy.mil/view_galleries.asp \n";
***************
*** 131,135 ****
s = "To those who offered advice through e-mail and \nthe global_conflict discussion group";
! AddCredit(s, 50.0f, false);
--- 131,135 ----
s = "To those who offered advice through e-mail and \nthe global_conflict discussion group";
! AddCredit(s, 120.0f, false);
***************
*** 140,144 ****
AddCredit(s, 20.0f, false);
! s = "www.gcblue.sourceforge.net";
AddCredit(s, 20.0f, false);
--- 140,144 ----
AddCredit(s, 20.0f, false);
! s = "www.gcblue.com";
AddCredit(s, 20.0f, false);
Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapView.cpp,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** tcMapView.cpp 9 Jan 2004 21:48:40 -0000 1.15
--- tcMapView.cpp 19 Jan 2004 21:20:58 -0000 1.15.2.1
***************
*** 163,166 ****
--- 163,167 ----
// mnWidth and mnHeight updated by tcWindow::OnSize
terrainView->SetSize(wxRect(pos.x,pos.y,mnWidth,mnHeight));
+ CalcViewParameters();
}
***************
*** 539,543 ****
else if (mnGameMode == GAMEMODE_PAUSED)
{
! sText.Format("%s (PAUSED)",dateTime.c_str());
mpBrush->SetColor(Color(254,125,125,255));
}
--- 540,544 ----
else if (mnGameMode == GAMEMODE_PAUSED)
{
! sText.Format("%s ",dateTime.c_str());
mpBrush->SetColor(Color(254,125,125,255));
}
Index: tcObjectControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcObjectControl.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** tcObjectControl.cpp 4 Jan 2004 22:24:53 -0000 1.9
--- tcObjectControl.cpp 19 Jan 2004 21:20:58 -0000 1.9.2.1
***************
*** 1357,1360 ****
--- 1357,1361 ----
}
+
/******************************************************************************/
void tcObjectControl::InitControls()
|
