diff options
author | Robin Cornelius | 2010-10-10 22:10:33 +0100 |
---|---|---|
committer | Robin Cornelius | 2010-10-10 22:10:33 +0100 |
commit | b3b30285126289f54b57bd42569bb0721e40e088 (patch) | |
tree | f4aaccb98d1a835c4ea376ec2803fc410a704052 /linden/indra/newview/lldrawpoolsky.h | |
parent | Merge branch 'mccabe-plugins' into plugins_merge (diff) | |
download | meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.zip meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.gz meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.bz2 meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.xz |
Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"
This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.
Conflicts:
linden/indra/newview/llsurface.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lldrawpoolsky.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linden/indra/newview/lldrawpoolsky.h b/linden/indra/newview/lldrawpoolsky.h index f35b114..8595d73 100644 --- a/linden/indra/newview/lldrawpoolsky.h +++ b/linden/indra/newview/lldrawpoolsky.h | |||
@@ -36,14 +36,12 @@ | |||
36 | #include "lldrawpool.h" | 36 | #include "lldrawpool.h" |
37 | 37 | ||
38 | class LLSkyTex; | 38 | class LLSkyTex; |
39 | class LLHeavenBody; | ||
40 | class LLGLSLShader; | 39 | class LLGLSLShader; |
41 | 40 | ||
42 | class LLDrawPoolSky : public LLFacePool | 41 | class LLDrawPoolSky : public LLFacePool |
43 | { | 42 | { |
44 | private: | 43 | private: |
45 | LLSkyTex *mSkyTex; | 44 | LLSkyTex *mSkyTex; |
46 | LLHeavenBody *mHB[2]; // Sun and Moon | ||
47 | LLGLSLShader *mShader; | 45 | LLGLSLShader *mShader; |
48 | 46 | ||
49 | public: | 47 | public: |
@@ -69,8 +67,6 @@ public: | |||
69 | /*virtual*/ void renderForSelect(); | 67 | /*virtual*/ void renderForSelect(); |
70 | /*virtual*/ void endRenderPass(S32 pass); | 68 | /*virtual*/ void endRenderPass(S32 pass); |
71 | void setSkyTex(LLSkyTex* const st) { mSkyTex = st; } | 69 | void setSkyTex(LLSkyTex* const st) { mSkyTex = st; } |
72 | void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; } | ||
73 | void setMoon(LLHeavenBody* moon) { mHB[1] = moon; } | ||
74 | 70 | ||
75 | void renderSkyCubeFace(U8 side); | 71 | void renderSkyCubeFace(U8 side); |
76 | void renderHeavenlyBody(U8 hb, LLFace* face); | 72 | void renderHeavenlyBody(U8 hb, LLFace* face); |