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

Merge branch 'master' of github.com:highfidelity/hifi into motor-action

Browse source
This commit is contained in:
Seth Alves 2017-05-01 09:52:53 -07:00
commit 128d9b02ec
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/recording/src/recording/Deck.cpp
View file

@ -166,6 +166,12 @@ void Deck::processFrames() {
if (!overLimit) { if (!overLimit) {
auto nextFrameTime = nextClip->positionFrameTime(); auto nextFrameTime = nextClip->positionFrameTime();
nextInterval = (int)Frame::frameTimeToMilliseconds(nextFrameTime - _position); nextInterval = (int)Frame::frameTimeToMilliseconds(nextFrameTime - _position);
if (nextInterval < 0) {
qCWarning(recordingLog) << "Unexpected nextInterval < 0 nextFrameTime:" << nextFrameTime
<< "_position:" << _position << "-- setting nextInterval to 0";
nextInterval = 0;
}
#ifdef WANT_RECORDING_DEBUG #ifdef WANT_RECORDING_DEBUG
qCDebug(recordingLog) << "Now " << _position; qCDebug(recordingLog) << "Now " << _position;
qCDebug(recordingLog) << "Next frame time " << nextInterval; qCDebug(recordingLog) << "Next frame time " << nextInterval;

8
scripts/system/makeUserConnection.js
View file

@ -13,7 +13,7 @@
var LABEL = "makeUserConnection"; var LABEL = "makeUserConnection";
var MAX_AVATAR_DISTANCE = 0.2; // m var MAX_AVATAR_DISTANCE = 0.2; // m
var GRIP_MIN = 0.05; // goes from 0-1, so 5% pressed is pressed var GRIP_MIN = 0.75; // goes from 0-1, so 75% pressed is pressed
var MESSAGE_CHANNEL = "io.highfidelity.makeUserConnection"; var MESSAGE_CHANNEL = "io.highfidelity.makeUserConnection";
var STATES = { var STATES = {
INACTIVE: 0, INACTIVE: 0,
@ -592,7 +592,11 @@
Window.makeConnection(false, result.connection); Window.makeConnection(false, result.connection);
UserActivityLogger.makeUserConnection(connectingId, false, result.connection); UserActivityLogger.makeUserConnection(connectingId, false, result.connection);
} }
var POLL_INTERVAL_MS = 200, POLL_LIMIT = 5; // This is a bit fragile - but to account for skew in when people actually create the
// connection request, I've upped this to 2 seconds (plus the round-trip times)
// TODO: keep track of when the person we are connecting with is done, and don't stop
// until say 1 second after that.
var POLL_INTERVAL_MS = 200, POLL_LIMIT = 10;
function handleConnectionResponseAndMaybeRepeat(error, response) { function handleConnectionResponseAndMaybeRepeat(error, response) {
// If response is 'pending', set a short timeout to try again. // If response is 'pending', set a short timeout to try again.
// If we fail other than pending, set result and immediately call connectionRequestCompleted. // If we fail other than pending, set result and immediately call connectionRequestCompleted.