diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llvosurfacepatch.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llvosurfacepatch.h')
| -rw-r--r-- | indra/newview/llvosurfacepatch.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llvosurfacepatch.h b/indra/newview/llvosurfacepatch.h index ad2331ffed..ede01eb1a9 100644 --- a/indra/newview/llvosurfacepatch.h +++ b/indra/newview/llvosurfacepatch.h @@ -42,6 +42,8 @@ class LLVector2; class LLVOSurfacePatch : public LLStaticViewerObject { public: + static F32 sLODFactor; + enum { VERTEX_DATA_MASK = (1 << LLVertexBuffer::TYPE_VERTEX) | @@ -69,7 +71,7 @@ public: LLStrider<LLColor4U> &colorsp, LLStrider<LLVector2> &texCoords0p, LLStrider<LLVector2> &texCoords1p, - LLStrider<U32> &indicesp); + LLStrider<U16> &indicesp); /*virtual*/ void updateTextures(LLAgent &agent); /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area @@ -99,8 +101,6 @@ protected: S32 mLastStride; S32 mLastLength; - void calcColor(const LLVector3* vertex, const LLVector3* normal, LLColor4U* colorp); - BOOL updateShadows(BOOL use_shadow_factor = FALSE); void getGeomSizesMain(const S32 stride, S32 &num_vertices, S32 &num_indices); void getGeomSizesNorth(const S32 stride, const S32 north_stride, S32 &num_vertices, S32 &num_indices); @@ -113,7 +113,7 @@ protected: LLStrider<LLColor4U> &colorsp, LLStrider<LLVector2> &texCoords0p, LLStrider<LLVector2> &texCoords1p, - LLStrider<U32> &indicesp, + LLStrider<U16> &indicesp, U32 &index_offset); void updateNorthGeometry(LLFace *facep, LLStrider<LLVector3> &verticesp, @@ -121,7 +121,7 @@ protected: LLStrider<LLColor4U> &colorsp, LLStrider<LLVector2> &texCoords0p, LLStrider<LLVector2> &texCoords1p, - LLStrider<U32> &indicesp, + LLStrider<U16> &indicesp, U32 &index_offset); void updateEastGeometry(LLFace *facep, LLStrider<LLVector3> &verticesp, @@ -129,7 +129,7 @@ protected: LLStrider<LLColor4U> &colorsp, LLStrider<LLVector2> &texCoords0p, LLStrider<LLVector2> &texCoords1p, - LLStrider<U32> &indicesp, + LLStrider<U16> &indicesp, U32 &index_offset); }; |