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

change flower name

Browse source
This commit is contained in:
ericrius1 2016-03-31 15:16:57 -07:00
parent aead16da89
commit 50e1a11f6c
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js
View file

@ -21,7 +21,7 @@
_this.waterSound = SoundCache.getSound("atp:/growingPlant/watering_can_pour.L.wav"); _this.waterSound = SoundCache.getSound("atp:/growingPlant/watering_can_pour.L.wav");
_this.POUR_ANGLE_THRESHOLD = 0; _this.POUR_ANGLE_THRESHOLD = 0;
_this.waterPouring = false; _this.waterPouring = false;
_this.WATER_SPOUT_NAME = "hifi-water-spout"; _this.WATER_SPOUT_NAME = "home_box_waterSpout";
_this.GROWABLE_ENTITIES_SEARCH_RANGE = 100; _this.GROWABLE_ENTITIES_SEARCH_RANGE = 100;
}; };
@ -229,20 +229,6 @@
print("EBL PRELOADING WATER CAN") print("EBL PRELOADING WATER CAN")
_this.entityID = entityID; _this.entityID = entityID;
_this.position = Entities.getEntityProperties(_this.entityID, "position").position; _this.position = Entities.getEntityProperties(_this.entityID, "position").position;
// Wait a a bit for spout to spawn for case where preload is initial spawn, then save it
Script.setTimeout(function() {
var entities = Entities.findEntities(_this.position, 2);
print("EBL SEARCHING FOR SPOUT");
entities.forEach(function(entity) {
var name = Entities.getEntityProperties(entity, "name").name;
if (name === _this.WATER_SPOUT_NAME) {
print("EBL FOUND SPOUT");
_this.waterSpout = entity;
}
});
}, 2000);
}, },

9
unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
View file

@ -44,7 +44,7 @@ Plant = function(spawnPosition, spawnRotation) {
// dynamic: true, // dynamic: true,
shapeType: 'box', shapeType: 'box',
// compoundShapeURL: BOWL_COLLISION_HULL_URL, // compoundShapeURL: BOWL_COLLISION_HULL_URL,
name: "plant bowl", name: "home_model_plantNowl",
position: bowlPosition, position: bowlPosition,
userData: JSON.stringify({ userData: JSON.stringify({
'hifiHomeKey': { 'hifiHomeKey': {
@ -71,7 +71,7 @@ Plant = function(spawnPosition, spawnRotation) {
var plant = Entities.addEntity({ var plant = Entities.addEntity({
type: "Model", type: "Model",
modelURL: PLANT_MODEL_URL, modelURL: PLANT_MODEL_URL,
name: "hifi-growable-plant", name: "home_model_growablePlant",
dimensions: plantDimensions, dimensions: plantDimensions,
position: plantPosition, position: plantPosition,
script: PLANT_SCRIPT_URL, script: PLANT_SCRIPT_URL,
@ -94,7 +94,7 @@ Plant = function(spawnPosition, spawnRotation) {
type: "Model", type: "Model",
shapeType: 'box', shapeType: 'box',
// compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL, // compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL,
name: "hifi-water-can", name: "home_model_waterCan",
modelURL: WATER_CAN_MODEL_URL, modelURL: WATER_CAN_MODEL_URL,
script: WATER_CAN_SCRIPT_URL, script: WATER_CAN_SCRIPT_URL,
dimensions: { dimensions: {
@ -151,9 +151,10 @@ Plant = function(spawnPosition, spawnRotation) {
var waterSpoutPosition = Vec3.sum(waterCanPosition, Vec3.multiply(0.2, Quat.getFront(orientation))) var waterSpoutPosition = Vec3.sum(waterCanPosition, Vec3.multiply(0.2, Quat.getFront(orientation)))
var waterSpoutRotation = Quat.multiply(waterCanRotation, Quat.fromPitchYawRollDegrees(10, 0, 0)); var waterSpoutRotation = Quat.multiply(waterCanRotation, Quat.fromPitchYawRollDegrees(10, 0, 0));
var WATER_SPOUT_NAME = "home_box_waterSpout";
var waterSpout = Entities.addEntity({ var waterSpout = Entities.addEntity({
type: "Box", type: "Box",
name: "hifi-water-spout", name: WATER_SPOUT_NAME,
dimensions: { dimensions: {
x: 0.02, x: 0.02,
y: 0.02, y: 0.02,