asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Basis constructor: row vectors -> column vectors

Browse source
This commit is contained in:
Zhehang Ding 2022-08-30 21:28:36 -07:00
parent 8fa9d1ae46
commit 69fe6336f1
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/math/basis.h
View file

@ -238,10 +238,8 @@ struct _NO_DISCARD_ Basis {
Basis(const Vector3 &p_axis, real_t p_angle, const Vector3 &p_scale) { set_axis_angle_scale(p_axis, p_angle, p_scale); } Basis(const Vector3 &p_axis, real_t p_angle, const Vector3 &p_scale) { set_axis_angle_scale(p_axis, p_angle, p_scale); }
static Basis from_scale(const Vector3 &p_scale); static Basis from_scale(const Vector3 &p_scale);
_FORCE_INLINE_ Basis(const Vector3 &row0, const Vector3 &row1, const Vector3 &row2) { _FORCE_INLINE_ Basis(const Vector3 &p_x_axis, const Vector3 &p_y_axis, const Vector3 &p_z_axis) {
rows[0] = row0; set_columns(p_x_axis, p_y_axis, p_z_axis);
rows[1] = row1;
rows[2] = row2;
} }
_FORCE_INLINE_ Basis() {} _FORCE_INLINE_ Basis() {}

10
core/math/vector3.cpp
View file

@ -134,11 +134,11 @@ Vector3 Vector3::octahedron_tangent_decode(const Vector2 &p_oct, float *sign) {
} }
Basis Vector3::outer(const Vector3 &p_with) const { Basis Vector3::outer(const Vector3 &p_with) const {
Vector3 row0(x * p_with.x, x * p_with.y, x * p_with.z); Basis basis;
Vector3 row1(y * p_with.x, y * p_with.y, y * p_with.z); basis.rows[0] = Vector3(x * p_with.x, x * p_with.y, x * p_with.z);
Vector3 row2(z * p_with.x, z * p_with.y, z * p_with.z); basis.rows[1] = Vector3(y * p_with.x, y * p_with.y, y * p_with.z);
basis.rows[2] = Vector3(z * p_with.x, z * p_with.y, z * p_with.z);
return Basis(row0, row1, row2); return basis;
} }
bool Vector3::is_equal_approx(const Vector3 &p_v) const { bool Vector3::is_equal_approx(const Vector3 &p_v) const {

4
editor/plugins/skeleton_3d_editor_plugin.cpp
View file

@ -426,7 +426,9 @@ PhysicalBone3D *Skeleton3DEditor::create_physical_bone(int bone_id, int bone_chi
bone_shape->set_name("CollisionShape3D"); bone_shape->set_name("CollisionShape3D");
Transform3D capsule_transform; Transform3D capsule_transform;
capsule_transform.basis = Basis(Vector3(1, 0, 0), Vector3(0, 0, 1), Vector3(0, -1, 0)); capsule_transform.basis.rows[0] = Vector3(1, 0, 0);
capsule_transform.basis.rows[1] = Vector3(0, 0, 1);
capsule_transform.basis.rows[2] = Vector3(0, -1, 0);
bone_shape->set_transform(capsule_transform); bone_shape->set_transform(capsule_transform);
/// Get an up vector not collinear with child rest origin /// Get an up vector not collinear with child rest origin