Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 13:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor cleanup, copyright

Browse source
This commit is contained in:
HifiExperiments 2024-02-26 14:58:15 -08:00
parent 56f697e5f0
commit d5e251d8da
136 changed files with 266 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/scripting/RenderScriptingInterface.cpp
View file

@ -219,7 +219,7 @@ void RenderScriptingInterface::forceAntialiasingMode(AntialiasingSetupConfig::Mo
setAntialiasingModeForView( mode, secondViewJitterCamConfig, secondViewAntialiasingConfig);
}
_antialiasingModeSetting.set(_antialiasingMode);
_antialiasingModeSetting.set((int)_antialiasingMode);
});
}

2
interface/src/scripting/RenderScriptingInterface.h
View file

@ -246,7 +246,7 @@ private:
Setting::Handle<bool> _shadowsEnabledSetting { "shadowsEnabled", true };
Setting::Handle<bool> _ambientOcclusionEnabledSetting { "ambientOcclusionEnabled", false };
//Setting::Handle<AntialiasingConfig::Mode> _antialiasingModeSetting { "antialiasingMode", AntialiasingConfig::Mode::TAA };
Setting::Handle<int> _antialiasingModeSetting { "antialiasingMode", AntialiasingSetupConfig::Mode::NONE };
Setting::Handle<int> _antialiasingModeSetting { "antialiasingMode", (int)AntialiasingSetupConfig::Mode::NONE };
Setting::Handle<float> _viewportResolutionScaleSetting { "viewportResolutionScale", 1.0f };
Setting::Handle<QString> _fullScreenScreenSetting { "fullScreenScreen", "" };

2
libraries/entities-renderer/src/RenderableGizmoEntityItem.cpp
View file

@ -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

1
libraries/entities-renderer/src/RenderableGridEntityItem.cpp
View file

@ -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

1
libraries/entities-renderer/src/RenderableImageEntityItem.cpp
View file

@ -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

2
libraries/entities-renderer/src/RenderableLineEntityItem.cpp
View file

@ -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

2
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -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

8
libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
View file

@ -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);

2
libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
View file

@ -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

1
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -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.

12
libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
View file

@ -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>();
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) {

17
libraries/entities-renderer/src/RenderableTextEntityItem.cpp
View file

@ -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) {

1
libraries/entities-renderer/src/RenderableTextEntityItem.h
View file

@ -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.

1
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -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

2
libraries/entities-renderer/src/paintStroke.slf
View file

@ -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

2
libraries/entities-renderer/src/paintStroke.slv
View file

@ -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

3
libraries/entities-renderer/src/polyvox.slf
View file

@ -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;

1
libraries/entities-renderer/src/polyvox.slv
View file

@ -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

3
libraries/entities-renderer/src/textured_particle.slf
View file

@ -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
}

4
libraries/entities-renderer/src/textured_particle.slv
View file

@ -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
}

8
libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
View file

@ -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:

8
libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
View file

@ -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<CameraBufferElement>;
struct ViewProjectionState {
Transform _view;
Transform _correctedView;
@ -448,7 +448,7 @@ protected:
TransformCamera _camera;
TransformCameras _cameras;
std::array<SaveTransform, gpu::Batch::MAX_TRANSFORM_SAVE_SLOT_COUNT> _savedTransforms;
std::array<SaveTransform, gpu::Batch::MAX_TRANSFORM_SAVE_SLOT_COUNT> _savedTransforms;
mutable std::map<std::string, GLvoid*> _drawCallInfoOffsets;

1
libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp
View file

@ -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

6
libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp
View file

@ -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;

1
libraries/gpu-gl-common/src/gpu/gl/GLPipeline.cpp
View file

@ -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

1
libraries/gpu-gl-common/src/gpu/gl/GLPipeline.h
View file

@ -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

1
libraries/gpu-gl/src/gpu/gl41/GL41Backend.h
View file

@ -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

1
libraries/gpu-gl/src/gpu/gl41/GL41BackendTransform.cpp
View file

@ -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

1
libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
View file

@ -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

1
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
View file

@ -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

1
libraries/gpu-gl/src/gpu/gl45/GL45BackendTransform.cpp
View file

@ -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

4
libraries/gpu/src/gpu/Backend.cpp
View file

@ -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;

2
libraries/gpu/src/gpu/Backend.h
View file

@ -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

5
libraries/gpu/src/gpu/Batch.cpp
View file

@ -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);
}

1
libraries/gpu/src/gpu/Batch.h
View file

@ -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

1
libraries/gpu/src/gpu/Context.cpp
View file

