Revision: 22705
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22705
Author: campbellbarton
Date: 2009-08-22 16:23:54 +0200 (Sat, 22 Aug 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22701:22704
Modified Paths:
--------------
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
Modified:
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
2009-08-22 14:19:27 UTC (rev 22704)
+++
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
2009-08-22 14:23:54 UTC (rev 22705)
@@ -50,7 +50,6 @@
const STR_String& toggleProp,
SCA_IObject* gameobj)
:SCA_ISensor(gameobj,keybdmgr),
- m_pKeyboardMgr(keybdmgr),
m_hotkey(hotkey),
m_qual(qual),
m_qual2(qual2),
@@ -125,7 +124,7 @@
bool qual_change = false;
short int m_val_orig = m_val;
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
// cerr << "SCA_KeyboardSensor::Eval event, sensing for "<<
m_hotkey << " at device " << inputdev << "\n";
/* See if we need to do logging: togPropState exists and is
@@ -360,7 +359,7 @@
*/
bool SCA_KeyboardSensor::IsShifted(void)
{
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
if (
(inputdev->GetEventValue(SCA_IInputDevice::KX_RIGHTSHIFTKEY).m_status
== SCA_InputEvent::KX_ACTIVE)
@@ -379,7 +378,7 @@
void SCA_KeyboardSensor::LogKeystrokes(void)
{
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
int num = inputdev->GetNumActiveEvents();
/* weird loop, this one... */
@@ -514,7 +513,7 @@
{
ShowDeprecationWarning("getPressedKeys()", "events");
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
int num = inputdev->GetNumJustEvents();
PyObject* resultlist = PyList_New(num);
@@ -555,7 +554,7 @@
{
ShowDeprecationWarning("getCurrentlyPressedKeys()", "events");
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
int num = inputdev->GetNumActiveEvents();
PyObject* resultlist = PyList_New(num);
@@ -604,7 +603,7 @@
return NULL;
}
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
const SCA_InputEvent & inevent =
inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) keycode);
return PyLong_FromSsize_t(inevent.m_status);
}
@@ -666,7 +665,7 @@
{
SCA_KeyboardSensor* self= static_cast<SCA_KeyboardSensor*>(self_v);
- SCA_IInputDevice* inputdev = self->m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)self->m_eventmgr)->GetInputDevice();
PyObject* resultlist = PyList_New(0);
Modified:
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
===================================================================
---
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
2009-08-22 14:19:27 UTC (rev 22704)
+++
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
2009-08-22 14:23:54 UTC (rev 22705)
@@ -43,9 +43,7 @@
class SCA_KeyboardSensor : public SCA_ISensor
{
Py_Header;
- class SCA_KeyboardManager* m_pKeyboardMgr;
-
/**
* the key this sensor is sensing for
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
