From 9fe094dcc83fbae889d39982ebe51cf6e8bf5eb8 Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Mon, 19 Oct 2020 15:43:15 -0400 Subject: [PATCH] Small cleanup to LLVOAvatar::renderImpostor. Thanks Ansa! --- indra/newview/llvoavatar.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 16aacd62974..f2440c2854e 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5168,10 +5168,12 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color, S32 diffuse_channel) return 0; } + auto& camera = LLViewerCamera::instance(); + LLVector3 pos(getRenderPosition()+mImpostorOffset); - LLVector3 at = (pos - LLViewerCamera::getInstance()->getOrigin()); + LLVector3 at = (pos - camera.getOrigin()); at.normalize(); - LLVector3 left = LLViewerCamera::getInstance()->getUpAxis() % at; + LLVector3 left = camera.getUpAxis() % at; LLVector3 up = at%left; left *= mImpostorDim.mV[0]; @@ -5190,11 +5192,11 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color, S32 diffuse_channel) // gGL.vertex3fv((pos+left+up).mV); // gGL.end(); + F32 thickness = llmax(F32(5.0f - 5.0f * (gFrameTimeSeconds - mLastImpostorUpdateFrameTime)), 1.0f); + gGL.setLineWidth(thickness); gGL.begin(LLRender::LINES); gGL.color4f(1.f,1.f,1.f,1.f); - F32 thickness = llmax(F32(5.0f-5.0f*(gFrameTimeSeconds-mLastImpostorUpdateFrameTime)),1.0f); - gGL.setLineWidth(thickness); gGL.vertex3fv((pos+left-up).mV); gGL.vertex3fv((pos-left-up).mV); gGL.vertex3fv((pos-left-up).mV); -- GitLab