minor cleanup, copyright

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

View file

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

View file

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

View file

@ -1,7 +1,7 @@
// //
// Created by Sam Gondelman on 1/22/19 // Created by Sam Gondelman on 1/22/19
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,6 +1,7 @@
// //
// Created by Sam Gondelman on 11/29/18 // Created by Sam Gondelman on 11/29/18
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,6 +1,7 @@
// //
// Created by Sam Gondelman on 11/29/18 // Created by Sam Gondelman on 11/29/18
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Seth Alves on 5/11/15. // Created by Seth Alves on 5/11/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Brad Hefta-Gaub on 8/6/14. // Created by Brad Hefta-Gaub on 8/6/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,7 +3,7 @@
// interface/src // interface/src
// //
// Created by Jason Rickwald on 3/2/15. // 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. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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->setDepthTest(true, false, gpu::LESS_EQUAL);
state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE, 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); gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
// TODO: handle opaque
PrepareStencil::testMaskResetNoAA(*state); PrepareStencil::testMaskResetNoAA(*state);
auto program = gpu::Shader::createProgram(shader::entities_renderer::program::textured_particle); 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.finish = EntityRenderer::calculatePulseColor(_particleProperties.getColorFinish(), _pulseProperties, _created);
color.spread = EntityRenderer::calculatePulseColor(_particleProperties.getColorSpread(), _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.setUniformBuffer(0, _uniformBuffer);
batch.setInputFormat(_vertexFormat); batch.setInputFormat(_vertexFormat);

View file

@ -4,7 +4,7 @@
// //
// Created by Eric Levin on 8/10/15 // Created by Eric Levin on 8/10/15
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,6 @@
// //
// Created by Seth Alves on 5/19/15. // Created by Seth Alves on 5/19/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors.
// Copyright 2022-2023 Overte e.V. // Copyright 2022-2023 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

View file

@ -1,7 +1,7 @@
// //
// Created by Bradley Austin Davis on 2016/05/09 // Created by Bradley Austin Davis on 2016/05/09
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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>(); auto geometryCache = DependencyManager::get<GeometryCache>();
GeometryCache::Shape geometryShape = geometryCache->getShapeForEntityShape(_shape); GeometryCache::Shape geometryShape = geometryCache->getShapeForEntityShape(_shape);
Transform transform; Transform transform;
Transform prevTransform;
withReadLock([&] { withReadLock([&] {
transform = _renderTransform; 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; 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, transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), _billboardMode,
args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition(), args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition(),
_shape < entity::Shape::Cube || _shape > entity::Shape::Icosahedron)); _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); Pipeline pipelineType = getPipelineType(materials);
if (pipelineType == Pipeline::PROCEDURAL) { if (pipelineType == Pipeline::PROCEDURAL) {

View file

@ -4,8 +4,7 @@
// //
// Created by Brad Hefta-Gaub on 8/6/14. // Created by Brad Hefta-Gaub on 8/6/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// Copyright 2023 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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; bool transparent;
Transform transform; Transform transform;
Transform prevTransform;
withReadLock([&] { withReadLock([&] {
transparent = isTransparent(); transparent = isTransparent();
transform = _renderTransform; transform = _renderTransform;
prevTransform = _prevRenderTransform; });
transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), _billboardMode, transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), _billboardMode,
args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition())); 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) { if (args->_renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || args->_renderMode == Args::RenderMode::MIRROR_RENDER_MODE) {
_prevRenderTransform = transform; _prevRenderTransform = transform;
} }
});
batch.setModelTransform(transform, prevTransform);
Pipeline pipelineType = getPipelineType(materials); Pipeline pipelineType = getPipelineType(materials);
if (pipelineType == Pipeline::PROCEDURAL) { if (pipelineType == Pipeline::PROCEDURAL) {

View file

@ -4,7 +4,6 @@
// //
// Created by Brad Hefta-Gaub on 8/6/14. // Created by Brad Hefta-Gaub on 8/6/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors.
// Copyright 2023 Overte e.V. // Copyright 2023 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

View file

@ -2,6 +2,7 @@
// Created by Bradley Austin Davis on 2015/05/12 // Created by Bradley Austin Davis on 2015/05/12
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2020 Vircadia contributors.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,7 +5,7 @@
// //
// Created by Eric Levin on 8/10/2015 // Created by Eric Levin on 8/10/2015
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,7 +5,7 @@
// //
// Created by Eric Levin on 7/20/15. // Created by Eric Levin on 7/20/15.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Seth Alves on 2015-8-3 // Created by Seth Alves on 2015-8-3
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// Generated on <$_SCRIBE_DATE$> // Generated on <$_SCRIBE_DATE$>
// //
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// textured_particle.frag // textured_particle.frag
// //
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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) { void main(void) {
outFragColor = texture(colorMap, varTexcoord.xy) * varColor; outFragColor = texture(colorMap, varTexcoord.xy) * varColor;
// TODO: handle opaque particles
} }

View file

@ -5,7 +5,7 @@
// texture_particle.vert // texture_particle.vert
// //
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2023 Overte e.V. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 quadPos = radius * vec4(UNIT_QUAD[twoTriID], 0.0);
vec4 eyePos = anchorPoint + rotation * quadPos; vec4 eyePos = anchorPoint + rotation * quadPos;
<$transformEyeToClipPos(cam, eyePos, gl_Position)$> <$transformEyeToClipPos(cam, eyePos, gl_Position)$>
// TODO: _prevPositionCS
} }

