[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.52.2.1,1.52.2.2 tc3DViewer.cpp,1.24.2.2,1.24.2.3 tcCreditView.cpp,1.6.2.2,1.6.2.3 tcMapView.cpp,1.15.2.1,1.15.2.2

[<ddc...@pr...>]

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11285/src/sim

Modified Files:
      Tag: v0_5_0
	Game.cpp tc3DViewer.cpp tcCreditView.cpp tcMapView.cpp 
Log Message:
Bug with arrow scroll causing bad symbol placement for initial map view

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.52.2.1
retrieving revision 1.52.2.2
diff -C2 -d -r1.52.2.1 -r1.52.2.2
*** Game.cpp	19 Jan 2004 21:20:58 -0000	1.52.2.1
--- Game.cpp	25 Jan 2004 17:36:28 -0000	1.52.2.2
***************
*** 129,132 ****
--- 129,134 ----
      mnLeftMargin = 200;
      mnBottomMargin = 200;
+ 
+     std::cout << "Game constructor success" << std::endl;
  }
  
***************
*** 238,241 ****
--- 240,244 ----
  {
      meScreenMode = CREDIT;
+     mcSound.PlayMusic("tension1");
  }
  
***************
*** 254,257 ****
--- 257,261 ----
      if (meGameMode == GM_START)
      {
+         if (meScreenMode == CREDIT) mcSound.PlayMusic("loop1");
          meScreenMode = START;
      }
***************
*** 318,326 ****
--- 322,333 ----
      startTime = wxDateTime::Now();
  
+     std::cout << "Time init success" << std::endl;
      try
      {    
          StartMusic();
+         std::cout << "Music start success" << std::endl;
  
          Initialize3DViewer();
+         std::cout << "3D viewer init success" << std::endl;
  
          /* ** Init graphics engine  * **/
***************
*** 385,390 ****
--- 392,399 ----
      catch(...)
      {
+         wxMessageBox("Unrecognized exception","Fatal error",wxICON_ERROR);
          throw;
      }
+     std::cout << "Game init success" << std::endl << std::endl;
  }
  
***************
*** 421,424 ****
--- 430,434 ----
  
      mcSound.PlayMusic("loop1");
+     mcSound.QueueMusic("tension1");
  }
  

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tc3DViewer.cpp,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -d -r1.24.2.2 -r1.24.2.3
*** tc3DViewer.cpp	20 Jan 2004 03:03:10 -0000	1.24.2.2
--- tc3DViewer.cpp	25 Jan 2004 17:36:29 -0000	1.24.2.3
***************
*** 884,887 ****
--- 884,889 ----
          mnHeight(size.GetHeight()), mnWidth(size.GetWidth())
  {
+     std::cout << "3DViewer constructor entry" << std::endl;
+ 
      SetBackgroundColour(*wxBLACK);
      wxWindow::Show(false);
***************
*** 918,921 ****
--- 920,924 ----
  
      camera = new Producer::Camera();
+     std::cout << "Producer::Camera init success" << std::endl;
  
      // causes warning C4312: 'type cast' : conversion from 'WXWidget' to 'HWND' of greater size
***************
*** 924,927 ****
--- 927,932 ----
  
      render_surface = new tcRenderSurface(hwnd);
+     std::cout << "RenderSurface init success" << std::endl;
+ 
      render_surface.get()->ref(); // prevents heap exception in debug mode, memory is modified after delete
      camera->setRenderSurface(render_surface.get());
***************
*** 946,949 ****
--- 951,955 ----
      camera_group->realize(Producer::CameraGroup::SingleThreaded); //   other option is Producer::CameraGroup::ThreadPerCamera
      camera_group->setInstrumentationMode(FALSE);
+     std::cout << "Camera setup success" << std::endl;
  
      osgDB::Registry::instance()->setDataFilePathList("3d");
***************
*** 962,973 ****
      orthoProjection->setMatrix(osg::Matrix::ortho2D(0,size.GetWidth(),0,size.GetHeight())); 
      orthoProjection->addChild(hudObjects.get());
  
      InitState();
  
      InitLight();
!     
      CreateScene();
  
      InitSceneView();
  }
  
--- 968,984 ----
      orthoProjection->setMatrix(osg::Matrix::ortho2D(0,size.GetWidth(),0,size.GetHeight())); 
      orthoProjection->addChild(hudObjects.get());
+     std::cout << "Scenegraph init success" << std::endl;
  
      InitState();
+     std::cout << "InitState success" << std::endl;
  
      InitLight();
!     std::cout << "InitLight success" << std::endl;
! 
      CreateScene();
+     std::cout << "CreateScene success" << std::endl;
  
      InitSceneView();
+     std::cout << "InitSceneView success" << std::endl;
  }
  

Index: tcCreditView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcCreditView.cpp,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** tcCreditView.cpp	19 Jan 2004 21:20:58 -0000	1.6.2.2
--- tcCreditView.cpp	25 Jan 2004 17:36:29 -0000	1.6.2.3
***************
*** 36,44 ****
  using namespace Gdiplus;
  
! void tcCreditView::AddCredit(tcString& s, float afTrailSpace, bool abBold) 
  {
     if (mnCredits >= MAX_CREDITS) {return;}
     maCredit[mnCredits].mfTrailSpace = afTrailSpace;
!    maCredit[mnCredits].mbBold = abBold;
     maCredit[mnCredits++].mzCaption = s;
  }
--- 36,44 ----
  using namespace Gdiplus;
  
! void tcCreditView::AddCredit(tcString& s, float afTrailSpace, int effect) 
  {
     if (mnCredits >= MAX_CREDITS) {return;}
     maCredit[mnCredits].mfTrailSpace = afTrailSpace;
!    maCredit[mnCredits].mnEffect = effect;
     maCredit[mnCredits++].mzCaption = s;
  }
***************
*** 49,148 ****
  
     s = "------- C R E D I T S -------";
!    AddCredit(s, 40.0f, true);
  
  
     s = "Dewitt \"Cole\" Colclough";
!    AddCredit(s, 25.0f, true);
  
     s = "Project manager and lead developer\n";
!    AddCredit(s, 80.0f, false);
  
     s = "Marcelo C\341ceres (op4_delta)"; 
!    AddCredit(s, 25.0f, true);
  
     s = "3D art"; 
!    AddCredit(s, 60.0f, false);
  
     s = "Marco Belli"; 
!    AddCredit(s, 25.0f, true);
  
     s = "Developer - Sound, Linux port"; 
!    AddCredit(s, 60.0f, false);
  
     s = "Jason Morris"; 
!    AddCredit(s, 25.0f, true);
  
     s = "Developer"; 
!    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";
!    AddCredit(s, 60.0f, false);
  
     s = "3D sky code\n";
!    AddCredit(s, 25.0f, false);
  
     s = "Combat Simulator Project, csp.sourceforge.net \n";
!    AddCredit(s, 60.0f, true);
  
  
     s = "Map data based on GTOPO30 archive distributed by the \nLand Processes Distributed Active Archive Center (LP DAAC)\nlpdaac.usgs.gov \n";
!    AddCredit(s, 100.0f, false);
  
     s = "Thanks to the developers of these software libraries:\n";
!    AddCredit(s, 30.0f, false);
  
     s = "wxWindows\n";
!    AddCredit(s, 20.0f, false);
     s =  "www.wxwindows.org\n";
!    AddCredit(s, 30.0f, false);
  
     s = "Python 2.3\n";
!    AddCredit(s, 20.0f, false);
     s =  "www.python.org\n";
!    AddCredit(s, 30.0f, false);
  
     s = "Boost Python\n";
!    AddCredit(s, 20.0f, false);
     s =  "www.boost.org\n";
!    AddCredit(s, 30.0f, false);
  
     s = "OpenSceneGraph\n";
!    AddCredit(s, 20.0f, false);
     s =  "openscenegraph.sourceforge.net\n";
!    AddCredit(s, 60.0f, false);
  
     s = "Special thanks to:";
!    AddCredit(s, 30.0f, false);
  
     s = "Harpoon HQ, www.harpoonhq.com\n";
!    AddCredit(s, 30.0f, false);
  
     s = "Mille-Sabords, www.mille-sabords.com\n";
