diff options
Diffstat (limited to 'linden/indra/newview/lldrawable.h')
-rw-r--r-- | linden/indra/newview/lldrawable.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h index 97e512f..e550142 100644 --- a/linden/indra/newview/lldrawable.h +++ b/linden/indra/newview/lldrawable.h | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "llviewerobject.h" | 46 | #include "llviewerobject.h" |
47 | #include "llrect.h" | 47 | #include "llrect.h" |
48 | 48 | ||
49 | class LLCamera; | ||
49 | class LLDrawPool; | 50 | class LLDrawPool; |
50 | class LLDrawable; | 51 | class LLDrawable; |
51 | class LLFace; | 52 | class LLFace; |
@@ -88,7 +89,7 @@ public: | |||
88 | 89 | ||
89 | const LLMatrix4& getWorldMatrix() const { return mXform.getWorldMatrix(); } | 90 | const LLMatrix4& getWorldMatrix() const { return mXform.getWorldMatrix(); } |
90 | const LLMatrix4& getRenderMatrix() const { return isRoot() ? getWorldMatrix() : getParent()->getWorldMatrix(); } | 91 | const LLMatrix4& getRenderMatrix() const { return isRoot() ? getWorldMatrix() : getParent()->getWorldMatrix(); } |
91 | const void setPosition(LLVector3 v) const { } | 92 | void setPosition(LLVector3 v) const { } |
92 | const LLVector3& getPosition() const { return mXform.getPosition(); } | 93 | const LLVector3& getPosition() const { return mXform.getPosition(); } |
93 | const LLVector3& getWorldPosition() const { return mXform.getPositionW(); } | 94 | const LLVector3& getWorldPosition() const { return mXform.getPositionW(); } |
94 | const LLVector3 getPositionAgent() const; | 95 | const LLVector3 getPositionAgent() const; |
@@ -96,14 +97,14 @@ public: | |||
96 | const LLVector3& getScale() const { return mCurrentScale; } | 97 | const LLVector3& getScale() const { return mCurrentScale; } |
97 | const LLQuaternion& getWorldRotation() const { return mXform.getWorldRotation(); } | 98 | const LLQuaternion& getWorldRotation() const { return mXform.getWorldRotation(); } |
98 | const LLQuaternion& getRotation() const { return mXform.getRotation(); } | 99 | const LLQuaternion& getRotation() const { return mXform.getRotation(); } |
99 | const F32 getIntensity() const { return llmin(mXform.getScale().mV[0], 4.f); } | 100 | F32 getIntensity() const { return llmin(mXform.getScale().mV[0], 4.f); } |
100 | const S32 getLOD() const { return mVObjp ? mVObjp->getLOD() : 1; } | 101 | S32 getLOD() const { return mVObjp ? mVObjp->getLOD() : 1; } |
101 | const F64 getBinRadius() const { return mBinRadius; } | 102 | F64 getBinRadius() const { return mBinRadius; } |
102 | void getMinMax(LLVector3& min,LLVector3& max) const { mXform.getMinMax(min,max); } | 103 | void getMinMax(LLVector3& min,LLVector3& max) const { mXform.getMinMax(min,max); } |
103 | LLXformMatrix* getXform() { return &mXform; } | 104 | LLXformMatrix* getXform() { return &mXform; } |
104 | 105 | ||
105 | const U32 getState() const { return mState; } | 106 | U32 getState() const { return mState; } |
106 | const BOOL isState (U32 bits) const { return ((mState & bits) != 0); } | 107 | BOOL isState (U32 bits) const { return ((mState & bits) != 0); } |
107 | void setState (U32 bits) { mState |= bits; } | 108 | void setState (U32 bits) { mState |= bits; } |
108 | void clearState(U32 bits) { mState &= ~bits; } | 109 | void clearState(U32 bits) { mState &= ~bits; } |
109 | 110 | ||