View file

@ -4,7 +4,7 @@
// //
// Created by Sam Gateau on 10/27/2014. // Created by Sam Gateau on 10/27/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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_drawIndexedInstanced:
case Batch::COMMAND_multiDrawIndirect: case Batch::COMMAND_multiDrawIndirect:
case Batch::COMMAND_multiDrawIndexedIndirect: case Batch::COMMAND_multiDrawIndexedIndirect:
case Batch::COMMAND_copySavedViewProjectionTransformToBuffer: // We need to store this transform state in the transform buffer
preUpdateTransform(); preUpdateTransform();
break; break;
@ -336,11 +337,6 @@ void GLBackend::renderPassTransfer(const Batch& batch) {
_stereo._contextDisable = false; _stereo._contextDisable = false;
break; 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_setFramebuffer:
case Batch::COMMAND_setViewportTransform: case Batch::COMMAND_setViewportTransform:
case Batch::COMMAND_setViewTransform: case Batch::COMMAND_setViewTransform:

View file

@ -4,7 +4,7 @@
// //
// Created by Sam Gateau on 10/27/2014. // Created by Sam Gateau on 10/27/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 3/8/2015. // Created by Sam Gateau on 3/8/2015.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Sam Gateau on 3/8/2015. // Created by Sam Gateau on 3/8/2015.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2023 Overte e.V. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,6 +1,7 @@
// //
// Created by Bradley Austin Davis on 2016/05/15 // Created by Bradley Austin Davis on 2016/05/15
// Copyright 2013-2016 High Fidelity, Inc. // Copyright 2013-2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,6 +1,7 @@
// //
// Created by Bradley Austin Davis on 2016/05/15 // Created by Bradley Austin Davis on 2016/05/15
// Copyright 2013-2016 High Fidelity, Inc. // Copyright 2013-2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 10/27/2014. // Created by Sam Gateau on 10/27/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 3/8/2015. // Created by Sam Gateau on 3/8/2015.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 10/27/2014. // Created by Sam Gateau on 10/27/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 1/19/2015. // Created by Sam Gateau on 1/19/2015.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 3/8/2015. // Created by Sam Gateau on 3/8/2015.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Olivier Prat on 05/25/2018. // Created by Olivier Prat on 05/25/2018.
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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); viewUntranslated[3] = Vec4(0.0f, 0.0f, 0.0f, 1.0f);
_previousProjectionViewUntranslated = previousProjection * viewUntranslated; _previousProjectionViewUntranslated = previousProjection * viewUntranslated;
//_previousProjectionViewUntranslated = _projection * viewUntranslated;
_stereoInfo = Vec4(0.0f); _stereoInfo = Vec4(0.0f);
return *this; return *this;

View file

