Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 22:49:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

image entities shown as images in entity list

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-01-26 15:40:22 -08:00
parent 9f8e2017ce
commit cc4bafb46f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/AssetServer.qml
View file

@ -142,7 +142,6 @@ Windows.ScrollingWindow {
}); });
} }
// Elisa note - need to link this with specific add entity call
function canAddToWorld(path) { function canAddToWorld(path) {
var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i]; var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];

4
scripts/system/html/js/entityList.js
View file

@ -156,6 +156,10 @@ function loaded() {
var urlParts = url.split('/'); var urlParts = url.split('/');
var filename = urlParts[urlParts.length - 1]; var filename = urlParts[urlParts.length - 1];
if (url === "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx") {
type = "Image";
}
if (entities[id] === undefined) { if (entities[id] === undefined) {
entityList.add([{ entityList.add([{
id: id, name: name, type: type, url: filename, locked: locked, visible: visible, id: id, name: name, type: type, url: filename, locked: locked, visible: visible,