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

Tune radar styles

Browse source
This commit is contained in:
Gabriel Calero 2018-02-20 19:07:41 -03:00
parent 5e3ad3fe9a
commit bd9d8ac4f9
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/AddressManager.cpp
View file

@ -107,7 +107,7 @@ void AddressManager::loadSettings(const QString& lookupString) {
#if defined(USE_GLES) && defined(Q_OS_WIN) #if defined(USE_GLES) && defined(Q_OS_WIN)
handleUrl(QUrl("hifi://127.0.0.0"), LookupTrigger::StartupFromSettings); handleUrl(QUrl("hifi://127.0.0.0"), LookupTrigger::StartupFromSettings);
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID)
handleUrl(QUrl("hifi://dev-android"), LookupTrigger::StartupFromSettings); handleUrl(QUrl(DEFAULT_HIFI_ADDRESS), LookupTrigger::StartupFromSettings);
#else #else
if (lookupString.isEmpty()) { if (lookupString.isEmpty()) {
handleUrl(currentAddressHandle.get(), LookupTrigger::StartupFromSettings); handleUrl(currentAddressHandle.get(), LookupTrigger::StartupFromSettings);

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

@ -33,9 +33,9 @@ var RADAR_HEIGHT_MAX_PLUS_AVATAR = 80;
var RADAR_HEIGHT_MIN_PLUS_AVATAR = 2; var RADAR_HEIGHT_MIN_PLUS_AVATAR = 2;
var RADAR_CAMERA_DISTANCE_TO_ICONS = 1.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 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_HEIGHT = 106;
var AVATAR_DISPLAY_NAME_CHAR_WIDTH = 18; var AVATAR_DISPLAY_NAME_CHAR_WIDTH = 48;
var AVATAR_DISPLAY_NAME_FONT_SIZE = 350; var AVATAR_DISPLAY_NAME_FONT_SIZE = 50;
var lastDragAt; var lastDragAt;
var lastDeltaDrag; var lastDeltaDrag;
@ -739,7 +739,7 @@ function saveAvatarData(QUuid) {
color: uniqueColor.convertHexToRGB(uniqueColor.getColor(QUuid)), color: uniqueColor.convertHexToRGB(uniqueColor.getColor(QUuid)),
dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS, dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0), rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
innerRadius: 1.6, innerRadius: 1.8,
outerRadius: 2, outerRadius: 2,
isSolid: true, isSolid: true,
visible: false visible: false
@ -812,8 +812,9 @@ function avatarRemoved(QUuid) {
var myAvatarIcon; var myAvatarIcon;
var myAvatarName; var myAvatarName;
function distanceForCameraHeight(h) { function distanceForCameraHeight(h) {
if (h < 10) return 1; if (h < 30) return 1;
if (h < 50) return 2; if (h < 40) return 2;
if (h < 50) return 2.5;
return 5; return 5;
} }
function renderMyAvatarIcon() { function renderMyAvatarIcon() {
@ -844,7 +845,7 @@ function renderMyAvatarIcon() {
color: uniqueColor.convertHexToRGB(uniqueColor.getColor(MyAvatar.SELF_ID)), color: uniqueColor.convertHexToRGB(uniqueColor.getColor(MyAvatar.SELF_ID)),
dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS, dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0), rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
innerRadius: 1.6, innerRadius: 1.8,
outerRadius: 2, outerRadius: 2,
isSolid: true, isSolid: true,
visible: false visible: false
@ -853,7 +854,7 @@ function renderMyAvatarIcon() {
if (!myAvatarName) { if (!myAvatarName) {
myAvatarName = Overlays.addOverlay("text", { myAvatarName = Overlays.addOverlay("text", {
width: 40, width: 100,
height: AVATAR_DISPLAY_NAME_HEIGHT, height: AVATAR_DISPLAY_NAME_HEIGHT,
textAlignCenter: true, textAlignCenter: true,
color: { red: 255, green: 255, blue: 255}, color: { red: 255, green: 255, blue: 255},