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

Merge pull request #4800 from PhilipRosedale/master

Browse source 
Minor tweak to grab, fix harmonicOscillator sample
This commit is contained in:
Clément Brisset 2015-05-08 16:39:31 +02:00
commit 0e5e6294a5
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/grab.js
View file

@ -179,7 +179,7 @@ function update(deltaTime) {
if (distanceToTarget > CLOSE_ENOUGH) { if (distanceToTarget > CLOSE_ENOUGH) {
// compute current velocity in the direction we want to move // compute current velocity in the direction we want to move
velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition)); velocityTowardTarget = Vec3.dot(currentVelocity, Vec3.normalize(dPosition));
velocityTowardTarget = Vec3.multiply(dPosition, velocityTowardTarget); velocityTowardTarget = Vec3.multiply(Vec3.normalize(dPosition), velocityTowardTarget);
// compute the speed we would like to be going toward the target position // compute the speed we would like to be going toward the target position
desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE); desiredVelocity = Vec3.multiply(dPosition, (1.0 / deltaTime) * SPRING_RATE);

32
examples/harmonicOscillator.js
View file

@ -16,8 +16,7 @@
var ball, disc; var ball, disc;
var time = 0.0; var time = 0.0;
var range = 1.0; var range = 1.0;
var speed = 0.5; var omega = 2.0 * Math.PI / 32.0;
var basePosition = Vec3.sum(Camera.getPosition(), Quat.getFront(Camera.getOrientation())); var basePosition = Vec3.sum(Camera.getPosition(), Quat.getFront(Camera.getOrientation()));
@ -25,35 +24,44 @@ ball = Entities.addEntity(
{ type: "Box", { type: "Box",
position: basePosition, position: basePosition,
dimensions: { x: 0.1, y: 0.1, z: 0.1 }, dimensions: { x: 0.1, y: 0.1, z: 0.1 },
color: { red: 255, green: 0, blue: 255 } color: { red: 255, green: 0, blue: 255 },
collisionsWillMove: false,
ignoreForCollisions: true
}); });
disc = Entities.addEntity( disc = Entities.addEntity(
{ type: "Sphere", { type: "Sphere",
position: basePosition, position: basePosition,
dimensions: { x: range, y: range / 20.0, z: range }, dimensions: { x: range * 0.8, y: range / 20.0, z: range * 0.8},
color: { red: 128, green: 128, blue: 128 } color: { red: 128, green: 128, blue: 128 }
}); });
function randomColor() {
return { red: Math.random() * 255, green: Math.random() * 255, blue: Math.random() * 255 };
}
function update(deltaTime) { function update(deltaTime) {
time += deltaTime * speed; time += deltaTime;
if (!ball.isKnownID) { if (!ball.isKnownID) {
ball = Entities.identifyEntity(ball); ball = Entities.identifyEntity(ball);
} }
rotation = Quat.angleAxis(time/Math.PI * 180.0, { x: 0, y: 1, z: 0 }); rotation = Quat.angleAxis(time * omega /Math.PI * 180.0, { x: 0, y: 1, z: 0 });
Entities.editEntity(ball, Entities.editEntity(ball,
{ {
color: { red: 255 * (Math.sin(time)/2.0 + 0.5), color: { red: 255 * (Math.sin(time * omega)/2.0 + 0.5),
green: 255 - 255 * (Math.sin(time)/2.0 + 0.5), green: 255 - 255 * (Math.sin(time * omega)/2.0 + 0.5),
blue: 0 }, blue: 0 },
position: { x: basePosition.x + Math.sin(time) / 2.0 * range, position: { x: basePosition.x + Math.sin(time * omega) / 2.0 * range,
y: basePosition.y, y: basePosition.y,
z: basePosition.z + Math.cos(time) / 2.0 * range }, z: basePosition.z + Math.cos(time * omega) / 2.0 * range },
velocity: { x: Math.cos(time)/2.0 * range, velocity: { x: Math.cos(time * omega)/2.0 * range * omega,
y: 0.0, y: 0.0,
z: -Math.sin(time)/2.0 * range }, z: -Math.sin(time * omega)/2.0 * range * omega},
rotation: rotation rotation: rotation
}); });
if (Math.random() < 0.007) {
Entities.editEntity(disc, { color: randomColor() });
}
} }
function scriptEnding() { function scriptEnding() {