mirror of
https://github.com/overte-org/overte.git
synced 2025-06-17 19:00:51 +02:00
* mirrors wip * fix view + projection, texture flipping, billboarding * wip portals * wip * fix cpu frustum culling (hacky?) * fix mirrors in deferred * mirrors on models + text * portals use exit as ignoreItem * cleanup * entity tags * wild guess to handle view correction, hide portalExitID in create when mirrorMode != portal * let's try this?? * plz * promising * fix paramsOffset and view flipping * portals shouldn't flip * break when tag found * fix portal view calculation * Revert "Mirrors + Portals" * Revert "Revert "Mirrors + Portals"" * web entity wantsKeyboardFocus property * fix typo * move audio zones to zone entity properties * fix audio zones in create * set dynamic factory * new procecural particle entity type * fix particle intersection * shorten create labels * fix 0 update props case * Ability to smooth model animations * sound entities * fix layered simulate items * fix stereo sound speed * support non-localOnly sound avatar entities * add sound url prompt * support registration point, improve locking * remove keyboardRasied * locking attempt #2 * fix keyboardRasied typo * add default particle props * add unlit property for shapes * Merge branch master into protocol_changes * add ambient light color * fix create issue * fix create issue * add tonemapping props to zones, wip ambient occlusion * wip ambient occlusion * it's working! * remove attachments * fix non-localOnly positional sounds not updating * change AO default to HBAO, remove from create * more graphics options * fix AO setting + effects in mirrors * fix AA in mirrors * alezia's fixes * fix haze in mirrors * add comment for SKYBOX_DISTANCE * new line * model loading priority updates over time, takes into account out of bounds, avatar entities have higher priority, and fsts can specify to wait for wearables to load before rendering * add loadPriority to model entities, working on other avatars waitForWearables * fix build error * try to fix isServer assert * fix stats + waitForWearables * Listen for click instead of release. * Reverted initial commit. Implemented hack to listen for menu click events. * Missed some reverts. * Missed another one. * Prevent duplicate actions. * Added extra needed checks. * Fix without formatting? (#91) * Hopefully fixed formatting. * Things can't be too easy. * Remove google poly * automated entity property serialization * cleanup + automate EntityPropertyFlags * text vertical alignment, use uint8_t for entity property enums, fix text recalculating too often * fix text size * Update interface/resources/controllers/keyboardMouse.json Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com> * fix component mode serialization * Fixed mouse look in selfie mode. * fix text debug assert on invalid or unloaded font * missed some enums * fix ADD_GROUP_PROPERTY_TO_MAP * fix PROP_GRAB_EQUIPPABLE_INDICATOR_URL missing urlPermission * fix KeyLightPropertyGroup legacy properties * fix PolyLineEntityItem::getEntityProperties * comment cmake script * fix copyright * Replaced key value with key text. Added additional comment about the specific delete key used. * weekly promoted place Highlight the first place in the list as the weekly promoted place * Fixed lingering references to `avatarIcon`. Signed-off-by: armored-dragon <publicmail@armoreddragon.com> * Adding icon for "Grab And Equip" section Adding icon for "Grab And Equip" section * Add "Grab And Equip" section Add "Grab And Equip" section for the grabbale and Equipable groups of properties. * Add files via upload * Add tooltips for the "Grab and Equip" properties Add the tooltips for the "Grab and Equip" properties * Text adjustments for grab.equippable Text adjustments for grab.equippable * Make Maturity Filter persisted Make Maturity Filter persisted and with a default value (Teen & Everyone) * Adjust the default value for maturity Adjust the default value for maturity * move "triggerable" under GRAB & EQUIP move "triggerable" under GRAB & EQUIP * Remove hifi-screenshare Cherry picked and updated from Tivoli dd5b6ea6ee5597a06603e16509640e7ed18106bb Co-authored-by: Julian Groß <julian.g@posteo.de> * Insert placeholder to not break protocol yet. * Fix incorrectly resolved merge conflict, left too much code. * Fixes based on review comments on previous PR * Remove code accidentally re-added during a conflict fix * bump protocol * rebuild fonts with full charset (NOT -allglyphs) * Attempt at fixing Windows master branch builds * Change minimum angular velocity to a lower one * Fix Uuid.NULL behavior --------- Signed-off-by: armored-dragon <publicmail@armoreddragon.com> Co-authored-by: HifiExperiments <thingsandstuffblog@gmail.com> Co-authored-by: ksuprynowicz <ksuprynowicz@post.pl> Co-authored-by: Dale Glass <51060919+daleglass@users.noreply.github.com> Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com> Co-authored-by: Julian Groß <julian.g@posteo.de> Co-authored-by: armored-dragon <publicmail@armoreddragon.com> Co-authored-by: Armored-Dragon <github56254@armoreddragon.com> Co-authored-by: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Co-authored-by: Maki <mxmcube@gmail.com> Co-authored-by: Dale Glass <dale@daleglass.net>
178 lines
6.3 KiB
QML
178 lines
6.3 KiB
QML
//
|
|
// surfaceGeometryPass.qml
|
|
//
|
|
// Created by Sam Gateau on 6/6/2016
|
|
// Copyright 2016 High Fidelity, Inc.
|
|
// Copyright 2023 Overte e.V.
|
|
//
|
|
// Distributed under the Apache License, Version 2.0.
|
|
// See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
import QtQuick 2.7
|
|
import QtQuick.Controls 1.4
|
|
import QtQuick.Layouts 1.3
|
|
|
|
import stylesUit 1.0
|
|
import controlsUit 1.0 as HifiControls
|
|
|
|
import "configSlider"
|
|
import "../lib/plotperf"
|
|
|
|
Rectangle {
|
|
HifiConstants { id: hifi;}
|
|
id: root;
|
|
anchors.margins: hifi.dimensions.contentMargin.x
|
|
|
|
color: hifi.colors.baseGray;
|
|
|
|
Column {
|
|
id: surfaceGeometry
|
|
spacing: 8
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.margins: hifi.dimensions.contentMargin.x
|
|
|
|
Repeater {
|
|
model: [
|
|
"Blur Edge Sharpness:edgeSharpness:1.0:false",
|
|
"Blur Radius:blurRadius:15.0:true",
|
|
"Resolution Downscale:resolutionLevel:2:true",
|
|
]
|
|
ConfigSlider {
|
|
label: qsTr(modelData.split(":")[0])
|
|
integral: (modelData.split(":")[3] == 'true')
|
|
config: Render.getConfig("RenderMainView.AmbientOcclusion")
|
|
property: modelData.split(":")[1]
|
|
max: modelData.split(":")[2]
|
|
min: 0.0
|
|
height:38
|
|
}
|
|
}
|
|
|
|
Row {
|
|
spacing: 10
|
|
Column {
|
|
Repeater {
|
|
model: [
|
|
"debugEnabled:debug",
|
|
"horizonBased:horizonBased",
|
|
"jitterEnabled:jitterEnabled",
|
|
"ditheringEnabled:ditheringEnabled",
|
|
"fetchMipsEnabled:fetchMipsEnabled",
|
|
"borderingEnabled:borderingEnabled"
|
|
]
|
|
HifiControls.CheckBox {
|
|
boxSize: 20
|
|
text: qsTr(modelData.split(":")[0])
|
|
checked: Render.getConfig("RenderMainView.AmbientOcclusion")[modelData.split(":")[1]]
|
|
onCheckedChanged: { Render.getConfig("RenderMainView.AmbientOcclusion")[modelData.split(":")[1]] = checked }
|
|
}
|
|
}
|
|
}
|
|
Column {
|
|
Repeater {
|
|
model: [
|
|
"showCursorPixel:showCursorPixel"
|
|
]
|
|
HifiControls.CheckBox {
|
|
boxSize: 20
|
|
text: qsTr(modelData.split(":")[0])
|
|
checked: Render.getConfig("RenderMainView.DebugAmbientOcclusion")[modelData.split(":")[1]]
|
|
onCheckedChanged: { Render.getConfig("RenderMainView.DebugAmbientOcclusion")[modelData.split(":")[1]] = checked }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
PlotPerf {
|
|
title: "Timing"
|
|
height: 50
|
|
object: Render.getConfig("RenderMainView.AmbientOcclusion")
|
|
valueUnit: "ms"
|
|
valueScale: 1
|
|
valueNumDigits: "3"
|
|
plots: [
|
|
{
|
|
prop: "gpuRunTime",
|
|
label: "gpu",
|
|
color: "#FFFFFF"
|
|
}
|
|
]
|
|
}
|
|
|
|
TabView {
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
height: 400
|
|
|
|
Tab {
|
|
title: "SSAO"
|
|
|
|
Rectangle {
|
|
color: hifi.colors.baseGray;
|
|
|
|
Column {
|
|
spacing: 8
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.margins: hifi.dimensions.contentMargin.x
|
|
|
|
Repeater {
|
|
model: [
|
|
"Radius:ssaoRadius:2.0:false",
|
|
"Level:ssaoObscuranceLevel:1.0:false",
|
|
"Num Taps:ssaoNumSamples:64:true",
|
|
"Taps Spiral:ssaoNumSpiralTurns:10.0:false",
|
|
"Falloff Angle:ssaoFalloffAngle:1.0:false",
|
|
]
|
|
ConfigSlider {
|
|
label: qsTr(modelData.split(":")[0])
|
|
integral: (modelData.split(":")[3] == 'true')
|
|
config: Render.getConfig("RenderMainView.AmbientOcclusion")
|
|
property: modelData.split(":")[1]
|
|
max: modelData.split(":")[2]
|
|
min: 0.0
|
|
height:38
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Tab {
|
|
title: "HBAO"
|
|
|
|
Rectangle {
|
|
color: hifi.colors.baseGray;
|
|
|
|
Column {
|
|
spacing: 8
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.margins: hifi.dimensions.contentMargin.x
|
|
|
|
Repeater {
|
|
model: [
|
|
"Radius:hbaoRadius:2.0:false",
|
|
"Level:hbaoObscuranceLevel:1.0:false",
|
|
"Num Taps:hbaoNumSamples:6:true",
|
|
"Falloff Angle:hbaoFalloffAngle:1.0:false",
|
|
]
|
|
ConfigSlider {
|
|
label: qsTr(modelData.split(":")[0])
|
|
integral: (modelData.split(":")[3] == 'true')
|
|
config: Render.getConfig("RenderMainView.AmbientOcclusion")
|
|
property: modelData.split(":")[1]
|
|
max: modelData.split(":")[2]
|
|
min: 0.0
|
|
height:38
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|