summaryrefslogtreecommitdiff
path: root/indra/newview/llface.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llface.h')
-rw-r--r--indra/newview/llface.h193
1 files changed, 109 insertions, 84 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 0d017d6efe..18db645305 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -19,18 +19,19 @@
#include "llquaternion.h"
#include "xform.h"
#include "lldarrayptr.h"
+#include "llvertexbuffer.h"
+#include "llviewerimage.h"
#include "llpagemem.h"
#include "llstat.h"
#include "lldrawable.h"
-#define ENABLE_FACE_LINKING 1 // Causes problems with snapshot rendering
-
-class LLDrawPool;
+class LLFacePool;
class LLVolume;
class LLViewerImage;
class LLTextureEntry;
class LLVertexProgram;
class LLViewerImage;
+class LLGeometryManager;
class LLFace
{
@@ -38,26 +39,12 @@ public:
enum EMasks
{
- SHARED_GEOM = 0x0001,
- LIGHT = 0x0002,
- REBUILD = 0x0004,
- GLOBAL = 0x0008,
- VISIBLE = 0x0010,
- BACKLIST = 0x0020,
- INTERP = 0x0040,
- FULLBRIGHT = 0x0080,
- HUD_RENDER = 0x0100,
- USE_FACE_COLOR = 0x0200,
-
- POINT_SPRITE = 0x10000,
- BOARD_SPRITE = 0x20000,
- FIXED_SPRITE = 0x40000,
- DEPTH_SPRITE = 0x80000
- };
-
- enum EDirty
- {
- DIRTY = -2
+ LIGHT = 0x0001,
+ GLOBAL = 0x0002,
+ FULLBRIGHT = 0x0004,
+ HUD_RENDER = 0x0008,
+ USE_FACE_COLOR = 0x0010,
+ TEXTURE_ANIM = 0x0020,
};
static void initClass();
@@ -74,54 +61,64 @@ public:
const S32 getGeomIndex() const { return mGeomIndex; } // index into draw pool
const U32 getGeomStart() const { return mGeomIndex; } // index into draw pool
LLViewerImage* getTexture() const { return mTexture; }
+ void setTexture(LLViewerImage* tex) { mTexture = tex; }
LLXformMatrix* getXform() const { return mXform; }
BOOL hasGeometry() const { return mGeomCount > 0; }
LLVector3 getPositionAgent() const;
- void setPrimType(U32 primType) { mPrimType = primType; }
- const U32 getPrimType() const { return mPrimType; }
-
+
U32 getState() const { return mState; }
void setState(U32 state) { mState |= state; }
void clearState(U32 state) { mState &= ~state; }
- BOOL isState(U32 state) const { return ((mState & state) != 0); }
-
+ BOOL isState(U32 state) const { return ((mState & state) != 0) ? TRUE : FALSE; }
+ void setVirtualSize(F32 size) { mVSize = size; }
+ void setPixelArea(F32 area) { mPixelArea = area; }
+ F32 getVirtualSize() const { return mVSize; }
+ F32 getPixelArea() const { return mPixelArea; }
void bindTexture(S32 stage = 0) const { LLViewerImage::bindTexture(mTexture, stage); }
void enableLights() const;
void renderSetColor() const;
S32 renderElements(const U32 *index_array) const;
- S32 renderIndexed (const U32 *index_array) const;
+ S32 renderIndexed ();
+ S32 renderIndexed (U32 mask);
S32 pushVertices(const U32* index_array) const;
void setWorldMatrix(const LLMatrix4& mat);
const LLTextureEntry* getTextureEntry() const { return mVObjp->getTE(mTEOffset); }
- LLDrawPool* getPool() const { return mDrawPoolp; }
- S32 getStride() const { return mDrawPoolp->getStride(); }
- const U32* getRawIndices() const { return &mDrawPoolp->mIndices[mIndicesIndex]; }
+ LLFacePool* getPool() const { return mDrawPoolp; }
+ U32 getPoolType() const { return mPoolType; }
LLDrawable* getDrawable() const { return mDrawablep; }
LLViewerObject* getViewerObject() const { return mVObjp; }
-
- void clearDirty() { mGeneration = mDrawPoolp->mGeneration; };
-
- S32 backup();
- void restore();
+ S32 getLOD() const { return mVObjp.notNull() ? mVObjp->getLOD() : 0; }
+ LLVertexBuffer* getVertexBuffer() const { return mVertexBuffer; }
+ void setPoolType(U32 type) { mPoolType = type; }
+ S32 getTEOffset() { return mTEOffset; }
void setViewerObject(LLViewerObject* object);
- void setPool(LLDrawPool *pool, LLViewerImage *texturep);
+ void setPool(LLFacePool *pool, LLViewerImage *texturep);
+
void setDrawable(LLDrawable *drawable);
void setTEOffset(const S32 te_offset);
- S32 getTEOffset() { return mTEOffset; }
+
void setFaceColor(const LLColor4& color); // override material color
void unsetFaceColor(); // switch back to material color
const LLColor4& getFaceColor() const { return mFaceColor; }
const LLColor4& getRenderColor() const;
- void unReserve(); // Set Removed from pool
-
- BOOL reserveIfNeeded(); // Reserves data if dirty.
-
+ //for volumes
+ S32 getGeometryVolume(const LLVolume& volume,
+ S32 f,
+ LLStrider<LLVector3>& vertices,
+ LLStrider<LLVector3>& normals,
+ LLStrider<LLVector2>& texcoords,
+ LLStrider<LLVector2>& texcoords2,
+ LLStrider<LLColor4U>& colors,
+ LLStrider<U32>& indices,
+ const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
+ U32& index_offset);
+
// For avatar
S32 getGeometryAvatar(
LLStrider<LLVector3> &vertices,
@@ -137,69 +134,51 @@ public:
LLStrider<LLColor4U> &colors,
LLStrider<LLVector2> &texCoords0,
LLStrider<LLVector2> &texCoords1,
- U32* &indices);
+ LLStrider<U32> &indices);
// For volumes, etc.
S32 getGeometry(LLStrider<LLVector3> &vertices,
LLStrider<LLVector3> &normals,
LLStrider<LLVector2> &texCoords,
- U32* &indices);
+ LLStrider<U32> &indices);
S32 getGeometryColors(LLStrider<LLVector3> &vertices,
LLStrider<LLVector3> &normals,
LLStrider<LLVector2> &texCoords,
LLStrider<LLColor4U> &colors,
- U32* &indices);
+ LLStrider<U32> &indices);
- S32 getGeometryMultiTexture(LLStrider<LLVector3> &vertices,
- LLStrider<LLVector3> &normals,
- LLStrider<LLVector3> &binormals,
- LLStrider<LLVector2> &texCoords0,
- LLStrider<LLVector2> &texCoords1,
- U32* &indices);
-
-
- S32 getVertices (LLStrider<LLVector3> &vertices);
- S32 getColors (LLStrider<LLColor4U> &colors);
- S32 getIndices (U32* &indices);
+ S32 getVertices(LLStrider<LLVector3> &vertices);
+ S32 getColors(LLStrider<LLColor4U> &colors);
+ S32 getIndices(LLStrider<U32> &indices);
void setSize(const S32 numVertices, const S32 num_indices = 0);
- BOOL getDirty() const { return (mGeneration != mDrawPoolp->mGeneration); }
-
- BOOL genVolumeTriangles(const LLVolume &volume, S32 f,
- const LLMatrix4& mat, const LLMatrix3& inv_trans_mat, BOOL global_volume = FALSE);
- BOOL genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend,
+
+ BOOL genVolumeBBoxes(const LLVolume &volume, S32 f,
const LLMatrix4& mat, const LLMatrix3& inv_trans_mat, BOOL global_volume = FALSE);
- BOOL genLighting(const LLVolume* volume, const LLDrawable* drawablep, S32 fstart, S32 fend,
- const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, BOOL do_lighting);
-
- BOOL genShadows(const LLVolume* volume, const LLDrawable* drawablep, S32 fstart, S32 fend,
- const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, BOOL use_shadow_factor);
-
+
void init(LLDrawable* drawablep, LLViewerObject* objp);
void destroy();
void update();
void updateCenterAgent(); // Update center when xform has changed.
- void renderSelectedUV(const S32 offset = 0, const S32 count = 0);
+ void renderSelectedUV(const S32 offset = 0, const S32 count = 0);
- void renderForSelect() const;
+ void renderForSelect(U32 data_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
void renderSelected(LLImageGL *image, const LLColor4 &color, const S32 offset = 0, const S32 count = 0);
F32 getKey() const { return mDistance; }
- S32 getGeneration() const { return mGeneration; }
S32 getReferenceIndex() const { return mReferenceIndex; }
void setReferenceIndex(const S32 index) { mReferenceIndex = index; }
BOOL verify(const U32* indices_array = NULL) const;
void printDebugInfo() const;
- void link(LLFace* facep);
+ void setGeomIndex(S32 idx) { mGeomIndex = idx; }
+ void setIndicesIndex(S32 idx) { mIndicesIndex = idx; }
protected:
- S32 allocBackupMem(); // Allocate backup memory based on the draw pool information.
- void setDirty();
public:
LLVector3 mCenterLocal;
@@ -208,30 +187,39 @@ public:
LLVector2 mTexExtents[2];
F32 mDistance;
F32 mAlphaFade;
- LLFace* mNextFace;
- BOOL mSkipRender;
-
+ LLPointer<LLVertexBuffer> mVertexBuffer;
+ LLPointer<LLVertexBuffer> mLastVertexBuffer;
+ F32 mLastUpdateTime;
+
protected:
- S32 mGeneration;
+ friend class LLGeometryManager;
+ friend class LLVolumeGeometryManager;
+
U32 mState;
- LLDrawPool* mDrawPoolp;
- S32 mGeomIndex; // index into draw pool
+ LLFacePool* mDrawPoolp;
+ U32 mPoolType;
LLColor4 mFaceColor; // overrides material color if state |= USE_FACE_COLOR
- U32 mPrimType;
S32 mGeomCount; // vertex count for this face
+ S32 mGeomIndex; // index into draw pool
U32 mIndicesCount;
S32 mIndicesIndex; // index into draw pool for indices (yeah, I know!)
- LLXformMatrix* mXform;
- LLPointer<LLViewerImage> mTexture;
- U8 *mBackupMem;
+ //previous rebuild's geometry info
+ S32 mLastGeomCount;
+ S32 mLastGeomIndex;
+ U32 mLastIndicesCount;
+ S32 mLastIndicesIndex;
+ LLXformMatrix* mXform;
+ LLPointer<LLViewerImage> mTexture;
LLPointer<LLDrawable> mDrawablep;
LLPointer<LLViewerObject> mVObjp;
S32 mTEOffset;
S32 mReferenceIndex;
+ F32 mVSize;
+ F32 mPixelArea;
protected:
static BOOL sSafeRenderSelect;
@@ -245,6 +233,43 @@ public:
}
};
+ struct CompareTexture
+ {
+ bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+ {
+ return lhs->getTexture() < rhs->getTexture();
+ }
+ };
+
+ struct CompareTextureAndGeomCount
+ {
+ bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+ {
+ return lhs->getTexture() == rhs->getTexture() ?
+ lhs->getGeomCount() < rhs->getGeomCount() :
+ lhs->getTexture() > rhs->getTexture();
+ }
+ };
+
+ struct CompareTextureAndLOD
+ {
+ bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+ {
+ return lhs->getTexture() == rhs->getTexture() ?
+ lhs->getLOD() < rhs->getLOD() :
+ lhs->getTexture() < rhs->getTexture();
+ }
+ };
+
+ struct CompareTextureAndTime
+ {
+ bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+ {
+ return lhs->getTexture() == rhs->getTexture() ?
+ lhs->mLastUpdateTime < rhs->mLastUpdateTime :
+ lhs->getTexture() < rhs->getTexture();
+ }
+ };
};
#endif // LL_LLFACE_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:51:38 +0000