@ -4,7 +4,7 @@
// //
// Created by Olivier Prat on 05/18/2018. // Created by Olivier Prat on 05/18/2018.
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 10/14/2014. // Created by Sam Gateau on 10/14/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 10/14/2014. // Created by Sam Gateau on 10/14/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 10/27/2014. // Created by Sam Gateau on 10/27/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 10/27/2014. // Created by Sam Gateau on 10/27/2014.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,11 +3,12 @@
// <$_SCRIBE_FILENAME$> // <$_SCRIBE_FILENAME$>
// Generated on <$_SCRIBE_DATE$> // Generated on <$_SCRIBE_DATE$>
// Draw the unit quad [-1,-1 -> 1,1]. // Draw the unit quad [-1,-1 -> 1,1].
// Not transform used. // No transform used.
// Simply draw a Triangle_strip of 2 triangles, no input buffers or index buffer needed // Simply draw a Triangle_strip of 2 triangles, no input buffers or index buffer needed
// //
// Created by Olivier Prat on 10/22/2018 // Created by Olivier Prat on 10/22/2018
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,7 +1,7 @@
// //
// Created by Bradley Austin Davis on 2018/10/14 // Created by Bradley Austin Davis on 2018/10/14
// Copyright 2013-2018 High Fidelity, Inc. // Copyright 2013-2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,7 +1,7 @@
// //
// Created by Bradley Austin Davis on 2018/10/14 // Created by Bradley Austin Davis on 2018/10/14
// Copyright 2013-2018 High Fidelity, Inc. // Copyright 2013-2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,7 +1,7 @@
// //
// Created by Bradley Austin Davis on 2018/10/14 // Created by Bradley Austin Davis on 2018/10/14
// Copyright 2013-2018 High Fidelity, Inc. // Copyright 2013-2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Niraj Venkat on 7/7/2015. // Created by Niraj Venkat on 7/7/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,7 +3,7 @@
// //
// Created by Sam Gateau on 2/10/15. // Created by Sam Gateau on 2/10/15.
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -363,7 +363,7 @@ TransformObject getTransformObject() {
<@endfunc@> <@endfunc@>
<@func transformEyeToPrevClipPos(cameraTransform, eyePos, prevClipPos)@> <@func transformEyeToPrevClipPos(cameraTransform, eyePos, prevClipPos)@>
{ // transformEyeToClipPos { // transformEyeToPrevClipPos
vec4 worldPos = <$cameraTransform$>._viewInverse * vec4(<$eyePos$>.xyz, 1.0); vec4 worldPos = <$cameraTransform$>._viewInverse * vec4(<$eyePos$>.xyz, 1.0);
<$prevClipPos$> = <$cameraTransform$>._previousProjectionViewUntranslated * worldPos; <$prevClipPos$> = <$cameraTransform$>._previousProjectionViewUntranslated * worldPos;
// Prev clip pos is in mono clip space // Prev clip pos is in mono clip space

View file

@ -3,6 +3,7 @@
// //
// Created by Nissim Hadar on 9/13/2017 // Created by Nissim Hadar on 9/13/2017
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 5/4/2015. // Created by Sam Gateau on 5/4/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 5/4/2015. // Created by Sam Gateau on 5/4/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,7 +5,7 @@
// //
// Created by Sam Gateau on 5/5/2015. // Created by Sam Gateau on 5/5/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,7 +3,7 @@
// libraries/graphics/src // libraries/graphics/src
// //
// Created by HifiExperiments on 8/5/2020. // Created by HifiExperiments on 8/5/2020.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,7 +5,7 @@
// //
// Created by Sam Gateau on 5/5/2015. // Created by Sam Gateau on 5/5/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -36,6 +36,7 @@ void main(void) {
<$transformEyeToWorldDir(cam, eyeDir, _normal)$> <$transformEyeToWorldDir(cam, eyeDir, _normal)$>
<@if not HIFI_USE_FORWARD@> <@if not HIFI_USE_FORWARD@>
// FIXME: this is probably wrong
_prevPositionCS = cam._previousProjectionViewUntranslated * (cam._viewInverse * (cam._projectionInverse * vec4(clipDir, 1.0))); _prevPositionCS = cam._previousProjectionViewUntranslated * (cam._viewInverse * (cam._projectionInverse * vec4(clipDir, 1.0)));
<@endif@> <@endif@>

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 9/21/2015. // Created by Sam Gateau on 9/21/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 9/21/15. // Created by Sam Gateau on 9/21/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -6,7 +6,7 @@
// //
// Created by Sam Gateau on 5/5/2015. // Created by Sam Gateau on 5/5/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Raffi Bedikian on 8/30/15 // Created by Raffi Bedikian on 8/30/15
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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(); emit dirty();
} }
void AntialiasingSetupConfig::setState(int state) { void AntialiasingSetupConfig::setState(State state) {
_state = (state) % 3; _state = (State)((int)state % (int)State::STATE_COUNT);
switch (_state) { switch (_state) {
case 0: { case State::NONE: {
none(); none();
break; break;
} }
case 1: { case State::PAUSE: {
pause(); pause();
break; break;
} }
case 2: case State::PLAY:
default: { default: {
play(); play();
break; break;
@ -65,26 +65,6 @@ void AntialiasingSetupConfig::setState(int state) {
emit dirty(); 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() { int AntialiasingSetupConfig::prev() {
setIndex(_index - 1); setIndex(_index - 1);
return _index; return _index;
@ -95,32 +75,32 @@ int AntialiasingSetupConfig::next() {
return _index; return _index;
} }
int AntialiasingSetupConfig::none() { AntialiasingSetupConfig::State AntialiasingSetupConfig::none() {
_state = 0; _state = State::NONE;
stop = true; stop = true;
freeze = false; freeze = false;
setIndex(-1); setIndex(-1);
return _state; return _state;
} }
int AntialiasingSetupConfig::pause() { AntialiasingSetupConfig::State AntialiasingSetupConfig::pause() {
_state = 1; _state = State::PAUSE;
stop = false; stop = false;
freeze = true; freeze = true;
setIndex(0); setIndex(0);
return _state; return _state;
} }
int AntialiasingSetupConfig::play() { AntialiasingSetupConfig::State AntialiasingSetupConfig::play() {
_state = 2; _state = State::PLAY;
stop = false; stop = false;
freeze = false; freeze = false;
setIndex(0); setIndex(0);
return _state; return _state;
} }
void AntialiasingSetupConfig::setAAMode(int mode) { void AntialiasingSetupConfig::setAAMode(Mode mode) {
this->mode = glm::clamp(mode, 0, (int)AntialiasingSetupConfig::MODE_COUNT); this->mode = (Mode)glm::clamp((int)mode, 0, (int)AntialiasingSetupConfig::Mode::MODE_COUNT);
emit dirty(); emit dirty();
} }

View file

@ -4,7 +4,6 @@
// //
// Created by Raffi Bedikian on 8/30/15 // Created by Raffi Bedikian on 8/30/15
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors.
// Copyright 2022-2023 Overte e.V. // Copyright 2022-2023 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // 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 freeze MEMBER freeze NOTIFY dirty)
Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty) Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty)
Q_PROPERTY(int index READ getIndex NOTIFY dirty) Q_PROPERTY(int index READ getIndex NOTIFY dirty)
Q_PROPERTY(int state READ getState WRITE setState NOTIFY dirty) Q_PROPERTY(State state READ getState WRITE setState NOTIFY dirty)
Q_PROPERTY(int mode READ getAAMode WRITE setAAMode NOTIFY dirty) Q_PROPERTY(Mode mode READ getAAMode WRITE setAAMode NOTIFY dirty)
public: public:
AntialiasingSetupConfig() : render::Job::Config(true) {} 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>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>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>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> * </tbody>
* </table> * </table>
* @typedef {number} AntialiasingMode * @typedef {number} AntialiasingMode
*/ */
enum Mode { enum class Mode {
NONE = 0, NONE = 0,
TAA, TAA,
FXAA, FXAA,
@ -56,33 +55,55 @@ public:
}; };
Q_ENUM(Mode) // Stored as signed int. 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 }; float scale { 0.75f };
bool stop { false }; bool stop { false };
bool freeze { false }; bool freeze { false };
int mode { TAA }; Mode mode { Mode::TAA };
void setIndex(int current);
void setState(int state);
public slots: public slots:
int cycleStopPauseRun();
int prev(); int prev();
int next(); int next();
int none(); State none();
int pause(); State pause();
int play(); State play();
int getIndex() const { return _index; } int getIndex() const { return _index; }
int getState() const { return _state; } void setIndex(int current);
void setAAMode(int mode); State getState() const { return _state; }
int getAAMode() const { return mode; } void setState(State state);
Mode getAAMode() const { return mode; }
void setAAMode(Mode mode);
signals: signals:
void dirty(); void dirty();
private: private:
int _state { 0 }; State _state { State::PLAY };
int _index { 0 }; int _index { 0 };
}; };
@ -91,7 +112,7 @@ class AntialiasingSetup {
public: public:
using Config = AntialiasingSetupConfig; using Config = AntialiasingSetupConfig;
using Output = int; using Output = AntialiasingSetupConfig::Mode;
using JobModel = render::Job::ModelO<AntialiasingSetup, Output, Config>; using JobModel = render::Job::ModelO<AntialiasingSetup, Output, Config>;
AntialiasingSetup(); AntialiasingSetup();
@ -106,7 +127,7 @@ private:
int _freezedSampleIndex { 0 }; int _freezedSampleIndex { 0 };
bool _isStopped { false }; bool _isStopped { false };
bool _isFrozen { 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 { class Antialiasing {
public: public:
using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, DeferredFramebufferPointer, LinearDepthFramebufferPointer, int>; using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, DeferredFramebufferPointer, LinearDepthFramebufferPointer, AntialiasingSetupConfig::Mode>;
using Outputs = gpu::TexturePointer; using Outputs = gpu::TexturePointer;
using Config = AntialiasingConfig; using Config = AntialiasingConfig;
using JobModel = render::Job::ModelIO<Antialiasing, Inputs, Outputs, Config>; using JobModel = render::Job::ModelIO<Antialiasing, Inputs, Outputs, Config>;

View file

@ -3,7 +3,7 @@
// //
// Created by Sam Gateau on 5/9/2017. // Created by Sam Gateau on 5/9/2017.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Olivier Prat on 09/25/17. // Created by Olivier Prat on 09/25/17.
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Olivier Prat on 09/26/2017 // Created by Olivier Prat on 09/26/2017
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,8 +4,7 @@
// //
// Created by Andrew Meadows 2017.01.17 // Created by Andrew Meadows 2017.01.17
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// Copyright 2023 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Clement on 12/3/15. // Created by Clement on 12/3/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Clement on 12/3/15. // Created by Clement on 12/3/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 5/4/16. // Created by Sam Gateau on 5/4/16.
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Sam Gateau on 1/12/15. // Created by Sam Gateau on 1/12/15.
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau 6/3/2016. // Created by Sam Gateau 6/3/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Sam Gateau 6/3/2016. // Created by Sam Gateau 6/3/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -33,10 +33,10 @@ public:
protected: protected:
// Class describing the uniform buffer with the transform info common to the AO shaders // Class describing the uniform buffer with the transform info common to the AO shaders
// It s changing every frame // It s changing every frame
#include "DeferredTransform_shared.slh" #include "DeferredTransform_shared.slh"
class FrameTransform : public _DeferredFrameTransform { class FrameTransform : public _DeferredFrameTransform {
public: public:
FrameTransform() { infos.stereoInfo = glm::vec4(0.0f); } FrameTransform() { infos.stereoInfo = glm::vec4(0.0f); }

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau 7/11/2016. // Created by Sam Gateau 7/11/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau 7/11/2016. // Created by Sam Gateau 7/11/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Andrzej Kapolka on 9/11/14. // Created by Andrzej Kapolka on 9/11/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Sam Gateau on 6/2/16. // Created by Sam Gateau on 6/2/16.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Andrzej Kapolka on 6/21/13. // Created by Andrzej Kapolka on 6/21/13.
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

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

View file

@ -7,6 +7,7 @@
// //
// Created by Olivier Prat on 11/02/2017 // Created by Olivier Prat on 11/02/2017
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,6 +3,7 @@
// //
// Created by Sam Gateau on 9/7/2016. // Created by Sam Gateau on 9/7/2016.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -193,12 +193,9 @@ void ModelMeshPartPayload::bindTransform(gpu::Batch& batch, const Transform& tra
if (_clusterBuffer) { if (_clusterBuffer) {
batch.setUniformBuffer(graphics::slot::buffer::Skinning, _clusterBuffer); batch.setUniformBuffer(graphics::slot::buffer::Skinning, _clusterBuffer);
} }
// TODO: I'm not sure of this
//batch.setModelTransform(transform, _previousModelTransform);
batch.setModelTransform(transform, _previousRenderTransform); batch.setModelTransform(transform, _previousRenderTransform);
if (renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || renderMode == Args::RenderMode::MIRROR_RENDER_MODE) { if (renderMode == Args::RenderMode::DEFAULT_RENDER_MODE || renderMode == Args::RenderMode::MIRROR_RENDER_MODE) {
// TODO: I'm not sure of this
//_prevRenderTransform = _drawTransform;
_previousRenderTransform = transform; _previousRenderTransform = transform;
} }
} }

View file

@ -1,7 +1,7 @@
// //
// Created by Bradley Austin Davis on 2018/01/09 // Created by Bradley Austin Davis on 2018/01/09
// Copyright 2013-2018 High Fidelity, Inc. // Copyright 2013-2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,6 +1,7 @@
// //
// Created by Bradley Austin Davis on 2018/01/09 // Created by Bradley Austin Davis on 2018/01/09
// Copyright 2013-2018 High Fidelity, Inc. // Copyright 2013-2018 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,7 +5,7 @@
// //
// Created by Sam Gateau on 5/29/15. // Created by Sam Gateau on 5/29/15.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,7 +3,8 @@
// render-utils/src/ // render-utils/src/
// //
// Created by Sam Gateau on 5/29/15. // 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. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Zach Pomerantz on 12/13/2016. // Created by Zach Pomerantz on 12/13/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Zach Pomerantz on 12/13/2016. // Created by Zach Pomerantz on 12/13/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,7 +1,7 @@
// //
// Created by Sam Gateau on 2019/06/14 // Created by Sam Gateau on 2019/06/14
// Copyright 2013-2019 High Fidelity, Inc. // Copyright 2013-2019 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -1,7 +1,7 @@
// //
// Created by Sam Gateau on 2019/06/14 // Created by Sam Gateau on 2019/06/14
// Copyright 2013-2019 High Fidelity, Inc. // Copyright 2013-2019 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 5/25/2017. // Created by Sam Gateau on 5/25/2017.
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 5/25/2017. // Created by Sam Gateau on 5/25/2017.
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 5/31/17. // Created by Sam Gateau on 5/31/17.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -3,7 +3,8 @@
// render-utils/src/ // render-utils/src/
// //
// Created by Sam Gateau on 5/31/17. // 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. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// //
// Created by Olivier Prat on 10/19/18. // Created by Olivier Prat on 10/19/18.
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,6 +4,7 @@
// //
// Created by Sam Gateau on 4/4/2017. // Created by Sam Gateau on 4/4/2017.
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Raffi Bedikian on 8/30/15 // Created by Raffi Bedikian on 8/30/15
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -7,6 +7,7 @@
// //
// Created by Sam Gateau on 6/16/16. // Created by Sam Gateau on 6/16/16.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Sam Gateau on 5/8/2015. // Created by Sam Gateau on 5/8/2015.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -6,6 +6,7 @@
// //
// Created by Sam Gateau on 6/29/15. // Created by Sam Gateau on 6/29/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -7,7 +7,7 @@
// //
// Created by Sam Gateau on 6/29/2015. // Created by Sam Gateau on 6/29/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2023 Overte e.V. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -7,6 +7,7 @@
// //
// Created by Sam Gateau on 6/29/15. // Created by Sam Gateau on 6/29/15.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -7,6 +7,7 @@
// //
// Created by Sam Gateau on 6/29/2015. // Created by Sam Gateau on 6/29/2015.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,7 +5,7 @@
// //
// Created by Zach Pomerantz on 2/16/2016. // Created by Zach Pomerantz on 2/16/2016.
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -4,7 +4,7 @@
// Generated on <$_SCRIBE_DATE$> // Generated on <$_SCRIBE_DATE$>
// //
// Created by HifiExperiments on 7/24/2020 // Created by HifiExperiments on 7/24/2020
// Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Sam Gateau on 9/8/2016. // Created by Sam Gateau on 9/8/2016.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -5,6 +5,7 @@
// //
// Created by Sam Gateau on 9/8/2016. // Created by Sam Gateau on 9/8/2016.
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -7,6 +7,7 @@
// //
// Created by Sam Gateau on 9/6/2016. // Created by Sam Gateau on 9/6/2016.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

View file

@ -7,6 +7,7 @@
// //
// Created by Sam Gateau on 9/6/2016. // Created by Sam Gateau on 9/6/2016.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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