diff options
Diffstat (limited to 'linden/indra/newview/llvowater.h')
-rw-r--r-- | linden/indra/newview/llvowater.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/linden/indra/newview/llvowater.h b/linden/indra/newview/llvowater.h index 9c33e74..55ce6d7 100644 --- a/linden/indra/newview/llvowater.h +++ b/linden/indra/newview/llvowater.h | |||
@@ -35,6 +35,7 @@ | |||
35 | 35 | ||
36 | #include "llviewerobject.h" | 36 | #include "llviewerobject.h" |
37 | #include "llviewerimage.h" | 37 | #include "llviewerimage.h" |
38 | #include "pipeline.h" | ||
38 | #include "v2math.h" | 39 | #include "v2math.h" |
39 | 40 | ||
40 | const U32 N_RES = 16; //32 // number of subdivisions of wave tile | 41 | const U32 N_RES = 16; //32 // number of subdivisions of wave tile |
@@ -71,7 +72,7 @@ public: | |||
71 | /*virtual*/ void updateTextures(); | 72 | /*virtual*/ void updateTextures(); |
72 | /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area | 73 | /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area |
73 | 74 | ||
74 | virtual U32 getPartitionType() const; | 75 | /*virtual*/ U32 getPartitionType() const; |
75 | 76 | ||
76 | /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. | 77 | /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. |
77 | 78 | ||
@@ -83,6 +84,18 @@ public: | |||
83 | protected: | 84 | protected: |
84 | BOOL mUseTexture; | 85 | BOOL mUseTexture; |
85 | BOOL mIsEdgePatch; | 86 | BOOL mIsEdgePatch; |
87 | LLPipeline::LLRenderTypeMask mRenderType; | ||
88 | }; | ||
89 | |||
90 | class LLVOVoidWater : public LLVOWater | ||
91 | { | ||
92 | public: | ||
93 | LLVOVoidWater(LLUUID const& id, LLPCode pcode, LLViewerRegion* regionp) : LLVOWater(id, pcode, regionp) | ||
94 | { | ||
95 | mRenderType = LLPipeline::RENDER_TYPE_VOIDWATER; | ||
96 | } | ||
97 | |||
98 | /*virtual*/ U32 getPartitionType() const; | ||
86 | }; | 99 | }; |
87 | 100 | ||
88 | #endif // LL_VOSURFACEPATCH_H | 101 | #endif // LL_VOSURFACEPATCH_H |