ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new widgets

Browse source
This commit is contained in:
IlyaShurupov 2024-06-19 22:17:18 +03:00
parent 3dce41ea39
commit 8f62c8f387
18 changed files with 373 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
3DEditor/private/Editor.cpp
View file

@ -58,7 +58,7 @@ void Editor::loadDefaults() {
void Editor::setViewportSize(const Vec2F& size) {
// TODO remove
mScene.mCamera.rotate(0.01f, 0.0);
// mScene.mCamera.rotate(0.01f, 0.0);
mScene.mRenderSettings.size = size;
@ -100,3 +100,19 @@ void Editor::denoisePathRenderBuffers() {
void Editor::setRenderType(Editor::RenderType type) {
mRenderType = type;
}
void Editor::navigationOrbit(const Vec2F& delta) {
mScene.mCamera.rotate(delta.x, delta.y);
}
void Editor::navigationPan(const Vec2F& pos, const Vec2F& prevPos) {
mScene.mCamera.move(pos, prevPos);
}
void Editor::navigationZoom(halnf factor) {
mScene.mCamera.zoom(factor);
}
void Editor::navigationReset() {
mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 1, 5, 1 }, { 0, 0, 1 });
}

6
3DEditor/public/Editor.hpp
View file

@ -23,6 +23,12 @@ namespace tp {
void setRenderType(RenderType type);
void denoisePathRenderBuffers();
void navigationOrbit(const Vec2F& delta);
void navigationPan(const Vec2F& pos, const Vec2F& prevPos);
void navigationZoom(halnf factor);
void navigationReset();
private:
void sendBuffersToGPU();
void denoise();

108
3DEditor/public/EditorWidget.hpp
View file

@ -45,13 +45,36 @@ namespace tp {
this->mChildWidgets.pushBack(&mSplitView);
this->mChildWidgets.pushBack(&mSettingsWidget);
mRenderPathTracer.mLabel.mLabel = "Render with Path Tracer";
mRenderRaster.mLabel.mLabel = "Render with Raster";
mDenoiseButton.mLabel.mLabel = "Denoise (IntelOpenImage)";
// Render
{
mRenderPathTracer.setLabel("Render with Path Tracer");
mRenderRaster.setLabel("Render with Raster");
mRenderDeNoise.setLabel("Denoise (IntelOpenImage)");
mSettingsWidget.addWidget(&mRenderPathTracer);
mSettingsWidget.addWidget(&mRenderRaster);
mSettingsWidget.addWidget(&mDenoiseButton);
mRenderMenu.addWidgetToMenu(&mRenderPathTracer);
mRenderMenu.addWidgetToMenu(&mRenderRaster);
mRenderMenu.addWidgetToMenu(&mRenderDeNoise);
mRenderMenu.setLabel("Render");
}
// Navigation
{
mNavigationPan.setLabel("Pan");
mNavigationOrbit.setLabel("Orbit");
mNavigationZoom.setLabel("Zoom");
mNavigationReset.setLabel("Reset");
mNavigationMenu.addWidgetToMenu(&mNavigationPan);
mNavigationMenu.addWidgetToMenu(&mNavigationOrbit);
mNavigationMenu.addWidgetToMenu(&mNavigationZoom);
mNavigationMenu.addWidgetToMenu(&mNavigationReset);
mNavigationMenu.setLabel("Navigation");
}
mSettingsWidget.addWidget(&mRenderMenu);
mSettingsWidget.addWidget(&mNavigationMenu);
}
void eventProcess(const Events& events) override {
@ -60,17 +83,60 @@ namespace tp {
mViewport.setArea(mSplitView.getFirst());
mSettingsWidget.setArea(mSplitView.getSecond());
if (mRenderPathTracer.isFired()) {
mEditor->renderPathFrame();
mEditor->setRenderType(Editor::RenderType::PATH_TRACER);
// render settings
{
if (mRenderPathTracer.isFired()) {
mEditor->renderPathFrame();
mEditor->setRenderType(Editor::RenderType::PATH_TRACER);
}
if (mRenderRaster.isFired()) {
mEditor->setRenderType(Editor::RenderType::RASTER);
}
if (mRenderDeNoise.isFired()) {
mEditor->denoisePathRenderBuffers();
}
}
if (mRenderRaster.isFired()) {
mEditor->setRenderType(Editor::RenderType::RASTER);
}
// navigation
{
if (mNavigationOrbit.isFired()) {
mNavigationType = ORBIT;
}
if (mDenoiseButton.isFired()) {
mEditor->denoisePathRenderBuffers();
if (mNavigationPan.isFired()) {
mNavigationType = PAN;
}
if (mNavigationZoom.isFired()) {
mNavigationType = ZOOM;
}
if (mNavigationReset.isFired()) {
mEditor->navigationReset();
}
const auto& activeArea = mViewport.mArea;
if (this->isHolding() && activeArea.isInside(events.getPointer())) {
switch (mNavigationType) {
case ORBIT:
mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3);
break;
case PAN:
{
auto pointer = (((events.getPointer() - activeArea.pos) / activeArea.size) - 0.5f) * 2;
auto prevPointer = (((events.getPointerPrev() - activeArea.pos) / activeArea.size) - 0.5f) * 2;
mEditor->navigationPan(prevPointer, pointer);
}
break;
case ZOOM:
mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y));
break;
}
}
}
}
@ -89,12 +155,22 @@ namespace tp {
SplitView<Events, Canvas> mSplitView;
ViewportWidget<Events, Canvas> mViewport;
ScrollableWindow<Events, Canvas> mSettingsWidget;
// Controls
ScrollableWindow<Events, Canvas> mSettingsWidget;
CollapsableMenu<Events, Canvas> mRenderMenu;
ButtonWidget<Events, Canvas> mRenderPathTracer;
ButtonWidget<Events, Canvas> mRenderRaster;
ButtonWidget<Events, Canvas> mDenoiseButton;
ButtonWidget<Events, Canvas> mRenderDeNoise;
// Navigation
enum NavigationType { ORBIT, PAN, ZOOM } mNavigationType = ORBIT;
CollapsableMenu<Events, Canvas> mNavigationMenu;
ButtonWidget<Events, Canvas> mNavigationPan;
ButtonWidget<Events, Canvas> mNavigationOrbit;
ButtonWidget<Events, Canvas> mNavigationZoom;
ButtonWidget<Events, Canvas> mNavigationReset;
RGBA mBaseColor;
};