summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lltextureentry.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-23 16:21:53 -0500
committerDave Parks <davep@lindenlab.com>2022-06-23 16:21:53 -0500
commit394479d7cc48a0170854e07f14267e28ba247990 (patch)
tree4e68623cf90138e851e082619d52b04c26949ea0 /indra/llprimitive/lltextureentry.h
parent54edd8ba8b824241f3d6df9e3ffff7a7c926665d (diff)
SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save"
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
-rw-r--r--indra/llprimitive/lltextureentry.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index dc2e201044..1549b2ce87 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -32,6 +32,7 @@
#include "llsd.h"
#include "llmaterialid.h"
#include "llmaterial.h"
+#include "llgltfmaterial.h"
// These bits are used while unpacking TEM messages to tell which aspects of
// the texture entry changed.
@@ -134,6 +135,10 @@ public:
S32 setMaterialID(const LLMaterialID& pMaterialID);
S32 setMaterialParams(const LLMaterialPtr pMaterialParams);
+ void setGLTFMaterial(LLGLTFMaterial* material) { mGLTFMaterial = material; }
+ LLGLTFMaterial* getGLTFMaterial() { return mGLTFMaterial; }
+
+
virtual const LLUUID &getID() const { return mID; }
const LLColor4 &getColor() const { return mColor; }
const F32 getAlpha() const { return mColor.mV[VALPHA]; }
@@ -162,6 +167,8 @@ public:
const LLMaterialID& getMaterialID() const { return mMaterialID; };
const LLMaterialPtr getMaterialParams() const { return mMaterial; };
+ LLGLTFMaterial* getGLTFMaterial() const { return mGLTFMaterial; }
+
// *NOTE: it is possible for hasMedia() to return true, but getMediaData() to return NULL.
// CONVERSELY, it is also possible for hasMedia() to return false, but getMediaData()
// to NOT return NULL.
@@ -219,6 +226,7 @@ protected:
bool mMaterialUpdatePending;
LLMaterialID mMaterialID;
LLMaterialPtr mMaterial;
+ LLPointer<LLGLTFMaterial> mGLTFMaterial; // if present, ignore mMaterial
// 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