diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 08:58:15 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 08:58:15 -0700 |
| commit | 7e4e59470f36ae7a0e01b8d2613af4c8fb6b0101 (patch) | |
| tree | 3ebbc7ae029d14b3a2f033b09fcd3fe9460cb1bf /indra/llprimitive/lltextureentry.h | |
| parent | c38204f5e0a9130f0d4d4bfc997da107fd1017ce (diff) | |
NORSPEC-233 WIP for individual material param edits across hetero object selections
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
| -rwxr-xr-x | indra/llprimitive/lltextureentry.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index 5cc76cfe82..59364cb913 100755 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -133,7 +133,13 @@ public: virtual const LLUUID &getID() const { return mID; } const LLColor4 &getColor() const { return mColor; } void getScale(F32 *s, F32 *t) const { *s = mScaleS; *t = mScaleT; } + void getScaleS(F32 *s) const { *s = mScaleS; } + void getScaleT(F32 *t) const { *t = mScaleT; } + void getOffset(F32 *s, F32 *t) const { *s = mOffsetS; *t = mOffsetT; } + F32 getOffsetS() const { return mOffsetS; } + F32 getOffsetT() const { return mOffsetT; } + F32 getRotation() const { return mRotation; } void getRotation(F32 *theta) const { *theta = mRotation; } @@ -144,7 +150,7 @@ public: U8 getBumpShinyFullbright() const { return mBump; } U8 getMediaFlags() const { return mMediaFlags & TEM_MEDIA_MASK; } - U8 getTexGen() const { return mMediaFlags & TEM_TEX_GEN_MASK; } + LLTextureEntry::e_texgen getTexGen() const { return LLTextureEntry::e_texgen(mMediaFlags & TEM_TEX_GEN_MASK); } U8 getMediaTexGen() const { return mMediaFlags; } F32 getGlow() const { return mGlow; } const LLMaterialID& getMaterialID() const { return mMaterialID; }; |