Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

single spawner tank

Browse source
This commit is contained in:
James B. Pollack 2016-03-28 11:44:11 -07:00
parent 19a8fa82e3
commit 774cf8f42f
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js
View file

@ -26,6 +26,7 @@
collisionWithEntity: function(myID, otherID, collisionInfo) { collisionWithEntity: function(myID, otherID, collisionInfo) {
var otherProps = Entities.getEntityProperties(otherID); var otherProps = Entities.getEntityProperties(otherID);
if (otherProps.name = "hifi-home-dressing-room-transformer-collider" && _this.locked === false) { if (otherProps.name = "hifi-home-dressing-room-transformer-collider" && _this.locked === false) {
var myProps = Entities.getEntityProperties(myID); var myProps = Entities.getEntityProperties(myID);
var distance = Vec3.distance(myProps.position, otherProps.position); var distance = Vec3.distance(myProps.position, otherProps.position);
@ -131,6 +132,7 @@
delete littleVersionProps.localPosition; delete littleVersionProps.localPosition;
delete littleVersionProps.localRotation; delete littleVersionProps.localRotation;
delete littleVersionProps.naturalPosition; delete littleVersionProps.naturalPosition;
// delete littleVersionProps.script;
var userData = JSON.parse(littleVersionProps.userData); var userData = JSON.parse(littleVersionProps.userData);
var basePosition = userData["hifiHomeTransformerKey"].basePosition; var basePosition = userData["hifiHomeTransformerKey"].basePosition;

7
unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js
View file

@ -1,11 +1,14 @@
var TRANSFORMER_SCRIPT = Script.resolvePath('transformer.js?' + Math.random()); var TRANSFORMER_SCRIPT = Script.resolvePath('transformer.js?' + Math.random());
var AVATAR_COLLISION_HULL='http://hifi-content.s3.amazonaws.com/DomainContent/Home/dressingRoom/Avatar-Hull.obj';
// var SHRINK_AMOUNT = 1 / 2; // var SHRINK_AMOUNT = 1 / 2;
TransformerDoll = function(modelURL, spawnPosition, spawnRotation, dimensions) { TransformerDoll = function(modelURL, spawnPosition, spawnRotation, dimensions) {
print('SCRIPT REF AT TRANSFORMER CREATE::' + TRANSFORMER_SCRIPT); print('SCRIPT REF AT TRANSFORMER CREATE::' + TRANSFORMER_SCRIPT);
var transformerProps = { var transformerProps = {
name: 'hifi-home-dressing-room-little-transformer', name: 'hifi-home-dressing-room-little-transformer',
type: 'Model', type: 'Model',
shapeType: 'box', shapeType: 'compound',
compoundShapeURL:AVATAR_COLLISION_HULL,
position: spawnPosition, position: spawnPosition,
rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z), rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
modelURL: modelURL, modelURL: modelURL,
@ -15,7 +18,7 @@
y: -5, y: -5,
z: 0 z: 0
}, },
visible: false, visible: true,
damping: 0.8, damping: 0.8,
userData: JSON.stringify({ userData: JSON.stringify({
'grabbableKey': { 'grabbableKey': {

12
unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js Normal file
View file

@ -0,0 +1,12 @@
var fishTankPath = Script.resolvePath('wrapper.js?' + Math.random());
Script.include(fishTankPath);
var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0,
y: 0.5,
z: 0
}), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation())));
var fishTank = new FishTank(center, {
x: 0,
y: 123,
z: 0
});