Skip to content

Commit

Permalink
Merge pull request #388 from Pikachuxxxx/envcubemap-cs
Browse files Browse the repository at this point in the history
Generating envcube map using compute shaders + VkTexture and RZSampler refactor
  • Loading branch information
Pikachuxxxx authored Dec 24, 2024
2 parents 5207974 + e002fdf commit 27ce5ec
Show file tree
Hide file tree
Showing 741 changed files with 75,699 additions and 27,982 deletions.
44 changes: 44 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Pull Request Title

Engine Version: current version of the engine

## Description

### What does this PR do?
- Provide a concise summary of the changes and their purpose
- Mention the relevant subsystem (e.g., rendering, physics, input, etc.)

## Implementation Details

### How was this implemented?
- Provide any insights into the approach, algorithms, or design decisions made

## Checklist

### Code Quality
- [ ] Code adheres to the project's style guidelines + Formatting rules etc
_Will be checked by Github Actions so careful_


### Testing
- [ ] Unit tests have been added/updated
- [ ] Existing tests pass without failures

### Documentation
- [ ] Changelog has been updated with this PR
- [ ] Added necessary commments and updated the DrawIO architecture sheet/PPT
- [ ] Link for DrawIO sheets with PR related design



### Testing Details
Explain how to test the engine to check the feature functionality introduced in this PR

## Related Issue(s)

- Link issues addressed by this PR (e.g., `Closes #123`, `Related to #456`).


## Screenshots (if applicable)

