Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 13:07:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix double URL scheme

Browse source
This commit is contained in:
Stephen Birarda 2015-10-27 11:48:52 -07:00
parent 12aadd7cf2
commit 7e8aec9db9
1 changed files with 16 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
examples/baseball/baseball.js
View file

@ -13,128 +13,34 @@ var ROBOT_MODEL = "atp:785c81e117206c36205404beec0cc68529644fe377542dbb2d13fae4d
var ROBOT_POSITION = { x: -0.81, y: 0.88, z: 2.12 };
var ROBOT_DIMENSIONS = { x: 0.95, y: 1.76, z: 0.56 };
var BAT_MODEL = "atp:07bdd769a57ff15ebe9331ae4e2c2eae8886a6792b4790cce03b4716eb3a81c7.fbx"
var BAT_COLLISION_MODEL = "atp:atp:9eafceb7510c41d50661130090de7e0632aa4da236ebda84a0059a4be2130e0c.obj"
var BAT_DIMENSIONS = { x: 1.35, y: 0.10, z: 0.10 };
var BAT_REGISTRATION_POINT = { x: 0.1, y: 0.5, z: 0.5 };
var BAT_MODEL = "atp:c47deaae09cca927f6bc9cca0e8bbe77fc618f8c3f2b49899406a63a59f885cb.fbx"
var BAT_COLLISION_MODEL = "atp:9eafceb7510c41d50661130090de7e0632aa4da236ebda84a0059a4be2130e0c.obj"
// add the fresh robot at home plate
var robot = Entities.addEntity({
name: 'Robot',
type: 'Model',
modelURL: ROBOT_MODEL,
position: ROBOT_POSITION,
// dimensions: ROBOT_DIMENSIONS,a
animationIsPlaying: true,
animation: {
url: ROBOT_MODEL,
fps: 30
}
});
// var robot = Entities.addEntity({
// name: 'Robot',
// type: 'Model',
// modelURL: ROBOT_MODEL,
// position: ROBOT_POSITION,
// // dimensions: ROBOT_DIMENSIONS,
// animationIsPlaying: true,
// animation: {
// url: ROBOT_MODEL,
// fps: 30
// }
// });
// add the bat
var bat = Entities.addEntity({
name: 'Bat',
/*/
type: 'Box',
/*/
type: 'Model',
modelURL: BAT_COLLISION_MODEL,
/**/
modelURL: BAT_MODEL,
collisionModelURL: BAT_COLLISION_MODEL,
// dimensions: BAT_DIMENSIONS,
registrationPoint: BAT_REGISTRATION_POINT,
visible: false
userData: "{"grabbableKey":{"spatialKey":{"relativePosition":{"x":0.9,"y":0,"z":0},"relativeRotation":{"x":10,"y":0,"z":0}},"kinematicGrab":true}}"
})
var lastTriggerValue = 0.0;
function checkTriggers() {
var rightTrigger = Controller.getTriggerValue(1);
if (rightTrigger == 0) {
if (lastTriggerValue > 0) {
// the trigger was just released, play out to the last frame of the swing
Entities.editEntity(robot, {
animation: {
running: true,
currentFrame: 21,
lastFrame: 115
}
});
}
} else {
if (lastTriggerValue == 0) {
// the trigger was just depressed, start the swing
Entities.editEntity(robot, {
animation: {
running: true,
currentFrame: 0,
lastFrame: 21
}
});
}
}
lastTriggerValue = rightTrigger;
}
var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position
var ACTION_LIFETIME = 15; // seconds
var action = null;
var factor = 0.0;
var STEP = 0.05;
function moveBat() {
var JOINT_INDEX = 19;
var forearmPosition = Entities.getJointPosition(robot, JOINT_INDEX);
var forearmRotation = Entities.getJointRotation(robot, JOINT_INDEX);
/*/
var properties = Entities.getEntityProperties(bat, ["position", "rotation"]);
var offsetPosition = Vec3.subtract(properties.position, forearmPosition);
var offsetRotation = Quat.multiply(Quat.inverse(forearmRotation), properties.rotation);
print("offsetPosition = " + JSON.stringify(offsetPosition));
print("offsetRotation = " + JSON.stringify(Quat.safeEulerAngles(offsetRotation)));
/*/
Entities.editEntity(bat, {
position: forearmPosition,
rotation: forearmRotation,
});
/**/
// var actionProperties = {
// relativePosition: forearmPosition,
// relativeRotation: forearmRotation,
//// tag: "bat-to-forearm",
//// linearTimeScale: DISTANCE_HOLDING_ACTION_TIMEFRAME,
//// angularTimeScale: DISTANCE_HOLDING_ACTION_TIMEFRAME,
//// lifetime: ACTION_LIFETIME
// hand: "left",
// timeScale: 0.15
// };
//
// if (action === null) {
// Entities.addAction("hold", bat, actionProperties);
// } else {
// Entities.editAction(bat, action, actionProperties);
// }
}
function update() {
// checkTriggers();
moveBat();
}
function scriptEnding() {
Entities.deleteEntity(robot);
Entities.deleteEntity(bat);
if (action) {
Entities.deleteAction(bat, action);
}
}
// hook the update so we can check controller triggers
Script.update.connect(update);
Script.scriptEnding.connect(scriptEnding);