From e8eac7db3432a56d131a645b35eb8428c38d98a5 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 5 Aug 2015 13:40:57 -0700 Subject: [PATCH] Render look-at vectors and target in first person view --- interface/src/avatar/Avatar.cpp | 2 ++ interface/src/avatar/Head.cpp | 3 +++ interface/src/avatar/Head.h | 1 + interface/src/avatar/MyAvatar.cpp | 1 + 4 files changed, 7 insertions(+) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index abb671f207..ecae0b017e 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -603,7 +603,9 @@ void Avatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, floa getHand()->render(renderArgs, false); } + getHead()->render(renderArgs, 1.0f, renderFrustum); + getHead()->renderLookAts(renderArgs); } bool Avatar::shouldRenderHead(const RenderArgs* renderArgs) const { diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp index 46f38acb33..bdd53cfd7f 100644 --- a/interface/src/avatar/Head.cpp +++ b/interface/src/avatar/Head.cpp @@ -303,6 +303,9 @@ void Head::relaxLean(float deltaTime) { } void Head::render(RenderArgs* renderArgs, float alpha, ViewFrustum* renderFrustum) { +} + +void Head::renderLookAts(RenderArgs* renderArgs) { if (_renderLookatVectors) { renderLookatVectors(renderArgs, _leftEyePosition, _rightEyePosition, getCorrectedLookAtPosition()); } diff --git a/interface/src/avatar/Head.h b/interface/src/avatar/Head.h index dff4702246..43042422d5 100644 --- a/interface/src/avatar/Head.h +++ b/interface/src/avatar/Head.h @@ -40,6 +40,7 @@ public: void setReturnToCenter (bool returnHeadToCenter) { _returnHeadToCenter = returnHeadToCenter; } void setRenderLookatVectors(bool onOff) { _renderLookatVectors = onOff; } void setRenderLookatTarget(bool onOff) { _renderLookatTarget = onOff; } + void renderLookAts(RenderArgs* renderArgs); /// \return orientationBase+Delta glm::quat getFinalOrientationInLocalFrame() const; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 2d7cf4ca5e..b1c2d113f9 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1160,6 +1160,7 @@ void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, fl if (shouldRenderHead(renderArgs)) { getHead()->render(renderArgs, 1.0f, renderFrustum); } + getHead()->renderLookAts(renderArgs); getHand()->render(renderArgs, true); }