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

Merge pull request #4888 from sethalves/finglonger

Browse source 
more pointer.js fixes
This commit is contained in:
Philip Rosedale 2015-05-15 17:18:32 -07:00
commit 831148e280
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
examples/pointer.js
View file

@ -32,7 +32,7 @@ function createOrUpdateLine(event) {
Entities.editEntity(lineEntityID, {
position: nearLinePoint(intersection.intersection),
dimensions: dim,
lifetime: 60 + props.lifespan // renew lifetime
lifetime: 15 + props.lifespan // renew lifetime
});
} else {
lineIsRezzed = true;
@ -41,7 +41,7 @@ function createOrUpdateLine(event) {
position: nearLinePoint(intersection.intersection),
dimensions: dim,
color: { red: 255, green: 255, blue: 255 },
lifetime: 60 // if someone crashes while pointing, don't leave the line there forever.
lifetime: 15 // if someone crashes while pointing, don't leave the line there forever.
});
}
} else {
@ -54,13 +54,8 @@ function mousePressEvent(event) {
if (!event.isLeftButton) {
return;
}
if (lineIsRezzed) {
return;
}
Controller.mouseMoveEvent.connect(mouseMoveEvent);
createOrUpdateLine(event);
if (lineIsRezzed) {
Controller.mouseMoveEvent.connect(mouseMoveEvent);
}
}
@ -69,10 +64,11 @@ function mouseMoveEvent(event) {
}
function mouseReleaseEvent() {
if (lineIsRezzed) {
Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
function mouseReleaseEvent(event) {
if (!event.isLeftButton) {
return;
}
Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
removeLine();
}