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

making requested changes

Browse source
This commit is contained in:
Dante Ruiz 2018-11-09 09:27:55 -08:00
parent 10d045b11b
commit 1a95ee2b31
2 changed files with 5 additions and 5 deletions
interface/src/octree
SafeLanding.cpp
scripts/system
interstitialPage.js

4
interface/src/octree/SafeLanding.cpp
View file

@ -13,6 +13,7 @@
#include <NodeList.h>
#include <SharedUtil.h>
#include <NumericalConstants.h>
#include "EntityTreeRenderer.h"
#include "RenderableModelEntityItem.h"
@ -21,7 +22,6 @@
const int SafeLanding::SEQUENCE_MODULO = std::numeric_limits<OCTREE_PACKET_SEQUENCE>::max() + 1;
const quint64 MAX_ELAPSED_TIME = 1000; // msec
const quint64 MICRO_TO_MILI_SECONDS = 1000;
namespace {
template<typename T> bool lessThanWraparound(int a, int b) {
@ -110,7 +110,7 @@ void SafeLanding::noteReceivedsequenceNumber(int sequenceNumber) {
}
bool SafeLanding::isLoadSequenceComplete() {
quint64 elapsedTime = (usecTimestampNow() - _startTime) / MICRO_TO_MILI_SECONDS;
quint64 elapsedTime = (usecTimestampNow() - _startTime) / USECS_PER_MSEC;
if ((isEntityLoadingComplete() && isSequenceNumbersComplete()) ||
(elapsedTime >= MAX_ELAPSED_TIME && isEntityServerNotRunning() && _sequenceNumbers.empty())) {
Locker lock(_lock);

6
scripts/system/interstitialPage.js
View file

@ -15,7 +15,7 @@
(function() {
Script.include("/~/system/libraries/Xform.js");
Script.include("/~/system/libraries/globals.js");
var DEBUG = true;
var DEBUG = false;
var TOTAL_LOADING_PROGRESS = 3.7;
var EPSILON = 0.05;
var TEXTURE_EPSILON = 0.01;
@ -197,7 +197,7 @@
var loadingBarProgress = Overlays.addOverlay("image3d", {
name: "Loading-Bar-Progress",
localPosition: { x: 0.0, y: -0.86, z: 0.0 },
localPosition: { x: 0.0, y: -0.91, z: 0.0 },
url: LOADING_BAR_PROGRESS,
alpha: 1,
dimensions: { x: TOTAL_LOADING_PROGRESS, y: 0.3},
@ -482,7 +482,7 @@
var end = 0;
var xLocalPosition = (progressPercentage * (end - start)) + start;
var properties = {
localPosition: { x: xLocalPosition, y: -0.93, z: 0.0 },
localPosition: { x: xLocalPosition, y: -0.91, z: 0.0 },
dimensions: {
x: progress,
y: 0.3