diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
| commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
| tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/newview/llface.h | |
| parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
| parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) | |
Sync with viewer-development
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 351d48a671..0166e45bee 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -89,6 +89,9 @@ public: BOOL hasGeometry() const { return mGeomCount > 0; } LLVector3 getPositionAgent() const; LLVector2 surfaceToTexture(LLVector2 surface_coord, LLVector3 position, LLVector3 normal); + void getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_pos, F32* scale) const; + bool calcAlignedPlanarTE(const LLFace* align_to, LLVector2* st_offset, + LLVector2* st_scale, F32* st_rot) const; U32 getState() const { return mState; } void setState(U32 state) { mState |= state; } @@ -132,10 +135,10 @@ public: void unsetFaceColor(); // switch back to material color const LLColor4& getFaceColor() const { return mFaceColor; } const LLColor4& getRenderColor() const; - //for volumes void updateRebuildFlags(); + bool canRenderAsMask(); // logic helper BOOL getGeometryVolume(const LLVolume& volume, const S32 &f, const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, @@ -207,7 +210,8 @@ private: F32 adjustPartialOverlapPixelArea(F32 cos_angle_to_view_dir, F32 radius ); BOOL calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) ; public: - static F32 calcImportanceToCamera(F32 to_view_dir, F32 dist); + static F32 calcImportanceToCamera(F32 to_view_dir, F32 dist); + static F32 adjustPixelArea(F32 importance, F32 pixel_area) ; public: |