diff options
Diffstat (limited to 'linden/indra/newview/lldrawpoolsky.h')
-rw-r--r-- | linden/indra/newview/lldrawpoolsky.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/linden/indra/newview/lldrawpoolsky.h b/linden/indra/newview/lldrawpoolsky.h index 2b22060..8595d73 100644 --- a/linden/indra/newview/lldrawpoolsky.h +++ b/linden/indra/newview/lldrawpoolsky.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -35,21 +36,19 @@ | |||
35 | #include "lldrawpool.h" | 36 | #include "lldrawpool.h" |
36 | 37 | ||
37 | class LLSkyTex; | 38 | class LLSkyTex; |
38 | class LLHeavenBody; | ||
39 | class LLGLSLShader; | 39 | class LLGLSLShader; |
40 | 40 | ||
41 | class LLDrawPoolSky : public LLFacePool | 41 | class LLDrawPoolSky : public LLFacePool |
42 | { | 42 | { |
43 | private: | 43 | private: |
44 | LLSkyTex *mSkyTex; | 44 | LLSkyTex *mSkyTex; |
45 | LLHeavenBody *mHB[2]; // Sun and Moon | ||
46 | LLGLSLShader *mShader; | 45 | LLGLSLShader *mShader; |
47 | 46 | ||
48 | public: | 47 | public: |
49 | enum | 48 | enum |
50 | { | 49 | { |
51 | VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | | 50 | VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | |
52 | LLVertexBuffer::MAP_TEXCOORD | 51 | LLVertexBuffer::MAP_TEXCOORD0 |
53 | }; | 52 | }; |
54 | 53 | ||
55 | virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } | 54 | virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } |
@@ -58,13 +57,16 @@ public: | |||
58 | 57 | ||
59 | /*virtual*/ LLDrawPool *instancePool(); | 58 | /*virtual*/ LLDrawPool *instancePool(); |
60 | 59 | ||
60 | /*virtual*/ S32 getNumPostDeferredPasses() { return getNumPasses(); } | ||
61 | /*virtual*/ void beginPostDeferredPass(S32 pass) { beginRenderPass(pass); } | ||
62 | /*virtual*/ void endPostDeferredPass(S32 pass) { endRenderPass(pass); } | ||
63 | /*virtual*/ void renderPostDeferred(S32 pass) { render(pass); } | ||
64 | |||
61 | /*virtual*/ void prerender(); | 65 | /*virtual*/ void prerender(); |
62 | /*virtual*/ void render(S32 pass = 0); | 66 | /*virtual*/ void render(S32 pass = 0); |
63 | /*virtual*/ void renderForSelect(); | 67 | /*virtual*/ void renderForSelect(); |
64 | /*virtual*/ void endRenderPass(S32 pass); | 68 | /*virtual*/ void endRenderPass(S32 pass); |
65 | void setSkyTex(LLSkyTex* const st) { mSkyTex = st; } | 69 | void setSkyTex(LLSkyTex* const st) { mSkyTex = st; } |
66 | void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; } | ||
67 | void setMoon(LLHeavenBody* moon) { mHB[1] = moon; } | ||
68 | 70 | ||
69 | void renderSkyCubeFace(U8 side); | 71 | void renderSkyCubeFace(U8 side); |
70 | void renderHeavenlyBody(U8 hb, LLFace* face); | 72 | void renderHeavenlyBody(U8 hb, LLFace* face); |