← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_TouchSensor.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_TouchSensor.h
56
56
        /**
57
57
         * The sensor should only look for objects with this property.
58
58
         */
59
 
        STR_String                              m_touchedpropname;      
 
59
        STR_String                              m_touchedpropname;
60
60
        bool                                    m_bFindMaterial;
61
61
        bool                                    m_bTouchPulse;          /* changes in the colliding objects trigger pulses */
62
62
        
93
93
        virtual void UnregisterSumo(KX_TouchEventManager* touchman);
94
94
        virtual void UnregisterToManager();
95
95
 
96
 
//      virtual DT_Bool HandleCollision(void* obj1,void* obj2,
97
 
//                                               const DT_CollData * coll_data); 
 
96
#if 0
 
97
        virtual DT_Bool HandleCollision(void* obj1,void* obj2,
 
98
                                        const DT_CollData * coll_data);
 
99
#endif
98
100
 
99
101
        virtual bool    NewHandleCollision(void*obj1,void*obj2,const PHY_CollData* colldata);
100
102
 
132
134
        
133
135
};
134
136
 
135
 
#endif //__KX_TOUCHSENSOR_H__
136
 
 
 
137
#endif  /* __KX_TOUCHSENSOR_H__ */