@ -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

1
libraries/gpu/src/gpu/Context.h
View file

@ -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

7
libraries/gpu/src/gpu/DrawUnitQuad.slv
View file

@ -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

2
libraries/gpu/src/gpu/FrameIOKeys.h
View file

@ -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

2
libraries/gpu/src/gpu/FrameReader.cpp
View file

@ -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

2
libraries/gpu/src/gpu/FrameWriter.cpp
View file

@ -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

1
libraries/gpu/src/gpu/Query.h
View file

@ -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

6
libraries/gpu/src/gpu/Transform.slh
View file

@ -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

2
libraries/gpu/src/gpu/TransformCamera_shared.slh
View file

@ -6,7 +6,7 @@
#else
# define TC_MAT4 mat4
# define TC_VEC4 vec4
# define TC_MUTABLE
# define TC_MUTABLE
#endif
struct _TransformCamera {

4
libraries/gpu/src/gpu/TransformObject_shared.slh
View file

@ -13,7 +13,7 @@ struct TransformObject {
};
// <@if 1@>
// Trigger Scribe include
// <@endif@> <!def that !>
// Trigger Scribe include
// <@endif@> <!def that !>
//

1
libraries/graphics/src/graphics/Haze.slh
View file

@ -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

1
libraries/graphics/src/graphics/Skybox.cpp
View file

@ -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

1
libraries/graphics/src/graphics/Skybox.h
View file

@ -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

2
libraries/graphics/src/graphics/skybox.slf
View file

@ -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

10
libraries/graphics/src/graphics/skybox.slh
View file

@ -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);

5
libraries/graphics/src/graphics/skybox.slv
View file

@ -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);

1
libraries/procedural/src/procedural/ProceduralSkybox.cpp
View file

@ -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

1
libraries/procedural/src/procedural/ProceduralSkybox.h
View file

@ -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

2
libraries/procedural/src/procedural/proceduralSkybox.slf
View file

@ -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

50
libraries/render-utils/src/AntialiasingEffect.cpp
View file

@ -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<gpu::State>();

61
libraries/render-utils/src/AntialiasingEffect.h
View file

@ -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:
* <tr><td><code>0</code></td><td>NONE</td><td>Antialiasing is disabled.</td></tr>
* <tr><td><code>1</code></td><td>TAA</td><td>Temporal Antialiasing.</td></tr>
* <tr><td><code>2</code></td><td>FXAA</td><td>FXAA.</td></tr>
* <tr><td><code>3</code></td><td>MODE_COUNT</td><td>Inducates number of antialiasing modes</td></tr>
* <tr><td><code>3</code></td><td>MODE_COUNT</td><td>Indicates number of antialiasing modes</td></tr>
* </tbody>
* </table>
* @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. <table>
* <thead>
* <tr><th>Value</th><th>Name</th><th>Description</th>
* </thead>
* <tbody>
* <tr><td><code>0</code></td><td>NONE</td><td>TAA is disabled.</td></tr>
* <tr><td><code>1</code></td><td>PAUSE</td><td>TAA jitter is paused.</td></tr>
* <tr><td><code>2</code></td><td>PLAY</td><td>TAA jitter is playing.</td></tr>
* <tr><td><code>3</code></td><td>STATE_COUNT</td><td>Indicates number of antialiasing states</td></tr>
* </tbody>
* </table>
* @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, Output, Config>;
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<TAAParams>;
class Antialiasing {
public:
using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, DeferredFramebufferPointer, LinearDepthFramebufferPointer, int>;
using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, DeferredFramebufferPointer, LinearDepthFramebufferPointer, AntialiasingSetupConfig::Mode>;
using Outputs = gpu::TexturePointer;
using Config = AntialiasingConfig;
using JobModel = render::Job::ModelIO<Antialiasing, Inputs, Outputs, Config>;

2
libraries/render-utils/src/BackgroundStage.cpp
View file

@ -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

1
libraries/render-utils/src/BloomEffect.cpp
View file

@ -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

1
libraries/render-utils/src/BloomThreshold.slf
View file

@ -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

3
libraries/render-utils/src/CauterizedMeshPartPayload.cpp
View file

@ -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

2
libraries/render-utils/src/DebugDeferredBuffer.cpp
View file

@ -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

1
libraries/render-utils/src/DebugDeferredBuffer.h
View file

@ -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

1
libraries/render-utils/src/DeferredBufferRead.slh
View file

@ -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

10
libraries/render-utils/src/DeferredBufferWrite.slh
View file

@ -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;

4
libraries/render-utils/src/DeferredBufferWrite_shared.slh
View file

@ -7,6 +7,6 @@
#define DEFERRED_LIGHTING_SLOT 4
// <@if 1@>
// Trigger Scribe include
// <@endif@> <!def that !>
// Trigger Scribe include
// <@endif@> <!def that !>
//

1
libraries/render-utils/src/DeferredFrameTransform.cpp
View file

@ -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

6
libraries/render-utils/src/DeferredFrameTransform.h
View file

@ -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); }

1
libraries/render-utils/src/DeferredFramebuffer.cpp
View file

@ -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

1
libraries/render-utils/src/DeferredFramebuffer.h
View file

@ -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

1
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -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

2
libraries/render-utils/src/DeferredTransform.slh
View file

@ -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

4
libraries/render-utils/src/DeferredTransform_shared.slh
View file

@ -28,6 +28,6 @@ struct _DeferredFrameTransform {
};
// <@if 1@>
// Trigger Scribe include
// <@endif@> <!def that !>
// Trigger Scribe include
// <@endif@> <!def that !>
//

1
libraries/render-utils/src/GeometryCache.cpp
View file

@ -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

6
libraries/render-utils/src/HighlightEffect.h
View file

@ -114,7 +114,8 @@ private:
class DrawHighlightMask {
public:
using Inputs = render::VaryingSet2<render::ShapeBounds, HighlightResourcesPointer>; using Outputs = glm::ivec4;
using Inputs = render::VaryingSet2<render::ShapeBounds, HighlightResourcesPointer>;
using Outputs = glm::ivec4;
using JobModel = render::Job::ModelIO<DrawHighlightMask, Inputs, Outputs>;
DrawHighlightMask(unsigned int highlightIndex, render::ShapePlumberPointer shapePlumber, HighlightSharedParametersPointer parameters, uint transformSlot);
@ -174,7 +175,8 @@ signals:
class DebugHighlight {
public:
using Inputs = render::VaryingSet2<HighlightResourcesPointer, glm::ivec4>; using Config = DebugHighlightConfig;
using Inputs = render::VaryingSet2<HighlightResourcesPointer, glm::ivec4>;
using Config = DebugHighlightConfig;
using JobModel = render::Job::ModelI<DebugHighlight, Inputs, Config>;
DebugHighlight(uint transformSlot);

1
libraries/render-utils/src/Highlight_aabox.slv
View file

@ -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

1
libraries/render-utils/src/LightClusters.cpp
View file

@ -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

5
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -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;
}
}

2
libraries/render-utils/src/MeshPartPayload.h
View file

@ -70,7 +70,7 @@ public:
static bool enableMaterialProceduralShaders;
protected:
protected:
mutable Transform _previousRenderTransform;
private:

2
libraries/render-utils/src/RenderCommonTask.cpp
View file

@ -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

1
libraries/render-utils/src/RenderCommonTask.h
View file

@ -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

2
libraries/render-utils/src/RenderDeferredTask.cpp
View file

@ -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

3
libraries/render-utils/src/RenderDeferredTask.h
View file

@ -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

1
libraries/render-utils/src/RenderForwardTask.cpp
View file

@ -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

1
libraries/render-utils/src/RenderForwardTask.h
View file

@ -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

2
libraries/render-utils/src/RenderHUDLayerTask.cpp
View file

@ -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

2
libraries/render-utils/src/RenderHUDLayerTask.h
View file

@ -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

1
libraries/render-utils/src/RenderViewTask.cpp
View file

@ -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

1
libraries/render-utils/src/RenderViewTask.h
View file

@ -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

1
libraries/render-utils/src/StencilMaskPass.cpp
View file

@ -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

3
libraries/render-utils/src/StencilMaskPass.h
View file

@ -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

2
libraries/render-utils/src/VelocityWrite.slh
View file

@ -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

1
libraries/render-utils/src/ZoneRenderer.cpp
View file

@ -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

5
libraries/render-utils/src/aa_blend.slf
View file

@ -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);
}
}

1
libraries/render-utils/src/deferred_light_limited.slv
View file

@ -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

1
libraries/render-utils/src/directional_skybox_light.slf
View file

@ -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

1
libraries/render-utils/src/drawWorkloadProxy.slf
View file

@ -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

2
libraries/render-utils/src/drawWorkloadProxy.slv
View file

@ -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

1
libraries/render-utils/src/drawWorkloadView.slf
View file

@ -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

1
libraries/render-utils/src/drawWorkloadView.slv
View file

@ -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

2
libraries/render-utils/src/grid.slf
View file

@ -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

Some files were not shown because too many files have changed in this diff Show more