diff options
Diffstat (limited to 'tests/manual/deferred-renderer-cpp')
16 files changed, 21 insertions, 58 deletions
diff --git a/tests/manual/deferred-renderer-cpp/deferred-renderer-cpp.pro b/tests/manual/deferred-renderer-cpp/deferred-renderer-cpp.pro deleted file mode 100644 index 3b3290bac..000000000 --- a/tests/manual/deferred-renderer-cpp/deferred-renderer-cpp.pro +++ /dev/null @@ -1,37 +0,0 @@ -!include( ../manual.pri ) { - error( "Couldn't find the manual.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dextras - -HEADERS += \ - gbuffer.h \ - deferredrenderer.h \ - finaleffect.h \ - sceneeffect.h \ - pointlightblock.h \ - screenquadentity.h \ - sceneentity.h - -SOURCES += \ - main.cpp \ - gbuffer.cpp \ - deferredrenderer.cpp \ - finaleffect.cpp \ - sceneeffect.cpp \ - pointlightblock.cpp \ - screenquadentity.cpp \ - sceneentity.cpp - -RESOURCES += \ - deferred-renderer-cpp.qrc - -OTHER_FILES += \ - geometry_gl2.vert \ - geometry_gl2.frag \ - geometry_gl3.frag \ - geometry_gl3.vert \ - final_gl2.vert \ - final_gl2.frag \ - final_gl3.frag \ - final_gl3.vert diff --git a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp index bc6dac23d..38ddb85f4 100644 --- a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp +++ b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "deferredrenderer.h" #include "gbuffer.h" @@ -74,13 +74,13 @@ void DeferredRenderer::setSurface(QWindow *surface) if (m_window != nullptr) { // Store connections m_widthChangedConnection = QObject::connect(surface, &QWindow::widthChanged, - [this] (int width) { - m_winSize->setValue(QSizeF(float(width), m_winSize->value().toSizeF().height())); - }); + this, [this](int width) { + m_winSize->setValue(QSizeF(float(width), m_winSize->value().toSizeF().height())); + }); m_heightChangedConnection = QObject::connect(surface, &QWindow::heightChanged, - [this] (int height) { - m_winSize->setValue(QSizeF(m_winSize->value().toSizeF().width(), float(height))); - }); + this, [this](int height) { + m_winSize->setValue(QSizeF(m_winSize->value().toSizeF().width(), float(height))); + }); } } } diff --git a/tests/manual/deferred-renderer-cpp/deferredrenderer.h b/tests/manual/deferred-renderer-cpp/deferredrenderer.h index 7528528c5..3d029778a 100644 --- a/tests/manual/deferred-renderer-cpp/deferredrenderer.h +++ b/tests/manual/deferred-renderer-cpp/deferredrenderer.h @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef DEFERREDRENDERER_H #define DEFERREDRENDERER_H diff --git a/tests/manual/deferred-renderer-cpp/finaleffect.cpp b/tests/manual/deferred-renderer-cpp/finaleffect.cpp index 434b9ef9c..d83fd7417 100644 --- a/tests/manual/deferred-renderer-cpp/finaleffect.cpp +++ b/tests/manual/deferred-renderer-cpp/finaleffect.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "finaleffect.h" diff --git a/tests/manual/deferred-renderer-cpp/finaleffect.h b/tests/manual/deferred-renderer-cpp/finaleffect.h index 7ea3c433b..48b9d4e12 100644 --- a/tests/manual/deferred-renderer-cpp/finaleffect.h +++ b/tests/manual/deferred-renderer-cpp/finaleffect.h @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef FINALEFFECT_H #define FINALEFFECT_H diff --git a/tests/manual/deferred-renderer-cpp/gbuffer.cpp b/tests/manual/deferred-renderer-cpp/gbuffer.cpp index 9658e97ac..489b785cd 100644 --- a/tests/manual/deferred-renderer-cpp/gbuffer.cpp +++ b/tests/manual/deferred-renderer-cpp/gbuffer.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "gbuffer.h" diff --git a/tests/manual/deferred-renderer-cpp/gbuffer.h b/tests/manual/deferred-renderer-cpp/gbuffer.h index 688d624a7..27f694933 100644 --- a/tests/manual/deferred-renderer-cpp/gbuffer.h +++ b/tests/manual/deferred-renderer-cpp/gbuffer.h @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef GBUFFER_H #define GBUFFER_H diff --git a/tests/manual/deferred-renderer-cpp/main.cpp b/tests/manual/deferred-renderer-cpp/main.cpp index 885d475d3..207d3f998 100644 --- a/tests/manual/deferred-renderer-cpp/main.cpp +++ b/tests/manual/deferred-renderer-cpp/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <Qt3DCore/QEntity> diff --git a/tests/manual/deferred-renderer-cpp/pointlightblock.cpp b/tests/manual/deferred-renderer-cpp/pointlightblock.cpp index 38b363a3d..caa55818a 100644 --- a/tests/manual/deferred-renderer-cpp/pointlightblock.cpp +++ b/tests/manual/deferred-renderer-cpp/pointlightblock.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "pointlightblock.h" diff --git a/tests/manual/deferred-renderer-cpp/pointlightblock.h b/tests/manual/deferred-renderer-cpp/pointlightblock.h index d7514ba83..a926123bc 100644 --- a/tests/manual/deferred-renderer-cpp/pointlightblock.h +++ b/tests/manual/deferred-renderer-cpp/pointlightblock.h @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef POINTLIGHTBLOCK_H #define POINTLIGHTBLOCK_H diff --git a/tests/manual/deferred-renderer-cpp/sceneeffect.cpp b/tests/manual/deferred-renderer-cpp/sceneeffect.cpp index 316f67527..7ce300334 100644 --- a/tests/manual/deferred-renderer-cpp/sceneeffect.cpp +++ b/tests/manual/deferred-renderer-cpp/sceneeffect.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "sceneeffect.h" diff --git a/tests/manual/deferred-renderer-cpp/sceneeffect.h b/tests/manual/deferred-renderer-cpp/sceneeffect.h index 7a701e295..74ac0561c 100644 --- a/tests/manual/deferred-renderer-cpp/sceneeffect.h +++ b/tests/manual/deferred-renderer-cpp/sceneeffect.h @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef SCENEEFFECT_H #define SCENEEFFECT_H diff --git a/tests/manual/deferred-renderer-cpp/sceneentity.cpp b/tests/manual/deferred-renderer-cpp/sceneentity.cpp index 3806af378..446ba8b80 100644 --- a/tests/manual/deferred-renderer-cpp/sceneentity.cpp +++ b/tests/manual/deferred-renderer-cpp/sceneentity.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "sceneentity.h" #include "sceneeffect.h" diff --git a/tests/manual/deferred-renderer-cpp/sceneentity.h b/tests/manual/deferred-renderer-cpp/sceneentity.h index fea3123ab..f6e7c00dc 100644 --- a/tests/manual/deferred-renderer-cpp/sceneentity.h +++ b/tests/manual/deferred-renderer-cpp/sceneentity.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef SCENEENTITY_H #define SCENEENTITY_H diff --git a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp index bc8d800cd..42aa9855e 100644 --- a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp +++ b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "screenquadentity.h" #include "finaleffect.h" diff --git a/tests/manual/deferred-renderer-cpp/screenquadentity.h b/tests/manual/deferred-renderer-cpp/screenquadentity.h index 01d8a1d1a..959f3d611 100644 --- a/tests/manual/deferred-renderer-cpp/screenquadentity.h +++ b/tests/manual/deferred-renderer-cpp/screenquadentity.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef SCREENQUADENTITY_H #define SCREENQUADENTITY_H |