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

Restore avatar overlays

Browse source
This commit is contained in:
Gabriel Calero 2018-02-19 16:12:41 -03:00
parent 82f9416b3f
commit 779e45aae7
3 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/RenderForwardTask.cpp
View file

@ -37,6 +37,7 @@ using namespace render;
extern void initForwardPipelines(ShapePlumber& plumber,
const render::ShapePipeline::BatchSetter& batchSetter,
const render::ShapePipeline::ItemSetter& itemSetter);
extern void initOverlay3DPipelines(render::ShapePlumber& plumber, bool depthTest = false);
void RenderForwardTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
auto items = input.get<Input>();
@ -45,6 +46,7 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
// Prepare the ShapePipelines
ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
initForwardPipelines(*shapePlumber, fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());
initOverlay3DPipelines(*shapePlumber);
// Extract opaques / transparents / lights / metas / overlays / background
const auto& opaques = items.get0()[RenderFetchCullSortTask::OPAQUE_SHAPE];

51
scripts/system/+android/radar.js
View file

@ -31,10 +31,11 @@ var PINCH_INCREMENT_FIRST = 0.4; // 0.1 meters zoom in - out
var PINCH_INCREMENT = 0.4; // 0.1 meters zoom in - out
var RADAR_HEIGHT_MAX_PLUS_AVATAR = 40;
var RADAR_HEIGHT_MIN_PLUS_AVATAR = 2;
var RADAR_CAMERA_DISTANCE_TO_ICONS = 0.5; // Icons are near the camera to prevent the LOD manager dismissing them
var RADAR_CAMERA_DISTANCE_TO_ICONS = 1.5; // Icons are near the camera to prevent the LOD manager dismissing them
var RADAR_ICONS_APPARENT_DISTANCE_TO_AVATAR_BASE = 1; // How much above the avatar base should the icon appear
var AVATAR_DISPLAY_NAME_HEIGHT = 38;
var AVATAR_DISPLAY_NAME_CHAR_WIDTH = 18;
var AVATAR_DISPLAY_NAME_FONT_SIZE = 350;
var lastDragAt;
var lastDeltaDrag;
@ -734,14 +735,15 @@ function saveAvatarData(QUuid) {
if (avatarsData[QUuid] != undefined) {
avatarsData[QUuid].position = avat.position;
} else {
var avatarIcon = Overlays.addOverlay("image3d", {
subImage: { x: 0, y: 0, width: 150, height: 142},
url: getAvatarIconForUser(QUuid),
dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
visible: false,
ignoreRayIntersection: false,
orientation: Quat.fromPitchYawRollDegrees(-90,0,0)
});
var avatarIcon = Overlays.addOverlay("circle3d", {
color: uniqueColor.convertHexToRGB(uniqueColor.getColor(QUuid)),
dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
innerRadius: 1.6,
outerRadius: 2,
isSolid: true,
visible: false
});
var needRefresh = !avat || !avat.displayName;
var displayName = avat && avat.displayName ? avat.displayName : "Unknown";
@ -752,7 +754,7 @@ function saveAvatarData(QUuid) {
color: { red: 255, green: 255, blue: 255},
backgroundAlpha: 0.0,
textRaiseColor: { red: 0, green: 0, blue: 0},
font: {size: 68, bold: true},
font: {size: AVATAR_DISPLAY_NAME_FONT_SIZE, bold: true},
visible: false,
text: displayName,
textAlignCenter: true
@ -833,15 +835,16 @@ function renderMyAvatarIcon() {
var x = (p1.x - borderPoints[0].x) * (Window.innerWidth) / (borderPoints[1].x - borderPoints[0].x);
var y = (p1.z - borderPoints[0].z) * (Window.innerHeight) / (borderPoints[1].z - borderPoints[0].z);
if (!myAvatarIcon && MyAvatar.sessionUUID) {
myAvatarIcon = Overlays.addOverlay("image3d", {
subImage: { x: 0, y: 0, width: 150, height: 142},
url: getAvatarIconForUser(MyAvatar.sessionUUID),
dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
visible: false,
ignoreRayIntersection: false,
orientation: Quat.fromPitchYawRollDegrees(-90,0,0)
});
if (!myAvatarIcon && MyAvatar.SELF_ID) {
myAvatarIcon = Overlays.addOverlay("circle3d", {
color: uniqueColor.convertHexToRGB(uniqueColor.getColor(MyAvatar.SELF_ID)),
dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
innerRadius: 1.6,
outerRadius: 2,
isSolid: true,
visible: false
});
}
if (!myAvatarName) {
@ -851,7 +854,7 @@ function renderMyAvatarIcon() {
textAlignCenter: true,
color: { red: 255, green: 255, blue: 255},
backgroundAlpha: 0.0,
font: {size: 68, bold: true},
font: {size: AVATAR_DISPLAY_NAME_FONT_SIZE, bold: true},
textRaiseColor: { red: 0, green: 0, blue: 0},
visible: false,
text: "Me"
@ -907,13 +910,13 @@ function renderAllOthersAvatarIcons() {
if (AvatarList.getAvatar(QUuid) != null) {
avatarPos = AvatarList.getAvatar(QUuid).position;
var cameraPos = Camera.position;
var p1 = findLineToHeightIntersectionCoords(avatarPos.x, avatarPos.y, avatarPos.z,
var cameraPos = Camera.position;
var p1 = findLineToHeightIntersectionCoords(avatarPos.x, avatarPos.y, avatarPos.z,
cameraPos.x, cameraPos.y, cameraPos.z,
commonY);
var x = (p1.x - borderPoints[0].x) * (Window.innerWidth) / (borderPoints[1].x - borderPoints[0].x);
var y = (p1.z - borderPoints[0].z) * (Window.innerHeight) / (borderPoints[1].z - borderPoints[0].z);
var x = (p1.x - borderPoints[0].x) * (Window.innerWidth) / (borderPoints[1].x - borderPoints[0].x);
var y = (p1.z - borderPoints[0].z) * (Window.innerHeight) / (borderPoints[1].z - borderPoints[0].z);
if (avatarsData[QUuid].icon != undefined) {
var iconPos = findLineToHeightIntersectionCoords( avatarPos.x, avatarPos.y + RADAR_ICONS_APPARENT_DISTANCE_TO_AVATAR_BASE, avatarPos.z,

10
scripts/system/+android/uniqueColor.js
View file

@ -41,6 +41,14 @@ function getColorForId(uuid) {
module.exports = {
getColor: function(id) {
return getColorForId(id);
return getColorForId(id);
},
convertHexToRGB: function(hex) {
var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
return result ? {
red: parseInt(result[1], 16),
green: parseInt(result[2], 16),
blue: parseInt(result[3], 16)
} : null;
}
};