Include screenshots or videos showing before/after changes, if relevant.
Binary file added Docs/course_notes_moving_frostbite_to_pbr_v32.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions Editor/src/UI/Windows/RZEFrameGraphEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ namespace Razix {
connect(ui.textureType, SIGNAL(currentIndexChanged(int)), this, SLOT(OnTextureTypeSelected()));
for (u32 i = 0; i < (u32) Razix::Gfx::TextureType::COUNT; i++)
ui.textureType->addItem(Razix::Gfx::TextureTypeNames[i]);
ui.textureType->setCurrentIndex((u32) Razix::Gfx::TextureType::Texture_2D);
ui.textureType->setCurrentIndex((u32) Razix::Gfx::TextureType::k2D);

connect(ui.textureFormat, SIGNAL(currentIndexChanged(int)), this, SLOT(OnTextureFormatSelected()));
for (u32 i = 0; i < (u32) Razix::Gfx::TextureFormat::COUNT; i++)
Expand All @@ -933,17 +933,17 @@ namespace Razix {
connect(ui.wrapMode, SIGNAL(currentIndexChanged(int)), this, SLOT(OnTextureWrapModeSelected()));
for (u32 i = 0; i < (u32) Razix::Gfx::Wrapping::COUNT; i++)
ui.wrapMode->addItem(Razix::Gfx::WrappingNames[i]);
ui.wrapMode->setCurrentIndex((u32) Razix::Gfx::Wrapping::CLAMP_TO_EDGE);
ui.wrapMode->setCurrentIndex((u32) Razix::Gfx::Wrapping::kClampToEdge);

connect(ui.filterModeMin, SIGNAL(currentIndexChanged(int)), this, SLOT(OnTextureFilteringMinModeSelected()));
for (u32 i = 0; i < (u32) Razix::Gfx::Filtering::Mode::COUNT; i++)
ui.filterModeMin->addItem(Razix::Gfx::FitleringModeNames[i]);
ui.filterModeMin->setCurrentIndex((u32) Razix::Gfx::Filtering::Mode::LINEAR);
ui.filterModeMin->setCurrentIndex((u32) Razix::Gfx::Filtering::Mode::kFilterModeLinear);

connect(ui.filterModeMag, SIGNAL(currentIndexChanged(int)), this, SLOT(OnTextureFilteringMagModeSelected()));
for (u32 i = 0; i < (u32) Razix::Gfx::Filtering::Mode::COUNT; i++)
ui.filterModeMag->addItem(Razix::Gfx::FitleringModeNames[i]);
ui.filterModeMag->setCurrentIndex((u32) Razix::Gfx::Filtering::Mode::LINEAR);
ui.filterModeMag->setCurrentIndex((u32) Razix::Gfx::Filtering::Mode::kFilterModeLinear);

connect(ui.enableMips, SIGNAL(stateChanged(int)), this, SLOT(OnEnableMips()));
connect(ui.isHDR, SIGNAL(stateChanged(int)), this, SLOT(OnEnableIsHDR()));
Expand Down
1 change: 0 additions & 1 deletion Editor/src/UI/Windows/RZESceneHierarchyPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "Razix/Core/RZCore.h"
#include "Razix/Core/RZEngine.h"
#include "Razix/Core/RZRoot.h"
#include "Razix/Scene/Components/RZComponents.h"
#include "Razix/Scene/RZEntity.h"
#include "Razix/Scene/RZScene.h"
Expand Down
14 changes: 7 additions & 7 deletions Editor/src/generated/moc_AutoHideDockContainer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'AutoHideDockContainer.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'AutoHideDockContainer.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -65,7 +65,7 @@ void ads::CAutoHideDockContainer::qt_static_metacall(QObject *_o, QMetaObject::C
#ifndef QT_NO_PROPERTIES
if (_c == QMetaObject::ReadProperty) {
auto *_t = static_cast<CAutoHideDockContainer *>(_o);
(void)_t;
Q_UNUSED(_t)
void *_v = _a[0];
switch (_id) {
case 0: *reinterpret_cast< int*>(_v) = _t->sideBarLocation(); break;
Expand All @@ -75,10 +75,10 @@ void ads::CAutoHideDockContainer::qt_static_metacall(QObject *_o, QMetaObject::C
} else if (_c == QMetaObject::ResetProperty) {
}
#endif // QT_NO_PROPERTIES
(void)_o;
(void)_id;
(void)_c;
(void)_a;
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}

QT_INIT_METAOBJECT const QMetaObject ads::CAutoHideDockContainer::staticMetaObject = { {
Expand Down
16 changes: 8 additions & 8 deletions Editor/src/generated/moc_AutoHideSideBar.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'AutoHideSideBar.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'AutoHideSideBar.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -71,7 +71,7 @@ void ads::CAutoHideSideBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c
#ifndef QT_NO_PROPERTIES
if (_c == QMetaObject::ReadProperty) {
auto *_t = static_cast<CAutoHideSideBar *>(_o);
(void)_t;
Q_UNUSED(_t)
void *_v = _a[0];
switch (_id) {
case 0: *reinterpret_cast< int*>(_v) = _t->sideBarLocation(); break;
Expand All @@ -81,7 +81,7 @@ void ads::CAutoHideSideBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c
}
} else if (_c == QMetaObject::WriteProperty) {
auto *_t = static_cast<CAutoHideSideBar *>(_o);
(void)_t;
Q_UNUSED(_t)
void *_v = _a[0];
switch (_id) {
case 2: _t->setSpacing(*reinterpret_cast< int*>(_v)); break;
Expand All @@ -90,10 +90,10 @@ void ads::CAutoHideSideBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c
} else if (_c == QMetaObject::ResetProperty) {
}
#endif // QT_NO_PROPERTIES
(void)_o;
(void)_id;
(void)_c;
(void)_a;
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}

QT_INIT_METAOBJECT const QMetaObject ads::CAutoHideSideBar::staticMetaObject = { {
Expand Down
14 changes: 7 additions & 7 deletions Editor/src/generated/moc_AutoHideTab.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'AutoHideTab.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'AutoHideTab.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -74,7 +74,7 @@ void ads::CAutoHideTab::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
#ifndef QT_NO_PROPERTIES
if (_c == QMetaObject::ReadProperty) {
auto *_t = static_cast<CAutoHideTab *>(_o);
(void)_t;
Q_UNUSED(_t)
void *_v = _a[0];
switch (_id) {
case 0: *reinterpret_cast< int*>(_v) = _t->sideBarLocation(); break;
Expand All @@ -87,10 +87,10 @@ void ads::CAutoHideTab::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
} else if (_c == QMetaObject::ResetProperty) {
}
#endif // QT_NO_PROPERTIES
(void)_o;
(void)_id;
(void)_c;
(void)_a;
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}

QT_INIT_METAOBJECT const QMetaObject ads::CAutoHideTab::staticMetaObject = { {
Expand Down
6 changes: 3 additions & 3 deletions Editor/src/generated/moc_DockAreaTabBar.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'DockAreaTabBar.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'DockAreaTabBar.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -129,7 +129,7 @@ void ads::CDockAreaTabBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
{
if (_c == QMetaObject::InvokeMetaMethod) {
auto *_t = static_cast<CDockAreaTabBar *>(_o);
(void)_t;
Q_UNUSED(_t)
switch (_id) {
case 0: _t->currentChanging((*reinterpret_cast< int(*)>(_a[1]))); break;
case 1: _t->currentChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
Expand Down
6 changes: 3 additions & 3 deletions Editor/src/generated/moc_DockAreaTitleBar.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'DockAreaTitleBar.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'DockAreaTitleBar.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -110,7 +110,7 @@ void ads::CDockAreaTitleBar::qt_static_metacall(QObject *_o, QMetaObject::Call _
{
if (_c == QMetaObject::InvokeMetaMethod) {
auto *_t = static_cast<CDockAreaTitleBar *>(_o);
(void)_t;
Q_UNUSED(_t)
switch (_id) {
case 0: _t->tabBarClicked((*reinterpret_cast< int(*)>(_a[1]))); break;
case 1: _t->onTabsMenuAboutToShow(); break;
Expand Down
20 changes: 10 additions & 10 deletions Editor/src/generated/moc_DockAreaTitleBar_p.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'DockAreaTitleBar_p.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'DockAreaTitleBar_p.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -57,10 +57,10 @@ static const uint qt_meta_data_ads__CTitleBarButton[] = {

void ads::CTitleBarButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
(void)_o;
(void)_id;
(void)_c;
(void)_a;
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}

QT_INIT_METAOBJECT const QMetaObject ads::CTitleBarButton::staticMetaObject = { {
Expand Down Expand Up @@ -127,10 +127,10 @@ static const uint qt_meta_data_ads__CSpacerWidget[] = {

void ads::CSpacerWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
(void)_o;
(void)_id;
(void)_c;
(void)_a;
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}

QT_INIT_METAOBJECT const QMetaObject ads::CSpacerWidget::staticMetaObject = { {
Expand Down
6 changes: 3 additions & 3 deletions Editor/src/generated/moc_DockAreaWidget.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'DockAreaWidget.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'DockAreaWidget.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -134,7 +134,7 @@ void ads::CDockAreaWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
{
if (_c == QMetaObject::InvokeMetaMethod) {
auto *_t = static_cast<CDockAreaWidget *>(_o);
(void)_t;
Q_UNUSED(_t)
switch (_id) {
case 0: _t->tabBarClicked((*reinterpret_cast< int(*)>(_a[1]))); break;
case 1: _t->currentChanging((*reinterpret_cast< int(*)>(_a[1]))); break;
Expand Down
6 changes: 3 additions & 3 deletions Editor/src/generated/moc_DockContainerWidget.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'DockContainerWidget.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.16)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
Expand All @@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'DockContainerWidget.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.15.16. It"
#error "This file was generated using the moc from 5.15.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Expand Down Expand Up @@ -86,7 +86,7 @@ void ads::CDockContainerWidget::qt_static_metacall(QObject *_o, QMetaObject::Cal
{
if (_c == QMetaObject::InvokeMetaMethod) {
auto *_t = static_cast<CDockContainerWidget *>(_o);
(void)_t;
Q_UNUSED(_t)
switch (_id) {
case 0: _t->dockAreasAdded(); break;
case 1: _t->autoHideWidgetCreated((*reinterpret_cast< ads::CAutoHideDockContainer*(*)>(_a[1]))); break;
Expand Down
Loading

0 comments on commit 27ce5ec

Please sign in to comment.