diff options
| author | prep <prep@lindenlab.com> | 2012-06-07 11:00:58 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-07 11:00:58 -0400 |
| commit | 18509683267385212c6f8652a8da0ab5bf88eb8a (patch) | |
| tree | beb5fa197a944769b8301e2cb840b4cdd04d6dfa /indra/newview/pipeline.cpp | |
| parent | 208d73f52497c7e4c15f21843428ffa6a3db7aaa (diff) | |
Physics capsules now inherit the rotations of their parent vo when rendered. API update.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 3531599764..708bb20bc2 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4377,24 +4377,27 @@ void LLPipeline::renderDebug() gPathfindingProgram.uniform1f("alpha_scale", 1.f); } - LLUUID id; + //Requried character physics capsule render parameters + LLUUID id; LLVector3 pos; - if ( pathfindingCharacter->isPhysicsCapsuleEnabled( id, pos ) ) - { + LLQuaternion rot; + + if ( pathfindingCharacter->isPhysicsCapsuleEnabled( id, pos, rot ) ) + { if (LLGLSLShader::sNoFixedFunction) { //remove blending artifacts gGL.setColorMask(false, false); - llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos ); + llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos, rot ); gGL.setColorMask(true, false); LLGLEnable blend(GL_BLEND); gPathfindingProgram.uniform1f("alpha_scale", 0.90f); - llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos ); + llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos, rot ); gPathfindingProgram.bind(); } else { - llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos ); + llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos, rot ); } } } |