Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 10:44:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

switch to image property list not working

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-01-22 17:46:12 -08:00
parent ceb621a521
commit 308e481e63
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/system/edit.js
View file

@ -252,7 +252,7 @@ var toolBar = (function () {
properties.rotation = MyAvatar.orientation; properties.rotation = MyAvatar.orientation;
// added image here // added image here
var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Image", "Web"]; var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) { if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
// Adjust position of entity per bounding box prior to creating it. // Adjust position of entity per bounding box prior to creating it.
@ -287,7 +287,6 @@ var toolBar = (function () {
properties.userData = JSON.stringify({ grabbableKey: { grabbable: false } }); properties.userData = JSON.stringify({ grabbableKey: { grabbable: false } });
} }
print("check 1 type: " + properties.type);
entityID = Entities.addEntity(properties); entityID = Entities.addEntity(properties);
if (properties.type === "ParticleEffect") { if (properties.type === "ParticleEffect") {
@ -540,20 +539,21 @@ var toolBar = (function () {
}); });
}); });
/*// for image button
addButton("newImageButton", "web-01.svg", function () {
print("new image message is received");
createNewEntity({
type: "Image",
dimensions: DEFAULT_DIMENSIONS,
imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg"
});
});*/
addButton("newImageButton", "web-01.svg", function () { addButton("newImageButton", "web-01.svg", function () {
createNewEntity({ createNewEntity({
type: "Model", type: "Model",
dimensions: DEFAULT_DIMENSIONS, // make constant for this later
dimensions: {
x: 4.16,
y: 0.02,
z: 2.58
},
modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx", modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx",
imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg",
// will this work?
/*get textures() {
return JSON.stringify({ "tex.picture": this.imageURL });
}*/
textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" }) textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })
}); });
}); });