xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

SP3-16 Slight rework to SHColour for compatibility #159

Merged
direnbharwani merged 7 commits from SP3-16-Math into main 2022-11-02 02:29:07 +08:00
Conversation 0 Commits 7 Files Changed 9 +12 -7
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 605ff9710d - Show all commits

2
SHADE_Engine/src/Math/SHMatrix.cpp
View File

@ -191,7 +191,7 @@ namespace SHADE
SHVec4 SHMatrix::operator*(const SHVec4& rhs) const noexcept SHVec4 SHMatrix::operator*(const SHVec4& rhs) const noexcept
{ {
return SHVec4::Transform3D(rhs, *this); return SHVec4::Transform(rhs, *this);
} }
SHMatrix SHMatrix::operator*(float rhs) const noexcept SHMatrix SHMatrix::operator*(float rhs) const noexcept

4
SHADE_Engine/src/Math/Vector/SHVec3.cpp
View File

@ -445,9 +445,7 @@ namespace SHADE
{ {
SHVec3 result; SHVec3 result;
const XMMATRIX TF = XMLoadFloat4x4(&transformMtx); XMStoreFloat3(&result, XMVector3TransformCoord(v, transformMtx));
XMStoreFloat3(&result, XMVector3TransformCoord(v, TF));
return result; return result;
} }
} }

12
SHADE_Engine/src/Math/Vector/SHVec4.cpp
View File

@ -460,13 +460,19 @@ namespace SHADE
return result; return result;
} }
SHVec4 SHVec4::Transform(const SHVec4& v, const SHMatrix& transformMtx) noexcept
{
SHVec4 result;
XMStoreFloat4(&result, XMVector4Transform(v, transformMtx));
return result;
}
SHVec4 SHVec4::Transform3D(const SHVec4& v, const SHMatrix& transformMtx) noexcept SHVec4 SHVec4::Transform3D(const SHVec4& v, const SHMatrix& transformMtx) noexcept
{ {
SHVec4 result; SHVec4 result;
const XMMATRIX TF = XMLoadFloat4x4(&transformMtx); XMStoreFloat4(&result, XMVector3TransformCoord(v, transformMtx));
XMStoreFloat4(&result, XMVector3TransformCoord(v, TF));
return result; return result;
} }
} }

1
SHADE_Engine/src/Math/Vector/SHVec4.h
View File

@ -134,6 +134,7 @@ namespace SHADE
[[nodiscard]] static SHVec4 Project3D (const SHVec4& v, const SHVec4& u) noexcept; [[nodiscard]] static SHVec4 Project3D (const SHVec4& v, const SHVec4& u) noexcept;
[[nodiscard]] static SHVec4 Reflect (const SHVec4& v, const SHVec4& normal) noexcept; [[nodiscard]] static SHVec4 Reflect (const SHVec4& v, const SHVec4& normal) noexcept;
[[nodiscard]] static SHVec4 Reflect3D (const SHVec4& v, const SHVec4& normal) noexcept; [[nodiscard]] static SHVec4 Reflect3D (const SHVec4& v, const SHVec4& normal) noexcept;
[[nodiscard]] static SHVec4 Transform (const SHVec4& v, const SHMatrix& transformMtx) noexcept;
[[nodiscard]] static SHVec4 Transform3D (const SHVec4& v, const SHMatrix& transformMtx) noexcept; [[nodiscard]] static SHVec4 Transform3D (const SHVec4& v, const SHMatrix& transformMtx) noexcept;
}; };