[Planeshift-cvs] CVS: planeshift/src/client pscamera.cpp, 1.77, 1.78

[Daniel F. <df...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23992/src/client

Modified Files:
	pscamera.cpp 
Log Message:
Camera fix

Index: pscamera.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscamera.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** pscamera.cpp	13 May 2006 16:01:51 -0000	1.77
--- pscamera.cpp	29 Jun 2006 09:00:42 -0000	1.78
***************
*** 533,542 ****
          return false;
  
-     // assume the normal camera movement is good, and move the camera
-     view->GetCamera()->SetSector(actorSector);
-     view->GetCamera()->GetTransform().SetOrigin(actorPos + csVector3(0,1,0));
-     view->GetCamera()->OnlyPortals(true);
-     view->GetCamera()->MoveWorld(GetPosition(CAMERA_ACTUAL_DATA) - view->GetCamera()->GetTransform().GetOrigin());
- 
      // if the actor changed sectors, then ensure that the position is correct (in case it's a warping portal)
      if (actorSector != lastActorSector && lastActorSector != 0)
--- 533,536 ----
***************
*** 547,552 ****
          SetUp(GetUp() + GetUp(CAMERA_ERR), CAMERA_ACTUAL_DATA);
      }
  
!     view->GetCamera()->GetTransform().LookAt(GetTarget(CAMERA_ACTUAL_DATA) - GetPosition(CAMERA_ACTUAL_DATA), GetUp(CAMERA_ACTUAL_DATA));
      view->Draw();
  
--- 541,555 ----
          SetUp(GetUp() + GetUp(CAMERA_ERR), CAMERA_ACTUAL_DATA);
      }
+ 	
+     // assume the normal camera movement is good, and move the camera
+     view->GetCamera()->SetSector(actorSector);
+     view->GetCamera()->GetTransform().SetOrigin(actorPos + csVector3(0,1,0));
+     view->GetCamera()->OnlyPortals(true);
+ 	view->GetCamera()->GetTransform().LookAt(GetTarget(CAMERA_ACTUAL_DATA) - GetPosition(CAMERA_ACTUAL_DATA), GetUp(CAMERA_ACTUAL_DATA));
+     view->GetCamera()->MoveWorld(GetPosition(CAMERA_ACTUAL_DATA) - view->GetCamera()->GetTransform().GetOrigin());
  
! 
! 
!   
      view->Draw();