Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:29:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

reverted to S3 for model URL

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-02-02 15:36:28 -08:00
parent d20ff0955c
commit e2bf8ad231
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,7 +183,7 @@ Windows.ScrollingWindow {
if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) { if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
var name = assetProxyModel.data(treeView.selection.currentIndex); var name = assetProxyModel.data(treeView.selection.currentIndex);
var modelURL = "../../meshes/images/default-image-model.fbx"; var modelURL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
var textures = JSON.stringify({ "tex.picture": defaultURL}); var textures = JSON.stringify({ "tex.picture": defaultURL});
var shapeType = "box"; var shapeType = "box";
var dynamic = false; var dynamic = false;

2
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
View file

@ -184,7 +184,7 @@ Rectangle {
if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) { if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
var name = assetProxyModel.data(treeView.selection.currentIndex); var name = assetProxyModel.data(treeView.selection.currentIndex);
var modelURL = "../../../meshes/images/default-image-model.fbx"; var modelURL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
var textures = JSON.stringify({ "tex.picture": defaultURL}); var textures = JSON.stringify({ "tex.picture": defaultURL});
var shapeType = "box"; var shapeType = "box";
var dynamic = false; var dynamic = false;

2
interface/src/Application.cpp
View file

@ -6525,7 +6525,7 @@ void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
QJsonObject textures { QJsonObject textures {
{"tex.picture", QString("atp:" + mapping) } {"tex.picture", QString("atp:" + mapping) }
}; };
properties.setModelURL("qrc:///snapshot/snapshot.fbx"); properties.setModelURL("https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx");
properties.setTextures(QJsonDocument(textures).toJson(QJsonDocument::Compact)); properties.setTextures(QJsonDocument(textures).toJson(QJsonDocument::Compact));
properties.setShapeType(SHAPE_TYPE_BOX); properties.setShapeType(SHAPE_TYPE_BOX);
} else { } else {

4
scripts/system/edit.js
View file

@ -540,8 +540,8 @@ var toolBar = (function () {
}); });
addButton("newImageButton", "web-01.svg", function () { addButton("newImageButton", "web-01.svg", function () {
var IMAGE_MODEL = Script.resourcesPath() + "meshes/images/default-image-model.fbx"; var IMAGE_MODEL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
var DEFAULT_IMAGE = Script.resourcesPath() + "snapshot/img/no-image.jpg"; var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
createNewEntity({ createNewEntity({
type: "Model", type: "Model",
dimensions: { dimensions: {