diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/lldrawpoolclouds.cpp | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/lldrawpoolclouds.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolclouds.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/linden/indra/newview/lldrawpoolclouds.cpp b/linden/indra/newview/lldrawpoolclouds.cpp index 7d877ee..83ef2b3 100644 --- a/linden/indra/newview/lldrawpoolclouds.cpp +++ b/linden/indra/newview/lldrawpoolclouds.cpp | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "pipeline.h" | 36 | #include "pipeline.h" |
37 | 37 | ||
38 | LLDrawPoolClouds::LLDrawPoolClouds() : | 38 | LLDrawPoolClouds::LLDrawPoolClouds() : |
39 | LLDrawPool(POOL_CLOUDS, DATA_SIMPLE_IL_MASK, 0) | 39 | LLDrawPool(POOL_CLOUDS) |
40 | { | 40 | { |
41 | } | 41 | } |
42 | 42 | ||
@@ -45,16 +45,15 @@ LLDrawPool *LLDrawPoolClouds::instancePool() | |||
45 | return new LLDrawPoolClouds(); | 45 | return new LLDrawPoolClouds(); |
46 | } | 46 | } |
47 | 47 | ||
48 | BOOL LLDrawPoolClouds::addFace(LLFace* face) | ||
49 | { | ||
50 | llerrs << "WTF?" << llendl; | ||
51 | return FALSE; | ||
52 | } | ||
53 | |||
48 | void LLDrawPoolClouds::enqueue(LLFace *facep) | 54 | void LLDrawPoolClouds::enqueue(LLFace *facep) |
49 | { | 55 | { |
50 | if (facep->isState(LLFace::BACKLIST)) | 56 | mDrawFace.push_back(facep); |
51 | { | ||
52 | mMoveFace.put(facep); | ||
53 | } | ||
54 | else | ||
55 | { | ||
56 | mDrawFace.push_back(facep); | ||
57 | } | ||
58 | facep->mDistance = (facep->mCenterAgent - gCamera->getOrigin()) * gCamera->getAtAxis(); | 57 | facep->mDistance = (facep->mCenterAgent - gCamera->getOrigin()) * gCamera->getAtAxis(); |
59 | } | 58 | } |
60 | 59 | ||
@@ -90,10 +89,6 @@ void LLDrawPoolClouds::render(S32 pass) | |||
90 | gPipeline.enableLightsFullbright(LLColor4(1.f,1.f,1.f)); | 89 | gPipeline.enableLightsFullbright(LLColor4(1.f,1.f,1.f)); |
91 | 90 | ||
92 | mDrawFace[0]->bindTexture(); | 91 | mDrawFace[0]->bindTexture(); |
93 | |||
94 | bindGLVertexPointer(); | ||
95 | bindGLTexCoordPointer(); | ||
96 | bindGLNormalPointer(); | ||
97 | 92 | ||
98 | std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater()); | 93 | std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater()); |
99 | 94 | ||