diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2009-04-01 17:11:37 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2009-04-01 17:11:37 +0000 |
| commit | 3d4e04b5569952629f68c52c9309b5364e16136c (patch) | |
| tree | 16bf58109074959695886f7125170c37b095cd90 /indra/llprimitive/lltextureentry.h | |
| parent | a8525c90b9ab0544583585cf887388b64ee1323f (diff) | |
QAR-1284 ip-takedown tools simulator work is ready for merge
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
| -rw-r--r-- | indra/llprimitive/lltextureentry.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index c562545fc4..84870e93e6 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -37,6 +37,7 @@ #include "v4color.h" #include "llsd.h" +const S32 TEM_CHANGE_NONE = 0x0; const S32 TEM_CHANGE_COLOR = 0x1; const S32 TEM_CHANGE_TEXTURE = 0x2; const S32 TEM_INVALID = 0x4; @@ -68,6 +69,7 @@ const S32 TEM_TEX_GEN_SHIFT = 1; class LLTextureEntry { public: + static LLTextureEntry* newTextureEntry(); typedef enum e_texgen { @@ -82,15 +84,19 @@ public: LLTextureEntry(const LLTextureEntry &rhs); LLTextureEntry &operator=(const LLTextureEntry &rhs); - ~LLTextureEntry(); + virtual ~LLTextureEntry(); bool operator==(const LLTextureEntry &rhs) const; bool operator!=(const LLTextureEntry &rhs) const; LLSD asLLSD() const; + void asLLSD(LLSD& sd) const; operator LLSD() const { return asLLSD(); } bool fromLLSD(LLSD& sd); + virtual LLTextureEntry* newBlank() const; + virtual LLTextureEntry* newCopy() const; + void init(const LLUUID& tex_id, F32 scale_s, F32 scale_t, F32 offset_s, F32 offset_t, F32 rotation, U8 bump); // These return a TEM_ flag from above to indicate if something changed. @@ -99,7 +105,11 @@ public: S32 setColor(const LLColor3 &color); S32 setAlpha(const F32 alpha); S32 setScale(F32 s, F32 t); + S32 setScaleS(F32 s); + S32 setScaleT(F32 t); S32 setOffset(F32 s, F32 t); + S32 setOffsetS(F32 s); + S32 setOffsetT(F32 t); S32 setRotation(F32 theta); S32 setBumpmap(U8 bump); @@ -113,7 +123,7 @@ public: S32 setMediaTexGen(U8 media); S32 setGlow(F32 glow); - const LLUUID &getID() const { return mID; } + 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 getOffset(F32 *s, F32 *t) const { *s = mOffsetS; *t = mOffsetT; } |