mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 03:44:02 +02:00
more sitting work
This commit is contained in:
parent
e41d3f407b
commit
aad666be62
1 changed files with 177 additions and 7 deletions
184
examples/sit.js
184
examples/sit.js
|
@ -38,9 +38,14 @@ var standUpButton = Overlays.addOverlay("image", {
|
|||
|
||||
var passedTime = 0.0;
|
||||
var startPosition = null;
|
||||
var startRotation = null;
|
||||
var animationLenght = 2.0;
|
||||
|
||||
var sitting = false;
|
||||
var avatarOldPosition = { x: 0, y: 0, z: 0 };
|
||||
|
||||
var sitting = false;
|
||||
|
||||
var seat = new Object();
|
||||
|
||||
// This is the pose we would like to end up
|
||||
var pose = [
|
||||
|
@ -83,7 +88,7 @@ var sittingDownAnimation = function(deltaTime) {
|
|||
}
|
||||
}
|
||||
|
||||
var standingUpAnimation = function(deltaTime){
|
||||
var standingUpAnimation = function(deltaTime) {
|
||||
|
||||
passedTime += deltaTime;
|
||||
var factor = 1 - passedTime/animationLenght;
|
||||
|
@ -97,6 +102,23 @@ var standingUpAnimation = function(deltaTime){
|
|||
}
|
||||
}
|
||||
|
||||
var goToSeatAnimation = function(deltaTime) {
|
||||
passedTime += deltaTime;
|
||||
var factor = passedTime/animationLenght;
|
||||
|
||||
if (passedTime <= animationLenght) {
|
||||
var targetPosition = Vec3.sum(seat.position, { x: 0.3, y: 0.5, z: 0 });
|
||||
MyAvatar.position = Vec3.sum(Vec3.multiply(startPosition, 1 - factor), Vec3.multiply(targetPosition, factor));
|
||||
} else if (passedTime <= 2 * animationLenght) {
|
||||
Quat.print("MyAvatar: ", MyAvatar.orientation);
|
||||
Quat.print("Seat: ", seat.rotation);
|
||||
MyAvatar.orientation = Quat.mix(startRotation, seat.rotation, factor - 1);
|
||||
} else {
|
||||
Script.update.disconnect(goToSeatAnimation);
|
||||
sitDown();
|
||||
}
|
||||
}
|
||||
|
||||
function sitDown() {
|
||||
sitting = true;
|
||||
passedTime = 0.0;
|
||||
|
@ -124,15 +146,104 @@ function standUp() {
|
|||
Overlays.editOverlay(sitDownButton, { visible: true });
|
||||
}
|
||||
|
||||
Controller.mousePressEvent.connect(function(event){
|
||||
var models = new Object();
|
||||
function SeatIndicator(modelProperties, seatIndex) {
|
||||
this.position = Vec3.sum(modelProperties.position,
|
||||
Vec3.multiply(Vec3.multiplyQbyV(modelProperties.modelRotation,
|
||||
modelProperties.sittingPoints[seatIndex].position),
|
||||
modelProperties.radius));
|
||||
|
||||
this.orientation = Quat.multiply(modelProperties.modelRotation,
|
||||
modelProperties.sittingPoints[seatIndex].rotation);
|
||||
this.scale = MyAvatar.scale / 12;
|
||||
|
||||
this.sphere = Overlays.addOverlay("sphere", {
|
||||
position: this.position,
|
||||
size: this.scale,
|
||||
solid: true,
|
||||
color: { red: 0, green: 0, blue: 255 },
|
||||
alpha: 1,
|
||||
visible: true
|
||||
});
|
||||
|
||||
this.show = function(doShow) {
|
||||
Overlays.editOverlay(this.sphere, { visible: doShow });
|
||||
}
|
||||
|
||||
this.update = function() {
|
||||
Overlays.editOverlay(this.sphere, {
|
||||
position: this.position,
|
||||
size: this.scale
|
||||
});
|
||||
}
|
||||
|
||||
this.cleanup = function() {
|
||||
Overlays.deleteOverlay(this.sphere);
|
||||
}
|
||||
}
|
||||
|
||||
Controller.mousePressEvent.connect(function(event) {
|
||||
var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
|
||||
|
||||
if (clickedOverlay == sitDownButton) {
|
||||
sitDown();
|
||||
} else if (clickedOverlay == standUpButton) {
|
||||
standUp();
|
||||
}
|
||||
} else {
|
||||
var pickRay = Camera.computePickRay(event.x, event.y);
|
||||
|
||||
var clickedOnSeat = false;
|
||||
|
||||
for (index in models) {
|
||||
var model = models[index];
|
||||
|
||||
for (var i = 0; i < model.properties.sittingPoints.length; ++i) {
|
||||
if (raySphereIntersection(pickRay.origin,
|
||||
pickRay.direction,
|
||||
model.properties.sittingPoints[i].indicator.position,
|
||||
model.properties.sittingPoints[i].indicator.scale / 2)) {
|
||||
clickedOnSeat = true;
|
||||
seat.position = model.properties.sittingPoints[i].indicator.position;
|
||||
seat.rotation = model.properties.sittingPoints[i].indicator.orientation;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (clickedOnSeat) {
|
||||
passedTime = 0.0;
|
||||
startPosition = MyAvatar.position;
|
||||
startRotation = MyAvatar.orientation;
|
||||
try{ Script.update.disconnect(standingUpAnimation); } catch(e){}
|
||||
try{ Script.update.disconnect(sittingDownAnimation); } catch(e){}
|
||||
Script.update.connect(goToSeatAnimation);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return;
|
||||
var intersection = Models.findRayIntersection(pickRay);
|
||||
|
||||
if (intersection.accurate && intersection.intersects && false) {
|
||||
var properties = intersection.modelProperties;
|
||||
print("Intersecting with model, let's check for seats.");
|
||||
|
||||
if (properties.sittingPoints.length > 0) {
|
||||
print("Available seats, going to the first one: " + properties.sittingPoints[0].name);
|
||||
seat.position = Vec3.sum(properties.position, Vec3.multiplyQbyV(properties.modelRotation, properties.sittingPoints[0].position));
|
||||
Vec3.print("Seat position: ", seat.position);
|
||||
seat.rotation = Quat.multiply(properties.modelRotation, properties.sittingPoints[0].rotation);
|
||||
Quat.print("Seat rotation: ", seat.rotation);
|
||||
|
||||
passedTime = 0.0;
|
||||
startPosition = MyAvatar.position;
|
||||
startRotation = MyAvatar.orientation;
|
||||
try{ Script.update.disconnect(standingUpAnimation); } catch(e){}
|
||||
try{ Script.update.disconnect(sittingDownAnimation); } catch(e){}
|
||||
Script.update.connect(goToSeatAnimation);
|
||||
} else {
|
||||
print ("Sorry, no seats here.");
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
function update(deltaTime){
|
||||
|
@ -143,7 +254,62 @@ function update(deltaTime){
|
|||
var newY = (windowDimensions.y - buttonHeight) / 2 ;
|
||||
Overlays.editOverlay( standUpButton, {x: newX, y: newY} );
|
||||
Overlays.editOverlay( sitDownButton, {x: newX, y: newY} );
|
||||
}
|
||||
}
|
||||
|
||||
if (MyAvatar.position.x != avatarOldPosition.x &&
|
||||
MyAvatar.position.y != avatarOldPosition.y &&
|
||||
MyAvatar.position.z != avatarOldPosition.z) {
|
||||
avatarOldPosition = MyAvatar.position;
|
||||
|
||||
var SEARCH_RADIUS = 5;
|
||||
var foundModels = Models.findModels(MyAvatar.position, SEARCH_RADIUS);
|
||||
// Let's remove indicator that got out of radius
|
||||
for (model in models) {
|
||||
if (Vec3.distance(models[model].properties.position, MyAvatar.position) > SEARCH_RADIUS) {
|
||||
removeIndicators(models[model]);
|
||||
}
|
||||
}
|
||||
|
||||
// Let's add indicators to new seats in radius
|
||||
for (var i = 0; i < foundModels.length; ++i) {
|
||||
var model = foundModels[i];
|
||||
if (typeof(models[model.id]) == "undefined") {
|
||||
addIndicators(model);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function addIndicators(modelID) {
|
||||
modelID.properties = Models.getModelProperties(modelID);
|
||||
if (modelID.properties.sittingPoints.length > 0) {
|
||||
for (var i = 0; i < modelID.properties.sittingPoints.length; ++i) {
|
||||
modelID.properties.sittingPoints[i].indicator = new SeatIndicator(modelID.properties, i);
|
||||
}
|
||||
|
||||
models[modelID.id] = modelID;
|
||||
} else {
|
||||
Models.editModel(modelID, { glowLevel: 0.0 });
|
||||
}
|
||||
}
|
||||
|
||||
function removeIndicators(modelID) {
|
||||
for (var i = 0; i < modelID.properties.sittingPoints.length; ++i) {
|
||||
modelID.properties.sittingPoints[i].indicator.cleanup();
|
||||
}
|
||||
delete models[modelID.id];
|
||||
}
|
||||
|
||||
function raySphereIntersection(origin, direction, center, radius) {
|
||||
var A = origin;
|
||||
var B = Vec3.normalize(direction);
|
||||
var P = center;
|
||||
|
||||
var x = Vec3.dot(Vec3.subtract(P, A), B);
|
||||
var X = Vec3.sum(A, Vec3.multiply(B, x));
|
||||
var d = Vec3.length(Vec3.subtract(P, X));
|
||||
|
||||
return (x > 0 && d <= radius);
|
||||
}
|
||||
|
||||
function keyPressEvent(event) {
|
||||
|
@ -161,11 +327,15 @@ Script.update.connect(update);
|
|||
Controller.keyPressEvent.connect(keyPressEvent);
|
||||
|
||||
Script.scriptEnding.connect(function() {
|
||||
|
||||
for (var i = 0; i < pose.length; i++){
|
||||
MyAvatar.clearJointData(pose[i].joint);
|
||||
}
|
||||
}
|
||||
|
||||
Overlays.deleteOverlay(sitDownButton);
|
||||
Overlays.deleteOverlay(standUpButton);
|
||||
for (model in models){
|
||||
for (var i = 0; i < models[model].properties.sittingPoints.length; ++i) {
|
||||
models[model].properties.sittingPoints[i].indicator.cleanup();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue