[Gcblue-commits] gcb_wx/src/graphics tc3DModel.cpp,1.22,1.23 tc3DViewer.cpp,1.9,1.10 tc3DWindow.cpp,1.14,1.15 tcMapView.cpp,1.16,1.17

[Dewitt C. <ddc...@us...>]

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

Modified Files:
	tc3DModel.cpp tc3DViewer.cpp tc3DWindow.cpp tcMapView.cpp 
Log Message:
Replaced osgAL with OpenAL++ exclusively due to instability issues.

Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcMapView.cpp	20 Feb 2005 21:54:33 -0000	1.16
--- tcMapView.cpp	21 Feb 2005 18:26:12 -0000	1.17
***************
*** 2281,2285 ****
  void tcTacticalMapView::OnMouseWheel(wxMouseEvent& event)
  {
!     wxPoint point = event.GetPosition();
      int zDelta = event.GetWheelRotation();
  
--- 2281,2285 ----
  void tcTacticalMapView::OnMouseWheel(wxMouseEvent& event)
  {
!     wxPoint point(mnXCenter, mnYCenter); // zoom on center regardless of pointer pos
      int zDelta = event.GetWheelRotation();
  

Index: tc3DModel.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tc3DModel.cpp	31 Jan 2005 01:33:07 -0000	1.22
--- tc3DModel.cpp	21 Feb 2005 18:26:09 -0000	1.23
***************
*** 41,48 ****
  #include <osgUtil/SmoothingVisitor>
  
! #include <osgAL/SoundNode>
! #include <osgAL/SoundRoot>
! #include <osgAL/SoundManager>
! #include <osgAL/SoundState>
  
  #ifdef _DEBUG
--- 41,48 ----
  #include <osgUtil/SmoothingVisitor>
  
! //#include <osgAL/SoundNode>
! //#include <osgAL/SoundRoot>
! //#include <osgAL/SoundManager>
! //#include <osgAL/SoundState>
  
  #ifdef _DEBUG
***************
*** 769,772 ****
--- 769,773 ----
  	modelTransform->addChild(root.get());
  
+ #if 0 // osgAL experiment
      try
      {
***************
*** 782,786 ****
          fprintf(stderr, "Failed to load sound file\n");
      }
! 
     
  
--- 783,787 ----
          fprintf(stderr, "Failed to load sound file\n");
      }
! #endif
     
  

Index: tc3DWindow.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DWindow.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tc3DWindow.cpp	20 Feb 2005 21:54:33 -0000	1.14
--- tc3DWindow.cpp	21 Feb 2005 18:26:12 -0000	1.15
***************
*** 1697,1701 ****
  {
  
! #ifdef _DEBUG
  	if (osg::StateSet* stateSet = backgroundRoot->getStateSet())
  	{		
--- 1697,1701 ----
  {
  
! #if 0
  	if (osg::StateSet* stateSet = backgroundRoot->getStateSet())
  	{		

Index: tc3DViewer.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DViewer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tc3DViewer.cpp	27 Jan 2005 01:01:49 -0000	1.9
--- tc3DViewer.cpp	21 Feb 2005 18:26:11 -0000	1.10
***************
*** 50,57 ****
  #include <osgUtil/UpdateVisitor>
  
! #include <osgAL/SoundNode>
! #include <osgAL/SoundRoot>
! #include <osgAL/SoundManager>
! #include <osgAL/SoundState>
  
  
--- 50,57 ----
  #include <osgUtil/UpdateVisitor>
  
! //#include <osgAL/SoundNode>
! //#include <osgAL/SoundRoot>
! //#include <osgAL/SoundManager>
! //#include <osgAL/SoundState>
  
  
***************
*** 1062,1067 ****
      sceneViewFar->setViewMatrixAsLookAt(cameraPosition, cameraTarget, osg::Vec3(0,0,1));
  
!     osgAL::SoundManager::instance()->getListener()->setPosition(cameraPosition.x(), cameraPosition.y(),
!         cameraPosition.z());
  
  	// update skyTransform based on camera position
--- 1062,1067 ----
      sceneViewFar->setViewMatrixAsLookAt(cameraPosition, cameraTarget, osg::Vec3(0,0,1));
  
!     //osgAL::SoundManager::instance()->getListener()->setPosition(cameraPosition.x(), cameraPosition.y(),
!     //    cameraPosition.z());
  
  	// update skyTransform based on camera position
***************
*** 1879,1883 ****
  	tc3DModel::LoadUnknowns();
  
!     rootnode->addChild(tcSound::Get()->GetSoundRoot());
  }
  
--- 1879,1883 ----
  	tc3DModel::LoadUnknowns();
  
! //    rootnode->addChild(tcSound::Get()->GetSoundRoot());
  }