diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvograss.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h index 50d5460..023db03 100644 --- a/linden/indra/newview/llvograss.h +++ b/linden/indra/newview/llvograss.h | |||
@@ -36,7 +36,7 @@ class LLSurfacePatch; | |||
36 | class LLViewerImage; | 36 | class LLViewerImage; |
37 | 37 | ||
38 | 38 | ||
39 | class LLVOGrass : public LLViewerObject | 39 | class LLVOGrass : public LLAlphaObject |
40 | { | 40 | { |
41 | public: | 41 | public: |
42 | LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); | 42 | LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); |
@@ -46,6 +46,8 @@ public: | |||
46 | static void initClass(); | 46 | static void initClass(); |
47 | static void cleanupClass(); | 47 | static void cleanupClass(); |
48 | 48 | ||
49 | virtual U32 getPartitionType() const; | ||
50 | |||
49 | /*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys, | 51 | /*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys, |
50 | void **user_data, | 52 | void **user_data, |
51 | U32 block_num, | 53 | U32 block_num, |
@@ -53,11 +55,19 @@ public: | |||
53 | LLDataPacker *dp); | 55 | LLDataPacker *dp); |
54 | static void import(FILE *file, LLMessageSystem *mesgsys, const LLVector3 &pos); | 56 | static void import(FILE *file, LLMessageSystem *mesgsys, const LLVector3 &pos); |
55 | /*virtual*/ void exportFile(FILE *file, const LLVector3 &position); | 57 | /*virtual*/ void exportFile(FILE *file, const LLVector3 &position); |
56 | 58 | ||
59 | void updateDrawable(BOOL force_damped); | ||
57 | 60 | ||
58 | /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); | 61 | /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); |
59 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); | 62 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); |
60 | 63 | /*virtual*/ void getGeometry(S32 idx, | |
64 | LLStrider<LLVector3>& verticesp, | ||
65 | LLStrider<LLVector3>& normalsp, | ||
66 | LLStrider<LLVector2>& texcoordsp, | ||
67 | LLStrider<LLColor4U>& colorsp, | ||
68 | LLStrider<U32>& indicesp); | ||
69 | |||
70 | void updateFaceSize(S32 idx) { } | ||
61 | /*virtual*/ void updateTextures(LLAgent &agent); | 71 | /*virtual*/ void updateTextures(LLAgent &agent); |
62 | /*virtual*/ BOOL updateLOD(); | 72 | /*virtual*/ BOOL updateLOD(); |
63 | /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area | 73 | /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area |