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

combined arm chair

Browse source
This commit is contained in:
ericrius1 2015-09-25 12:34:35 -07:00
parent f5e44675bb
commit c53ad3c534
2 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/toys/doll/doll.js
View file

@ -25,11 +25,14 @@
startAnimationSetting: JSON.stringify({
running: true,
fps: 30,
// startFrame: 0,
// lastFrame: 128,
firstFrame: 0,
lastFrame: 120,
startAutomatically: true
}),
stopAnimationSetting: JSON.stringify({running: false}),
stopAnimationSetting: JSON.stringify({
running: false,
frameIndex: 0
}),
audioInjector: null,
isGrabbed: false,
setLeftHand: function() {

51
examples/toys/masterResetEntity.js
View file

@ -77,17 +77,17 @@ function createAllToys() {
z: 503.54
});
createArmChair({
createCombinedArmChair({
x: 549.29,
y: 495.05,
z: 508.22
})
createPillow({
x: 549.29,
y: 495.35,
z: 508.22
});
// createPillow({
// x: 549.29,
// y: 495.35,
// z: 508.22
// });
createPottedPlant({
x: 554.26,
@ -393,7 +393,7 @@ function createBasketBall(position) {
function createDoll(position) {
var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
var scriptURL = Script.resolvePath("doll/doll.js");
var scriptURL = Script.resolvePath("doll/doll.js?v2"+ Math.random());
var naturalDimensions = {
x: 1.63,
@ -499,6 +499,43 @@ function createPottedPlant(position) {
};
function createCombinedArmChair(position) {
var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj"
var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
var entity = Entities.addEntity({
type: "Model",
name: "Red Arm Chair",
modelURL: modelURL,
shapeType: 'compound',
compoundShapeURL: RED_ARM_CHAIR_COLLISION_HULL,
position: position,
rotation: rotation,
dimensions: {
x: 1.26,
y: 1.56,
z: 1.35
},
collisionsWillMove: true,
gravity: {
x: 0,
y: -0.8,
z: 0
},
velocity: {
x: 0,
y: 0,
z: 0
},
linearDamping: 0.2
});
setEntityCustomData(resetKey, entity, {
resetMe: true
});
};
function createArmChair(position) {
var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair.fbx";