From d0c2c862efe2ce684b48092465cc753b3ab64da9 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Wed, 19 Oct 2022 09:18:24 -0700 Subject: SL-18105 viewer side for handling Material Override LargeGenericMessage LLGLTFMaterialList now decodes gltf json overrides from the server and stores them in LLTextureEntry::mGLTFMaterialOverrides --- indra/llprimitive/lltextureentry.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index 1549b2ce87..24875f0d21 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -200,6 +200,10 @@ public: // Media flags enum { MF_NONE = 0x0, MF_HAS_MEDIA = 0x1 }; + // GLTF override + LLGLTFMaterial* getGLTFMaterialOverride() { return mGLTFMaterialOverrides; } + void setGLTFMaterialOverride(LLGLTFMaterial* mat) { mGLTFMaterialOverrides = mat; } + public: F32 mScaleS; // S, T offset F32 mScaleT; // S, T offset @@ -228,6 +232,10 @@ protected: LLMaterialPtr mMaterial; LLPointer mGLTFMaterial; // if present, ignore mMaterial + // GLTF material parameter overrides -- the viewer will use this data to override material parameters + // set by the asset + LLPointer mGLTFMaterialOverrides; + // Note the media data is not sent via the same message structure as the rest of the TE LLMediaEntry* mMediaEntry; // The media data for the face -- cgit v1.2.3