!    AddCredit(s, 30.0f, false);
  
     s = "Seawolves Surface Division, www.seawolves.org/fc\n";
!    AddCredit(s, 30.0f, false);
  
     s = "and\n"; 
!    AddCredit(s, 30.0f, false);
      
     s = "To those who offered advice through e-mail and \nthe global_conflict discussion group";
!    AddCredit(s, 120.0f, false);
  
  
     s = "GLOBAL CONFLICT BLUE";
!    AddCredit(s, 20.0f, false);
  
     s = "An open source project";
!    AddCredit(s, 20.0f, false);
  
     s = "www.gcblue.com";
!    AddCredit(s, 20.0f, false);
  
     s = "Copyright (C) 2002-2004, All rights reserved.\n";
!    AddCredit(s, 60.0f, false);
  
  
--- 49,160 ----
  
     s = "------- C R E D I T S -------";
!    AddCredit(s, 40.0f, 1);
  
  
     s = "Dewitt \"Cole\" Colclough";
!    AddCredit(s, 25.0f, 1);
  
     s = "Project manager and lead developer\n";
!    AddCredit(s, 80.0f, 0);
  
     s = "Marcelo C\341ceres (op4_delta)"; 
!    AddCredit(s, 25.0f, 1);
  
     s = "3D art"; 
!    AddCredit(s, 60.0f, 0);
  
     s = "Marco Belli"; 
!    AddCredit(s, 25.0f, 1);
  
     s = "Developer - Sound, Linux port"; 
!    AddCredit(s, 60.0f, 0);
  
     s = "Jason Morris"; 
!    AddCredit(s, 25.0f, 1);
  
     s = "Developer"; 
!    AddCredit(s, 60.0f, 0);
! 
!    s = "Test\n"; 
!    AddCredit(s, 23.0f, 1);
! 
!    AddCredit(tcString("Marco Belli"), 12.0f, 2);
!    AddCredit(tcString("Marcelo C\341ceres"), 12.0f, 2);
!    AddCredit(tcString("Rob Carpenter"), 12.0f, 2);
!    AddCredit(tcString("Paul Daly"), 12.0f, 2);
!    AddCredit(tcString("Dust"), 12.0f, 2);
!    AddCredit(tcString("Jason Morris"), 12.0f, 2);
!    AddCredit(tcString("Andrew Platfoot"), 12.0f, 2);
!    AddCredit(tcString("Justin Priestman"), 12.0f, 2);
!    AddCredit(tcString("Gregg Smith"), 38.0f+12.0f, 2);
! 
  
  
     s = "Some 2D art courtesy of U.S. Navy, www.news.navy.mil/view_galleries.asp \n";
!    AddCredit(s, 60.0f, 0);
  
     s = "3D sky code\n";
!    AddCredit(s, 25.0f, 0);
  
     s = "Combat Simulator Project, csp.sourceforge.net \n";
!    AddCredit(s, 60.0f, 1);
  
  
     s = "Map data based on GTOPO30 archive distributed by the \nLand Processes Distributed Active Archive Center (LP DAAC)\nlpdaac.usgs.gov \n";
!    AddCredit(s, 100.0f, 0);
  
     s = "Thanks to the developers of these software libraries:\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "wxWindows\n";
!    AddCredit(s, 20.0f, 0);
     s =  "www.wxwindows.org\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "Python 2.3\n";
!    AddCredit(s, 20.0f, 0);
     s =  "www.python.org\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "Boost Python\n";
!    AddCredit(s, 20.0f, 0);
     s =  "www.boost.org\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "OpenSceneGraph\n";
!    AddCredit(s, 20.0f, 0);
     s =  "openscenegraph.sourceforge.net\n";
!    AddCredit(s, 60.0f, 0);
  
     s = "Special thanks to:";
!    AddCredit(s, 30.0f, 0);
  
     s = "Harpoon HQ, www.harpoonhq.com\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "Mille-Sabords, www.mille-sabords.com\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "Seawolves Surface Division, www.seawolves.org/fc\n";
!    AddCredit(s, 30.0f, 0);
  
     s = "and\n"; 
!    AddCredit(s, 30.0f, 0);
      
     s = "To those who offered advice through e-mail and \nthe global_conflict discussion group";
