Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/oxygen/sceneserver
Modified Files:
fpscontroller.cpp fpscontroller.h fpscontroller_c.cpp
sceneserver.cpp sceneserver.h
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)
Index: fpscontroller.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fpscontroller.h 5 Dec 2005 21:21:17 -0000 1.1
--- fpscontroller.h 15 Mar 2007 07:26:28 -0000 1.2
***************
*** 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.2
diff -C2 -d -r1.1 -r1.2
*** fpscontroller_c.cpp 5 Dec 2005 21:21:17 -0000 1.1
--- fpscontroller_c.cpp 15 Mar 2007 07:26:28 -0000 1.2
***************
*** 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: sceneserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/sceneserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sceneserver.h 5 Dec 2005 21:21:17 -0000 1.1
--- sceneserver.h 15 Mar 2007 07:26:28 -0000 1.2
***************
*** 37,40 ****
--- 37,41 ----
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
+ #include "scene.h"
namespace oxygen
***************
*** 66,70 ****
/** creates a new scene hierarchy at a specific location, new
hierarchy is also made current */
! boost::shared_ptr<Scene> CreateScene(const std::string &location);
/** sets the active scene */
--- 67,71 ----
/** creates a new scene hierarchy at a specific location, new
hierarchy is also made current */
! bool CreateScene(const std::string &location);
/** sets the active scene */
***************
*** 72,76 ****
/** returns a reference to the current active scene */
! boost::shared_ptr<Scene> GetActiveScene() { return mActiveScene; }
/** updates the state of the current active scene (deltaTime is in
--- 73,77 ----
/** returns a reference to the current active scene */
! boost::shared_ptr<Scene> GetActiveScene() { return mActiveScene.get(); }
/** updates the state of the current active scene (deltaTime is in
***************
*** 118,122 ****
private:
/** the current active scene */
! boost::shared_ptr<Scene> mActiveScene;
/** cached reference to the Space node below the active scene */
--- 119,123 ----
private:
/** the current active scene */
! CachedPath<Scene> mActiveScene;
/** cached reference to the Space node below the active scene */
Index: sceneserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/sceneserver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sceneserver.cpp 18 Feb 2006 19:46:54 -0000 1.2
--- sceneserver.cpp 15 Mar 2007 07:26:28 -0000 1.3
***************
*** 49,53 ****
}
! boost::shared_ptr<Scene> SceneServer::CreateScene(const std::string &location)
{
shared_ptr<CoreContext> context = GetCore()->CreateContext();
--- 49,53 ----
}
! bool SceneServer::CreateScene(const std::string &location)
{
shared_ptr<CoreContext> context = GetCore()->CreateContext();
***************
*** 56,86 ****
(context->New("oxygen/Scene", location));
! if (scene.get() != 0)
! {
! ResetCache();
! mActiveScene = scene;
! }
!
! return scene;
}
bool SceneServer::SetActiveScene(const std::string &location)
{
! shared_ptr<Scene> scene =
! shared_dynamic_cast<Scene>(GetCore()->Get(location));
!
! if (scene.get() != 0)
! {
! ResetCache();
! mActiveScene = scene;
! return true;
! }
!
! return false;
}
void SceneServer::ResetCache()
{
- mActiveScene.reset();
mActiveSpace.reset();
mActiveWorld.reset();
--- 56,73 ----
(context->New("oxygen/Scene", location));
! ResetCache();
! RegisterCachedPath(mActiveScene, location);
! return (scene.get() != 0);
}
bool SceneServer::SetActiveScene(const std::string &location)
{
! ResetCache();
! RegisterCachedPath(mActiveScene, location);
! return (mActiveScene.get() != 0);
}
void SceneServer::ResetCache()
{
mActiveSpace.reset();
mActiveWorld.reset();
Index: fpscontroller.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/fpscontroller.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fpscontroller.cpp 5 Dec 2005 21:21:17 -0000 1.1
--- fpscontroller.cpp 15 Mar 2007 07:26:28 -0000 1.2
***************
*** 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)
{
|
