svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22704:22717
[blender.git] / source / gameengine / Ketsji / KX_MouseFocusSensor.h
index dfada7a..89ac012 100644 (file)
@@ -49,11 +49,12 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
        
  public:
        
-       KX_MouseFocusSensor(class SCA_MouseManager* keybdmgr,
+       KX_MouseFocusSensor(class SCA_MouseManager* eventmgr,
                                                int startx,
                                                int starty,
                                                short int mousemode,
                                                int focusmode,
+                                               bool bTouchPulse,
                                                KX_Scene* kxscene,
                                                KX_KetsjiEngine* kxengine,
                                                SCA_IObject* gameobj);
@@ -107,6 +108,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
                
        /* --------------------------------------------------------------------- */
        SCA_IObject*    m_hitObject;
+       void*                   m_hitObject_Last; /* only use for comparison, never access */
 
  private:
        /**
@@ -119,6 +121,11 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
         */
        bool m_mouse_over_in_previous_frame;
 
+       /**
+        * Flags whether changes in hit object should trigger a pulse
+        */
+       bool m_bTouchPulse;
+       
        /**
         * Flags whether the previous test evaluated positive.
         */