Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:29:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix debugAvatarMixer.js

Browse source
This commit is contained in:
SamGondelman 2019-03-06 15:53:25 -08:00
parent a54171d60c
commit 96eb137df2
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/ui/overlays/Overlays.cpp
View file

@ -204,7 +204,8 @@ QString Overlays::overlayToEntityType(const QString& type) {
#define RENAME_PROP(o, e) \ #define RENAME_PROP(o, e) \
{ \ { \
auto iter = overlayProps.find(#o); \ auto iter = overlayProps.find(#o); \
if (iter != overlayProps.end()) { \ if (iter != overlayProps.end() && \
!overlayProps.contains(#e)) { \
overlayProps[#e] = iter.value(); \ overlayProps[#e] = iter.value(); \
} \ } \
} }

19
scripts/developer/debugging/debugAvatarMixer.js
View file

@ -19,6 +19,11 @@ Script.include("/~/system/libraries/controllers.js");
var isShowingOverlays = true; var isShowingOverlays = true;
var debugOverlays = {}; var debugOverlays = {};
var textSizeOverlay = Overlays.addOverlay("text3d", {
position: MyAvatar.position,
lineHeight: 0.1,
visible: false
});
function removeOverlays() { function removeOverlays() {
// enumerate the overlays and remove them // enumerate the overlays and remove them
@ -31,6 +36,8 @@ function removeOverlays() {
} }
} }
Overlays.deleteOverlay(textSizeOverlay);
debugOverlays = {}; debugOverlays = {};
} }
@ -60,8 +67,6 @@ function updateOverlays() {
var overlayPosition = avatar.getJointPosition("Head"); var overlayPosition = avatar.getJointPosition("Head");
overlayPosition.y += 1.15; overlayPosition.y += 1.15;
var rows = 8;
var text = avatarID + "\n" var text = avatarID + "\n"
+"--- Data from Mixer ---\n" +"--- Data from Mixer ---\n"
+"All: " + AvatarManager.getAvatarDataRate(avatarID).toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID).toFixed(2) + "hz)" + "\n" +"All: " + AvatarManager.getAvatarDataRate(avatarID).toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID).toFixed(2) + "hz)" + "\n"
@ -85,9 +90,11 @@ function updateOverlays() {
//+" SM: " + AvatarManager.getAvatarSimulationRate(avatarID,"skeletonModel").toFixed(2) + "hz \n" //+" SM: " + AvatarManager.getAvatarSimulationRate(avatarID,"skeletonModel").toFixed(2) + "hz \n"
+" JD: " + AvatarManager.getAvatarSimulationRate(avatarID,"jointData").toFixed(2) + "hz \n" +" JD: " + AvatarManager.getAvatarSimulationRate(avatarID,"jointData").toFixed(2) + "hz \n"
var dimensions = Overlays.textSize(textSizeOverlay, text);
if (avatarID in debugOverlays) { if (avatarID in debugOverlays) {
// keep the overlay above the current position of this avatar // keep the overlay above the current position of this avatar
Overlays.editOverlay(debugOverlays[avatarID][0], { Overlays.editOverlay(debugOverlays[avatarID][0], {
dimensions: { x: 1.1 * dimensions.width, y: 0.6 * dimensions.height },
position: overlayPosition, position: overlayPosition,
text: text text: text
}); });
@ -95,15 +102,9 @@ function updateOverlays() {
// add the overlay above this avatar // add the overlay above this avatar
var newOverlay = Overlays.addOverlay("text3d", { var newOverlay = Overlays.addOverlay("text3d", {
position: overlayPosition, position: overlayPosition,
dimensions: { dimensions: { x: 1.1 * dimensions.width, y: 0.6 * dimensions.height },
x: 1.25,
y: rows * 0.13
},
lineHeight: 0.1, lineHeight: 0.1,
font:{size:0.1},
text: text, text: text,
size: 1,
scale: 0.4,
color: { red: 255, green: 255, blue: 255}, color: { red: 255, green: 255, blue: 255},
alpha: 1, alpha: 1,
solid: true, solid: true,