!    AddCredit(s, 120.0f, 0);
  
  
     s = "GLOBAL CONFLICT BLUE";
!    AddCredit(s, 20.0f, 0);
  
     s = "An open source project";
!    AddCredit(s, 20.0f, 0);
  
     s = "www.gcblue.com";
!    AddCredit(s, 20.0f, 0);
  
     s = "Copyright (C) 2002-2004, All rights reserved.\n";
!    AddCredit(s, 60.0f, 0);
  
  
***************
*** 158,161 ****
--- 170,179 ----
        return false;
     }
+    mpFontSmall = new Font(&ff,12,FontStyleRegular,UnitPixel);
+    if (mpFontSmall == NULL) {
+       WTL("tcCreditView - mpFontSmall creation failed\n");
+       return false;
+    }
+ 
     mpBrush = new SolidBrush(Color(0xFEFFFFFF)); // color is ARGB 
     if (mpBrush == NULL) {
***************
*** 194,198 ****
  
  
!    float fY = (float)mnHeight - 0.5f*(float)nDeltaTime;
     float fX = 0.5f*(float)mnWidth;
     
--- 212,216 ----
  
  
!    float fY = (float)mnHeight - 2*0.5f*(float)nDeltaTime;
     float fX = 0.5f*(float)mnWidth;
     
***************
*** 244,248 ****
        }
        else if (fY <= (float)mnHeight) { 
!          if (n > nFlashId) {
              nFlashId = n;
              bFlash = true;
--- 262,266 ----
        }
        else if (fY <= (float)mnHeight) { 
!          if ((n > nFlashId)&&(maCredit[n].mnEffect == 1)) {
              nFlashId = n;
              bFlash = true;
***************
*** 251,255 ****
              bFlash = false;
           }
!          Font *pFont = (maCredit[n].mbBold) ? mpFontLarge : mpFont;
           mpBrush->SetColor(Color(nColorFade)); // font color
           
--- 269,282 ----
              bFlash = false;
           }
!          Font *pFont = mpFont;
!          if (maCredit[n].mnEffect == 1)
!          {
!              pFont = mpFontLarge;
!          }
!          else if (maCredit[n].mnEffect == 2)
!          {
!              pFont = mpFontSmall;
!          }
! 
           mpBrush->SetColor(Color(nColorFade)); // font color
           
***************
*** 283,287 ****
  }
  
! void tcCreditView::Rewind() {
     mnStartTime = mcTime.snCount_30Hz;
     mbDrawRewind = true;
--- 310,315 ----
  }
  
! void tcCreditView::Rewind() 
! {
     mnStartTime = mcTime.snCount_30Hz;
     mbDrawRewind = true;
***************
*** 299,302 ****
--- 327,332 ----
  {
     mpFont = NULL;
+    mpFontLarge = NULL;
+    mpFontSmall = NULL;
     mpBrush = NULL;
     mpSound = NULL;
***************
*** 308,311 ****
--- 338,342 ----
     if (mpFont != NULL) {delete mpFont;}
     if (mpFontLarge != NULL) {delete mpFontLarge;}
+    if (mpFontSmall != NULL) {delete mpFontSmall;}
     if (mpBrush != NULL) {delete mpBrush;}
     if (mpPen != NULL) {delete mpPen;}

Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapView.cpp,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** tcMapView.cpp	19 Jan 2004 21:20:58 -0000	1.15.2.1
--- tcMapView.cpp	25 Jan 2004 17:36:30 -0000	1.15.2.2
***************
*** 1330,1337 ****
      dx = sinf(fDirection_rad)*dr;
      dy = cosf(fDirection_rad)*dr;
  
!     mrectCurrentView.Offset(dx,dy);
!     mrectViewBounds.ApplyBounds(mrectCurrentView);
!     CalcViewParameters();
  }
  
--- 1330,1339 ----
      dx = sinf(fDirection_rad)*dr;
      dy = cosf(fDirection_rad)*dr;
+     
+     tcPoint p;
+     p.x = mrectCurrentView.XCenter() + dx;
+     p.y = mrectCurrentView.YCenter() + dy;
  
!     SetView(p, mrectCurrentView.Width());
  }