From 2c148ca97d72734bd771bb50c5396b0b059b8a78 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Fri, 26 Jul 2024 18:23:23 -0700 Subject: [PATCH] change AO default to HBAO, remove from create --- .../entities/src/AmbientOcclusionPropertyGroup.h | 4 +++- .../entityProperties/html/js/entityProperties.js | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/entities/src/AmbientOcclusionPropertyGroup.h b/libraries/entities/src/AmbientOcclusionPropertyGroup.h index c1a734c9a4..3f348c4d39 100644 --- a/libraries/entities/src/AmbientOcclusionPropertyGroup.h +++ b/libraries/entities/src/AmbientOcclusionPropertyGroup.h @@ -91,7 +91,9 @@ public: EntityPropertyFlags& propertyFlags, bool overwriteLocalData, bool& somethingChanged) override; - DEFINE_PROPERTY_REF_ENUM(PROP_AMBIENT_OCCLUSION_TECHNIQUE, Technique, technique, AmbientOcclusionTechnique, AmbientOcclusionTechnique::SSAO); + // FIXME: On some machines, SSAO seems to be causing performance problems. Let's default to HBAO for now and maybe + // revisit when we have Vulkan + DEFINE_PROPERTY_REF_ENUM(PROP_AMBIENT_OCCLUSION_TECHNIQUE, Technique, technique, AmbientOcclusionTechnique, AmbientOcclusionTechnique::HBAO); DEFINE_PROPERTY(PROP_AMBIENT_OCCLUSION_JITTER, Jitter, jitter, bool, false); DEFINE_PROPERTY(PROP_AMBIENT_OCCLUSION_RESOLUTION_LEVEL, ResolutionLevel, resolutionLevel, uint8_t, 2); DEFINE_PROPERTY(PROP_AMBIENT_OCCLUSION_EDGE_SHARPNESS, EdgeSharpness, edgeSharpness, float, 1.0f); diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index cd129a9eca..4cc870d016 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -657,13 +657,13 @@ const GROUPS = [ options: { inherit: "Inherit", disabled: "Off", enabled: "On" }, propertyID: "ambientOcclusionMode", }, - { - label: "Technique", - type: "dropdown", - options: { ssao: "SSAO", hbao: "HBAO" }, - propertyID: "ambientOcclusion.technique", - showPropertyRule: { "ambientOcclusionMode": "enabled" }, - }, + //{ + // label: "Technique", + // type: "dropdown", + // options: { ssao: "SSAO", hbao: "HBAO" }, + // propertyID: "ambientOcclusion.technique", + // showPropertyRule: { "ambientOcclusionMode": "enabled" }, + //}, { label: "Jitter", type: "bool",