[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20378] trunk/blender/source/gameengine: BGE: renamed sensor type enum to avoid conflict with mingw ( NEAR was causing the problem).

[Benoit Bolsee]

Revision: 20378
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20378
Author:   ben2610
Date:     2009-05-24 14:53:49 +0200 (Sun, 24 May 2009)

Log Message:
-----------
BGE: renamed sensor type enum to avoid conflict with mingw (NEAR was causing 
the problem).

Modified Paths:
--------------
    trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h
    trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h
    trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.h
    trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.h

Modified: trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h     2009-05-24 
12:37:55 UTC (rev 20377)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h     2009-05-24 
12:53:49 UTC (rev 20378)
@@ -93,10 +93,10 @@
 public:
 
        enum sensortype {
-               NONE = 0,
-               TOUCH,
-               NEAR,
-               RADAR,
+               ST_NONE = 0,
+               ST_TOUCH,
+               ST_NEAR,
+               ST_RADAR,
                // to be updated as needed
        };
 
@@ -147,7 +147,7 @@
 
        virtual double GetNumber();
 
-       virtual sensortype GetSensorType() { return NONE; }
+       virtual sensortype GetSensorType() { return ST_NONE; }
 
        /** Stop sensing for a while. */
        void Suspend();

Modified: trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h      2009-05-24 
12:37:55 UTC (rev 20377)
+++ trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h      2009-05-24 
12:53:49 UTC (rev 20378)
@@ -78,7 +78,7 @@
                                                 const PHY_CollData * 
coll_data); 
        virtual bool    BroadPhaseFilterCollision(void*obj1,void*obj2);
        virtual bool    BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { 
return false; };
-       virtual sensortype GetSensorType() { return NEAR; }
+       virtual sensortype GetSensorType() { return ST_NEAR; }
 
        /* 
--------------------------------------------------------------------- */
        /* Python interface 
---------------------------------------------------- */

Modified: trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.h     2009-05-24 
12:37:55 UTC (rev 20377)
+++ trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.h     2009-05-24 
12:53:49 UTC (rev 20378)
@@ -92,7 +92,7 @@
        virtual PyObject* py_getattro(PyObject *attr);
        virtual PyObject* py_getattro_dict();
        virtual int py_setattro(PyObject *attr, PyObject* value);
-       virtual sensortype GetSensorType() { return RADAR; }
+       virtual sensortype GetSensorType() { return ST_RADAR; }
 
        //Deprecated ----->
        KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeOrigin);

Modified: trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp     
2009-05-24 12:37:55 UTC (rev 20377)
+++ trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp     
2009-05-24 12:53:49 UTC (rev 20378)
@@ -105,7 +105,7 @@
                        it != info->m_sensors.end();
                        ++it)
                {
-                       if ((*it)->GetSensorType() == SCA_ISensor::TOUCH) 
+                       if ((*it)->GetSensorType() == SCA_ISensor::ST_TOUCH) 
                        {
                                KX_TouchSensor* touchsensor = 
static_cast<KX_TouchSensor*>(*it);
                                if 
(touchsensor->BroadPhaseSensorFilterCollision(object1, object2))

Modified: trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.h     2009-05-24 
12:37:55 UTC (rev 20377)
+++ trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.h     2009-05-24 
12:53:49 UTC (rev 20378)
@@ -104,7 +104,7 @@
        // return value = true if collision should be checked on pair of object
        virtual bool    BroadPhaseFilterCollision(void*obj1,void*obj2) { return 
true; }
        virtual bool    BroadPhaseSensorFilterCollision(void*obj1,void*obj2);
-       virtual sensortype GetSensorType() { return TOUCH; }
+       virtual sensortype GetSensorType() { return ST_TOUCH; }
   
 
        virtual bool IsPositiveTrigger() {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs