Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #16530 from AndreaCatania/rays

Browse source 
Improved ray shape (2D and 3D) by addiing the possibility to act as r…
This commit is contained in:
Rémi Verschelde 2018-02-19 22:15:49 +01:00 • committed by GitHub
commit b2aeb02e7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 117 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
servers/physics/shape_sw.cpp
View file

@ -165,6 +165,10 @@ real_t RayShapeSW::get_length() const {
return length;
}
bool RayShapeSW::get_slips_on_slope() const {
return slips_on_slope;
}
void RayShapeSW::project_range(const Vector3 &p_normal, const Transform &p_transform, real_t &r_min, real_t &r_max) const {
// don't think this will be even used
@ -221,25 +225,31 @@ Vector3 RayShapeSW::get_moment_of_inertia(real_t p_mass) const {
return Vector3();
}
void RayShapeSW::_setup(real_t p_length) {
void RayShapeSW::_setup(real_t p_length, bool p_slips_on_slope) {
length = p_length;
slips_on_slope = p_slips_on_slope;
configure(AABB(Vector3(0, 0, 0), Vector3(0.1, 0.1, length)));
}
void RayShapeSW::set_data(const Variant &p_data) {
_setup(p_data);
Dictionary d = p_data;
_setup(d["length"], d["slips_on_slope"]);
}
Variant RayShapeSW::get_data() const {
return length;
Dictionary d;
d["length"] = length;
d["slips_on_slope"] = slips_on_slope;
return d;
}
RayShapeSW::RayShapeSW() {
length = 1;
slips_on_slope = false;
}
/********** SPHERE *************/