Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-05 21:22:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing compiled resource access

Browse source
This commit is contained in:
Brad Davis 2018-01-10 17:18:12 -08:00
parent 2c35242af1
commit 97593bc4d8
15 changed files with 74 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -77,6 +77,12 @@ TAGS
# ignore node files for the console
node_modules
npm-debug.log
# Android studio files
*___jb_old___
# Generated assets for Android
android/app/src/main/assets
# Resource binary file
interface/compiledResources

2
interface/CMakeLists.txt
View file

@ -12,7 +12,7 @@ function(JOIN VALUES GLUE OUTPUT)
endfunction()
set(RESOURCES_QRC ${CMAKE_CURRENT_BINARY_DIR}/resources.qrc)
set(RESOURCES_RCC ${CMAKE_CURRENT_BINARY_DIR}/resources.rcc)
set(RESOURCES_RCC ${CMAKE_CURRENT_SOURCE_DIR}/compiledResources/resources.rcc)
generate_qrc(OUTPUT ${RESOURCES_QRC} PATH ${CMAKE_CURRENT_SOURCE_DIR}/resources GLOBS *)
add_custom_command(

15
interface/src/Application.cpp
View file

@ -808,10 +808,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
{
#if defined(Q_OS_ANDROID)
const QString resourcesBinaryFile = "assets:resources.rcc";
const QString resourcesBinaryFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/resources.rcc";
#else
const QString resourcesBinaryFile = QFileInfo(argv[0]).absolutePath() + "/resources.rcc";
const QString resourcesBinaryFile = applicationDirPath() + "/resources.rcc";
#endif
if (!QFile::exists(resourcesBinaryFile)) {
throw std::runtime_error("Unable to find primary resources");
}
if (!QResource::registerResource(resourcesBinaryFile)) {
throw std::runtime_error("Unable to load primary resources");
}
@ -1037,8 +1040,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
// Inititalize sample before registering
QFileInfo infSample = QFileInfo(PathUtils::resourcesPath() + "sounds/sample.wav");
_sampleSound = DependencyManager::get<SoundCache>()->getSound(QUrl::fromLocalFile(infSample.absoluteFilePath()));
_sampleSound = DependencyManager::get<SoundCache>()->getSound(QUrl(PathUtils::resourcesUrl() + "sounds/sample.wav"));
auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
scriptEngines->registerScriptInitializer([this](ScriptEnginePointer engine){
@ -1823,8 +1825,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
return entityServerNode && !isPhysicsEnabled();
});
QFileInfo infSnap = QFileInfo(PathUtils::resourcesPath() + "sounds/snap.wav");
_snapshotSound = DependencyManager::get<SoundCache>()->getSound(QUrl::fromLocalFile(infSnap.absoluteFilePath()));
_snapshotSound = DependencyManager::get<SoundCache>()->getSound(QUrl(PathUtils::resourcesUrl() + "sounds/snap.wav"));
QVariant testProperty = property(hifi::properties::TEST);
qDebug() << testProperty;
@ -2356,7 +2357,7 @@ void Application::initializeUi() {
offscreenUi->setProxyWindow(_window->windowHandle());
// OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
// support the window management and scripting proxies for VR use
offscreenUi->createDesktop(PathUtils::qmlBasePath() + "hifi/Desktop.qml");
offscreenUi->createDesktop(PathUtils::qmlBaseUrl("hifi/Desktop.qml"));
// FIXME either expose so that dialogs can set this themselves or
// do better detection in the offscreen UI of what has focus
offscreenUi->setNavigationFocused(false);

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1801,7 +1801,7 @@ void MyAvatar::initAnimGraph() {
} else if (!_fstAnimGraphOverrideUrl.isEmpty()) {
graphUrl = _fstAnimGraphOverrideUrl;
} else {
graphUrl = QUrl::fromLocalFile(PathUtils::resourcesPath() + "avatar/avatar-animation.json");
graphUrl = QUrl(PathUtils::resourcesUrl() + "avatar/avatar-animation.json");
}
_skeletonModel->getRig().initAnimGraph(graphUrl);

2
libraries/avatars/src/AvatarData.cpp
View file

@ -103,7 +103,7 @@ AvatarData::~AvatarData() {
QUrl AvatarData::_defaultFullAvatarModelUrl = {}; // In C++, if this initialization were in the AvatarInfo, every file would have it's own copy, even for class vars.
const QUrl& AvatarData::defaultFullAvatarModelUrl() {
if (_defaultFullAvatarModelUrl.isEmpty()) {
_defaultFullAvatarModelUrl = QUrl::fromLocalFile(PathUtils::resourcesPath() + "/meshes/defaultAvatar_full.fst");
_defaultFullAvatarModelUrl = QUrl(PathUtils::resourcesUrl() + "/meshes/defaultAvatar_full.fst");
}
return _defaultFullAvatarModelUrl;
}

2
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -262,7 +262,7 @@ gpu::TexturePointer getFallbackTextureForType(image::TextureUsage::Type type) {
gpu::TexturePointer TextureCache::getImageTexture(const QString& path, image::TextureUsage::Type type, QVariantMap options) {
QImage image = QImage(path);
auto loader = image::TextureUsage::getTextureLoaderForType(type, options);
return gpu::TexturePointer(loader(std::move(image), QUrl::fromLocalFile(path).fileName().toStdString(), false));
return gpu::TexturePointer(loader(std::move(image), path.toStdString(), false));
}
QSharedPointer<Resource> TextureCache::createResource(const QUrl& url, const QSharedPointer<Resource>& fallback,

19
libraries/networking/src/FileResourceRequest.cpp
View file

@ -17,18 +17,25 @@
#include <StatTracker.h>
#include "ResourceManager.h"
void FileResourceRequest::doSend() {
auto statTracker = DependencyManager::get<StatTracker>();
statTracker->incrementStat(STAT_FILE_REQUEST_STARTED);
int fileSize = 0;
QString filename = _url.toLocalFile();
// sometimes on windows, we see the toLocalFile() return null,
// in this case we will attempt to simply use the url as a string
if (filename.isEmpty()) {
filename = _url.toString();
QString filename;
if (_url.scheme() == URL_SCHEME_QRC) {
filename = ":/" + _url.path();
} else {
filename = _url.toLocalFile();
// sometimes on windows, we see the toLocalFile() return null,
// in this case we will attempt to simply use the url as a string
if (filename.isEmpty()) {
filename = _url.toString();
}
}
// Allow platform specific versions of files loaded out of a resource cache via file://
filename = QFileSelector().select(filename);

32
libraries/networking/src/ResourceManager.cpp
View file

@ -11,6 +11,8 @@
#include "ResourceManager.h"
#include <mutex>
#include <QNetworkDiskCache>
#include <QStandardPaths>
#include <QThread>
@ -24,7 +26,6 @@
#include "NetworkAccessManager.h"
#include "NetworkLogging.h"
ResourceManager::ResourceManager() {
_thread.setObjectName("Resource Manager Thread");
@ -53,7 +54,7 @@ QString ResourceManager::normalizeURL(const QString& urlString) {
copy = _prefixMap;
}
foreach(const auto& entry, copy) {
foreach (const auto& entry, copy) {
const auto& prefix = entry.first;
const auto& replacement = entry.second;
if (result.startsWith(prefix)) {
@ -64,13 +65,24 @@ QString ResourceManager::normalizeURL(const QString& urlString) {
return result;
}
const QSet<QString>& getKnownUrls() {
static QSet<QString> knownUrls;
static std::once_flag once;
std::call_once(once, [] {
knownUrls.insert(URL_SCHEME_QRC);
knownUrls.insert(URL_SCHEME_FILE);
knownUrls.insert(URL_SCHEME_HTTP);
knownUrls.insert(URL_SCHEME_HTTPS);
knownUrls.insert(URL_SCHEME_FTP);
knownUrls.insert(URL_SCHEME_ATP);
});
return knownUrls;
}
QUrl ResourceManager::normalizeURL(const QUrl& originalUrl) {
QUrl url = QUrl(normalizeURL(originalUrl.toString()));
auto scheme = url.scheme();
if (!(scheme == URL_SCHEME_FILE ||
scheme == URL_SCHEME_HTTP || scheme == URL_SCHEME_HTTPS || scheme == URL_SCHEME_FTP ||
scheme == URL_SCHEME_ATP)) {
if (!getKnownUrls().contains(scheme)) {
// check the degenerative file case: on windows we can often have urls of the form c:/filename
// this checks for and works around that case.
QUrl urlWithFileScheme{ URL_SCHEME_FILE + ":///" + url.toString() };
@ -94,7 +106,7 @@ ResourceRequest* ResourceManager::createResourceRequest(QObject* parent, const Q
ResourceRequest* request = nullptr;
if (scheme == URL_SCHEME_FILE) {
if (scheme == URL_SCHEME_FILE || scheme == URL_SCHEME_QRC) {
request = new FileResourceRequest(normalizedURL);
} else if (scheme == URL_SCHEME_HTTP || scheme == URL_SCHEME_HTTPS || scheme == URL_SCHEME_FTP) {
request = new HTTPResourceRequest(normalizedURL);
@ -113,15 +125,14 @@ ResourceRequest* ResourceManager::createResourceRequest(QObject* parent, const Q
return request;
}
bool ResourceManager::resourceExists(const QUrl& url) {
auto scheme = url.scheme();
if (scheme == URL_SCHEME_FILE) {
QFileInfo file { url.toString() };
QFileInfo file{ url.toString() };
return file.exists();
} else if (scheme == URL_SCHEME_HTTP || scheme == URL_SCHEME_HTTPS || scheme == URL_SCHEME_FTP) {
auto& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request { url };
QNetworkRequest request{ url };
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
@ -159,4 +170,3 @@ bool ResourceManager::resourceExists(const QUrl& url) {
qCDebug(networking) << "Unknown scheme (" << scheme << ") for URL: " << url.url();
return false;
}

1
libraries/networking/src/ResourceManager.h
View file

@ -22,6 +22,7 @@
#include "ResourceRequest.h"
const QString URL_SCHEME_QRC = "qrc";
const QString URL_SCHEME_FILE = "file";
const QString URL_SCHEME_HTTP = "http";
const QString URL_SCHEME_HTTPS = "https";

16
libraries/shared/src/PathUtils.cpp
View file

@ -61,19 +61,27 @@ const QString& PathUtils::resourcesPath() {
return staticResourcePath;
}
// FIXME rename to qmlBaseUrl
const QString& PathUtils::qmlBasePath() {
const QString& PathUtils::resourcesUrl() {
#if !defined(Q_OS_ANDROID) && defined(DEV_BUILD)
// For dev builds, load
if (USE_SOURCE_TREE_RESOURCES) {
static const QString staticResourcePath = QUrl::fromLocalFile(projectRootPath() + "/interface/resources/qml").toString();
static const QString staticResourcePath = "file:///" + projectRootPath() + "/interface/resources/";
return staticResourcePath;
}
#endif
static const QString staticResourcePath = "qrc:///qml/";
static const QString staticResourcePath = "qrc:///";
return staticResourcePath;
}
const QString& PathUtils::qmlBaseUrl() {
static const QString staticResourcePath = resourcesUrl() + "qml/";
return staticResourcePath;
}
QUrl PathUtils::qmlBaseUrl(const QString& relativeUrl) {
return QUrl(qmlBaseUrl() + relativeUrl);
}
QString PathUtils::getAppDataPath() {
return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/";
}

4
libraries/shared/src/PathUtils.h
View file

@ -33,8 +33,10 @@ class PathUtils : public QObject, public Dependency {
Q_PROPERTY(QString resources READ resourcesPath CONSTANT)
Q_PROPERTY(QUrl defaultScripts READ defaultScriptsLocation CONSTANT)
public:
static const QString& resourcesUrl();
static const QString& resourcesPath();
static const QString& qmlBasePath();
static const QString& qmlBaseUrl();
static QUrl qmlBaseUrl(const QString& relative);
#ifdef DEV_BUILD
static const QString& projectRootPath();
#endif

2
libraries/ui/src/InfoView.cpp
View file

@ -46,7 +46,7 @@ void InfoView::show(const QString& path, bool firstOrChangedOnly, QString urlQue
registerType();
QUrl url;
if (QDir(path).isRelative()) {
url = QUrl::fromLocalFile(PathUtils::resourcesPath() + path);
url = QUrl(PathUtils::resourcesUrl() + path);
} else {
url = QUrl::fromLocalFile(path);
}

2
libraries/ui/src/OffscreenQmlElement.h
View file

@ -42,7 +42,7 @@ public: \
private:
#define HIFI_QML_DEF(x) \
const QUrl x::QML = QUrl(PathUtils::qmlBasePath() + #x ".qml"); \
const QUrl x::QML = PathUtils::qmlBaseUrl(#x ".qml"); \
const QString x::NAME = #x; \
\
void x::registerType() { \

6
libraries/ui/src/ui/OffscreenQmlSurface.cpp
View file

@ -70,7 +70,7 @@ public:
withWriteLock([&] {
for (auto url : urls) {
if (url.isRelative()) {
url = QUrl(PathUtils::qmlBasePath() + url.toString());
url = PathUtils::qmlBaseUrl(url.toString());
}
_callbacks[url].push_back(callback);
}
@ -443,7 +443,7 @@ void initializeQmlEngine(QQmlEngine* engine, QQuickWindow* window) {
auto rootContext = engine->rootContext();
rootContext->setContextProperty("GL", ::getGLContextData());
rootContext->setContextProperty("urlHandler", new UrlHandler());
rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
rootContext->setContextProperty("resourceDirectoryUrl", QUrl(PathUtils::resourcesUrl()));
rootContext->setContextProperty("pathToFonts", "../../");
rootContext->setContextProperty("ApplicationInterface", qApp);
auto javaScriptToInject = getEventBridgeJavascript();
@ -682,7 +682,7 @@ void OffscreenQmlSurface::create() {
auto qmlEngine = acquireEngine(_quickWindow);
_qmlContext = new QQmlContext(qmlEngine->rootContext());
_qmlContext->setBaseUrl(QUrl{ PathUtils::qmlBasePath() });
_qmlContext->setBaseUrl(QUrl{ PathUtils::qmlBaseUrl() });
_qmlContext->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
_qmlContext->setContextProperty("eventBridge", this);
_qmlContext->setContextProperty("webEntity", this);

3
libraries/ui/src/ui/TabletScriptingInterface.cpp
View file

@ -172,9 +172,8 @@ void TabletScriptingInterface::preloadSounds() {
//preload audio events
const QStringList &audioSettings = tabletSoundsButtonClick.get();
for (int i = 0; i < TabletAudioEvents::Last; i++) {
QFileInfo inf = QFileInfo(PathUtils::resourcesPath() + audioSettings.at(i));
SharedSoundPointer sound = DependencyManager::get<SoundCache>()->
getSound(QUrl::fromLocalFile(inf.absoluteFilePath()));
getSound(QUrl(PathUtils::resourcesUrl() + audioSettings.at(i)));
_audioEvents.insert(static_cast<TabletAudioEvents>(i), sound);
}
}