diff --git a/Source/Engine/Core/Math/Double3.cpp b/Source/Engine/Core/Math/Double3.cpp index 4c0a31df7..c31f076dd 100644 --- a/Source/Engine/Core/Math/Double3.cpp +++ b/Source/Engine/Core/Math/Double3.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. +// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. #include "Double2.h" #include "Double3.h" @@ -45,6 +45,20 @@ Double3::Double3(const Vector2& xy) { } +Double3::Double3(const Vector3& xyz) + : X(xyz.X) + , Y(xyz.Y) + , Z(xyz.Z) +{ +} + +Double3::Double3(const Vector4& xyzw) + : X(xyzw.X) + , Y(xyzw.Y) + , Z(xyzw.Z) +{ +} + Double3::Double3(const Int2& xy, double z) : X(static_cast(xy.X)) , Y(static_cast(xy.Y)) @@ -66,13 +80,6 @@ Double3::Double3(const Int4& xyzw) { } -Double3::Double3(const Vector4& xyzw) - : X(xyzw.X) - , Y(xyzw.Y) - , Z(xyzw.Z) -{ -} - Double3::Double3(const Double2& xy) : X(xy.X) , Y(xy.Y) diff --git a/Source/Engine/Core/Math/Double3.h b/Source/Engine/Core/Math/Double3.h index f57608190..177bbcc5e 100644 --- a/Source/Engine/Core/Math/Double3.h +++ b/Source/Engine/Core/Math/Double3.h @@ -143,11 +143,19 @@ public: // Init // @param xy Vector2 value explicit Double3(const Vector2& xy); + + // Init + // @param xyz Vector3 value + explicit Double3(const Vector3& xyz); // Init - // @param xy Int22 with X and Y components values + // @param xyz Vector4 value + explicit Double3(const Vector4& xyzw); + + // Init + // @param xy Int2 with X and Y components values // @param z Z component value - explicit Double3(const Int2& xy, double z); + explicit Double3(const Int2& xy, double z); // Init // @param xyz Int3 value @@ -155,22 +163,17 @@ public: // Init // @param xyzw Int4 value - explicit Double3(const Int4& xyzw); - - // Init - // @param xyz Vector4 value - explicit Double3(const Vector4& xyzw); + explicit Double3(const Int4& xyzw); // Init // @param xy Double2 value - Double3(const Double2& xy); + explicit Double3(const Double2& xy); // Init // @param xy Double2 value // @param z Z component value explicit Double3(const Double2& xy, double z); - // Init // @param xyzw Double4 value explicit Double3(const Double4& xyzw);