From d5e251d8da0168bfcf69da6e239075655b711a8e Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Mon, 26 Feb 2024 14:58:15 -0800 Subject: [PATCH] minor cleanup, copyright --- .../scripting/RenderScriptingInterface.cpp | 2 +- .../src/scripting/RenderScriptingInterface.h | 2 +- .../src/RenderableGizmoEntityItem.cpp | 2 +- .../src/RenderableGridEntityItem.cpp | 1 + .../src/RenderableImageEntityItem.cpp | 1 + .../src/RenderableLineEntityItem.cpp | 2 +- .../src/RenderableModelEntityItem.cpp | 2 +- .../RenderableParticleEffectEntityItem.cpp | 8 ++- .../src/RenderablePolyLineEntityItem.cpp | 2 +- .../src/RenderablePolyVoxEntityItem.cpp | 1 - .../src/RenderableShapeEntityItem.cpp | 12 ++-- .../src/RenderableTextEntityItem.cpp | 17 +++--- .../src/RenderableTextEntityItem.h | 1 - .../src/RenderableWebEntityItem.cpp | 1 + .../entities-renderer/src/paintStroke.slf | 2 +- .../entities-renderer/src/paintStroke.slv | 2 +- libraries/entities-renderer/src/polyvox.slf | 3 +- libraries/entities-renderer/src/polyvox.slv | 1 + .../src/textured_particle.slf | 3 + .../src/textured_particle.slv | 4 +- .../gpu-gl-common/src/gpu/gl/GLBackend.cpp | 8 +-- .../gpu-gl-common/src/gpu/gl/GLBackend.h | 8 +-- .../src/gpu/gl/GLBackendPipeline.cpp | 1 + .../src/gpu/gl/GLBackendTransform.cpp | 6 +- .../gpu-gl-common/src/gpu/gl/GLPipeline.cpp | 1 + .../gpu-gl-common/src/gpu/gl/GLPipeline.h | 1 + libraries/gpu-gl/src/gpu/gl41/GL41Backend.h | 1 + .../src/gpu/gl41/GL41BackendTransform.cpp | 1 + libraries/gpu-gl/src/gpu/gl45/GL45Backend.h | 1 + .../src/gpu/gl45/GL45BackendTexture.cpp | 1 + .../src/gpu/gl45/GL45BackendTransform.cpp | 1 + libraries/gpu/src/gpu/Backend.cpp | 4 +- libraries/gpu/src/gpu/Backend.h | 2 +- libraries/gpu/src/gpu/Batch.cpp | 5 +- libraries/gpu/src/gpu/Batch.h | 1 + libraries/gpu/src/gpu/Context.cpp | 1 + libraries/gpu/src/gpu/Context.h | 1 + libraries/gpu/src/gpu/DrawUnitQuad.slv | 7 ++- libraries/gpu/src/gpu/FrameIOKeys.h | 2 +- libraries/gpu/src/gpu/FrameReader.cpp | 2 +- libraries/gpu/src/gpu/FrameWriter.cpp | 2 +- libraries/gpu/src/gpu/Query.h | 1 + libraries/gpu/src/gpu/Transform.slh | 6 +- .../gpu/src/gpu/TransformCamera_shared.slh | 2 +- .../gpu/src/gpu/TransformObject_shared.slh | 4 +- libraries/graphics/src/graphics/Haze.slh | 1 + libraries/graphics/src/graphics/Skybox.cpp | 1 + libraries/graphics/src/graphics/Skybox.h | 1 + libraries/graphics/src/graphics/skybox.slf | 2 +- libraries/graphics/src/graphics/skybox.slh | 10 +-- libraries/graphics/src/graphics/skybox.slv | 5 +- .../src/procedural/ProceduralSkybox.cpp | 1 + .../src/procedural/ProceduralSkybox.h | 1 + .../src/procedural/proceduralSkybox.slf | 2 +- .../render-utils/src/AntialiasingEffect.cpp | 50 +++++---------- .../render-utils/src/AntialiasingEffect.h | 61 +++++++++++++------ .../render-utils/src/BackgroundStage.cpp | 2 +- libraries/render-utils/src/BloomEffect.cpp | 1 + libraries/render-utils/src/BloomThreshold.slf | 1 + .../src/CauterizedMeshPartPayload.cpp | 3 +- .../render-utils/src/DebugDeferredBuffer.cpp | 2 +- .../render-utils/src/DebugDeferredBuffer.h | 1 + .../render-utils/src/DeferredBufferRead.slh | 1 + .../render-utils/src/DeferredBufferWrite.slh | 10 +-- .../src/DeferredBufferWrite_shared.slh | 4 +- .../src/DeferredFrameTransform.cpp | 1 + .../render-utils/src/DeferredFrameTransform.h | 6 +- .../render-utils/src/DeferredFramebuffer.cpp | 1 + .../render-utils/src/DeferredFramebuffer.h | 1 + .../src/DeferredLightingEffect.cpp | 1 + .../render-utils/src/DeferredTransform.slh | 2 +- .../src/DeferredTransform_shared.slh | 4 +- libraries/render-utils/src/GeometryCache.cpp | 1 + libraries/render-utils/src/HighlightEffect.h | 6 +- .../render-utils/src/Highlight_aabox.slv | 1 + libraries/render-utils/src/LightClusters.cpp | 1 + .../render-utils/src/MeshPartPayload.cpp | 5 +- libraries/render-utils/src/MeshPartPayload.h | 2 +- .../render-utils/src/RenderCommonTask.cpp | 2 +- libraries/render-utils/src/RenderCommonTask.h | 1 + .../render-utils/src/RenderDeferredTask.cpp | 2 +- .../render-utils/src/RenderDeferredTask.h | 3 +- .../render-utils/src/RenderForwardTask.cpp | 1 + .../render-utils/src/RenderForwardTask.h | 1 + .../render-utils/src/RenderHUDLayerTask.cpp | 2 +- .../render-utils/src/RenderHUDLayerTask.h | 2 +- libraries/render-utils/src/RenderViewTask.cpp | 1 + libraries/render-utils/src/RenderViewTask.h | 1 + .../render-utils/src/StencilMaskPass.cpp | 1 + libraries/render-utils/src/StencilMaskPass.h | 3 +- libraries/render-utils/src/VelocityWrite.slh | 2 +- libraries/render-utils/src/ZoneRenderer.cpp | 1 + libraries/render-utils/src/aa_blend.slf | 5 +- .../src/deferred_light_limited.slv | 1 + .../src/directional_skybox_light.slf | 1 + .../render-utils/src/drawWorkloadProxy.slf | 1 + .../render-utils/src/drawWorkloadProxy.slv | 2 +- .../render-utils/src/drawWorkloadView.slf | 1 + .../render-utils/src/drawWorkloadView.slv | 1 + libraries/render-utils/src/grid.slf | 2 +- libraries/render-utils/src/grid.slv | 4 +- .../src/lightClusters_drawClusterContent.slf | 1 + .../lightClusters_drawClusterFromDepth.slf | 1 + .../src/local_lights_drawOutline.slf | 1 + .../render-utils/src/local_lights_shading.slf | 1 + libraries/render-utils/src/model.slf | 21 ++++--- libraries/render-utils/src/parabola.slf | 1 + libraries/render-utils/src/parabola.slv | 1 + .../src/render-utils/ShaderConstants.h | 1 + libraries/render-utils/src/sdf_text3D.slf | 3 + libraries/render-utils/src/sdf_text3D.slh | 1 + libraries/render-utils/src/sdf_text3D.slv | 2 + libraries/render-utils/src/simple.slf | 2 +- libraries/render-utils/src/simple.slv | 2 +- .../render-utils/src/simple_procedural.slf | 1 + .../render-utils/src/simple_procedural.slv | 1 + .../src/surfaceGeometry_makeCurvature.slf | 1 + libraries/render-utils/src/taa.slf | 2 +- libraries/render-utils/src/taa.slh | 4 +- libraries/render-utils/src/taa_blend.slf | 1 + libraries/render-utils/src/web_browser.slf | 1 + libraries/render-utils/src/web_browser.slv | 2 +- .../render-utils/src/zone_drawAmbient.slf | 1 + .../render-utils/src/zone_drawKeyLight.slf | 1 + .../render-utils/src/zone_drawSkybox.slf | 1 + .../render/src/render/DrawSceneOctree.cpp | 1 + libraries/render/src/render/DrawSceneOctree.h | 3 +- libraries/render/src/render/DrawStatus.cpp | 1 + libraries/render/src/render/DrawTask.cpp | 3 +- libraries/render/src/render/DrawTask.h | 3 +- libraries/render/src/render/Engine.h | 1 + libraries/render/src/render/ShapePipeline.cpp | 1 + .../render/src/render/drawItemStatus.slv | 2 +- .../utilities/render/luci/Antialiasing.qml | 2 +- .../utilities/render/luci/Framebuffer.qml | 1 + tools/gpu-frame-player/src/RenderThread.cpp | 2 +- 136 files changed, 266 insertions(+), 180 deletions(-) diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index 50bdb5557d..cecfbc63a2 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -219,7 +219,7 @@ void RenderScriptingInterface::forceAntialiasingMode(AntialiasingSetupConfig::Mo setAntialiasingModeForView( mode, secondViewJitterCamConfig, secondViewAntialiasingConfig); } - _antialiasingModeSetting.set(_antialiasingMode); + _antialiasingModeSetting.set((int)_antialiasingMode); }); } diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index dd95cca568..126fc67f94 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -246,7 +246,7 @@ private: Setting::Handle _shadowsEnabledSetting { "shadowsEnabled", true }; Setting::Handle _ambientOcclusionEnabledSetting { "ambientOcclusionEnabled", false }; //Setting::Handle _antialiasingModeSetting { "antialiasingMode", AntialiasingConfig::Mode::TAA }; - Setting::Handle _antialiasingModeSetting { "antialiasingMode", AntialiasingSetupConfig::Mode::NONE }; + Setting::Handle _antialiasingModeSetting { "antialiasingMode", (int)AntialiasingSetupConfig::Mode::NONE }; Setting::Handle _viewportResolutionScaleSetting { "viewportResolutionScale", 1.0f }; Setting::Handle _fullScreenScreenSetting { "fullScreenScreen", "" }; diff --git a/libraries/entities-renderer/src/RenderableGizmoEntityItem.cpp b/libraries/entities-renderer/src/RenderableGizmoEntityItem.cpp index 2b7d45dc4c..e8ac59898a 100644 --- a/libraries/entities-renderer/src/RenderableGizmoEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableGizmoEntityItem.cpp @@ -1,7 +1,7 @@ // // Created by Sam Gondelman on 1/22/19 // Copyright 2019 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/RenderableGridEntityItem.cpp b/libraries/entities-renderer/src/RenderableGridEntityItem.cpp index 76ae8760be..d535c5f846 100644 --- a/libraries/entities-renderer/src/RenderableGridEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableGridEntityItem.cpp @@ -1,6 +1,7 @@ // // Created by Sam Gondelman on 11/29/18 // Copyright 2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/RenderableImageEntityItem.cpp b/libraries/entities-renderer/src/RenderableImageEntityItem.cpp index 217c64f1fb..209a551b4a 100644 --- a/libraries/entities-renderer/src/RenderableImageEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableImageEntityItem.cpp @@ -1,6 +1,7 @@ // // Created by Sam Gondelman on 11/29/18 // Copyright 2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index 95fe17c986..5752e6eb65 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -4,7 +4,7 @@ // // Created by Seth Alves on 5/11/15. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index f5e7550a27..c30cf05c8f 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -4,7 +4,7 @@ // // Created by Brad Hefta-Gaub on 8/6/14. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp index accaae0a1c..2276d52111 100644 --- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp @@ -3,7 +3,7 @@ // interface/src // // Created by Jason Rickwald on 3/2/15. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -32,6 +32,7 @@ static ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, co state->setDepthTest(true, false, gpu::LESS_EQUAL); state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE, gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE); + // TODO: handle opaque PrepareStencil::testMaskResetNoAA(*state); auto program = gpu::Shader::createProgram(shader::entities_renderer::program::textured_particle); @@ -456,7 +457,10 @@ void ParticleEffectEntityRenderer::doRender(RenderArgs* args) { color.finish = EntityRenderer::calculatePulseColor(_particleProperties.getColorFinish(), _pulseProperties, _created); color.spread = EntityRenderer::calculatePulseColor(_particleProperties.getColorSpread(), _pulseProperties, _created); - batch.setModelTransform(transform); // particles are currently always transparent so we don't worry about TAA right now + batch.setModelTransform(transform, _prevRenderTransform); + if (args->_renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || args->_renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { + _prevRenderTransform = transform; + } batch.setUniformBuffer(0, _uniformBuffer); batch.setInputFormat(_vertexFormat); diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index 1e7e3f688b..2d9b025cbf 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -4,7 +4,7 @@ // // Created by Eric Levin on 8/10/15 // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index c7581f3ec1..4210031482 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -4,7 +4,6 @@ // // Created by Seth Alves on 5/19/15. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. // Copyright 2022-2023 Overte e.V. // // Distributed under the Apache License, Version 2.0. diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp index 7f73902eca..1f0865eddc 100644 --- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp @@ -1,7 +1,7 @@ // // Created by Bradley Austin Davis on 2016/05/09 // Copyright 2013 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -112,13 +112,8 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) { auto geometryCache = DependencyManager::get(); GeometryCache::Shape geometryShape = geometryCache->getShapeForEntityShape(_shape); Transform transform; - Transform prevTransform; withReadLock([&] { transform = _renderTransform; - prevTransform = _prevRenderTransform; - if (args->_renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || args->_renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { - _prevRenderTransform = _renderTransform; - } }); bool wireframe = render::ShapeKey(args->_globalShapeKey).isWireframe() || _primitiveMode == PrimitiveMode::LINES; @@ -126,7 +121,10 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) { transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), _billboardMode, args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition(), _shape < entity::Shape::Cube || _shape > entity::Shape::Icosahedron)); - batch.setModelTransform(transform, prevTransform); + batch.setModelTransform(transform, _prevRenderTransform); + if (args->_renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || args->_renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { + _prevRenderTransform = transform; + } Pipeline pipelineType = getPipelineType(materials); if (pipelineType == Pipeline::PROCEDURAL) { diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp index 7769e1ef68..3fd9bfc6c8 100644 --- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp @@ -4,8 +4,7 @@ // // Created by Brad Hefta-Gaub on 8/6/14. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. -// Copyright 2023 Overte e.V. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -160,19 +159,17 @@ void TextEntityRenderer::doRender(RenderArgs* args) { bool transparent; Transform transform; - Transform prevTransform; withReadLock([&] { transparent = isTransparent(); transform = _renderTransform; - prevTransform = _prevRenderTransform; - transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), _billboardMode, - args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition())); - if (args->_renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || args->_renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { - _prevRenderTransform = transform; - } }); - batch.setModelTransform(transform, prevTransform); + transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), _billboardMode, + args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition())); + batch.setModelTransform(transform, _prevRenderTransform); + if (args->_renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || args->_renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { + _prevRenderTransform = transform; + } Pipeline pipelineType = getPipelineType(materials); if (pipelineType == Pipeline::PROCEDURAL) { diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.h b/libraries/entities-renderer/src/RenderableTextEntityItem.h index df256a5cd0..738d93704f 100644 --- a/libraries/entities-renderer/src/RenderableTextEntityItem.h +++ b/libraries/entities-renderer/src/RenderableTextEntityItem.h @@ -4,7 +4,6 @@ // // Created by Brad Hefta-Gaub on 8/6/14. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. // Copyright 2023 Overte e.V. // // Distributed under the Apache License, Version 2.0. diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index cd2f8b25f8..a6db84e056 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -2,6 +2,7 @@ // Created by Bradley Austin Davis on 2015/05/12 // Copyright 2013 High Fidelity, Inc. // Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/paintStroke.slf b/libraries/entities-renderer/src/paintStroke.slf index 4b73d50bd7..2d4d8e4d26 100644 --- a/libraries/entities-renderer/src/paintStroke.slf +++ b/libraries/entities-renderer/src/paintStroke.slf @@ -5,7 +5,7 @@ // // Created by Eric Levin on 8/10/2015 // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/paintStroke.slv b/libraries/entities-renderer/src/paintStroke.slv index 23315cbc2d..bdf31012f0 100644 --- a/libraries/entities-renderer/src/paintStroke.slv +++ b/libraries/entities-renderer/src/paintStroke.slv @@ -5,7 +5,7 @@ // // Created by Eric Levin on 7/20/15. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/polyvox.slf b/libraries/entities-renderer/src/polyvox.slf index dd735ecf16..f5251fe1f8 100644 --- a/libraries/entities-renderer/src/polyvox.slf +++ b/libraries/entities-renderer/src/polyvox.slf @@ -5,6 +5,7 @@ // // Created by Seth Alves on 2015-8-3 // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -37,7 +38,7 @@ <@if HIFI_USE_FORWARD@> layout(location=RENDER_UTILS_ATTR_POSITION_ES) in vec4 _positionES; <@else@> - layout(location=RENDER_UTILS_ATTR_PREV_POSITION_CS) in vec4 _prevPositionCS; + layout(location=RENDER_UTILS_ATTR_PREV_POSITION_CS) in vec4 _prevPositionCS; <@endif@> layout(location=RENDER_UTILS_ATTR_POSITION_MS) in vec3 _positionMS; layout(location=RENDER_UTILS_ATTR_NORMAL_WS) in vec3 _normalWS; diff --git a/libraries/entities-renderer/src/polyvox.slv b/libraries/entities-renderer/src/polyvox.slv index 42ee508bfd..794d56645d 100644 --- a/libraries/entities-renderer/src/polyvox.slv +++ b/libraries/entities-renderer/src/polyvox.slv @@ -4,6 +4,7 @@ // Generated on <$_SCRIBE_DATE$> // // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/entities-renderer/src/textured_particle.slf b/libraries/entities-renderer/src/textured_particle.slf index 7dadb6fc49..2b8e189832 100644 --- a/libraries/entities-renderer/src/textured_particle.slf +++ b/libraries/entities-renderer/src/textured_particle.slf @@ -5,6 +5,7 @@ // textured_particle.frag // // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -19,4 +20,6 @@ layout(location=0) out vec4 outFragColor; void main(void) { outFragColor = texture(colorMap, varTexcoord.xy) * varColor; + + // TODO: handle opaque particles } diff --git a/libraries/entities-renderer/src/textured_particle.slv b/libraries/entities-renderer/src/textured_particle.slv index e66b7d0302..eb0054630c 100644 --- a/libraries/entities-renderer/src/textured_particle.slv +++ b/libraries/entities-renderer/src/textured_particle.slv @@ -5,7 +5,7 @@ // texture_particle.vert // // Copyright 2015 High Fidelity, Inc. -// Copyright 2023 Overte e.V. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -174,4 +174,6 @@ void main(void) { vec4 quadPos = radius * vec4(UNIT_QUAD[twoTriID], 0.0); vec4 eyePos = anchorPoint + rotation * quadPos; <$transformEyeToClipPos(cam, eyePos, gl_Position)$> + + // TODO: _prevPositionCS } diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp index e80279fa87..6e4a9f66c5 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp @@ -4,7 +4,7 @@ // // Created by Sam Gateau on 10/27/2014. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -325,6 +325,7 @@ void GLBackend::renderPassTransfer(const Batch& batch) { case Batch::COMMAND_drawIndexedInstanced: case Batch::COMMAND_multiDrawIndirect: case Batch::COMMAND_multiDrawIndexedIndirect: + case Batch::COMMAND_copySavedViewProjectionTransformToBuffer: // We need to store this transform state in the transform buffer preUpdateTransform(); break; @@ -336,11 +337,6 @@ void GLBackend::renderPassTransfer(const Batch& batch) { _stereo._contextDisable = false; break; - case Batch::COMMAND_copySavedViewProjectionTransformToBuffer: - // We need to store this transform state in the transform buffer - preUpdateTransform(); - break; - case Batch::COMMAND_setFramebuffer: case Batch::COMMAND_setViewportTransform: case Batch::COMMAND_setViewTransform: diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h index 8d07b069d6..4ff3b959b3 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h @@ -4,7 +4,7 @@ // // Created by Sam Gateau on 10/27/2014. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -308,7 +308,7 @@ protected: virtual bool supportsBindless() const { return false; } static const size_t INVALID_OFFSET = (size_t)-1; - static const uint INVALID_SAVED_CAMERA_SLOT = (uint)-1; + static const uint INVALID_SAVED_CAMERA_SLOT = (uint)-1; bool _inRenderTransferPass { false }; int _currentDraw { -1 }; @@ -424,7 +424,7 @@ protected: using CameraBufferElement = TransformCamera; #endif using TransformCameras = std::vector; - + struct ViewProjectionState { Transform _view; Transform _correctedView; @@ -448,7 +448,7 @@ protected: TransformCamera _camera; TransformCameras _cameras; - std::array _savedTransforms; + std::array _savedTransforms; mutable std::map _drawCallInfoOffsets; diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp index 45db4ba5fb..5c2219e720 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 3/8/2015. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp index 0f07fde876..db228281e3 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp @@ -4,7 +4,7 @@ // // Created by Sam Gateau on 3/8/2015. // Copyright 2014 High Fidelity, Inc. -// Copyright 2023 Overte e.V. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -19,7 +19,7 @@ void GLBackend::do_setModelTransform(const Batch& batch, size_t paramOffset) { } void GLBackend::do_setViewTransform(const Batch& batch, size_t paramOffset) { - _transform._viewProjectionState._view = batch._transforms.get(batch._params[paramOffset]._uint); + _transform._viewProjectionState._view = batch._transforms.get(batch._params[paramOffset]._uint); // View history is only supported with saved transforms and if setViewTransform is called (and not setSavedViewProjectionTransform) // then, in consequence, the view will NOT be corrected in the present thread. In which case // the previousCorrectedView should be the same as the view. @@ -119,7 +119,7 @@ void GLBackend::syncTransformStateCache() { Mat4 modelView; auto modelViewInv = glm::inverse(modelView); - _transform._viewProjectionState._view.evalFromRawMatrix(modelViewInv); + _transform._viewProjectionState._view.evalFromRawMatrix(modelViewInv); glDisableVertexAttribArray(gpu::Stream::DRAW_CALL_INFO); _transform._enabledDrawcallInfoBuffer = false; diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.cpp index d4786a5a8f..0d7b28e223 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.cpp @@ -1,6 +1,7 @@ // // Created by Bradley Austin Davis on 2016/05/15 // Copyright 2013-2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.h b/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.h index 1634483323..b58ca3be6d 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.h +++ b/libraries/gpu-gl-common/src/gpu/gl/GLPipeline.h @@ -1,6 +1,7 @@ // // Created by Bradley Austin Davis on 2016/05/15 // Copyright 2013-2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h b/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h index 49ef58ab00..967d94a687 100644 --- a/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h +++ b/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 10/27/2014. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41BackendTransform.cpp b/libraries/gpu-gl/src/gpu/gl41/GL41BackendTransform.cpp index 6d7e108194..e49405d3cf 100644 --- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendTransform.cpp +++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendTransform.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 3/8/2015. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h index c8b0a84605..e0b921237e 100644 --- a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h +++ b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 10/27/2014. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp index f1fa282720..3d30ebf03e 100644 --- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp +++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 1/19/2015. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTransform.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTransform.cpp index 644ec6ae8e..0fd328f353 100644 --- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTransform.cpp +++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTransform.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 3/8/2015. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/Backend.cpp b/libraries/gpu/src/gpu/Backend.cpp index c344b4c535..7859a86824 100644 --- a/libraries/gpu/src/gpu/Backend.cpp +++ b/libraries/gpu/src/gpu/Backend.cpp @@ -4,7 +4,7 @@ // // Created by Olivier Prat on 05/25/2018. // Copyright 2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -120,6 +120,8 @@ const Backend::TransformCamera& Backend::TransformCamera::recomputeDerived(const viewUntranslated[3] = Vec4(0.0f, 0.0f, 0.0f, 1.0f); _previousProjectionViewUntranslated = previousProjection * viewUntranslated; + //_previousProjectionViewUntranslated = _projection * viewUntranslated; + _stereoInfo = Vec4(0.0f); return *this; diff --git a/libraries/gpu/src/gpu/Backend.h b/libraries/gpu/src/gpu/Backend.h index 901780829c..0b180671d7 100644 --- a/libraries/gpu/src/gpu/Backend.h +++ b/libraries/gpu/src/gpu/Backend.h @@ -4,7 +4,7 @@ // // Created by Olivier Prat on 05/18/2018. // Copyright 2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/Batch.cpp b/libraries/gpu/src/gpu/Batch.cpp index bc53bf9c8e..59eff31ce8 100644 --- a/libraries/gpu/src/gpu/Batch.cpp +++ b/libraries/gpu/src/gpu/Batch.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 10/14/2014. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -104,7 +105,7 @@ void Batch::clear() { _drawcallUniformReset = 0; _enableStereo = true; _enableSkybox = false; - _mustUpdatePreviousModels = true; + _mustUpdatePreviousModels = true; } size_t Batch::cacheData(size_t size, const void* data) { @@ -273,7 +274,7 @@ void Batch::pushProjectionJitterEnabled(bool isProjectionEnabled) { _params.emplace_back(isProjectionEnabled & 1); } -void Batch::popProjectionJitterEnabled() { +void Batch::popProjectionJitterEnabled() { pushProjectionJitterEnabled(_isJitterOnProjectionEnabled); } diff --git a/libraries/gpu/src/gpu/Batch.h b/libraries/gpu/src/gpu/Batch.h index df9161bdda..18de16d903 100644 --- a/libraries/gpu/src/gpu/Batch.h +++ b/libraries/gpu/src/gpu/Batch.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 10/14/2014. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/Context.cpp b/libraries/gpu/src/gpu/Context.cpp index 7afd4374fe..cb85923033 100644 --- a/libraries/gpu/src/gpu/Context.cpp +++ b/libraries/gpu/src/gpu/Context.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 10/27/2014. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/Context.h b/libraries/gpu/src/gpu/Context.h index 4e5cab17a8..439aeec6bf 100644 --- a/libraries/gpu/src/gpu/Context.h +++ b/libraries/gpu/src/gpu/Context.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 10/27/2014. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/DrawUnitQuad.slv b/libraries/gpu/src/gpu/DrawUnitQuad.slv index 909ab81655..b87b9d0e8d 100644 --- a/libraries/gpu/src/gpu/DrawUnitQuad.slv +++ b/libraries/gpu/src/gpu/DrawUnitQuad.slv @@ -1,13 +1,14 @@ <@include gpu/Config.slh@> <$VERSION_HEADER$> -// <$_SCRIBE_FILENAME$> +// <$_SCRIBE_FILENAME$> // Generated on <$_SCRIBE_DATE$> -// Draw the unit quad [-1,-1 -> 1,1]. -// Not transform used. +// Draw the unit quad [-1,-1 -> 1,1]. +// No transform used. // Simply draw a Triangle_strip of 2 triangles, no input buffers or index buffer needed // // Created by Olivier Prat on 10/22/2018 // Copyright 2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/FrameIOKeys.h b/libraries/gpu/src/gpu/FrameIOKeys.h index 6cc4a6bd8c..4e9833fd46 100644 --- a/libraries/gpu/src/gpu/FrameIOKeys.h +++ b/libraries/gpu/src/gpu/FrameIOKeys.h @@ -1,7 +1,7 @@ // // Created by Bradley Austin Davis on 2018/10/14 // Copyright 2013-2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/FrameReader.cpp b/libraries/gpu/src/gpu/FrameReader.cpp index 79858e2888..d156720a1f 100644 --- a/libraries/gpu/src/gpu/FrameReader.cpp +++ b/libraries/gpu/src/gpu/FrameReader.cpp @@ -1,7 +1,7 @@ // // Created by Bradley Austin Davis on 2018/10/14 // Copyright 2013-2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/FrameWriter.cpp b/libraries/gpu/src/gpu/FrameWriter.cpp index eb53041280..f3e632bcad 100644 --- a/libraries/gpu/src/gpu/FrameWriter.cpp +++ b/libraries/gpu/src/gpu/FrameWriter.cpp @@ -1,7 +1,7 @@ // // Created by Bradley Austin Davis on 2018/10/14 // Copyright 2013-2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/Query.h b/libraries/gpu/src/gpu/Query.h index acec5500b2..e327e14cc0 100644 --- a/libraries/gpu/src/gpu/Query.h +++ b/libraries/gpu/src/gpu/Query.h @@ -4,6 +4,7 @@ // // Created by Niraj Venkat on 7/7/2015. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/gpu/src/gpu/Transform.slh b/libraries/gpu/src/gpu/Transform.slh index 5653d67a26..4d5bbd6dfa 100644 --- a/libraries/gpu/src/gpu/Transform.slh +++ b/libraries/gpu/src/gpu/Transform.slh @@ -3,7 +3,7 @@ // // Created by Sam Gateau on 2/10/15. // Copyright 2013 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -229,7 +229,7 @@ TransformObject getTransformObject() { <$clipPos$> = <$cameraTransform$>._projectionViewUntranslated * eyeWAPos; <$transformStereoClipSpace($clipPos$)$> - <$prevClipPos$> = <$cameraTransform$>._previousProjectionViewUntranslated * prevEyeWAPos; + <$prevClipPos$> = <$cameraTransform$>._previousProjectionViewUntranslated * prevEyeWAPos; // Prev clip pos is in mono clip space } <@endfunc@> @@ -363,7 +363,7 @@ TransformObject getTransformObject() { <@endfunc@> <@func transformEyeToPrevClipPos(cameraTransform, eyePos, prevClipPos)@> - { // transformEyeToClipPos + { // transformEyeToPrevClipPos vec4 worldPos = <$cameraTransform$>._viewInverse * vec4(<$eyePos$>.xyz, 1.0); <$prevClipPos$> = <$cameraTransform$>._previousProjectionViewUntranslated * worldPos; // Prev clip pos is in mono clip space diff --git a/libraries/gpu/src/gpu/TransformCamera_shared.slh b/libraries/gpu/src/gpu/TransformCamera_shared.slh index a7d8f58590..86a3b06db2 100644 --- a/libraries/gpu/src/gpu/TransformCamera_shared.slh +++ b/libraries/gpu/src/gpu/TransformCamera_shared.slh @@ -6,7 +6,7 @@ #else # define TC_MAT4 mat4 # define TC_VEC4 vec4 -# define TC_MUTABLE +# define TC_MUTABLE #endif struct _TransformCamera { diff --git a/libraries/gpu/src/gpu/TransformObject_shared.slh b/libraries/gpu/src/gpu/TransformObject_shared.slh index dce87c9e0b..edb7ca4a5b 100644 --- a/libraries/gpu/src/gpu/TransformObject_shared.slh +++ b/libraries/gpu/src/gpu/TransformObject_shared.slh @@ -13,7 +13,7 @@ struct TransformObject { }; // <@if 1@> - // Trigger Scribe include - // <@endif@> + // Trigger Scribe include + // <@endif@> // diff --git a/libraries/graphics/src/graphics/Haze.slh b/libraries/graphics/src/graphics/Haze.slh index 2a98177e83..e10f1b1449 100644 --- a/libraries/graphics/src/graphics/Haze.slh +++ b/libraries/graphics/src/graphics/Haze.slh @@ -3,6 +3,7 @@ // // Created by Nissim Hadar on 9/13/2017 // Copyright 2013 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/graphics/src/graphics/Skybox.cpp b/libraries/graphics/src/graphics/Skybox.cpp index e0134c337b..b9232418fc 100644 --- a/libraries/graphics/src/graphics/Skybox.cpp +++ b/libraries/graphics/src/graphics/Skybox.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/4/2015. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/graphics/src/graphics/Skybox.h b/libraries/graphics/src/graphics/Skybox.h index 94b12cf1ab..6dc788c48c 100644 --- a/libraries/graphics/src/graphics/Skybox.h +++ b/libraries/graphics/src/graphics/Skybox.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/4/2015. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/graphics/src/graphics/skybox.slf b/libraries/graphics/src/graphics/skybox.slf index 394af6f260..eb34488d50 100755 --- a/libraries/graphics/src/graphics/skybox.slf +++ b/libraries/graphics/src/graphics/skybox.slf @@ -5,7 +5,7 @@ // // Created by Sam Gateau on 5/5/2015. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/graphics/src/graphics/skybox.slh b/libraries/graphics/src/graphics/skybox.slh index e84f770c7d..6bb8570aad 100644 --- a/libraries/graphics/src/graphics/skybox.slh +++ b/libraries/graphics/src/graphics/skybox.slh @@ -3,7 +3,7 @@ // libraries/graphics/src // // Created by HifiExperiments on 8/5/2020. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -46,11 +46,11 @@ vec2 packVelocity(vec4 prevPositionCS) { } // Must match layout in DeferredBufferWrite.slh, but only velocity and lighting are used -layout(location = 0) out vec4 _albedoMetallic; // albedo / metallic -layout(location = 1) out vec4 _normalRoughness; // normal / roughness +layout(location = 0) out vec4 _albedoMetallic; // albedo / metallic +layout(location = 1) out vec4 _normalRoughness; // normal / roughness layout(location = 2) out vec4 _scatteringEmissiveOcclusion; // scattering / emissive / occlusion -layout(location = 3) out vec4 _velocity; // velocity -layout(location = 4) out vec4 _lighting; // emissive +layout(location = 3) out vec4 _velocity; // velocity +layout(location = 4) out vec4 _lighting; // emissive void packDeferredFragmentSky(vec4 prevPositionCS, vec3 color, vec3 normal) { _albedoMetallic = vec4(color, 0.6f); diff --git a/libraries/graphics/src/graphics/skybox.slv b/libraries/graphics/src/graphics/skybox.slv index 991f0c938f..5c60cf73a9 100755 --- a/libraries/graphics/src/graphics/skybox.slv +++ b/libraries/graphics/src/graphics/skybox.slv @@ -5,7 +5,7 @@ // // Created by Sam Gateau on 5/5/2015. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -36,9 +36,10 @@ void main(void) { <$transformEyeToWorldDir(cam, eyeDir, _normal)$> <@if not HIFI_USE_FORWARD@> + // FIXME: this is probably wrong _prevPositionCS = cam._previousProjectionViewUntranslated * (cam._viewInverse * (cam._projectionInverse * vec4(clipDir, 1.0))); <@endif@> - + // Position is supposed to come in clip space gl_Position = vec4(clipDir, 1.0); diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.cpp b/libraries/procedural/src/procedural/ProceduralSkybox.cpp index f96dd7f4ed..fb3223d73a 100644 --- a/libraries/procedural/src/procedural/ProceduralSkybox.cpp +++ b/libraries/procedural/src/procedural/ProceduralSkybox.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 9/21/2015. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.h b/libraries/procedural/src/procedural/ProceduralSkybox.h index 122eeafbf9..5aef9171d9 100644 --- a/libraries/procedural/src/procedural/ProceduralSkybox.h +++ b/libraries/procedural/src/procedural/ProceduralSkybox.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 9/21/15. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/procedural/src/procedural/proceduralSkybox.slf b/libraries/procedural/src/procedural/proceduralSkybox.slf index b6c68faa5c..3070d5d643 100644 --- a/libraries/procedural/src/procedural/proceduralSkybox.slf +++ b/libraries/procedural/src/procedural/proceduralSkybox.slf @@ -6,7 +6,7 @@ // // Created by Sam Gateau on 5/5/2015. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp index 444431fabf..01b17e5a9d 100644 --- a/libraries/render-utils/src/AntialiasingEffect.cpp +++ b/libraries/render-utils/src/AntialiasingEffect.cpp @@ -4,7 +4,7 @@ // // Created by Raffi Bedikian on 8/30/15 // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -45,18 +45,18 @@ void AntialiasingSetupConfig::setIndex(int current) { emit dirty(); } -void AntialiasingSetupConfig::setState(int state) { - _state = (state) % 3; +void AntialiasingSetupConfig::setState(State state) { + _state = (State)((int)state % (int)State::STATE_COUNT); switch (_state) { - case 0: { + case State::NONE: { none(); break; } - case 1: { + case State::PAUSE: { pause(); break; } - case 2: + case State::PLAY: default: { play(); break; @@ -65,26 +65,6 @@ void AntialiasingSetupConfig::setState(int state) { emit dirty(); } -int AntialiasingSetupConfig::cycleStopPauseRun() { - _state = (_state + 1) % 3; - switch (_state) { - case 0: { - return none(); - break; - } - case 1: { - return pause(); - break; - } - case 2: - default: { - return play(); - break; - } - } - return _state; -} - int AntialiasingSetupConfig::prev() { setIndex(_index - 1); return _index; @@ -95,32 +75,32 @@ int AntialiasingSetupConfig::next() { return _index; } -int AntialiasingSetupConfig::none() { - _state = 0; +AntialiasingSetupConfig::State AntialiasingSetupConfig::none() { + _state = State::NONE; stop = true; freeze = false; setIndex(-1); return _state; } -int AntialiasingSetupConfig::pause() { - _state = 1; +AntialiasingSetupConfig::State AntialiasingSetupConfig::pause() { + _state = State::PAUSE; stop = false; freeze = true; setIndex(0); return _state; } -int AntialiasingSetupConfig::play() { - _state = 2; +AntialiasingSetupConfig::State AntialiasingSetupConfig::play() { + _state = State::PLAY; stop = false; freeze = false; setIndex(0); return _state; } -void AntialiasingSetupConfig::setAAMode(int mode) { - this->mode = glm::clamp(mode, 0, (int)AntialiasingSetupConfig::MODE_COUNT); +void AntialiasingSetupConfig::setAAMode(Mode mode) { + this->mode = (Mode)glm::clamp((int)mode, 0, (int)AntialiasingSetupConfig::Mode::MODE_COUNT); emit dirty(); } @@ -172,7 +152,7 @@ Antialiasing::~Antialiasing() { _antialiasingBuffers.clear(); } -const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline() { +const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline() { if (!_antialiasingPipeline) { gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::taa); gpu::StatePointer state = std::make_shared(); diff --git a/libraries/render-utils/src/AntialiasingEffect.h b/libraries/render-utils/src/AntialiasingEffect.h index c2c4f53057..87b90cba02 100644 --- a/libraries/render-utils/src/AntialiasingEffect.h +++ b/libraries/render-utils/src/AntialiasingEffect.h @@ -4,7 +4,6 @@ // // Created by Raffi Bedikian on 8/30/15 // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. // Copyright 2022-2023 Overte e.V. // // Distributed under the Apache License, Version 2.0. @@ -28,8 +27,8 @@ class AntialiasingSetupConfig : public render::Job::Config { Q_PROPERTY(bool freeze MEMBER freeze NOTIFY dirty) Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty) Q_PROPERTY(int index READ getIndex NOTIFY dirty) - Q_PROPERTY(int state READ getState WRITE setState NOTIFY dirty) - Q_PROPERTY(int mode READ getAAMode WRITE setAAMode NOTIFY dirty) + Q_PROPERTY(State state READ getState WRITE setState NOTIFY dirty) + Q_PROPERTY(Mode mode READ getAAMode WRITE setAAMode NOTIFY dirty) public: AntialiasingSetupConfig() : render::Job::Config(true) {} @@ -43,12 +42,12 @@ public: * 0NONEAntialiasing is disabled. * 1TAATemporal Antialiasing. * 2FXAAFXAA. - * 3MODE_COUNTInducates number of antialiasing modes + * 3MODE_COUNTIndicates number of antialiasing modes * * * @typedef {number} AntialiasingMode */ - enum Mode { + enum class Mode { NONE = 0, TAA, FXAA, @@ -56,33 +55,55 @@ public: }; Q_ENUM(Mode) // Stored as signed int. + /*@jsdoc + *TAA Antialiasing state. + * + * + * + * + * + * + * + * + * + *
ValueNameDescription
0NONETAA is disabled.
1PAUSETAA jitter is paused.
2PLAYTAA jitter is playing.
3STATE_COUNTIndicates number of antialiasing states
+ * @typedef {number} AntialiasingState + */ + enum class State + { + NONE = 0, + PAUSE, + PLAY, + STATE_COUNT + }; + Q_ENUM(State) + float scale { 0.75f }; bool stop { false }; bool freeze { false }; - int mode { TAA }; - - void setIndex(int current); - void setState(int state); + Mode mode { Mode::TAA }; public slots: - int cycleStopPauseRun(); int prev(); int next(); - int none(); - int pause(); - int play(); + State none(); + State pause(); + State play(); int getIndex() const { return _index; } - int getState() const { return _state; } + void setIndex(int current); - void setAAMode(int mode); - int getAAMode() const { return mode; } + State getState() const { return _state; } + void setState(State state); + + Mode getAAMode() const { return mode; } + void setAAMode(Mode mode); signals: void dirty(); private: - int _state { 0 }; + State _state { State::PLAY }; int _index { 0 }; }; @@ -91,7 +112,7 @@ class AntialiasingSetup { public: using Config = AntialiasingSetupConfig; - using Output = int; + using Output = AntialiasingSetupConfig::Mode; using JobModel = render::Job::ModelO; AntialiasingSetup(); @@ -106,7 +127,7 @@ private: int _freezedSampleIndex { 0 }; bool _isStopped { false }; bool _isFrozen { false }; - int _mode { AntialiasingSetupConfig::Mode::TAA }; + AntialiasingSetupConfig::Mode _mode{ AntialiasingSetupConfig::Mode::TAA }; }; @@ -203,7 +224,7 @@ using TAAParamsBuffer = gpu::StructBuffer; class Antialiasing { public: - using Inputs = render::VaryingSet4; + using Inputs = render::VaryingSet4; using Outputs = gpu::TexturePointer; using Config = AntialiasingConfig; using JobModel = render::Job::ModelIO; diff --git a/libraries/render-utils/src/BackgroundStage.cpp b/libraries/render-utils/src/BackgroundStage.cpp index 38fe0aea3d..89c73a9422 100644 --- a/libraries/render-utils/src/BackgroundStage.cpp +++ b/libraries/render-utils/src/BackgroundStage.cpp @@ -3,7 +3,7 @@ // // Created by Sam Gateau on 5/9/2017. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp index 1aae75e97d..e454a489fa 100644 --- a/libraries/render-utils/src/BloomEffect.cpp +++ b/libraries/render-utils/src/BloomEffect.cpp @@ -4,6 +4,7 @@ // // Created by Olivier Prat on 09/25/17. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/BloomThreshold.slf b/libraries/render-utils/src/BloomThreshold.slf index 1a12f070ba..d8e4153198 100644 --- a/libraries/render-utils/src/BloomThreshold.slf +++ b/libraries/render-utils/src/BloomThreshold.slf @@ -5,6 +5,7 @@ // // Created by Olivier Prat on 09/26/2017 // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp index 2238b4be7f..89365e4099 100644 --- a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp +++ b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp @@ -4,8 +4,7 @@ // // Created by Andrew Meadows 2017.01.17 // Copyright 2017 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. -// Copyright 2023 Overte e.V. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp index c0ad71fcfb..f1d6f74df6 100644 --- a/libraries/render-utils/src/DebugDeferredBuffer.cpp +++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp @@ -4,7 +4,7 @@ // // Created by Clement on 12/3/15. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DebugDeferredBuffer.h b/libraries/render-utils/src/DebugDeferredBuffer.h index 4e4104f221..bdc97ec104 100644 --- a/libraries/render-utils/src/DebugDeferredBuffer.h +++ b/libraries/render-utils/src/DebugDeferredBuffer.h @@ -4,6 +4,7 @@ // // Created by Clement on 12/3/15. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredBufferRead.slh b/libraries/render-utils/src/DeferredBufferRead.slh index 3198594825..8d30bd6b18 100644 --- a/libraries/render-utils/src/DeferredBufferRead.slh +++ b/libraries/render-utils/src/DeferredBufferRead.slh @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/4/16. // Copyright 2013 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredBufferWrite.slh b/libraries/render-utils/src/DeferredBufferWrite.slh index 99e62153fa..9213bc2fcd 100644 --- a/libraries/render-utils/src/DeferredBufferWrite.slh +++ b/libraries/render-utils/src/DeferredBufferWrite.slh @@ -4,7 +4,7 @@ // // Created by Sam Gateau on 1/12/15. // Copyright 2013 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -16,11 +16,11 @@ <@include DeferredBufferWrite_shared.slh@> // Must match layout in skybox.slh -layout(location = DEFERRED_COLOR_SLOT) out vec4 _albedoMetallic; // albedo / metallic -layout(location = DEFERRED_NORMAL_SLOT) out vec4 _normalRoughness; // normal / roughness +layout(location = DEFERRED_COLOR_SLOT) out vec4 _albedoMetallic; // albedo / metallic +layout(location = DEFERRED_NORMAL_SLOT) out vec4 _normalRoughness; // normal / roughness layout(location = DEFERRED_SPECULAR_SLOT) out vec4 _scatteringEmissiveOcclusion; // scattering / emissive / occlusion -layout(location = DEFERRED_VELOCITY_SLOT) out vec4 _velocity; // velocity -layout(location = DEFERRED_LIGHTING_SLOT) out vec4 _lighting; // emissive +layout(location = DEFERRED_VELOCITY_SLOT) out vec4 _velocity; // velocity +layout(location = DEFERRED_LIGHTING_SLOT) out vec4 _lighting; // emissive // the alpha threshold const float alphaThreshold = 0.5; diff --git a/libraries/render-utils/src/DeferredBufferWrite_shared.slh b/libraries/render-utils/src/DeferredBufferWrite_shared.slh index a1954d1062..f26bc3ac49 100644 --- a/libraries/render-utils/src/DeferredBufferWrite_shared.slh +++ b/libraries/render-utils/src/DeferredBufferWrite_shared.slh @@ -7,6 +7,6 @@ #define DEFERRED_LIGHTING_SLOT 4 // <@if 1@> - // Trigger Scribe include - // <@endif@> + // Trigger Scribe include + // <@endif@> // diff --git a/libraries/render-utils/src/DeferredFrameTransform.cpp b/libraries/render-utils/src/DeferredFrameTransform.cpp index 5c379a0324..5e6826ae26 100644 --- a/libraries/render-utils/src/DeferredFrameTransform.cpp +++ b/libraries/render-utils/src/DeferredFrameTransform.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau 6/3/2016. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredFrameTransform.h b/libraries/render-utils/src/DeferredFrameTransform.h index a0f7879199..67179c36d0 100644 --- a/libraries/render-utils/src/DeferredFrameTransform.h +++ b/libraries/render-utils/src/DeferredFrameTransform.h @@ -4,7 +4,7 @@ // // Created by Sam Gateau 6/3/2016. // Copyright 2016 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -33,10 +33,10 @@ public: protected: - // Class describing the uniform buffer with the transform info common to the AO shaders // It s changing every frame -#include "DeferredTransform_shared.slh" +#include "DeferredTransform_shared.slh" + class FrameTransform : public _DeferredFrameTransform { public: FrameTransform() { infos.stereoInfo = glm::vec4(0.0f); } diff --git a/libraries/render-utils/src/DeferredFramebuffer.cpp b/libraries/render-utils/src/DeferredFramebuffer.cpp index c99073a18a..e1104d2cbb 100644 --- a/libraries/render-utils/src/DeferredFramebuffer.cpp +++ b/libraries/render-utils/src/DeferredFramebuffer.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau 7/11/2016. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredFramebuffer.h b/libraries/render-utils/src/DeferredFramebuffer.h index ed107b677f..272ba42e44 100644 --- a/libraries/render-utils/src/DeferredFramebuffer.h +++ b/libraries/render-utils/src/DeferredFramebuffer.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau 7/11/2016. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index aa2b0a8e7c..8f7ab0cb02 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -4,6 +4,7 @@ // // Created by Andrzej Kapolka on 9/11/14. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredTransform.slh b/libraries/render-utils/src/DeferredTransform.slh index b354e27f92..19c6f67973 100644 --- a/libraries/render-utils/src/DeferredTransform.slh +++ b/libraries/render-utils/src/DeferredTransform.slh @@ -4,7 +4,7 @@ // // Created by Sam Gateau on 6/2/16. // Copyright 2016 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/DeferredTransform_shared.slh b/libraries/render-utils/src/DeferredTransform_shared.slh index 2973b627ce..2c3441ffed 100644 --- a/libraries/render-utils/src/DeferredTransform_shared.slh +++ b/libraries/render-utils/src/DeferredTransform_shared.slh @@ -28,6 +28,6 @@ struct _DeferredFrameTransform { }; // <@if 1@> - // Trigger Scribe include - // <@endif@> + // Trigger Scribe include + // <@endif@> // diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index c1cbdbe5e4..f1a99197c6 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -4,6 +4,7 @@ // // Created by Andrzej Kapolka on 6/21/13. // Copyright 2013 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/HighlightEffect.h b/libraries/render-utils/src/HighlightEffect.h index dc95d96394..d5f4a844e7 100644 --- a/libraries/render-utils/src/HighlightEffect.h +++ b/libraries/render-utils/src/HighlightEffect.h @@ -114,7 +114,8 @@ private: class DrawHighlightMask { public: - using Inputs = render::VaryingSet2; using Outputs = glm::ivec4; + using Inputs = render::VaryingSet2; + using Outputs = glm::ivec4; using JobModel = render::Job::ModelIO; DrawHighlightMask(unsigned int highlightIndex, render::ShapePlumberPointer shapePlumber, HighlightSharedParametersPointer parameters, uint transformSlot); @@ -174,7 +175,8 @@ signals: class DebugHighlight { public: - using Inputs = render::VaryingSet2; using Config = DebugHighlightConfig; + using Inputs = render::VaryingSet2; + using Config = DebugHighlightConfig; using JobModel = render::Job::ModelI; DebugHighlight(uint transformSlot); diff --git a/libraries/render-utils/src/Highlight_aabox.slv b/libraries/render-utils/src/Highlight_aabox.slv index e75694d910..6d7e5d5bc2 100644 --- a/libraries/render-utils/src/Highlight_aabox.slv +++ b/libraries/render-utils/src/Highlight_aabox.slv @@ -7,6 +7,7 @@ // // Created by Olivier Prat on 11/02/2017 // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp index a1bd4001fc..301e2dd85a 100644 --- a/libraries/render-utils/src/LightClusters.cpp +++ b/libraries/render-utils/src/LightClusters.cpp @@ -3,6 +3,7 @@ // // Created by Sam Gateau on 9/7/2016. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp index c3d40c4954..61e3ea94d1 100644 --- a/libraries/render-utils/src/MeshPartPayload.cpp +++ b/libraries/render-utils/src/MeshPartPayload.cpp @@ -193,12 +193,9 @@ void ModelMeshPartPayload::bindTransform(gpu::Batch& batch, const Transform& tra if (_clusterBuffer) { batch.setUniformBuffer(graphics::slot::buffer::Skinning, _clusterBuffer); } - // TODO: I'm not sure of this - //batch.setModelTransform(transform, _previousModelTransform); + batch.setModelTransform(transform, _previousRenderTransform); if (renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { - // TODO: I'm not sure of this - //_prevRenderTransform = _drawTransform; _previousRenderTransform = transform; } } diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h index 9aad004002..3c0d756756 100644 --- a/libraries/render-utils/src/MeshPartPayload.h +++ b/libraries/render-utils/src/MeshPartPayload.h @@ -70,7 +70,7 @@ public: static bool enableMaterialProceduralShaders; -protected: +protected: mutable Transform _previousRenderTransform; private: diff --git a/libraries/render-utils/src/RenderCommonTask.cpp b/libraries/render-utils/src/RenderCommonTask.cpp index cf20bff06b..358d4d9c11 100644 --- a/libraries/render-utils/src/RenderCommonTask.cpp +++ b/libraries/render-utils/src/RenderCommonTask.cpp @@ -1,7 +1,7 @@ // // Created by Bradley Austin Davis on 2018/01/09 // Copyright 2013-2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderCommonTask.h b/libraries/render-utils/src/RenderCommonTask.h index e8603c003f..36d8899edb 100644 --- a/libraries/render-utils/src/RenderCommonTask.h +++ b/libraries/render-utils/src/RenderCommonTask.h @@ -1,6 +1,7 @@ // // Created by Bradley Austin Davis on 2018/01/09 // Copyright 2013-2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index cfee877bbd..bbd42596a1 100644 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -5,7 +5,7 @@ // // Created by Sam Gateau on 5/29/15. // Copyright 2016 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h index ce4348f257..40962c13ac 100644 --- a/libraries/render-utils/src/RenderDeferredTask.h +++ b/libraries/render-utils/src/RenderDeferredTask.h @@ -3,7 +3,8 @@ // render-utils/src/ // // Created by Sam Gateau on 5/29/15. -// Copyright 20154 High Fidelity, Inc. +// Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp index fe774a100e..22bab2700f 100644 --- a/libraries/render-utils/src/RenderForwardTask.cpp +++ b/libraries/render-utils/src/RenderForwardTask.cpp @@ -5,6 +5,7 @@ // // Created by Zach Pomerantz on 12/13/2016. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderForwardTask.h b/libraries/render-utils/src/RenderForwardTask.h index c3deb002b6..de13be79e0 100644 --- a/libraries/render-utils/src/RenderForwardTask.h +++ b/libraries/render-utils/src/RenderForwardTask.h @@ -4,6 +4,7 @@ // // Created by Zach Pomerantz on 12/13/2016. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderHUDLayerTask.cpp b/libraries/render-utils/src/RenderHUDLayerTask.cpp index b3720a4cf7..e43eb8810d 100644 --- a/libraries/render-utils/src/RenderHUDLayerTask.cpp +++ b/libraries/render-utils/src/RenderHUDLayerTask.cpp @@ -1,7 +1,7 @@ // // Created by Sam Gateau on 2019/06/14 // Copyright 2013-2019 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderHUDLayerTask.h b/libraries/render-utils/src/RenderHUDLayerTask.h index 5e70e73584..de7bb63670 100644 --- a/libraries/render-utils/src/RenderHUDLayerTask.h +++ b/libraries/render-utils/src/RenderHUDLayerTask.h @@ -1,7 +1,7 @@ // // Created by Sam Gateau on 2019/06/14 // Copyright 2013-2019 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderViewTask.cpp b/libraries/render-utils/src/RenderViewTask.cpp index 6dbad76e80..1b27cfcee3 100644 --- a/libraries/render-utils/src/RenderViewTask.cpp +++ b/libraries/render-utils/src/RenderViewTask.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/25/2017. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/RenderViewTask.h b/libraries/render-utils/src/RenderViewTask.h index 8911431c88..c00bcdd96c 100644 --- a/libraries/render-utils/src/RenderViewTask.h +++ b/libraries/render-utils/src/RenderViewTask.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/25/2017. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/StencilMaskPass.cpp b/libraries/render-utils/src/StencilMaskPass.cpp index 76ee597592..7d86dc4d6e 100644 --- a/libraries/render-utils/src/StencilMaskPass.cpp +++ b/libraries/render-utils/src/StencilMaskPass.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/31/17. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/StencilMaskPass.h b/libraries/render-utils/src/StencilMaskPass.h index 5599d792ba..527e426be3 100644 --- a/libraries/render-utils/src/StencilMaskPass.h +++ b/libraries/render-utils/src/StencilMaskPass.h @@ -3,7 +3,8 @@ // render-utils/src/ // // Created by Sam Gateau on 5/31/17. -// Copyright 20154 High Fidelity, Inc. +// Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/VelocityWrite.slh b/libraries/render-utils/src/VelocityWrite.slh index 0ef0242787..79f52bb687 100644 --- a/libraries/render-utils/src/VelocityWrite.slh +++ b/libraries/render-utils/src/VelocityWrite.slh @@ -4,7 +4,7 @@ // // Created by Olivier Prat on 10/19/18. // Copyright 2018 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/ZoneRenderer.cpp b/libraries/render-utils/src/ZoneRenderer.cpp index 5e8a8df9d3..b8c282cad1 100644 --- a/libraries/render-utils/src/ZoneRenderer.cpp +++ b/libraries/render-utils/src/ZoneRenderer.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 4/4/2017. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/aa_blend.slf b/libraries/render-utils/src/aa_blend.slf index 8391bba221..c42c6373cc 100644 --- a/libraries/render-utils/src/aa_blend.slf +++ b/libraries/render-utils/src/aa_blend.slf @@ -1,10 +1,11 @@ <@include gpu/Config.slh@> <$VERSION_HEADER$> -// <$_SCRIBE_FILENAME$> +// <$_SCRIBE_FILENAME$> // Generated on <$_SCRIBE_DATE$> // // Created by Raffi Bedikian on 8/30/15 // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -47,6 +48,6 @@ void main(void) { vec4 maxColor = pixels[4] + vec4(0.5); outFragColor = clamp(pixels[4] + sharpenedPixel * params.sharpenIntensity.x, minColor, maxColor); } else { - outFragColor = texelFetch(colorTexture, ivec2(gl_FragCoord.xy), 0); + outFragColor = texelFetch(colorTexture, ivec2(gl_FragCoord.xy), 0); } } diff --git a/libraries/render-utils/src/deferred_light_limited.slv b/libraries/render-utils/src/deferred_light_limited.slv index 5757e99f78..f99a43771b 100644 --- a/libraries/render-utils/src/deferred_light_limited.slv +++ b/libraries/render-utils/src/deferred_light_limited.slv @@ -7,6 +7,7 @@ // // Created by Sam Gateau on 6/16/16. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/directional_skybox_light.slf b/libraries/render-utils/src/directional_skybox_light.slf index 77935c3e19..c02c29681c 100644 --- a/libraries/render-utils/src/directional_skybox_light.slf +++ b/libraries/render-utils/src/directional_skybox_light.slf @@ -5,6 +5,7 @@ // // Created by Sam Gateau on 5/8/2015. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/drawWorkloadProxy.slf b/libraries/render-utils/src/drawWorkloadProxy.slf index 107d1a6c4b..9a05498441 100644 --- a/libraries/render-utils/src/drawWorkloadProxy.slf +++ b/libraries/render-utils/src/drawWorkloadProxy.slf @@ -6,6 +6,7 @@ // // Created by Sam Gateau on 6/29/15. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/drawWorkloadProxy.slv b/libraries/render-utils/src/drawWorkloadProxy.slv index a6e5ab7022..c74d42e8cc 100644 --- a/libraries/render-utils/src/drawWorkloadProxy.slv +++ b/libraries/render-utils/src/drawWorkloadProxy.slv @@ -7,7 +7,7 @@ // // Created by Sam Gateau on 6/29/2015. // Copyright 2015 High Fidelity, Inc. -// Copyright 2023 Overte e.V. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/drawWorkloadView.slf b/libraries/render-utils/src/drawWorkloadView.slf index c838a2f1c8..fb9c430490 100644 --- a/libraries/render-utils/src/drawWorkloadView.slf +++ b/libraries/render-utils/src/drawWorkloadView.slf @@ -7,6 +7,7 @@ // // Created by Sam Gateau on 6/29/15. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/drawWorkloadView.slv b/libraries/render-utils/src/drawWorkloadView.slv index fe7c3f6692..6320d9ea83 100644 --- a/libraries/render-utils/src/drawWorkloadView.slv +++ b/libraries/render-utils/src/drawWorkloadView.slv @@ -7,6 +7,7 @@ // // Created by Sam Gateau on 6/29/2015. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/grid.slf b/libraries/render-utils/src/grid.slf index ff98e2b56d..fa510b9204 100644 --- a/libraries/render-utils/src/grid.slf +++ b/libraries/render-utils/src/grid.slf @@ -5,7 +5,7 @@ // // Created by Zach Pomerantz on 2/16/2016. // Copyright 2016 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/grid.slv b/libraries/render-utils/src/grid.slv index 1e71893159..cd6143fa50 100644 --- a/libraries/render-utils/src/grid.slv +++ b/libraries/render-utils/src/grid.slv @@ -4,7 +4,7 @@ // Generated on <$_SCRIBE_DATE$> // // Created by HifiExperiments on 7/24/2020 -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -26,7 +26,7 @@ layout(location=GPU_ATTR_COLOR) out vec4 varColor; void main(void) { varTexCoord0 = inTexCoord0.st; varColor = color_sRGBAToLinear(inColor); - + // standard transform TransformCamera cam = getTransformCamera(); TransformObject obj = getTransformObject(); diff --git a/libraries/render-utils/src/lightClusters_drawClusterContent.slf b/libraries/render-utils/src/lightClusters_drawClusterContent.slf index b3b81544a7..18602954b8 100644 --- a/libraries/render-utils/src/lightClusters_drawClusterContent.slf +++ b/libraries/render-utils/src/lightClusters_drawClusterContent.slf @@ -5,6 +5,7 @@ // // Created by Sam Gateau on 9/8/2016. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slf b/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slf index 5e3714abee..31a8eac667 100644 --- a/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slf +++ b/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slf @@ -5,6 +5,7 @@ // // Created by Sam Gateau on 9/8/2016. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/local_lights_drawOutline.slf b/libraries/render-utils/src/local_lights_drawOutline.slf index f9f78aabb5..1b8773dc63 100644 --- a/libraries/render-utils/src/local_lights_drawOutline.slf +++ b/libraries/render-utils/src/local_lights_drawOutline.slf @@ -7,6 +7,7 @@ // // Created by Sam Gateau on 9/6/2016. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/local_lights_shading.slf b/libraries/render-utils/src/local_lights_shading.slf index 9339d6b7ca..166005b7f0 100644 --- a/libraries/render-utils/src/local_lights_shading.slf +++ b/libraries/render-utils/src/local_lights_shading.slf @@ -7,6 +7,7 @@ // // Created by Sam Gateau on 9/6/2016. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/model.slf b/libraries/render-utils/src/model.slf index 8b3f1b2c23..d69f3af4e8 100644 --- a/libraries/render-utils/src/model.slf +++ b/libraries/render-utils/src/model.slf @@ -47,12 +47,6 @@ <@include gpu/Transform.slh@> <$declareStandardCameraTransform()$> - - <@if HIFI_USE_FORWARD or HIFI_USE_TRANSLUCENT@> - layout(location=0) out vec4 _fragColor0; - <@else@> - <@include DeferredBufferWrite.slh@> - <@endif@> <@elif HIFI_USE_FORWARD or HIFI_USE_TRANSLUCENT@> <@include DefaultMaterials.slh@> <@include GlobalLight.slh@> @@ -68,7 +62,9 @@ <@endif@> <@include gpu/Transform.slh@> <$declareStandardCameraTransform()$> + <@endif@> + <@if HIFI_USE_FORWARD@> layout(location=0) out vec4 _fragColor0; <@else@> <@include DeferredBufferWrite.slh@> @@ -217,14 +213,25 @@ void main(void) { shade, shadingShift, getMaterialShadingToony(mat), getMaterialMatcap(mat), getMaterialParametricRim(mat), getMaterialParametricRimFresnelPower(mat), getMaterialParametricRimLift(mat), rimTex, getMaterialRimLightingMix(mat), matKey), opacity); - <@if HIFI_USE_FORWARD or HIFI_USE_TRANSLUCENT@> + <@if HIFI_USE_FORWARD@> _fragColor0 = isUnlitEnabled() * vec4(color.rgb <@if HIFI_USE_FADE@> + fadeEmissive <@endif@> , color.a); + <@elif HIFI_USE_TRANSLUCENT@> + packDeferredFragmentTranslucent( + _prevPositionCS, + fragNormalWS, + color.a, + color.rgb + <@if HIFI_USE_FADE@> + + fadeEmissive + <@endif@> + , DEFAULT_ROUGHNESS); <@else@> packDeferredFragmentUnlit( + _prevPositionCS, fragNormalWS, 1.0, color.rgb diff --git a/libraries/render-utils/src/parabola.slf b/libraries/render-utils/src/parabola.slf index cd97a79113..dbf7c85404 100644 --- a/libraries/render-utils/src/parabola.slf +++ b/libraries/render-utils/src/parabola.slf @@ -5,6 +5,7 @@ // // Created by Sam Gondelman on 7/18/2018 // Copyright 2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/parabola.slv b/libraries/render-utils/src/parabola.slv index 731c14f122..4dade8f091 100644 --- a/libraries/render-utils/src/parabola.slv +++ b/libraries/render-utils/src/parabola.slv @@ -4,6 +4,7 @@ // // Created by Sam Gondelman on 7/18/2018 // Copyright 2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/render-utils/ShaderConstants.h b/libraries/render-utils/src/render-utils/ShaderConstants.h index 5d00736a29..e1b78c9cb5 100644 --- a/libraries/render-utils/src/render-utils/ShaderConstants.h +++ b/libraries/render-utils/src/render-utils/ShaderConstants.h @@ -1,6 +1,7 @@ // // // Created by Bradley Austin Davis on 2015-02-04 +// Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. +// // Based on fragment shader code from // https://github.com/paulhoux/Cinder-Samples/blob/master/TextRendering/include/text/Text.cpp // Distributed under the Apache License, Version 2.0. diff --git a/libraries/render-utils/src/sdf_text3D.slh b/libraries/render-utils/src/sdf_text3D.slh index cbcfd4826c..aff3286eb3 100644 --- a/libraries/render-utils/src/sdf_text3D.slh +++ b/libraries/render-utils/src/sdf_text3D.slh @@ -6,6 +6,7 @@ // // Created by Sam Gondelman on 3/15/19 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/sdf_text3D.slv b/libraries/render-utils/src/sdf_text3D.slv index e110b7bd9e..59892c0c8d 100644 --- a/libraries/render-utils/src/sdf_text3D.slv +++ b/libraries/render-utils/src/sdf_text3D.slv @@ -5,6 +5,8 @@ // vertex shader // // Created by Brad Davis on 10/14/13. +// Copyright 2013 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/simple.slf b/libraries/render-utils/src/simple.slf index 610ac094e5..72c8870a74 100644 --- a/libraries/render-utils/src/simple.slf +++ b/libraries/render-utils/src/simple.slf @@ -5,7 +5,7 @@ // // Created by Andrzej Kapolka on 9/15/14. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/simple.slv b/libraries/render-utils/src/simple.slv index 42aebf13a1..50dfc558de 100644 --- a/libraries/render-utils/src/simple.slv +++ b/libraries/render-utils/src/simple.slv @@ -5,7 +5,7 @@ // // Created by Andrzej Kapolka on 9/15/14. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/simple_procedural.slf b/libraries/render-utils/src/simple_procedural.slf index d0cf9a53b2..9f9636e34a 100644 --- a/libraries/render-utils/src/simple_procedural.slf +++ b/libraries/render-utils/src/simple_procedural.slf @@ -5,6 +5,7 @@ // // Created by Andrzej Kapolka on 9/15/14. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/simple_procedural.slv b/libraries/render-utils/src/simple_procedural.slv index 7c7544fe3d..69b7f14e6d 100644 --- a/libraries/render-utils/src/simple_procedural.slv +++ b/libraries/render-utils/src/simple_procedural.slv @@ -5,6 +5,7 @@ // // Created by Andrzej Kapolka on 9/15/14. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf b/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf index 47bb66b5e3..d5eebefec0 100644 --- a/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf +++ b/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf @@ -6,6 +6,7 @@ // // Created by Sam Gateau on 6/3/16. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/taa.slf b/libraries/render-utils/src/taa.slf index 8a4b4aff65..cd40c6b46f 100644 --- a/libraries/render-utils/src/taa.slf +++ b/libraries/render-utils/src/taa.slf @@ -5,7 +5,7 @@ // // Created by Sam Gateau on 8/14/2017 // Copyright 2017 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/taa.slh b/libraries/render-utils/src/taa.slh index a082ec2531..4df30094df 100644 --- a/libraries/render-utils/src/taa.slh +++ b/libraries/render-utils/src/taa.slh @@ -5,7 +5,7 @@ // // Created by Sam Gateau on 8/17/2017 // Copyright 2017 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -301,7 +301,7 @@ vec2 taa_computePrevFragAndEyeUV(vec2 fragUV, vec2 fragVelocity, out vec2 prevEy bool taa_fetchSourceAndHistory(vec2 fragUV, vec2 fragVelocity, out vec4 sourceColor, out vec4 historyColor) { sourceColor.rgb = texture(sourceMap, fragUV).rgb; - // Store AA intensity in alpha + // Store AA intensity in alpha sourceColor.a = texture(intensityMap, fragUV).r; // If velocity is 0 then don't fetch history, just return the source. This means there is no jitter on this pixel diff --git a/libraries/render-utils/src/taa_blend.slf b/libraries/render-utils/src/taa_blend.slf index 0779109cd9..fa0d94dd78 100644 --- a/libraries/render-utils/src/taa_blend.slf +++ b/libraries/render-utils/src/taa_blend.slf @@ -7,6 +7,7 @@ // // Created by Sam Gateau on 8/17/2017 // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/web_browser.slf b/libraries/render-utils/src/web_browser.slf index 2dc71f12dd..4ba7422d24 100644 --- a/libraries/render-utils/src/web_browser.slf +++ b/libraries/render-utils/src/web_browser.slf @@ -5,6 +5,7 @@ // // Created by Anthony Thibault on 7/25/16. // Copyright 2016 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/web_browser.slv b/libraries/render-utils/src/web_browser.slv index 0d7a82da8a..ee6305ab75 100644 --- a/libraries/render-utils/src/web_browser.slv +++ b/libraries/render-utils/src/web_browser.slv @@ -5,7 +5,7 @@ // // Created by Andrzej Kapolka on 9/15/14. // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/zone_drawAmbient.slf b/libraries/render-utils/src/zone_drawAmbient.slf index 1792407f3e..daf16a7adb 100644 --- a/libraries/render-utils/src/zone_drawAmbient.slf +++ b/libraries/render-utils/src/zone_drawAmbient.slf @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/16/17. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/zone_drawKeyLight.slf b/libraries/render-utils/src/zone_drawKeyLight.slf index ddd1b1e9c9..0cd6bbdbb1 100644 --- a/libraries/render-utils/src/zone_drawKeyLight.slf +++ b/libraries/render-utils/src/zone_drawKeyLight.slf @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/16/17. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render-utils/src/zone_drawSkybox.slf b/libraries/render-utils/src/zone_drawSkybox.slf index d6d4bedeb4..cd9d478ba7 100644 --- a/libraries/render-utils/src/zone_drawSkybox.slf +++ b/libraries/render-utils/src/zone_drawSkybox.slf @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 5/16/17. // Copyright 2017 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/DrawSceneOctree.cpp b/libraries/render/src/render/DrawSceneOctree.cpp index 145c6c681b..41472e8b18 100644 --- a/libraries/render/src/render/DrawSceneOctree.cpp +++ b/libraries/render/src/render/DrawSceneOctree.cpp @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 1/25/16. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/DrawSceneOctree.h b/libraries/render/src/render/DrawSceneOctree.h index eddac42d4d..dc9c105d13 100644 --- a/libraries/render/src/render/DrawSceneOctree.h +++ b/libraries/render/src/render/DrawSceneOctree.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 1/25/16. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -71,7 +72,7 @@ namespace render { const gpu::PipelinePointer getDrawCellBoundsPipeline(); const gpu::PipelinePointer getDrawLODReticlePipeline(); const gpu::PipelinePointer getDrawItemBoundPipeline(); - + private: uint _transformSlot; }; diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp index b3a6ed658f..57ed515629 100644 --- a/libraries/render/src/render/DrawStatus.cpp +++ b/libraries/render/src/render/DrawStatus.cpp @@ -4,6 +4,7 @@ // // Created by Niraj Venkat on 6/29/15. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 2b5f4c8846..1efe33c497 100644 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -3,7 +3,8 @@ // render/src/render // // Created by Sam Gateau on 5/21/15. -// Copyright 20154 High Fidelity, Inc. +// Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/DrawTask.h b/libraries/render/src/render/DrawTask.h index f948dce1b2..8768c56b4b 100644 --- a/libraries/render/src/render/DrawTask.h +++ b/libraries/render/src/render/DrawTask.h @@ -3,7 +3,8 @@ // render/src/render // // Created by Sam Gateau on 5/21/15. -// Copyright 20154 High Fidelity, Inc. +// Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h index 6de0727a3a..c9544a3fa3 100644 --- a/libraries/render/src/render/Engine.h +++ b/libraries/render/src/render/Engine.h @@ -4,6 +4,7 @@ // // Created by Sam Gateau on 3/3/15. // Copyright 2014 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/ShapePipeline.cpp b/libraries/render/src/render/ShapePipeline.cpp index 467abd9f9a..b4c52ae724 100644 --- a/libraries/render/src/render/ShapePipeline.cpp +++ b/libraries/render/src/render/ShapePipeline.cpp @@ -4,6 +4,7 @@ // // Created by Zach Pomerantz on 12/31/15. // Copyright 2015 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/render/src/render/drawItemStatus.slv b/libraries/render/src/render/drawItemStatus.slv index a70112ffe6..166b1f7894 100644 --- a/libraries/render/src/render/drawItemStatus.slv +++ b/libraries/render/src/render/drawItemStatus.slv @@ -7,7 +7,7 @@ // // Created by Sam Gateau on 6/30/2015. // Copyright 2015 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/scripts/developer/utilities/render/luci/Antialiasing.qml b/scripts/developer/utilities/render/luci/Antialiasing.qml index 10627fcab4..7c174d53c5 100644 --- a/scripts/developer/utilities/render/luci/Antialiasing.qml +++ b/scripts/developer/utilities/render/luci/Antialiasing.qml @@ -3,7 +3,7 @@ // // Created by Sam Gateau on 8/14/2017 // Copyright 2016 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 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 diff --git a/scripts/developer/utilities/render/luci/Framebuffer.qml b/scripts/developer/utilities/render/luci/Framebuffer.qml index c1603d646b..7847d2523e 100644 --- a/scripts/developer/utilities/render/luci/Framebuffer.qml +++ b/scripts/developer/utilities/render/luci/Framebuffer.qml @@ -3,6 +3,7 @@ // // Created by Sam Gateau on 4/18/2019 // Copyright 2019 High Fidelity, Inc. +// Copyright 2024 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 diff --git a/tools/gpu-frame-player/src/RenderThread.cpp b/tools/gpu-frame-player/src/RenderThread.cpp index d74551a9bc..fda551dfa4 100644 --- a/tools/gpu-frame-player/src/RenderThread.cpp +++ b/tools/gpu-frame-player/src/RenderThread.cpp @@ -1,7 +1,7 @@ // // Created by Bradley Austin Davis on 2018/10/21 // Copyright 2014 High Fidelity, Inc. -// Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html