diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-04-17 16:12:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 16:12:49 -0500 |
| commit | bc93177ea0788a245554882b6d721eae2e057206 (patch) | |
| tree | 5b15cf6b55ff8e200e763ae720771f3f91ead8f3 /indra/llmath | |
| parent | d46811d60d8fca4a9908b4e989b14905345928bd (diff) | |
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate (#1258)
* #1176 Somewhat working GLTF Node support for translate tool
* #1176 Missing file from last commit
* #1176 Better translation for rotated nodes.
* #1176 Fix for objects snapping back to original position
* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display
* #1176 Clean out some unused and not working functions.
* #1176 Fix for mac build, incidental cleanup
* Mac build fix
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llmatrix4a.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llmath/llmatrix4a.h b/indra/llmath/llmatrix4a.h index 2cf50e9cd2..12fc6d570a 100644 --- a/indra/llmath/llmatrix4a.h +++ b/indra/llmath/llmatrix4a.h @@ -34,8 +34,8 @@ class LLMatrix4a { public: - LL_ALIGN_16(LLVector4a mMatrix[4]); - + LL_ALIGN_16(LLVector4a mMatrix[4]); + LLMatrix4a() { @@ -56,6 +56,16 @@ public: return (F32*)&mMatrix; } + inline LLMatrix4& asMatrix4() + { + return *(LLMatrix4*)this; + } + + inline const LLMatrix4& asMatrix4() const + { + return *(LLMatrix4*)this; + } + inline void clear() { mMatrix[0].clear(); |