Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge from upstream

Browse source
This commit is contained in:
Seth Alves 2017-01-12 17:08:14 -08:00
parent e9422cbf1e
commit cc4f4ac506
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/ui/overlays/Web3DOverlay.cpp
View file

@ -118,6 +118,19 @@ void Web3DOverlay::update(float deltatime) {
} }
} }
QString Web3DOverlay::pickURL() {
QUrl sourceUrl(_url);
if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
_url.toLower().endsWith(".htm") || _url.toLower().endsWith(".html")) {
_webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
return "Web3DOverlay.qml";
} else {
return QUrl::fromLocalFile(PathUtils::resourcesPath()).toString() + "/" + _url;
}
}
void Web3DOverlay::loadSourceURL() { void Web3DOverlay::loadSourceURL() {
QUrl sourceUrl(_url); QUrl sourceUrl(_url);
@ -152,7 +165,7 @@ void Web3DOverlay::render(RenderArgs* args) {
QOpenGLContext * currentContext = QOpenGLContext::currentContext(); QOpenGLContext * currentContext = QOpenGLContext::currentContext();
QSurface * currentSurface = currentContext->surface(); QSurface * currentSurface = currentContext->surface();
if (!_webSurface) { if (!_webSurface) {
_webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(QML); _webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(pickURL());
_webSurface->setMaxFps(10); _webSurface->setMaxFps(10);
// FIXME, the max FPS could be better managed by being dynamic (based on the number of current surfaces // FIXME, the max FPS could be better managed by being dynamic (based on the number of current surfaces
// and the current rendering load) // and the current rendering load)

1
interface/src/ui/overlays/Web3DOverlay.h
View file

@ -29,6 +29,7 @@ public:
Web3DOverlay(const Web3DOverlay* Web3DOverlay); Web3DOverlay(const Web3DOverlay* Web3DOverlay);
virtual ~Web3DOverlay(); virtual ~Web3DOverlay();
QString pickURL();
void loadSourceURL(); void loadSourceURL();
virtual void render(RenderArgs* args) override; virtual void render(RenderArgs* args) override;
virtual const render::ShapeKey getShapeKey() override; virtual const render::ShapeKey getShapeKey() override;