diff options
| author | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 12:24:04 -0600 |
|---|---|---|
| committer | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 12:24:04 -0600 |
| commit | 871a40f2f290106f9da58dd4d09cec28fbecb0fa (patch) | |
| tree | fab5c657732c6da25a4fbcbd837af7389ec283f5 /indra/llrender/llrender.h | |
| parent | d1efc0fd52c0e5dc59951f50435e121305fe9b69 (diff) | |
| parent | 6d4b4762d1eb0a1431e1793a7254f8cac220062a (diff) | |
merge
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | indra/llrender/llrender.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 0121a190ee..a70ccf4d80 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -286,6 +286,14 @@ public: void pushMatrix(); void popMatrix(); + void translateUI(F32 x, F32 y, F32 z); + void scaleUI(F32 x, F32 y, F32 z); + void pushUIMatrix(); + void popUIMatrix(); + void loadUIIdentity(); + LLVector3 getUITranslation(); + LLVector3 getUIScale(); + void flush(); void begin(const GLuint& mode); @@ -333,7 +341,9 @@ public: }; public: - + static U32 sUICalls; + static U32 sUIVerts; + private: bool mDirty; U32 mCount; @@ -350,7 +360,14 @@ private: std::vector<LLTexUnit*> mTexUnits; LLTexUnit* mDummyTexUnit; + U32 mCurrBlendSFactor; + U32 mCurrBlendDFactor; + F32 mMaxAnisotropy; + + std::list<LLVector3> mUIOffset; + std::list<LLVector3> mUIScale; + }; extern F64 gGLModelView[16]; |