Revision: 22701
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22701
Author: campbellbarton
Date: 2009-08-22 12:51:21 +0200 (Sat, 22 Aug 2009)
Log Message:
-----------
- BGE, Some sensors, stored the event manager in 2 places (became confusing to
do changes in this area)
- Change compiler warnings for linux/scons/C++
Modified Paths:
--------------
trunk/blender/config/linux2-config.py
trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.h
Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py 2009-08-22 09:21:08 UTC (rev
22700)
+++ trunk/blender/config/linux2-config.py 2009-08-22 10:51:21 UTC (rev
22701)
@@ -190,9 +190,10 @@
##ARFLAGSQUIET = ru
##
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
-
CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
##FIX_STUBS_WARNINGS = -Wno-unused
LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
Modified: trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
2009-08-22 09:21:08 UTC (rev 22700)
+++ trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
2009-08-22 10:51:21 UTC (rev 22701)
@@ -49,7 +49,6 @@
int
hat, int hatf, bool allevents,
PyTypeObject* T )
:SCA_ISensor(gameobj,eventmgr,T),
-
m_pJoystickMgr(eventmgr),
m_axis(axis),
m_axisf(axisf),
m_button(button),
@@ -104,7 +103,7 @@
bool SCA_JoystickSensor::Evaluate()
{
- SCA_Joystick *js = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *js = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
bool result = false;
bool reset = m_reset && m_level;
@@ -404,7 +403,7 @@
"\tReturns a list of the values for the current state of each axis.\n";
PyObject* SCA_JoystickSensor::PyGetAxisValue( ) {
ShowDeprecationWarning("getAxisValue()", "the axisPosition property");
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
int axis_index= joy->GetNumberOfAxes();
PyObject *list= PyList_New(axis_index);
@@ -479,7 +478,7 @@
"getButtonActiveList\n"
"\tReturns a list containing the indicies of the button currently pressed.\n";
PyObject* SCA_JoystickSensor::PyGetButtonActiveList( ) {
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
PyObject *ls = PyList_New(0);
PyObject *value;
int i;
@@ -501,7 +500,7 @@
"getButtonStatus(buttonIndex)\n"
"\tReturns a bool of the current pressed state of the specified button.\n";
PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args ) {
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
int index;
if(!PyArg_ParseTuple(args, "i:getButtonStatus", &index)){
@@ -547,7 +546,7 @@
"\tReturns the number of axes .\n";
PyObject* SCA_JoystickSensor::PyNumberOfAxes( ) {
ShowDeprecationWarning("getNumAxes()", "the numAxis property");
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
// when the joystick is null their is 0 exis still. dumb but scripters
should use isConnected()
return PyInt_FromLong( joy ? joy->GetNumberOfAxes() : 0 );
}
@@ -558,7 +557,7 @@
"\tReturns the number of buttons .\n";
PyObject* SCA_JoystickSensor::PyNumberOfButtons( ) {
ShowDeprecationWarning("getNumButtons()", "the numButtons property");
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
return PyInt_FromLong( joy ? joy->GetNumberOfButtons() : 0 );
}
@@ -568,7 +567,7 @@
"\tReturns the number of hats .\n";
PyObject* SCA_JoystickSensor::PyNumberOfHats( ) {
ShowDeprecationWarning("getNumHats()", "the numHats property");
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
return PyInt_FromLong( joy ? joy->GetNumberOfHats() : 0 );
}
@@ -577,7 +576,7 @@
"\tReturns True if a joystick is connected at this joysticks index.\n";
PyObject* SCA_JoystickSensor::PyConnected( ) {
ShowDeprecationWarning("getConnected()", "the connected property");
- SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)m_eventmgr)->GetJoystickDevice(m_joyindex);
return PyBool_FromLong( joy ? joy->Connected() : 0 );
}
@@ -585,7 +584,7 @@
PyObject* SCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
int axis_index= joy->GetNumberOfAxes();
PyObject *list= PyList_New(axis_index);
@@ -600,7 +599,7 @@
PyObject* SCA_JoystickSensor::pyattr_get_axis_single(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
if(self->m_joymode != KX_JOYSENSORMODE_AXIS_SINGLE) {
PyErr_SetString(PyExc_TypeError, "val = sensor.axisSingle:
Joystick Sensor, not 'Single Axis' type");
@@ -613,7 +612,7 @@
PyObject* SCA_JoystickSensor::pyattr_get_hat_values(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
int hat_index= joy->GetNumberOfHats();
PyObject *list= PyList_New(hat_index);
@@ -628,7 +627,7 @@
PyObject* SCA_JoystickSensor::pyattr_get_hat_single(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
return PyInt_FromLong(joy->GetHat(self->m_hat-1));
}
@@ -636,27 +635,27 @@
PyObject* SCA_JoystickSensor::pyattr_get_num_axis(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
return PyInt_FromLong( joy ? joy->GetNumberOfAxes() : 0 );
}
PyObject* SCA_JoystickSensor::pyattr_get_num_buttons(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
return PyInt_FromLong( joy ? joy->GetNumberOfButtons() : 0 );
}
PyObject* SCA_JoystickSensor::pyattr_get_num_hats(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
return PyInt_FromLong( joy ? joy->GetNumberOfHats() : 0 );
}
PyObject* SCA_JoystickSensor::pyattr_get_connected(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
{
SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
- SCA_Joystick *joy =
self->m_pJoystickMgr->GetJoystickDevice(self->m_joyindex);
+ SCA_Joystick *joy = ((SCA_JoystickManager
*)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
return PyBool_FromLong( joy ? joy->Connected() : 0 );
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
2009-08-22 09:21:08 UTC (rev 22700)
+++ trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
2009-08-22 10:51:21 UTC (rev 22701)
@@ -35,7 +35,6 @@
class SCA_JoystickSensor :public SCA_ISensor
{
Py_Header;
- class SCA_JoystickManager* m_pJoystickMgr;
/**
* Axis 1-JOYAXIS_MAX, MUST be followed by m_axisf
Modified: trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
2009-08-22 09:21:08 UTC (rev 22700)
+++ trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
2009-08-22 10:51:21 UTC (rev 22701)
@@ -52,7 +52,6 @@
SCA_IObject*
gameobj,
PyTypeObject*
T)
: SCA_ISensor(gameobj,eventmgr, T),
- m_pMouseMgr(eventmgr),
m_x(startx),
m_y(starty)
{
@@ -148,7 +147,7 @@
{
bool result = false;
bool reset = m_reset && m_level;
- SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice();
+ SCA_IInputDevice* mousedev = ((SCA_MouseManager
*)m_eventmgr)->GetInputDevice();
m_reset = false;
switch (m_mousemode) {
@@ -283,7 +282,7 @@
return NULL;
}
- SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice();
+ SCA_IInputDevice* mousedev = ((SCA_MouseManager
*)m_eventmgr)->GetInputDevice();
const SCA_InputEvent& event =
mousedev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) button);
return PyInt_FromLong(event.m_status);
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.h 2009-08-22
09:21:08 UTC (rev 22700)
+++ trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.h 2009-08-22
10:51:21 UTC (rev 22701)
@@ -39,7 +39,6 @@
class SCA_MouseSensor : public SCA_ISensor
{
Py_Header;
- class SCA_MouseManager* m_pMouseMgr;
/**
* Use SCA_IInputDevice values to encode the mouse mode for now.
Modified:
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
