mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 10:37:35 +02:00
add flag to outline render flags, fix pal.js/edit.js interaction
This commit is contained in:
parent
96500d897c
commit
4b7779f0f5
4 changed files with 15 additions and 6 deletions
|
@ -1489,7 +1489,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
|
||||||
properties["atp_mapping_requests"] = atpMappingRequests;
|
properties["atp_mapping_requests"] = atpMappingRequests;
|
||||||
|
|
||||||
properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false;
|
properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false;
|
||||||
|
|
||||||
QJsonObject bytesDownloaded;
|
QJsonObject bytesDownloaded;
|
||||||
bytesDownloaded["atp"] = statTracker->getStat(STAT_ATP_RESOURCE_TOTAL_BYTES).toInt();
|
bytesDownloaded["atp"] = statTracker->getStat(STAT_ATP_RESOURCE_TOTAL_BYTES).toInt();
|
||||||
bytesDownloaded["http"] = statTracker->getStat(STAT_HTTP_RESOURCE_TOTAL_BYTES).toInt();
|
bytesDownloaded["http"] = statTracker->getStat(STAT_HTTP_RESOURCE_TOTAL_BYTES).toInt();
|
||||||
|
@ -5420,8 +5420,13 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
|
||||||
//ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, transaction);
|
//ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, transaction);
|
||||||
|
|
||||||
RenderArgs::OutlineFlags renderOutlineFlags = RenderArgs::RENDER_OUTLINE_NONE;
|
RenderArgs::OutlineFlags renderOutlineFlags = RenderArgs::RENDER_OUTLINE_NONE;
|
||||||
if (DependencyManager::get<ContextOverlayInterface>()->getIsInMarketplaceInspectionMode()) {
|
auto contextOverlayInterface = DependencyManager::get<ContextOverlayInterface>();
|
||||||
renderOutlineFlags = RenderArgs::RENDER_OUTLINE_WIREFRAMES;
|
if (contextOverlayInterface->getEnabled()) {
|
||||||
|
if (DependencyManager::get<ContextOverlayInterface>()->getIsInMarketplaceInspectionMode()) {
|
||||||
|
renderOutlineFlags = RenderArgs::RENDER_OUTLINE_MARKETPLACE_MODE;
|
||||||
|
} else {
|
||||||
|
renderOutlineFlags = RenderArgs::RENDER_OUTLINE_WIREFRAMES;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
renderArgs->_outlineFlags = renderOutlineFlags;
|
renderArgs->_outlineFlags = renderOutlineFlags;
|
||||||
}
|
}
|
||||||
|
|
|
@ -372,7 +372,10 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
|
||||||
_model->updateRenderItems();
|
_model->updateRenderItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool showingEntityHighlight = ((bool)(args->_outlineFlags & (int)RenderArgs::RENDER_OUTLINE_WIREFRAMES) && getMarketplaceID().length() != 0) || getShouldHighlight();
|
// this simple logic should say we set showingEntityHighlight to true whenever we are in marketplace mode and we have a marketplace id, or
|
||||||
|
// whenever we are not set to none and shouldHighlight is true.
|
||||||
|
bool showingEntityHighlight = ((bool)(args->_outlineFlags & (int)RenderArgs::RENDER_OUTLINE_MARKETPLACE_MODE) && getMarketplaceID().length() != 0) ||
|
||||||
|
(args->_outlineFlags != RenderArgs::RENDER_OUTLINE_NONE && getShouldHighlight());
|
||||||
if (showingEntityHighlight) {
|
if (showingEntityHighlight) {
|
||||||
static glm::vec4 yellowColor(1.0f, 1.0f, 0.0f, 1.0f);
|
static glm::vec4 yellowColor(1.0f, 1.0f, 0.0f, 1.0f);
|
||||||
gpu::Batch& batch = *args->_batch;
|
gpu::Batch& batch = *args->_batch;
|
||||||
|
|
|
@ -66,7 +66,8 @@ namespace render {
|
||||||
enum OutlineFlags {
|
enum OutlineFlags {
|
||||||
RENDER_OUTLINE_NONE = 0,
|
RENDER_OUTLINE_NONE = 0,
|
||||||
RENDER_OUTLINE_WIREFRAMES = 1,
|
RENDER_OUTLINE_WIREFRAMES = 1,
|
||||||
RENDER_OUTLINE_SHADER = 2
|
RENDER_OUTLINE_MARKETPLACE_MODE = 2,
|
||||||
|
RENDER_OUTLINE_SHADER = 4
|
||||||
};
|
};
|
||||||
enum DebugFlags {
|
enum DebugFlags {
|
||||||
RENDER_DEBUG_NONE = 0,
|
RENDER_DEBUG_NONE = 0,
|
||||||
|
|
|
@ -710,6 +710,7 @@ function off() {
|
||||||
Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
|
Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
|
||||||
tablet.tabletShownChanged.disconnect(tabletVisibilityChanged);
|
tablet.tabletShownChanged.disconnect(tabletVisibilityChanged);
|
||||||
isWired = false;
|
isWired = false;
|
||||||
|
ContextOverlay.enabled = true
|
||||||
}
|
}
|
||||||
if (audioTimer) {
|
if (audioTimer) {
|
||||||
Script.clearInterval(audioTimer);
|
Script.clearInterval(audioTimer);
|
||||||
|
@ -718,7 +719,6 @@ function off() {
|
||||||
triggerPressMapping.disable(); // see above
|
triggerPressMapping.disable(); // see above
|
||||||
removeOverlays();
|
removeOverlays();
|
||||||
Users.requestsDomainListData = false;
|
Users.requestsDomainListData = false;
|
||||||
ContextOverlay.enabled = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function tabletVisibilityChanged() {
|
function tabletVisibilityChanged() {
|
||||||
|
|
Loading…
Reference in a new issue