Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/kerosin/inputserver
Modified Files:
inputcontrol.cpp inputcontrol.h inputserver.cpp
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)
Index: inputcontrol.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** inputcontrol.h 5 Dec 2005 21:38:22 -0000 1.1
--- inputcontrol.h 15 Mar 2007 07:26:25 -0000 1.2
***************
*** 111,114 ****
--- 111,117 ----
bool RegisterInputItem(const std::string& inputItem, const std::string& name);
+ /** update variables from a script */
+ virtual void UpdateCached();
+
protected:
virtual void OnLink();
Index: inputcontrol.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** inputcontrol.cpp 25 Dec 2005 18:32:27 -0000 1.2
--- inputcontrol.cpp 15 Mar 2007 07:26:25 -0000 1.3
***************
*** 34,39 ****
{
mDeltaTime = 0;
! mHorSens = 0.3;
! mVertSens = 0.3;
mAdvanceTime = true;
mMouseLook = false;
--- 34,39 ----
{
mDeltaTime = 0;
! mHorSens = 0.3f;
! mVertSens = 0.3f;
mAdvanceTime = true;
mMouseLook = false;
***************
*** 315,316 ****
--- 315,321 ----
return true;
}
+
+ void InputControl::UpdateCached()
+ {
+ mFPSController.reset();
+ }
Index: inputserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputserver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** inputserver.cpp 25 Dec 2005 18:32:27 -0000 1.2
--- inputserver.cpp 15 Mar 2007 07:26:25 -0000 1.3
***************
*** 34,38 ****
InputServer::InputServer() :
! Node(), mModifierState(Input::Input::eNone), mScanCodeMap(new ScanCodeMap())
{
// default to a german keyboard layout
--- 34,38 ----
InputServer::InputServer() :
! Node(), mModifierState(Input::eUnknown), mScanCodeMap(new ScanCodeMap())
{
// default to a german keyboard layout
***************
*** 310,314 ****
//printf("Looking at: %d %d %d", (*bind).mCode, (*bind).cmd, (*bind).modifier);
! if (bind.modifier == mModifierState)
{
if (input.mType == Input::eButton)
--- 310,317 ----
//printf("Looking at: %d %d %d", (*bind).mCode, (*bind).cmd, (*bind).modifier);
! if (
! (bind.modifier == 0 && mModifierState == 0) ||
! (bind.modifier & mModifierState)
! )
{
if (input.mType == Input::eButton)
|
