diff --git a/src/otbullet/otbullet.hpp b/src/otbullet/otbullet.hpp index 1b7f0a5b71..e0c0fe07d0 100644 --- a/src/otbullet/otbullet.hpp +++ b/src/otbullet/otbullet.hpp @@ -79,8 +79,8 @@ class physics : public policy_intrusive_base ifc_fn void set_debug_drawer_mode(int debug_mode); ifc_fn void debug_draw_world(); - ifc_fn void querry_volume_sphere(const double3 & pos, float rad, ifc_inout coid::dynarray& result); - ifc_fn void querry_volume_frustum(const double3 & pos, const float4 * f_planes_norms, uint8 nplanes, bool include_partial, ifc_inout coid::dynarray& result); + ifc_fn void query_volume_sphere(const double3 & pos, float rad, ifc_inout coid::dynarray& result); + ifc_fn void query_volume_frustum(const double3 & pos, const float4 * f_planes_norms, uint8 nplanes, bool include_partial, ifc_inout coid::dynarray& result); ifc_event bool terrain_collisions( diff --git a/src/otbullet/otbullet.intergen.cpp b/src/otbullet/otbullet.intergen.cpp index 7aa45eaa44..a8f8fd41ff 100644 --- a/src/otbullet/otbullet.intergen.cpp +++ b/src/otbullet/otbullet.intergen.cpp @@ -66,8 +66,8 @@ class physics_dispatcher : public physics _vtable1[29] = reinterpret_cast(static_cast(&::physics::set_debug_draw_enabled)); _vtable1[30] = reinterpret_cast(static_cast(&::physics::set_debug_drawer_mode)); _vtable1[31] = reinterpret_cast(static_cast(&::physics::debug_draw_world)); - _vtable1[32] = reinterpret_cast(static_cast&)>(&::physics::querry_volume_sphere)); - _vtable1[33] = reinterpret_cast(static_cast&)>(&::physics::querry_volume_frustum)); + _vtable1[32] = reinterpret_cast(static_cast&)>(&::physics::query_volume_sphere)); + _vtable1[33] = reinterpret_cast(static_cast&)>(&::physics::query_volume_frustum)); return _vtable1; } @@ -193,9 +193,9 @@ class physics_dispatcher : public physics "bt::physics@wrapper", on ? (void*)&_generic_interface_creator : nullptr); interface_register::register_interface_creator( - "bt::physics.create@1981346415", on ? (void*)&create : nullptr); + "bt::physics.create@3358894847", on ? (void*)&create : nullptr); interface_register::register_interface_creator( - "bt::physics.get@1981346415", on ? (void*)&get : nullptr); + "bt::physics.get@3358894847", on ? (void*)&get : nullptr); } }; diff --git a/src/otbullet/physics.h b/src/otbullet/physics.h index 3cf53f2252..a2a5e7cc99 100644 --- a/src/otbullet/physics.h +++ b/src/otbullet/physics.h @@ -106,9 +106,9 @@ class physics void debug_draw_world(); - void querry_volume_sphere( const double3& pos, float rad, ifc_inout coid::dynarray& result ); + void query_volume_sphere( const double3& pos, float rad, ifc_inout coid::dynarray& result ); - void querry_volume_frustum( const double3& pos, const float4* f_planes_norms, uint8 nplanes, bool include_partial, ifc_inout coid::dynarray& result ); + void query_volume_frustum( const double3& pos, const float4* f_planes_norms, uint8 nplanes, bool include_partial, ifc_inout coid::dynarray& result ); protected: @@ -157,7 +157,7 @@ class physics if(_cleaner) _cleaner(this,0); } - static const int HASHID = 1981346415; + static const int HASHID = 3358894847; int intergen_hash_id() const override { return HASHID; } @@ -167,7 +167,7 @@ class physics } static const coid::token& intergen_default_creator_static( EBackend bck ) { - static const coid::token _dc("bt::physics.get@1981346415"); + static const coid::token _dc("bt::physics.get@3358894847"); static const coid::token _djs("bt::js::physics@wrapper"); static const coid::token _dnone; @@ -218,7 +218,7 @@ inline iref physics::create( T* _subclass_, double r, void* context ) typedef iref (*fn_creator)(physics*, double, void*); static fn_creator create = 0; - static const coid::token ifckey = "bt::physics.create@1981346415"; + static const coid::token ifckey = "bt::physics.create@3358894847"; if(!create) create = reinterpret_cast( @@ -236,7 +236,7 @@ inline iref physics::get( T* _subclass_ ) typedef iref (*fn_creator)(physics*); static fn_creator create = 0; - static const coid::token ifckey = "bt::physics.get@1981346415"; + static const coid::token ifckey = "bt::physics.get@3358894847"; if(!create) create = reinterpret_cast( @@ -345,10 +345,10 @@ inline void physics::set_debug_drawer_mode( int debug_mode ) inline void physics::debug_draw_world() { return VT_CALL(void,(),31)(); } -inline void physics::querry_volume_sphere( const double3& pos, float rad, coid::dynarray& result ) +inline void physics::query_volume_sphere( const double3& pos, float rad, coid::dynarray& result ) { return VT_CALL(void,(const double3&,float,coid::dynarray&),32)(pos,rad,result); } -inline void physics::querry_volume_frustum( const double3& pos, const float4* f_planes_norms, uint8 nplanes, bool include_partial, coid::dynarray& result ) +inline void physics::query_volume_frustum( const double3& pos, const float4* f_planes_norms, uint8 nplanes, bool include_partial, coid::dynarray& result ) { return VT_CALL(void,(const double3&,const float4*,uint8,bool,coid::dynarray&),33)(pos,f_planes_norms,nplanes,include_partial,result); } } //namespace diff --git a/src/otbullet/wrapper.cpp b/src/otbullet/wrapper.cpp index 467b94c4c3..14847614f2 100644 --- a/src/otbullet/wrapper.cpp +++ b/src/otbullet/wrapper.cpp @@ -148,12 +148,12 @@ void physics::debug_draw_world() { } } -void physics::querry_volume_sphere(const double3 & pos, float rad, coid::dynarray& result) +void physics::query_volume_sphere(const double3 & pos, float rad, coid::dynarray& result) { _world->query_volume_sphere(pos,rad,result); } -void physics::querry_volume_frustum(const double3 & pos,const float4 * f_planes_norms, uint8 nplanes, bool include_partial, coid::dynarray& result) +void physics::query_volume_frustum(const double3 & pos,const float4 * f_planes_norms, uint8 nplanes, bool include_partial, coid::dynarray& result) { _world->query_volume_frustum(pos, f_planes_norms, nplanes, include_partial,result); }