diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-19 12:10:40 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-19 12:10:40 -0700 |
| commit | 3f186aab7737d611e1b8a62e66a79828e3b5ef5b (patch) | |
| tree | a42a19d1ff584a2d074ef9c07f166d0ad47dc7a2 /indra/newview/pipeline.h | |
| parent | 80256fdbf5fe444c177be793b12d0da58ce2b608 (diff) | |
| parent | 171089207b528ab80a954292c127ba77254ee927 (diff) | |
Merge in viewer-release
Diffstat (limited to 'indra/newview/pipeline.h')
| -rwxr-xr-x | indra/newview/pipeline.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 5e68524067..f0bebbe20d 100755 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -58,6 +58,7 @@ class LLRenderFunc; class LLCubeMap; class LLCullResult; class LLVOAvatar; +class LLVOPartGroup; class LLGLSLShader; class LLCurlRequest; class LLDrawPoolAlpha; @@ -202,6 +203,12 @@ public: LLVector4a* normal = NULL, // return the surface normal at the intersection point LLVector4a* tangent = NULL // return the surface tangent at the intersection point ); + + //get the closest particle to start between start and end, returns the LLVOPartGroup and particle index + LLVOPartGroup* lineSegmentIntersectParticle(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection, + S32* face_hit); + + LLViewerObject* lineSegmentIntersectInHUD(const LLVector4a& start, const LLVector4a& end, BOOL pick_transparent, S32* face_hit, // return the face hit @@ -288,8 +295,7 @@ public: void unbindDeferredShader(LLGLSLShader& shader); void renderDeferredLighting(); - void renderDeferredLightingToRT(LLRenderTarget* target); - + void generateWaterReflection(LLCamera& camera); void generateSunShadow(LLCamera& camera); void generateHighlight(LLCamera& camera); @@ -588,7 +594,6 @@ public: static BOOL sPickAvatar; static BOOL sReflectionRender; static BOOL sImpostorRender; - static BOOL sImpostorRenderAlphaDepthPass; static BOOL sUnderWaterRender; static BOOL sRenderGlow; static BOOL sTextureBindTest; @@ -912,6 +917,7 @@ public: static F32 RenderGlowWidth; static F32 RenderGlowStrength; static BOOL RenderDepthOfField; + static BOOL RenderDepthOfFieldInEditMode; static F32 CameraFocusTransitionTime; static F32 CameraFNumber; static F32 CameraFocalLength; @@ -956,4 +962,3 @@ extern BOOL gDebugPipeline; extern const LLMatrix4* gGLLastMatrix; #endif - |