From: Markus R. <rol...@us...> - 2007-02-25 16:27:52
|
Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25212 Modified Files: Tag: WIN32 fpscontroller.cpp fpscontroller.h fpscontroller_c.cpp Log Message: - add and export functions SetHAngle and SetVAngle Index: fpscontroller.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** fpscontroller.h 5 Dec 2005 21:21:17 -0000 1.1 --- fpscontroller.h 25 Feb 2007 16:27:45 -0000 1.1.2.1 *************** *** 50,53 **** --- 50,59 ---- void AdjustVAngle(const float delta); + /** sets the current horizontal angle */ + void SetHAngleDeg(const float angleDeg); + + /** sets the current vertical angle */ + void SetVAngleDeg(const float angleDeg); + /** enables or disables forward movement */ void Forward(const bool state); *************** *** 86,93 **** float mAcceleration; ! /** the current horizontal angle */ float mHAngle; ! /** the current vertical angle */ float mVAngle; --- 92,99 ---- float mAcceleration; ! /** the current horizontal angle in degrees*/ float mHAngle; ! /** the current vertical angle in degrees */ float mVAngle; Index: fpscontroller_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** fpscontroller_c.cpp 5 Dec 2005 21:21:17 -0000 1.1 --- fpscontroller_c.cpp 25 Feb 2007 16:27:45 -0000 1.1.2.1 *************** *** 41,44 **** --- 41,76 ---- } + FUNCTION(FPSController,setHAngle) + { + float inAngleDeg; + + if ( + (in.GetSize() != 1) || + (! in.GetValue(in.begin(),inAngleDeg)) + ) + { + return false; + } + + obj->SetHAngleDeg(inAngleDeg); + return true; + } + + FUNCTION(FPSController,setVAngle) + { + float inAngleDeg; + + if ( + (in.GetSize() != 1) || + (! in.GetValue(in.begin(),inAngleDeg)) + ) + { + return false; + } + + obj->SetVAngleDeg(inAngleDeg); + return true; + } + FUNCTION(FPSController,getAcceleration) { *************** *** 51,53 **** --- 83,87 ---- DEFINE_FUNCTION(setAcceleration); DEFINE_FUNCTION(getAcceleration); + DEFINE_FUNCTION(setHAngle); + DEFINE_FUNCTION(setVAngle); } Index: fpscontroller.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** fpscontroller.cpp 5 Dec 2005 21:21:17 -0000 1.1 --- fpscontroller.cpp 25 Feb 2007 16:27:45 -0000 1.1.2.1 *************** *** 104,107 **** --- 104,117 ---- } + void FPSController::SetHAngleDeg(const float angleDeg) + { + mHAngle = angleDeg; + } + + void FPSController::SetVAngleDeg(const float angleDeg) + { + mVAngle = angleDeg; + } + void FPSController::Forward(const bool state) { |