mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:29:32 +02:00
reverted to S3 for model URL
This commit is contained in:
parent
d20ff0955c
commit
e2bf8ad231
4 changed files with 5 additions and 5 deletions
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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: {
|
||||||
|
|
Loading…
Reference in a new issue