diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-04 23:43:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-04 23:43:13 -0600 |
| commit | ff0271d632eb59fef1dc52ff261064b6a09abefa (patch) | |
| tree | f1554768fa9f1dfcb84f3df0f7aeaa35172080b2 /indra/llrender/llrender.h | |
| parent | 7d2d8ea58f572a6df08b04f64f3b71501ee21f6c (diff) | |
| parent | 979ddb2ec952f836f7cde7cbc85559b8e9582416 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | indra/llrender/llrender.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 0121a190ee..6e38fac67b 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,13 @@ private: std::vector<LLTexUnit*> mTexUnits; LLTexUnit* mDummyTexUnit; + U32 mCurrSceneBlendType; + F32 mMaxAnisotropy; + + std::list<LLVector3> mUIOffset; + std::list<LLVector3> mUIScale; + }; extern F64 gGLModelView[16]; |