diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-14 14:22:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-14 14:22:46 -0500 |
| commit | d21f29b6439db5b954d630a4461fe77365cdb4b3 (patch) | |
| tree | 50b128638c6ce451234ac71c734c3376ea1d6046 /indra/llprimitive/llgltfmaterial.cpp | |
| parent | 799ebf21624edb8b42ca16b8cf51c138643efd32 (diff) | |
| parent | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (diff) | |
Merge branch 'project/gltf_development' into project/gltf_development
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp index 12af568b7e..94bc5ef74c 100644 --- a/indra/llprimitive/llgltfmaterial.cpp +++ b/indra/llprimitive/llgltfmaterial.cpp @@ -81,7 +81,7 @@ LLGLTFMaterial::LLGLTFMaterial() #endif } -void LLGLTFMaterial::TextureTransform::getPacked(F32 (&packed)[8]) const +void LLGLTFMaterial::TextureTransform::getPacked(Pack& packed) const { packed[0] = mScale.mV[VX]; packed[1] = mScale.mV[VY]; @@ -92,6 +92,15 @@ void LLGLTFMaterial::TextureTransform::getPacked(F32 (&packed)[8]) const packed[3] = packed[6] = packed[7] = 0.f; } +void LLGLTFMaterial::TextureTransform::getPackedTight(PackTight& packed) const +{ + packed[0] = mScale.mV[VX]; + packed[1] = mScale.mV[VY]; + packed[2] = mRotation; + packed[3] = mOffset.mV[VX]; + packed[4] = mOffset.mV[VY]; +} + bool LLGLTFMaterial::TextureTransform::operator==(const TextureTransform& other) const { return mOffset == other.mOffset && mScale == other.mScale && mRotation == other.mRotation; |