mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 19:59:28 +02:00
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
This commit is contained in:
commit
e9d28cf275
17 changed files with 383 additions and 124 deletions
|
@ -21,6 +21,7 @@ Item {
|
||||||
signal newViewRequestedCallback(var request)
|
signal newViewRequestedCallback(var request)
|
||||||
signal loadingChangedCallback(var loadRequest)
|
signal loadingChangedCallback(var loadRequest)
|
||||||
|
|
||||||
|
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
||||||
property bool interactive: false
|
property bool interactive: false
|
||||||
|
@ -29,6 +30,10 @@ Item {
|
||||||
id: hifi
|
id: hifi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function stop() {
|
||||||
|
webViewCore.stop();
|
||||||
|
}
|
||||||
|
|
||||||
function unfocus() {
|
function unfocus() {
|
||||||
webViewCore.runJavaScript("if (document.activeElement) document.activeElement.blur();", function(result) {
|
webViewCore.runJavaScript("if (document.activeElement) document.activeElement.blur();", function(result) {
|
||||||
console.log('unfocus completed: ', result);
|
console.log('unfocus completed: ', result);
|
||||||
|
|
|
@ -21,6 +21,10 @@ Item {
|
||||||
property bool passwordField: false
|
property bool passwordField: false
|
||||||
property alias flickable: webroot.interactive
|
property alias flickable: webroot.interactive
|
||||||
|
|
||||||
|
function stop() {
|
||||||
|
webroot.stop();
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface
|
// FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface
|
||||||
// or provide HMDinfo object to QML in RenderableWebEntityItem and do the following.
|
// or provide HMDinfo object to QML in RenderableWebEntityItem and do the following.
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -9,11 +9,6 @@
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
//
|
//
|
||||||
|
|
||||||
/**jsdoc
|
|
||||||
* The LOD class manages your Level of Detail functions within interface
|
|
||||||
* @namespace LODManager
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef hifi_LODManager_h
|
#ifndef hifi_LODManager_h
|
||||||
#define hifi_LODManager_h
|
#define hifi_LODManager_h
|
||||||
|
|
||||||
|
@ -39,10 +34,32 @@ const float ADJUST_LOD_MIN_SIZE_SCALE = DEFAULT_OCTREE_SIZE_SCALE * 0.04f;
|
||||||
|
|
||||||
class AABox;
|
class AABox;
|
||||||
|
|
||||||
|
/**jsdoc
|
||||||
|
* The LOD class manages your Level of Detail functions within Interface.
|
||||||
|
* @namespace LODManager
|
||||||
|
* @property {number} presentTime <em>Read-only.</em>
|
||||||
|
* @property {number} engineRunTime <em>Read-only.</em>
|
||||||
|
* @property {number} gpuTime <em>Read-only.</em>
|
||||||
|
* @property {number} avgRenderTime <em>Read-only.</em>
|
||||||
|
* @property {number} fps <em>Read-only.</em>
|
||||||
|
* @property {number} lodLevel <em>Read-only.</em>
|
||||||
|
* @property {number} lodDecreaseFPS <em>Read-only.</em>
|
||||||
|
* @property {number} lodIncreaseFPS <em>Read-only.</em>
|
||||||
|
*/
|
||||||
|
|
||||||
class LODManager : public QObject, public Dependency {
|
class LODManager : public QObject, public Dependency {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
SINGLETON_DEPENDENCY
|
SINGLETON_DEPENDENCY
|
||||||
|
|
||||||
|
Q_PROPERTY(float presentTime READ getPresentTime)
|
||||||
|
Q_PROPERTY(float engineRunTime READ getEngineRunTime)
|
||||||
|
Q_PROPERTY(float gpuTime READ getGPUTime)
|
||||||
|
Q_PROPERTY(float avgRenderTime READ getAverageRenderTime)
|
||||||
|
Q_PROPERTY(float fps READ getMaxTheoreticalFPS)
|
||||||
|
Q_PROPERTY(float lodLevel READ getLODLevel)
|
||||||
|
Q_PROPERTY(float lodDecreaseFPS READ getLODDecreaseFPS)
|
||||||
|
Q_PROPERTY(float lodIncreaseFPS READ getLODIncreaseFPS)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/**jsdoc
|
/**jsdoc
|
||||||
|
@ -138,28 +155,6 @@ public:
|
||||||
*/
|
*/
|
||||||
Q_INVOKABLE float getLODIncreaseFPS() const;
|
Q_INVOKABLE float getLODIncreaseFPS() const;
|
||||||
|
|
||||||
/**jsdoc
|
|
||||||
* @namespace LODManager
|
|
||||||
* @property {number} presentTime <em>Read-only.</em>
|
|
||||||
* @property {number} engineRunTime <em>Read-only.</em>
|
|
||||||
* @property {number} gpuTime <em>Read-only.</em>
|
|
||||||
* @property {number} avgRenderTime <em>Read-only.</em>
|
|
||||||
* @property {number} fps <em>Read-only.</em>
|
|
||||||
* @property {number} lodLevel <em>Read-only.</em>
|
|
||||||
* @property {number} lodDecreaseFPS <em>Read-only.</em>
|
|
||||||
* @property {number} lodIncreaseFPS <em>Read-only.</em>
|
|
||||||
*/
|
|
||||||
|
|
||||||
Q_PROPERTY(float presentTime READ getPresentTime)
|
|
||||||
Q_PROPERTY(float engineRunTime READ getEngineRunTime)
|
|
||||||
Q_PROPERTY(float gpuTime READ getGPUTime)
|
|
||||||
Q_PROPERTY(float avgRenderTime READ getAverageRenderTime)
|
|
||||||
Q_PROPERTY(float fps READ getMaxTheoreticalFPS)
|
|
||||||
Q_PROPERTY(float lodLevel READ getLODLevel)
|
|
||||||
|
|
||||||
Q_PROPERTY(float lodDecreaseFPS READ getLODDecreaseFPS)
|
|
||||||
Q_PROPERTY(float lodIncreaseFPS READ getLODIncreaseFPS)
|
|
||||||
|
|
||||||
float getPresentTime() const { return _presentTime; }
|
float getPresentTime() const { return _presentTime; }
|
||||||
float getEngineRunTime() const { return _engineRunTime; }
|
float getEngineRunTime() const { return _engineRunTime; }
|
||||||
float getGPUTime() const { return _gpuTime; }
|
float getGPUTime() const { return _gpuTime; }
|
||||||
|
|
|
@ -615,9 +615,15 @@ void Wallet::updateImageProvider() {
|
||||||
securityImageProvider->setSecurityImage(_securityImage);
|
securityImageProvider->setSecurityImage(_securityImage);
|
||||||
|
|
||||||
// inform tablet security image provider
|
// inform tablet security image provider
|
||||||
QQmlEngine* tabletEngine = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system")->getTabletSurface()->getSurfaceContext()->engine();
|
TabletProxy* tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
|
||||||
securityImageProvider = reinterpret_cast<SecurityImageProvider*>(tabletEngine->imageProvider(SecurityImageProvider::PROVIDER_NAME));
|
if (tablet) {
|
||||||
securityImageProvider->setSecurityImage(_securityImage);
|
OffscreenQmlSurface* tabletSurface = tablet->getTabletSurface();
|
||||||
|
if (tabletSurface) {
|
||||||
|
QQmlEngine* tabletEngine = tabletSurface->getSurfaceContext()->engine();
|
||||||
|
securityImageProvider = reinterpret_cast<SecurityImageProvider*>(tabletEngine->imageProvider(SecurityImageProvider::PROVIDER_NAME));
|
||||||
|
securityImageProvider->setSecurityImage(_securityImage);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Wallet::chooseSecurityImage(const QString& filename) {
|
void Wallet::chooseSecurityImage(const QString& filename) {
|
||||||
|
|
|
@ -28,7 +28,7 @@ class ScriptEngine;
|
||||||
/**jsdoc
|
/**jsdoc
|
||||||
* The Controller API provides facilities to interact with computer and controller hardware.
|
* The Controller API provides facilities to interact with computer and controller hardware.
|
||||||
*
|
*
|
||||||
* <h5>Functions:</h5>
|
* <h5>Functions</h5>
|
||||||
*
|
*
|
||||||
* <p>Properties</p>
|
* <p>Properties</p>
|
||||||
* <ul>
|
* <ul>
|
||||||
|
@ -143,6 +143,61 @@ class ScriptEngine;
|
||||||
* <li>{@link Controller.stopInputPlayback|stopInputPlayback}</li>
|
* <li>{@link Controller.stopInputPlayback|stopInputPlayback}</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
*
|
*
|
||||||
|
* <h5>Entity Methods:</h5>
|
||||||
|
*
|
||||||
|
* <p>The default scripts implement hand controller actions that use {@link Entities.callEntityMethod} to call entity script
|
||||||
|
* methods, if present in the entity being interacted with.</p>
|
||||||
|
*
|
||||||
|
* <table>
|
||||||
|
* <thead>
|
||||||
|
* <tr><th>Method Name</th><th>Description</th><th>Example</th></tr>
|
||||||
|
* </thead>
|
||||||
|
* <tbody>
|
||||||
|
* <tr>
|
||||||
|
* <td><code>startFarTrigger</code><br /><code>continueFarTrigger</code><br /><code>stopFarTrigger</code></td>
|
||||||
|
* <td>These methods are called when a user is more than 0.3m away from the entity, the entity is triggerable, and the
|
||||||
|
* user starts, continues, or stops squeezing the trigger.</td>
|
||||||
|
* </td>
|
||||||
|
* <td>A light switch that can be toggled on and off from a distance.</td>
|
||||||
|
* </tr>
|
||||||
|
* <tr>
|
||||||
|
* <td><code>startNearTrigger</code><br /><code>continueNearTrigger</code><br /><code>stopNearTrigger</code></td>
|
||||||
|
* <td>These methods are called when a user is less than 0.3m away from the entity, the entity is triggerable, and the
|
||||||
|
* user starts, continues, or stops squeezing the trigger.</td>
|
||||||
|
* <td>A doorbell that can be rung when a user is near.</td>
|
||||||
|
* </tr>
|
||||||
|
* <tr>
|
||||||
|
* <td><code>startDistanceGrab</code><br /><code>continueDistanceGrab</code><br /></td>
|
||||||
|
* <td>These methods are called when a user is more than 0.3m away from the entity, the entity is either cloneable, or
|
||||||
|
* grabbable and not locked, and the user starts or continues to squeeze the trigger.</td>
|
||||||
|
* <td>A comet that emits icy particle trails when a user is dragging it through the sky.</td>
|
||||||
|
* </tr>
|
||||||
|
* <tr>
|
||||||
|
* <td><code>startNearGrab</code><br /><code>continueNearGrab</code><br /></td>
|
||||||
|
* <td>These methods are called when a user is less than 0.3m away from the entity, the entity is either cloneable, or
|
||||||
|
* grabbable and not locked, and the user starts or continues to squeeze the trigger.</td>
|
||||||
|
* <td>A ball that glows when it's being held close.</td>
|
||||||
|
* </tr>
|
||||||
|
* <tr>
|
||||||
|
* <td><code>releaseGrab</code></td>
|
||||||
|
* <td>This method is called when a user releases the trigger when having been either distance or near grabbing an
|
||||||
|
* entity.</td>
|
||||||
|
* <td>Turn off the ball glow or comet trail with the user finishes grabbing it.</td>
|
||||||
|
* </tr>
|
||||||
|
* <tr>
|
||||||
|
* <td><code>startEquip</code><br /><code>continueEquip</code><br /><code>releaseEquip</code></td>
|
||||||
|
* <td>These methods are called when a user starts, continues, or stops equipping an entity.</td>
|
||||||
|
* <td>A glass that stays in the user's hand after the trigger is clicked.</td>
|
||||||
|
* </tr>
|
||||||
|
* </tbody>
|
||||||
|
* </table>
|
||||||
|
* <p>All the entity methods are called with the following two arguments:</p>
|
||||||
|
* <ul>
|
||||||
|
* <li>The entity ID.</li>
|
||||||
|
* <li>A string, <code>"hand,userID"</code> — where "hand" is <code>"left"</code> or <code>"right"</code>, and "userID"
|
||||||
|
* is the user's {@link MyAvatar|MyAvatar.sessionUUID}.</li>
|
||||||
|
* </ul>
|
||||||
|
*
|
||||||
* @namespace Controller
|
* @namespace Controller
|
||||||
*
|
*
|
||||||
* @property {Controller.Actions} Actions - Predefined actions on Interface and the user's avatar. These can be used as end
|
* @property {Controller.Actions} Actions - Predefined actions on Interface and the user's avatar. These can be used as end
|
||||||
|
|
|
@ -39,7 +39,9 @@ class UserInputMapper;
|
||||||
* methods.</li>
|
* methods.</li>
|
||||||
* <li>Use {@link Controller.parseMapping} or {@link Controller.loadMapping} to load a {@link Controller.MappingJSON}.</li>
|
* <li>Use {@link Controller.parseMapping} or {@link Controller.loadMapping} to load a {@link Controller.MappingJSON}.</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
* <p>Enable the mapping using {@link MappingObject#enable|enable} or {@link Controller.enableMapping} for it to take effect.
|
*
|
||||||
|
* <p>Enable the mapping using {@link MappingObject#enable|enable} or {@link Controller.enableMapping} for it to take
|
||||||
|
* effect.</p>
|
||||||
*
|
*
|
||||||
* <p>Mappings and their routes are applied according to the following rules:</p>
|
* <p>Mappings and their routes are applied according to the following rules:</p>
|
||||||
* <ul>
|
* <ul>
|
||||||
|
@ -49,7 +51,7 @@ class UserInputMapper;
|
||||||
* output that already has a route the new route is ignored.</li>
|
* output that already has a route the new route is ignored.</li>
|
||||||
* <li>New mappings override previous mappings: each output is processed using the route in the most recently enabled
|
* <li>New mappings override previous mappings: each output is processed using the route in the most recently enabled
|
||||||
* mapping that contains that output.</li>
|
* mapping that contains that output.</li>
|
||||||
* </p>
|
* </ul>
|
||||||
*
|
*
|
||||||
* @class MappingObject
|
* @class MappingObject
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -29,7 +29,8 @@ class ScriptingInterface;
|
||||||
* <p>A route in a {@link MappingObject} used by the {@link Controller} API.</p>
|
* <p>A route in a {@link MappingObject} used by the {@link Controller} API.</p>
|
||||||
*
|
*
|
||||||
* <p>Create a route using {@link MappingObject} methods and apply this object's methods to process it, terminating with
|
* <p>Create a route using {@link MappingObject} methods and apply this object's methods to process it, terminating with
|
||||||
* {@link RouteObject#to} to apply it to a <code>Standard</code> control, action, or script function.</p>
|
* {@link RouteObject#to} to apply it to a <code>Standard</code> control, action, or script function. Note: Loops are not
|
||||||
|
* permitted.</p>
|
||||||
*
|
*
|
||||||
* <p>Some methods apply to routes with number data, some apply routes with {@link Pose} data, and some apply to both route
|
* <p>Some methods apply to routes with number data, some apply routes with {@link Pose} data, and some apply to both route
|
||||||
* types.<p>
|
* types.<p>
|
||||||
|
|
|
@ -308,12 +308,7 @@ bool WebEntityRenderer::buildWebSurface(const TypedEntityPointer& entity) {
|
||||||
item->setProperty(URL_PROPERTY, _lastSourceUrl);
|
item->setProperty(URL_PROPERTY, _lastSourceUrl);
|
||||||
});
|
});
|
||||||
} else if (_contentType == ContentType::QmlContent) {
|
} else if (_contentType == ContentType::QmlContent) {
|
||||||
_webSurface->load(_lastSourceUrl, [this](QQmlContext* context, QObject* item) {
|
_webSurface->load(_lastSourceUrl);
|
||||||
if (item && item->objectName() == "tabletRoot") {
|
|
||||||
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
|
|
||||||
tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
_fadeStartTime = usecTimestampNow();
|
_fadeStartTime = usecTimestampNow();
|
||||||
_webSurface->resume();
|
_webSurface->resume();
|
||||||
|
@ -323,32 +318,21 @@ bool WebEntityRenderer::buildWebSurface(const TypedEntityPointer& entity) {
|
||||||
|
|
||||||
void WebEntityRenderer::destroyWebSurface() {
|
void WebEntityRenderer::destroyWebSurface() {
|
||||||
QSharedPointer<OffscreenQmlSurface> webSurface;
|
QSharedPointer<OffscreenQmlSurface> webSurface;
|
||||||
|
ContentType contentType{ ContentType::NoContent };
|
||||||
withWriteLock([&] {
|
withWriteLock([&] {
|
||||||
webSurface.swap(_webSurface);
|
webSurface.swap(_webSurface);
|
||||||
|
std::swap(contentType, _contentType);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (webSurface) {
|
if (webSurface) {
|
||||||
--_currentWebCount;
|
--_currentWebCount;
|
||||||
QQuickItem* rootItem = webSurface->getRootItem();
|
QQuickItem* rootItem = webSurface->getRootItem();
|
||||||
// Explicitly set the web URL to an empty string, in an effort to get a
|
|
||||||
// faster shutdown of any chromium processes interacting with audio
|
|
||||||
if (rootItem && _contentType == ContentType::HtmlContent) {
|
|
||||||
rootItem->setProperty(URL_PROPERTY, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rootItem && rootItem->objectName() == "tabletRoot") {
|
|
||||||
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
|
|
||||||
tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix for crash in QtWebEngineCore when rapidly switching domains
|
// Fix for crash in QtWebEngineCore when rapidly switching domains
|
||||||
// Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
|
// Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
|
||||||
if (rootItem) {
|
if (rootItem && contentType == ContentType::HtmlContent) {
|
||||||
QObject* obj = rootItem->findChild<QObject*>("webEngineView");
|
// stop loading
|
||||||
if (obj) {
|
QMetaObject::invokeMethod(rootItem, "stop");
|
||||||
// stop loading
|
|
||||||
QMetaObject::invokeMethod(obj, "stop");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
webSurface->pause();
|
webSurface->pause();
|
||||||
|
|
|
@ -153,6 +153,8 @@ void PhysicalEntitySimulation::clearEntitiesInternal() {
|
||||||
// remove the objects (aka MotionStates) from physics
|
// remove the objects (aka MotionStates) from physics
|
||||||
_physicsEngine->removeSetOfObjects(_physicalObjects);
|
_physicsEngine->removeSetOfObjects(_physicalObjects);
|
||||||
|
|
||||||
|
clearOwnershipData();
|
||||||
|
|
||||||
// delete the MotionStates
|
// delete the MotionStates
|
||||||
for (auto stateItr : _physicalObjects) {
|
for (auto stateItr : _physicalObjects) {
|
||||||
EntityMotionState* motionState = static_cast<EntityMotionState*>(&(*stateItr));
|
EntityMotionState* motionState = static_cast<EntityMotionState*>(&(*stateItr));
|
||||||
|
@ -165,7 +167,6 @@ void PhysicalEntitySimulation::clearEntitiesInternal() {
|
||||||
_physicalObjects.clear();
|
_physicalObjects.clear();
|
||||||
|
|
||||||
// clear all other lists specific to this derived class
|
// clear all other lists specific to this derived class
|
||||||
clearOwnershipData();
|
|
||||||
_entitiesToRemoveFromPhysics.clear();
|
_entitiesToRemoveFromPhysics.clear();
|
||||||
_entitiesToAddToPhysics.clear();
|
_entitiesToAddToPhysics.clear();
|
||||||
_incomingChanges.clear();
|
_incomingChanges.clear();
|
||||||
|
|
|
@ -90,19 +90,23 @@ SharedObject::~SharedObject() {
|
||||||
_renderControl = nullptr;
|
_renderControl = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_rootItem) {
|
||||||
|
delete _rootItem;
|
||||||
|
_rootItem = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
if (_quickWindow) {
|
if (_quickWindow) {
|
||||||
_quickWindow->destroy();
|
_quickWindow->destroy();
|
||||||
delete _quickWindow;
|
delete _quickWindow;
|
||||||
_quickWindow = nullptr;
|
_quickWindow = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
// _rootItem is parented to the quickWindow, so needs no explicit destruction
|
if (_qmlContext) {
|
||||||
//if (_rootItem) {
|
auto engine = _qmlContext->engine();
|
||||||
// delete _rootItem;
|
delete _qmlContext;
|
||||||
// _rootItem = nullptr;
|
_qmlContext = nullptr;
|
||||||
//}
|
releaseEngine(engine);
|
||||||
|
}
|
||||||
releaseEngine(_qmlContext->engine());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SharedObject::create(OffscreenSurface* surface) {
|
void SharedObject::create(OffscreenSurface* surface) {
|
||||||
|
@ -210,9 +214,9 @@ QQmlEngine* SharedObject::acquireEngine(OffscreenSurface* surface) {
|
||||||
if (!globalEngine) {
|
if (!globalEngine) {
|
||||||
Q_ASSERT(0 == globalEngineRefCount);
|
Q_ASSERT(0 == globalEngineRefCount);
|
||||||
globalEngine = new QQmlEngine();
|
globalEngine = new QQmlEngine();
|
||||||
surface->initializeQmlEngine(result);
|
surface->initializeEngine(result);
|
||||||
++globalEngineRefCount;
|
|
||||||
}
|
}
|
||||||
|
++globalEngineRefCount;
|
||||||
result = globalEngine;
|
result = globalEngine;
|
||||||
#else
|
#else
|
||||||
result = new QQmlEngine();
|
result = new QQmlEngine();
|
||||||
|
|
|
@ -2161,6 +2161,32 @@ void ScriptEngine::loadEntityScript(const EntityItemID& entityID, const QString&
|
||||||
}, forceRedownload);
|
}, forceRedownload);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**jsdoc
|
||||||
|
* Triggered when the script starts for a user.
|
||||||
|
* <p>Note: Can only be connected to via <code>this.preload = function (...) { ... }</code> in the entity script.</p>
|
||||||
|
* <table><tr><th>Available in:</th><td>Client Entity Scripts</td><td>Server Entity Scripts</td></tr></table>
|
||||||
|
* @function Entities.preload
|
||||||
|
* @param {Uuid} entityID - The ID of the entity that the script is running in.
|
||||||
|
* @returns {Signal}
|
||||||
|
* @example <caption>Get the ID of the entity that a client entity script is running in.</caption>
|
||||||
|
* var entityScript = (function () {
|
||||||
|
* this.entityID = Uuid.NULL;
|
||||||
|
*
|
||||||
|
* this.preload = function (entityID) {
|
||||||
|
* this.entityID = entityID;
|
||||||
|
* print("Entity ID: " + this.entityID);
|
||||||
|
* };
|
||||||
|
* );
|
||||||
|
*
|
||||||
|
* var entityID = Entities.addEntity({
|
||||||
|
* type: "Box",
|
||||||
|
* position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0, z: -5 })),
|
||||||
|
* dimensions: { x: 0.5, y: 0.5, z: 0.5 },
|
||||||
|
* color: { red: 255, green: 0, blue: 0 },
|
||||||
|
* script: "(" + entityScript + ")", // Could host the script on a Web server instead.
|
||||||
|
* lifetime: 300 // Delete after 5 minutes.
|
||||||
|
* });
|
||||||
|
*/
|
||||||
// since all of these operations can be asynch we will always do the actual work in the response handler
|
// since all of these operations can be asynch we will always do the actual work in the response handler
|
||||||
// for the download
|
// for the download
|
||||||
void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success , const QString& status) {
|
void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, const QString& scriptOrURL, const QString& contents, bool isURL, bool success , const QString& status) {
|
||||||
|
@ -2345,6 +2371,13 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
|
||||||
processDeferredEntityLoads(entityScript, entityID);
|
processDeferredEntityLoads(entityScript, entityID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**jsdoc
|
||||||
|
* Triggered when the script terminates for a user.
|
||||||
|
* <p>Note: Can only be connected to via <code>this.unoad = function () { ... }</code> in the entity script.</p>
|
||||||
|
* <table><tr><th>Available in:</th><td>Client Entity Scripts</td><td>Server Entity Scripts</td></tr></table>
|
||||||
|
* @function Entities.unload
|
||||||
|
* @returns {Signal}
|
||||||
|
*/
|
||||||
void ScriptEngine::unloadEntityScript(const EntityItemID& entityID, bool shouldRemoveFromMap) {
|
void ScriptEngine::unloadEntityScript(const EntityItemID& entityID, bool shouldRemoveFromMap) {
|
||||||
if (QThread::currentThread() != thread()) {
|
if (QThread::currentThread() != thread()) {
|
||||||
#ifdef THREAD_DEBUGGING
|
#ifdef THREAD_DEBUGGING
|
||||||
|
|
|
@ -102,6 +102,9 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, const QString& id = "", const QVariantMap& args = {}, const QVariantMap& extra = {}) {
|
inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, const QString& id = "", const QVariantMap& args = {}, const QVariantMap& extra = {}) {
|
||||||
|
if (!DependencyManager::isSet<Tracer>()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
const auto& tracer = DependencyManager::get<Tracer>();
|
const auto& tracer = DependencyManager::get<Tracer>();
|
||||||
if (tracer) {
|
if (tracer) {
|
||||||
tracer->traceEvent(category, name, type, id, args, extra);
|
tracer->traceEvent(category, name, type, id, args, extra);
|
||||||
|
|
|
@ -115,6 +115,7 @@ private:
|
||||||
class UrlHandler : public QObject {
|
class UrlHandler : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
|
UrlHandler(QObject* parent = nullptr) : QObject(parent) {}
|
||||||
Q_INVOKABLE bool canHandleUrl(const QString& url) {
|
Q_INVOKABLE bool canHandleUrl(const QString& url) {
|
||||||
static auto handler = dynamic_cast<AbstractUriHandler*>(qApp);
|
static auto handler = dynamic_cast<AbstractUriHandler*>(qApp);
|
||||||
return handler && handler->canAcceptURL(url);
|
return handler && handler->canAcceptURL(url);
|
||||||
|
@ -223,6 +224,17 @@ void AudioHandler::run() {
|
||||||
qDebug() << "QML Audio changed to " << _newTargetDevice;
|
qDebug() << "QML Audio changed to " << _newTargetDevice;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OffscreenQmlSurface::~OffscreenQmlSurface() {
|
||||||
|
clearFocusItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
void OffscreenQmlSurface::clearFocusItem() {
|
||||||
|
if (_currentFocusItem) {
|
||||||
|
disconnect(_currentFocusItem, &QObject::destroyed, this, &OffscreenQmlSurface::focusDestroyed);
|
||||||
|
}
|
||||||
|
_currentFocusItem = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
|
void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
|
||||||
Parent::initializeEngine(engine);
|
Parent::initializeEngine(engine);
|
||||||
new QQmlFileSelector(engine);
|
new QQmlFileSelector(engine);
|
||||||
|
@ -246,7 +258,7 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
|
||||||
|
|
||||||
auto rootContext = engine->rootContext();
|
auto rootContext = engine->rootContext();
|
||||||
rootContext->setContextProperty("GL", ::getGLContextData());
|
rootContext->setContextProperty("GL", ::getGLContextData());
|
||||||
rootContext->setContextProperty("urlHandler", new UrlHandler());
|
rootContext->setContextProperty("urlHandler", new UrlHandler(rootContext));
|
||||||
rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
|
rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
|
||||||
rootContext->setContextProperty("ApplicationInterface", qApp);
|
rootContext->setContextProperty("ApplicationInterface", qApp);
|
||||||
auto javaScriptToInject = getEventBridgeJavascript();
|
auto javaScriptToInject = getEventBridgeJavascript();
|
||||||
|
@ -545,17 +557,15 @@ bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QT
|
||||||
}
|
}
|
||||||
|
|
||||||
void OffscreenQmlSurface::focusDestroyed(QObject* obj) {
|
void OffscreenQmlSurface::focusDestroyed(QObject* obj) {
|
||||||
if (_currentFocusItem) {
|
clearFocusItem();
|
||||||
disconnect(_currentFocusItem, &QObject::destroyed, this, &OffscreenQmlSurface::focusDestroyed);
|
|
||||||
}
|
|
||||||
_currentFocusItem = nullptr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OffscreenQmlSurface::onFocusObjectChanged(QObject* object) {
|
void OffscreenQmlSurface::onFocusObjectChanged(QObject* object) {
|
||||||
|
clearFocusItem();
|
||||||
|
|
||||||
QQuickItem* item = static_cast<QQuickItem*>(object);
|
QQuickItem* item = static_cast<QQuickItem*>(object);
|
||||||
if (!item) {
|
if (!item) {
|
||||||
setFocusText(false);
|
setFocusText(false);
|
||||||
_currentFocusItem = nullptr;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -563,10 +573,6 @@ void OffscreenQmlSurface::onFocusObjectChanged(QObject* object) {
|
||||||
qApp->sendEvent(object, &query);
|
qApp->sendEvent(object, &query);
|
||||||
setFocusText(query.value(Qt::ImEnabled).toBool());
|
setFocusText(query.value(Qt::ImEnabled).toBool());
|
||||||
|
|
||||||
if (_currentFocusItem) {
|
|
||||||
disconnect(_currentFocusItem, &QObject::destroyed, this, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Raise and lower keyboard for QML text fields.
|
// Raise and lower keyboard for QML text fields.
|
||||||
// HTML text fields are handled in emitWebEvent() methods - testing READ_ONLY_PROPERTY prevents action for HTML files.
|
// HTML text fields are handled in emitWebEvent() methods - testing READ_ONLY_PROPERTY prevents action for HTML files.
|
||||||
const char* READ_ONLY_PROPERTY = "readOnly";
|
const char* READ_ONLY_PROPERTY = "readOnly";
|
||||||
|
|
|
@ -22,7 +22,8 @@ class OffscreenQmlSurface : public hifi::qml::OffscreenSurface {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(bool focusText READ isFocusText NOTIFY focusTextChanged)
|
Q_PROPERTY(bool focusText READ isFocusText NOTIFY focusTextChanged)
|
||||||
public:
|
public:
|
||||||
|
~OffscreenQmlSurface();
|
||||||
|
|
||||||
static void addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback);
|
static void addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback);
|
||||||
static void addWhitelistContextHandler(const QUrl& url, const QmlContextCallback& callback) { addWhitelistContextHandler({ { url } }, callback); };
|
static void addWhitelistContextHandler(const QUrl& url, const QmlContextCallback& callback) { addWhitelistContextHandler({ { url } }, callback); };
|
||||||
|
|
||||||
|
@ -58,6 +59,7 @@ public slots:
|
||||||
void sendToQml(const QVariant& message);
|
void sendToQml(const QVariant& message);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
void clearFocusItem();
|
||||||
void setFocusText(bool newFocusText);
|
void setFocusText(bool newFocusText);
|
||||||
void initializeEngine(QQmlEngine* engine) override;
|
void initializeEngine(QQmlEngine* engine) override;
|
||||||
void onRootContextCreated(QQmlContext* qmlContext) override;
|
void onRootContextCreated(QQmlContext* qmlContext) override;
|
||||||
|
|
|
@ -1291,6 +1291,7 @@ function cleanupModelMenus() {
|
||||||
Menu.removeMenuItem("Edit", MENU_EASE_ON_FOCUS);
|
Menu.removeMenuItem("Edit", MENU_EASE_ON_FOCUS);
|
||||||
Menu.removeMenuItem("Edit", MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE);
|
Menu.removeMenuItem("Edit", MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE);
|
||||||
Menu.removeMenuItem("Edit", MENU_SHOW_ZONES_IN_EDIT_MODE);
|
Menu.removeMenuItem("Edit", MENU_SHOW_ZONES_IN_EDIT_MODE);
|
||||||
|
Menu.removeMenuItem("Edit", MENU_CREATE_ENTITIES_GRABBABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
Script.scriptEnding.connect(function () {
|
Script.scriptEnding.connect(function () {
|
||||||
|
|
47
tests/qml/qml/controls/WebEntityView.qml
Normal file
47
tests/qml/qml/controls/WebEntityView.qml
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
//
|
||||||
|
// WebEntityView.qml
|
||||||
|
//
|
||||||
|
// Created by Kunal Gosar on 16 March 2017
|
||||||
|
// Copyright 2017 High Fidelity, Inc.
|
||||||
|
//
|
||||||
|
// Distributed under the Apache License, Version 2.0.
|
||||||
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
//
|
||||||
|
|
||||||
|
import QtQuick 2.5
|
||||||
|
import QtWebEngine 1.5
|
||||||
|
import Hifi 1.0
|
||||||
|
|
||||||
|
/*
|
||||||
|
TestItem {
|
||||||
|
Rectangle {
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: 10
|
||||||
|
color: "blue"
|
||||||
|
property string url: ""
|
||||||
|
ColorAnimation on color {
|
||||||
|
loops: Animation.Infinite; from: "blue"; to: "yellow"; duration: 1000
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
WebEngineView {
|
||||||
|
id: webViewCore
|
||||||
|
objectName: "webEngineView"
|
||||||
|
width: parent !== null ? parent.width : undefined
|
||||||
|
height: parent !== null ? parent.height : undefined
|
||||||
|
|
||||||
|
onFeaturePermissionRequested: {
|
||||||
|
grantFeaturePermission(securityOrigin, feature, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
//disable popup
|
||||||
|
onContextMenuRequested: {
|
||||||
|
request.accepted = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
onNewViewRequested: {
|
||||||
|
newViewRequestedCallback(request)
|
||||||
|
}
|
||||||
|
}
|
|
@ -28,52 +28,87 @@
|
||||||
#include <QtGui/QImage>
|
#include <QtGui/QImage>
|
||||||
#include <QtGui/QOpenGLFunctions_4_5_Core>
|
#include <QtGui/QOpenGLFunctions_4_5_Core>
|
||||||
#include <QtGui/QOpenGLContext>
|
#include <QtGui/QOpenGLContext>
|
||||||
|
#include <QtQuick/QQuickItem>
|
||||||
#include <QtQml/QQmlContext>
|
#include <QtQml/QQmlContext>
|
||||||
#include <QtQml/QQmlComponent>
|
#include <QtQml/QQmlComponent>
|
||||||
|
|
||||||
|
#include <SettingInterface.h>
|
||||||
|
|
||||||
#include <gl/OffscreenGLCanvas.h>
|
#include <gl/OffscreenGLCanvas.h>
|
||||||
#include <GLMHelpers.h>
|
|
||||||
#include <PathUtils.h>
|
#include <PathUtils.h>
|
||||||
#include <NumericalConstants.h>
|
#include <NumericalConstants.h>
|
||||||
#include <PerfStat.h>
|
#include <PerfStat.h>
|
||||||
#include <PathUtils.h>
|
#include <PathUtils.h>
|
||||||
#include <ViewFrustum.h>
|
#include <ViewFrustum.h>
|
||||||
#include <qml/OffscreenSurface.h>
|
#include <qml/OffscreenSurface.h>
|
||||||
|
#include <unordered_set>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
|
namespace gl {
|
||||||
|
extern void initModuleGl();
|
||||||
|
}
|
||||||
|
|
||||||
class OffscreenQmlSurface : public hifi::qml::OffscreenSurface {
|
class QTestItem : public QQuickItem {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
QTestItem(QQuickItem* parent = nullptr) : QQuickItem(parent) { qDebug() << __FUNCTION__; }
|
||||||
|
|
||||||
|
~QTestItem() { qDebug() << __FUNCTION__; }
|
||||||
|
};
|
||||||
|
|
||||||
|
QUrl getTestResource(const QString& relativePath) {
|
||||||
|
static QString dir;
|
||||||
|
if (dir.isEmpty()) {
|
||||||
|
QDir path(__FILE__);
|
||||||
|
path.cdUp();
|
||||||
|
dir = path.cleanPath(path.absoluteFilePath("../")) + "/";
|
||||||
|
qDebug() << "Resources Path: " << dir;
|
||||||
|
}
|
||||||
|
return QUrl::fromLocalFile(dir + relativePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
#define DIVISIONS_X 5
|
||||||
|
#define DIVISIONS_Y 5
|
||||||
|
|
||||||
|
using QmlPtr = QSharedPointer<hifi::qml::OffscreenSurface>;
|
||||||
|
using TextureAndFence = hifi::qml::OffscreenSurface::TextureAndFence;
|
||||||
|
|
||||||
|
struct QmlInfo {
|
||||||
|
QmlPtr surface;
|
||||||
|
GLuint texture{ 0 };
|
||||||
|
uint64_t lifetime{ 0 };
|
||||||
};
|
};
|
||||||
|
|
||||||
class TestWindow : public QWindow {
|
class TestWindow : public QWindow {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TestWindow();
|
TestWindow();
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
using TextureAndFence = hifi::qml::OffscreenSurface::TextureAndFence;
|
|
||||||
QOpenGLContext _glContext;
|
QOpenGLContext _glContext;
|
||||||
OffscreenGLCanvas _sharedContext;
|
OffscreenGLCanvas _sharedContext;
|
||||||
OffscreenQmlSurface _offscreenQml;
|
std::array<std::array<QmlInfo, DIVISIONS_Y>, DIVISIONS_X> _surfaces;
|
||||||
|
|
||||||
QOpenGLFunctions_4_5_Core _glf;
|
QOpenGLFunctions_4_5_Core _glf;
|
||||||
uint32_t _currentTexture{ 0 };
|
|
||||||
GLsync _readFence{ 0 };
|
|
||||||
std::function<void(uint32_t, void*)> _discardLamdba;
|
std::function<void(uint32_t, void*)> _discardLamdba;
|
||||||
QSize _size;
|
QSize _size;
|
||||||
|
size_t _surfaceCount{ 0 };
|
||||||
GLuint _fbo{ 0 };
|
GLuint _fbo{ 0 };
|
||||||
const QSize _qmlSize{ 640, 480 };
|
const QSize _qmlSize{ 640, 480 };
|
||||||
bool _aboutToQuit{ false };
|
bool _aboutToQuit{ false };
|
||||||
|
uint64_t _createStopTime;
|
||||||
void initGl();
|
void initGl();
|
||||||
|
void updateSurfaces();
|
||||||
|
void buildSurface(QmlInfo& qmlInfo, bool allowVideo);
|
||||||
|
void destroySurface(QmlInfo& qmlInfo);
|
||||||
void resizeWindow(const QSize& size);
|
void resizeWindow(const QSize& size);
|
||||||
void draw();
|
void draw();
|
||||||
void resizeEvent(QResizeEvent* ev) override;
|
void resizeEvent(QResizeEvent* ev) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
TestWindow::TestWindow() {
|
TestWindow::TestWindow() {
|
||||||
setSurfaceType(QSurface::OpenGLSurface);
|
Setting::init();
|
||||||
|
|
||||||
|
setSurfaceType(QSurface::OpenGLSurface);
|
||||||
QSurfaceFormat format;
|
QSurfaceFormat format;
|
||||||
format.setDepthBufferSize(24);
|
format.setDepthBufferSize(24);
|
||||||
format.setStencilBufferSize(8);
|
format.setStencilBufferSize(8);
|
||||||
|
@ -83,13 +118,16 @@ TestWindow::TestWindow() {
|
||||||
QSurfaceFormat::setDefaultFormat(format);
|
QSurfaceFormat::setDefaultFormat(format);
|
||||||
setFormat(format);
|
setFormat(format);
|
||||||
|
|
||||||
|
qmlRegisterType<QTestItem>("Hifi", 1, 0, "TestItem");
|
||||||
|
|
||||||
show();
|
show();
|
||||||
|
_createStopTime = usecTimestampNow() + (3000u * USECS_PER_SECOND);
|
||||||
|
|
||||||
resize(QSize(800, 600));
|
resize(QSize(800, 600));
|
||||||
|
|
||||||
auto timer = new QTimer(this);
|
auto timer = new QTimer(this);
|
||||||
timer->setTimerType(Qt::PreciseTimer);
|
timer->setTimerType(Qt::PreciseTimer);
|
||||||
timer->setInterval(5);
|
timer->setInterval(30);
|
||||||
connect(timer, &QTimer::timeout, [&] { draw(); });
|
connect(timer, &QTimer::timeout, [&] { draw(); });
|
||||||
timer->start();
|
timer->start();
|
||||||
|
|
||||||
|
@ -97,7 +135,6 @@ TestWindow::TestWindow() {
|
||||||
timer->stop();
|
timer->stop();
|
||||||
_aboutToQuit = true;
|
_aboutToQuit = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TestWindow::initGl() {
|
void TestWindow::initGl() {
|
||||||
|
@ -105,6 +142,7 @@ void TestWindow::initGl() {
|
||||||
if (!_glContext.create() || !_glContext.makeCurrent(this)) {
|
if (!_glContext.create() || !_glContext.makeCurrent(this)) {
|
||||||
qFatal("Unable to intialize Window GL context");
|
qFatal("Unable to intialize Window GL context");
|
||||||
}
|
}
|
||||||
|
gl::initModuleGl();
|
||||||
|
|
||||||
_glf.initializeOpenGLFunctions();
|
_glf.initializeOpenGLFunctions();
|
||||||
_glf.glCreateFramebuffers(1, &_fbo);
|
_glf.glCreateFramebuffers(1, &_fbo);
|
||||||
|
@ -113,15 +151,97 @@ void TestWindow::initGl() {
|
||||||
qFatal("Unable to intialize Shared GL context");
|
qFatal("Unable to intialize Shared GL context");
|
||||||
}
|
}
|
||||||
hifi::qml::OffscreenSurface::setSharedContext(_sharedContext.getContext());
|
hifi::qml::OffscreenSurface::setSharedContext(_sharedContext.getContext());
|
||||||
_discardLamdba = _offscreenQml.getDiscardLambda();
|
_discardLamdba = hifi::qml::OffscreenSurface::getDiscardLambda();
|
||||||
_offscreenQml.resize({ 640, 480 });
|
|
||||||
_offscreenQml.load(QUrl::fromLocalFile("C:/Users/bdavi/Git/hifi/tests/qml/qml/main.qml"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TestWindow::resizeWindow(const QSize& size) {
|
void TestWindow::resizeWindow(const QSize& size) {
|
||||||
_size = size;
|
_size = size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const int DEFAULT_MAX_FPS = 10;
|
||||||
|
static const QString CONTROL_URL{ "/qml/controls/WebEntityView.qml" };
|
||||||
|
static const char* URL_PROPERTY{ "url" };
|
||||||
|
|
||||||
|
QString getSourceUrl(bool video) {
|
||||||
|
static const std::vector<QString> SOURCE_URLS{
|
||||||
|
"https://www.reddit.com/wiki/random",
|
||||||
|
"https://en.wikipedia.org/wiki/Wikipedia:Random",
|
||||||
|
"https://slashdot.org/",
|
||||||
|
};
|
||||||
|
|
||||||
|
static const std::vector<QString> VIDEO_SOURCE_URLS{
|
||||||
|
"https://www.youtube.com/watch?v=gDXwhHm4GhM",
|
||||||
|
"https://www.youtube.com/watch?v=Ch_hoYPPeGc",
|
||||||
|
};
|
||||||
|
|
||||||
|
const auto& sourceUrls = video ? VIDEO_SOURCE_URLS : SOURCE_URLS;
|
||||||
|
auto index = rand() % sourceUrls.size();
|
||||||
|
return sourceUrls[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWindow::buildSurface(QmlInfo& qmlInfo, bool video) {
|
||||||
|
++_surfaceCount;
|
||||||
|
auto lifetimeSecs = (uint32_t)(5.0f + (randFloat() * 10.0f));
|
||||||
|
auto lifetimeUsecs = (USECS_PER_SECOND * lifetimeSecs);
|
||||||
|
qmlInfo.lifetime = lifetimeUsecs + usecTimestampNow();
|
||||||
|
qmlInfo.texture = 0;
|
||||||
|
qmlInfo.surface.reset(new hifi::qml::OffscreenSurface());
|
||||||
|
qmlInfo.surface->load(getTestResource(CONTROL_URL), [video](QQmlContext* context, QQuickItem* item) {
|
||||||
|
item->setProperty(URL_PROPERTY, getSourceUrl(video));
|
||||||
|
});
|
||||||
|
qmlInfo.surface->setMaxFps(DEFAULT_MAX_FPS);
|
||||||
|
qmlInfo.surface->resize(_qmlSize);
|
||||||
|
qmlInfo.surface->resume();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWindow::destroySurface(QmlInfo& qmlInfo) {
|
||||||
|
auto& surface = qmlInfo.surface;
|
||||||
|
auto webView = surface->getRootItem();
|
||||||
|
if (webView) {
|
||||||
|
// stop loading
|
||||||
|
QMetaObject::invokeMethod(webView, "stop");
|
||||||
|
webView->setProperty(URL_PROPERTY, "about:blank");
|
||||||
|
}
|
||||||
|
surface->pause();
|
||||||
|
surface.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWindow::updateSurfaces() {
|
||||||
|
auto now = usecTimestampNow();
|
||||||
|
// Fetch any new textures
|
||||||
|
for (size_t x = 0; x < DIVISIONS_X; ++x) {
|
||||||
|
for (size_t y = 0; y < DIVISIONS_Y; ++y) {
|
||||||
|
auto& qmlInfo = _surfaces[x][y];
|
||||||
|
if (!qmlInfo.surface) {
|
||||||
|
if (now < _createStopTime && randFloat() > 0.99f) {
|
||||||
|
buildSurface(qmlInfo, x == 0 && y == 0);
|
||||||
|
} else {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (now > qmlInfo.lifetime) {
|
||||||
|
destroySurface(qmlInfo);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& surface = qmlInfo.surface;
|
||||||
|
auto& currentTexture = qmlInfo.texture;
|
||||||
|
|
||||||
|
TextureAndFence newTextureAndFence;
|
||||||
|
if (surface->fetchTexture(newTextureAndFence)) {
|
||||||
|
if (currentTexture != 0) {
|
||||||
|
auto readFence = _glf.glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
|
||||||
|
glFlush();
|
||||||
|
_discardLamdba(currentTexture, readFence);
|
||||||
|
}
|
||||||
|
currentTexture = newTextureAndFence.first;
|
||||||
|
_glf.glWaitSync((GLsync)newTextureAndFence.second, 0, GL_TIMEOUT_IGNORED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void TestWindow::draw() {
|
void TestWindow::draw() {
|
||||||
if (_aboutToQuit) {
|
if (_aboutToQuit) {
|
||||||
return;
|
return;
|
||||||
|
@ -140,38 +260,30 @@ void TestWindow::draw() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateSurfaces();
|
||||||
|
|
||||||
|
auto size = this->geometry().size();
|
||||||
|
auto incrementX = size.width() / DIVISIONS_X;
|
||||||
|
auto incrementY = size.height() / DIVISIONS_Y;
|
||||||
|
_glf.glViewport(0, 0, size.width(), size.height());
|
||||||
_glf.glClearColor(1, 0, 0, 1);
|
_glf.glClearColor(1, 0, 0, 1);
|
||||||
_glf.glClear(GL_COLOR_BUFFER_BIT);
|
_glf.glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
for (uint32_t x = 0; x < DIVISIONS_X; ++x) {
|
||||||
TextureAndFence newTextureAndFence;
|
for (uint32_t y = 0; y < DIVISIONS_Y; ++y) {
|
||||||
if (_offscreenQml.fetchTexture(newTextureAndFence)) {
|
auto& qmlInfo = _surfaces[x][y];
|
||||||
if (_currentTexture) {
|
if (!qmlInfo.surface || !qmlInfo.texture) {
|
||||||
_discardLamdba(_currentTexture, _readFence);
|
continue;
|
||||||
_readFence = 0;
|
}
|
||||||
|
_glf.glNamedFramebufferTexture(_fbo, GL_COLOR_ATTACHMENT0, qmlInfo.texture, 0);
|
||||||
|
_glf.glBlitNamedFramebuffer(_fbo, 0,
|
||||||
|
// src coordinates
|
||||||
|
0, 0, _qmlSize.width() - 1, _qmlSize.height() - 1,
|
||||||
|
// dst coordinates
|
||||||
|
incrementX * x, incrementY * y, incrementX * (x + 1), incrementY * (y + 1),
|
||||||
|
// blit mask and filter
|
||||||
|
GL_COLOR_BUFFER_BIT, GL_NEAREST);
|
||||||
}
|
}
|
||||||
|
|
||||||
_currentTexture = newTextureAndFence.first;
|
|
||||||
_glf.glWaitSync((GLsync)newTextureAndFence.second, 0, GL_TIMEOUT_IGNORED);
|
|
||||||
_glf.glNamedFramebufferTexture(_fbo, GL_COLOR_ATTACHMENT0, _currentTexture, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
auto diff = _size - _qmlSize;
|
|
||||||
diff /= 2;
|
|
||||||
auto qmlExtent = diff + _qmlSize;
|
|
||||||
|
|
||||||
if (_currentTexture) {
|
|
||||||
_glf.glBlitNamedFramebuffer(_fbo, 0,
|
|
||||||
0, 0, _qmlSize.width() - 1, _qmlSize.height() - 1,
|
|
||||||
diff.width(), diff.height(), qmlExtent.width() - 1, qmlExtent.height() - 2,
|
|
||||||
GL_COLOR_BUFFER_BIT, GL_NEAREST);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_readFence) {
|
|
||||||
_glf.glDeleteSync(_readFence);
|
|
||||||
}
|
|
||||||
_readFence = _glf.glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
|
|
||||||
_glf.glFlush();
|
|
||||||
|
|
||||||
_glContext.swapBuffers(this);
|
_glContext.swapBuffers(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,11 +292,9 @@ void TestWindow::resizeEvent(QResizeEvent* ev) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
setupHifiApplication("QML Test");
|
|
||||||
|
|
||||||
QGuiApplication app(argc, argv);
|
QGuiApplication app(argc, argv);
|
||||||
TestWindow window;
|
TestWindow window;
|
||||||
app.exec();
|
return app.exec();
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include "main.moc"
|
||||||
|
|
Loading…
Reference in a new issue