diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-02 13:36:43 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-10 23:17:07 +0200 |
| commit | 5691d302ef876a7e6fb6861441f14e5e7f0c7735 (patch) | |
| tree | a87a93f40ca50645a194931c3bf641f01bcaf3f5 /indra/llprimitive/llmaterial.h | |
| parent | bb4d02446fa215520a11f219ebca453d2dea0388 (diff) | |
SL-12069 Issues with bakes-on-mesh and alpha modes
Diffstat (limited to 'indra/llprimitive/llmaterial.h')
| -rw-r--r-- | indra/llprimitive/llmaterial.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index d58b7ee812..1207917568 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -115,8 +115,17 @@ public: void setSpecularLightExponent(U8 exponent); U8 getEnvironmentIntensity() const; void setEnvironmentIntensity(U8 intensity); + + // getDiffuseAlphaModeRender takes into account if image supports alpha + // and returns value apropriate for render + // getDiffuseAlphaMode() returns value as is + U8 getDiffuseAlphaModeRender() const; U8 getDiffuseAlphaMode() const; void setDiffuseAlphaMode(U8 alpha_mode); + U32 getDiffuseFormatPrimary() const; + void setDiffuseFormatPrimary(U32 format_primary); + bool getIsDiffuseBaked() const; + void setDiffuseBaked(bool baked); U8 getAlphaMaskCutoff() const; void setAlphaMaskCutoff(U8 cutoff); @@ -147,6 +156,8 @@ protected: U8 mSpecularLightExponent; U8 mEnvironmentIntensity; U8 mDiffuseAlphaMode; + U32 mDiffuseFormatPrimary; // value from texture, LLGLenum, is not included in fromLLSD/asLLSD + bool mDiffuseBaked; // is not included in fromLLSD/asLLSD U8 mAlphaMaskCutoff; }; |