Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drag zip cleaned up, marketplaces stylized, back button fixed

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-08-02 10:51:40 -07:00
parent 692aa4c4b9
commit 06ff766952
4 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -229,8 +229,6 @@ static const QString FBX_EXTENSION = ".fbx";
static const QString OBJ_EXTENSION = ".obj";
static const QString AVA_JSON_EXTENSION = ".ava.json";
static const QString WEB_VIEW_TAG = "noDownload=true";
// temporary zip handling for Emily
static const QString ZIP_EXTENSION = ".zip";
static const float MIRROR_FULLSCREEN_DISTANCE = 0.389f;
@ -264,8 +262,6 @@ const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensi
{ JSON_EXTENSION, &Application::importJSONFromURL },
{ JS_EXTENSION, &Application::askToLoadScript },
{ FST_EXTENSION, &Application::askToSetAvatarUrl },
// temporary zip handling for Emily
{ ZIP_EXTENSION, &Application::importFromZIP }
};
@ -6355,7 +6351,12 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
addAssetToWorldError(filenameFromPath(filePath), errorInfo);
} else {
addAssetToWorldAddEntity(filePath, mapping);
// to prevent files that aren't models from being loaded into world automatically
if (filePath.endsWith(".obj") || filePath.endsWith(".fbx")) {
addAssetToWorldAddEntity(filePath, mapping);
} else {
addAssetToWorldInfoDone(filenameFromPath(filePath));
}
}
request->deleteLater();
});

2
interface/src/Application.h
View file

@ -481,8 +481,6 @@ private:
bool importJSONFromURL(const QString& urlString);
bool importSVOFromURL(const QString& urlString);
// temporary zip handling for Emily
bool importFromZIP(const QString& filePath);
bool nearbyEntitiesAreReadyForPhysics();

16
scripts/system/html/js/marketplacesInject.js
View file

@ -65,7 +65,10 @@
// Footer actions.
$("#back-button").on("click", function () {
window.history.back();
if (window.history.state != null) window.history.back();
// to fix back button issue when in directory
//else window.location = "http://www.highfidelity.com/marketplace";
else window.location = "https://metaverse.highfidelity.com/marketplace?";
});
$("#all-markets").on("click", function () {
EventBridge.emitWebEvent(GOTO_DIRECTORY);
@ -79,9 +82,11 @@
letUsKnow.replaceWith(letUsKnow.html());
// Add button links.
/* Blocks not yet implemented
$('#exploreBlocksMarketplace').on('click', function () {
window.location = "https://vr.google.com/objects";
});
});*/
$('#exploreClaraMarketplace').on('click', function () {
window.location = "https://clara.io/library?gameCheck=true&public=true";
});
@ -102,7 +107,7 @@
'</div>'
);*/
$("body").append(
'style= "bottom: 135px" '
'<p>hello</p>'
);
}
@ -345,6 +350,7 @@
if (location.href.indexOf("google.com/") !== -1) { pageType = BLOCKS; }
if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; }
//if (pageType != BLOCKS)
injectCommonCode(pageType === DIRECTORY);
switch (pageType) {
case DIRECTORY:
@ -354,7 +360,9 @@
injectHiFiCode();
break;
case BLOCKS:
injectBlocksCode();
console.log("in Blocks");
//injectBlocksCode();
console.log("blocks injection");
break;
case CLARA:
injectClaraCode();

24
scripts/system/html/marketplaces.html
View file

@ -25,24 +25,26 @@
</div>
<div class="marketplace-tile-second-column">
<p class="marketplace-tile-description">This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.</p>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace" />
</div>
<hr class="tile-divider">
</div>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace" />
</div>
<hr class="tile-divider">
</div>
<!-- Blocks not yet implemented
<div class="marketplace-tile">
<div class="marketplace-tile-first-column">
<img class="marketplace-tile-image" src="img/blocks-tile.png">
</div>
<div class="marketplace-tile-second-column">
<p class="marketplace-tile-description">Blocks, released by Google, allows anyone to create 3D models using just a few simple tools. Browse through other users' creations for low-poly assets to add to your world.</p>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreBlocksMarketplace" />
</div>
<hr class="tile-divider">
</div>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreBlocksMarketplace" />
</div>
<hr class="tile-divider">
</div>
-->
<div class="marketplace-tile">
<div class="marketplace-tile-first-column">
<img class="marketplace-tile-image" src="img/clara-tile.png">
@ -53,9 +55,9 @@
<li><a id="claraSignUp" href="http://www.clara.io/signup">Create an account here </a>or log in as an existing user.</li>
<li>Choose a model from the list and click &ldquo;Download to High Fidelity&rdquo;.</li>
</ol>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreClaraMarketplace" />
</div>
</div>
<div class="exploreButton-holder">
<input class="blue exploreButton" type="button" value="Explore" id="exploreClaraMarketplace" />
</div>
</div>
</div>