godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Merge pull request #23833 from neikeq/hh

Browse Source 
C#: Fix Basis(Vec3,Vec3,Vec3) constructor
This commit is contained in:
Ignacio Etcheverry
2018-11-20 06:13:29 +01:00
committed by GitHub
parent 78eae047c6 bf94eed60c
commit 5712daf2d9
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/mono/glue/Managed/Files/Basis.cs
View File

@@ -410,10 +410,12 @@ namespace Godot
); );
} }
public Quat Quat() { public Quat Quat()
{
real_t trace = _x[0] + _y[1] + _z[2]; real_t trace = _x[0] + _y[1] + _z[2];
if (trace > 0.0f) { if (trace > 0.0f)
{
real_t s = Mathf.Sqrt(trace + 1.0f) * 2f; real_t s = Mathf.Sqrt(trace + 1.0f) * 2f;
real_t inv_s = 1f / s; real_t inv_s = 1f / s;
return new Quat( return new Quat(
@@ -424,7 +426,8 @@ namespace Godot
); );
} }
if (_x[0] > _y[1] && _x[0] > _z[2]) { if (_x[0] > _y[1] && _x[0] > _z[2])
{
real_t s = Mathf.Sqrt(_x[0] - _y[1] - _z[2] + 1.0f) * 2f; real_t s = Mathf.Sqrt(_x[0] - _y[1] - _z[2] + 1.0f) * 2f;
real_t inv_s = 1f / s; real_t inv_s = 1f / s;
return new Quat( return new Quat(
@@ -435,7 +438,8 @@ namespace Godot
); );
} }
if (_y[1] > _z[2]) { if (_y[1] > _z[2])
{
real_t s = Mathf.Sqrt(-_x[0] + _y[1] - _z[2] + 1.0f) * 2f; real_t s = Mathf.Sqrt(-_x[0] + _y[1] - _z[2] + 1.0f) * 2f;
real_t inv_s = 1f / s; real_t inv_s = 1f / s;
return new Quat( return new Quat(
@@ -444,7 +448,9 @@ namespace Godot
(_y[2] + _z[1]) * inv_s, (_y[2] + _z[1]) * inv_s,
(_x[2] - _z[0]) * inv_s (_x[2] - _z[0]) * inv_s
); );
} else { }
else
{
real_t s = Mathf.Sqrt(-_x[0] - _y[1] + _z[2] + 1.0f) * 2f; real_t s = Mathf.Sqrt(-_x[0] - _y[1] + _z[2] + 1.0f) * 2f;
real_t inv_s = 1f / s; real_t inv_s = 1f / s;
return new Quat( return new Quat(
@@ -502,8 +508,8 @@ namespace Godot
{ {
var axis_sq = new Vector3(axis.x * axis.x, axis.y * axis.y, axis.z * axis.z); var axis_sq = new Vector3(axis.x * axis.x, axis.y * axis.y, axis.z * axis.z);
real_t cosine = Mathf.Cos( phi); real_t cosine = Mathf.Cos(phi);
real_t sine = Mathf.Sin( phi); real_t sine = Mathf.Sin(phi);
_x = new Vector3 _x = new Vector3
( (
@@ -529,9 +535,9 @@ namespace Godot
public Basis(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis) public Basis(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis)
{ {
_x = xAxis; x = xAxis;
_y = yAxis; y = yAxis;
_z = zAxis; z = zAxis;
} }
public Basis(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz) public Basis(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz)