From 2cea83a5991e384931f503ecf8fc5c9964ce7760 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 24 Feb 2014 13:36:43 -0800 Subject: [PATCH] Proper header on ribbon.js, show display name for own avatar. --- examples/ribbon.js | 8 +++++++- interface/src/avatar/Avatar.h | 4 ++-- interface/src/avatar/MyAvatar.cpp | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/examples/ribbon.js b/examples/ribbon.js index 53f890c368..7858c744fe 100644 --- a/examples/ribbon.js +++ b/examples/ribbon.js @@ -1,4 +1,10 @@ -// Draws a screensavery rainbow ribbon. +// +// ribbon.js +// hifi +// +// Created by Andrzej Kapolka on 2/24/14. +// Copyright (c) 2014 High Fidelity, Inc. All rights reserved. +// function vectorMultiply(vector, scalar) { return [ vector[0] * scalar, vector[1] * scalar, vector[2] * scalar ]; diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index be98254696..9a693f4a86 100755 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -171,6 +171,8 @@ protected: float getPelvisFloatingHeight() const; float getPelvisToHeadLength() const; + void renderDisplayName(); + private: bool _initialized; @@ -178,8 +180,6 @@ private: void renderBody(); void renderBillboard(); - - void renderDisplayName(); }; #endif diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 50b182c20c..ccd7524c4b 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -480,8 +480,8 @@ void MyAvatar::render(bool forceRenderHead) { if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) { renderBody(forceRenderHead); } - - //renderDebugBodyPoints(); + setShowDisplayName(true); + renderDisplayName(); if (!_chatMessage.empty()) { int width = 0;