maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

refactor(editor): turned main view into its own document

Browse source
This commit is contained in:
maelstrom 2025-04-24 00:58:36 +02:00
parent 2dc9df4d1f
commit 1ba9911036
12 changed files with 232 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/objects/meta.cpp
View file

@ -3,6 +3,7 @@
#include "objects/jointsservice.h"
#include "objects/part.h"
#include "objects/joint/snap.h"
#include "objects/script.h"
#include "objects/workspace.h"
std::map<std::string, const InstanceType*> INSTANCE_MAP = {
@ -13,4 +14,5 @@ std::map<std::string, const InstanceType*> INSTANCE_MAP = {
{ "Snap", &Snap::TYPE },
{ "JointInstance", &JointInstance::TYPE },
{ "JointsService", &JointsService::TYPE },
{ "Script", &Script::TYPE },
};

19
core/src/objects/script.cpp Normal file
View file

@ -0,0 +1,19 @@
#include "script.h"
#include "objects/base/instance.h"
const InstanceType Script::TYPE = {
.super = &Instance::TYPE,
.className = "Script",
.constructor = &Script::Create,
.explorerIcon = "script",
};
const InstanceType* Script::GetClass() {
return &TYPE;
}
Script::Script(): Instance(&TYPE) {
}
Script::~Script() {
}

16
core/src/objects/script.h Normal file
View file

@ -0,0 +1,16 @@
#pragma once
#include "objects/base/instance.h"
#include <memory>
class Script : public Instance {
public:
const static InstanceType TYPE;
Script();
~Script();
static inline std::shared_ptr<Script> New() { return std::make_shared<Script>(); };
static inline std::shared_ptr<Instance> Create() { return std::make_shared<Script>(); };
virtual const InstanceType* GetClass() override;
};

2
editor/CMakeLists.txt
View file

@ -30,6 +30,8 @@ set(PROJECT_SOURCES
panes/explorermodel.cpp
panes/propertiesview.h
panes/propertiesview.cpp
placedocument.cpp
placedocument.h
${TS_FILES}
)

1
editor/mainglwidget.cpp
View file

@ -5,6 +5,7 @@
#include <qsoundeffect.h>
#include <string>
#include "mainglwidget.h"
#include "mainwindow.h"
#include "common.h"
#include "math_helper.h"
#include "objects/base/instance.h"

2
editor/mainglwidget.h
View file

@ -1,7 +1,6 @@
#ifndef MAINGLWIDGET_H
#define MAINGLWIDGET_H
#include "mainwindow.h"
#include "objects/part.h"
#include "qevent.h"
#include <QOpenGLWidget>
@ -9,6 +8,7 @@
#include <memory>
class HandleFace;
class MainWindow;
class MainGLWidget : public QOpenGLWidget {
public:

137
editor/mainwindow.cpp
View file

@ -2,8 +2,10 @@
#include "./ui_mainwindow.h"
#include "common.h"
#include "logger.h"
#include "objects/datamodel.h"
#include "objects/jointsservice.h"
#include "objects/joint/snap.h"
#include "placedocument.h"
#include <map>
#include <memory>
#include <qclipboard.h>
@ -12,19 +14,12 @@
#include <qmimedata.h>
#include <qstylefactory.h>
#include <qstylehints.h>
#include <qmdisubwindow.h>
#ifdef _NDEBUG
#define NDEBUG
#endif
enum RunState {
RUN_STOPPED,
RUN_RUNNING,
RUN_PAUSED
};
RunState runState = RUN_STOPPED;
bool worldSpaceTransforms = false;
inline bool isDarkMode() {
@ -63,7 +58,6 @@ MainWindow::MainWindow(QWidget *parent)
gDataModel->Init();
ui->setupUi(this);
timer.start(33, this);
setMouseTracking(true);
// https://stackoverflow.com/a/78854851/16255372
@ -138,48 +132,11 @@ MainWindow::MainWindow(QWidget *parent)
});
// ui->explorerView->Init(ui);
// Baseplate
gWorkspace()->AddChild(ui->mainWidget->lastPart = Part::New({
.position = glm::vec3(0, -5, 0),
.rotation = glm::vec3(0),
.size = glm::vec3(512, 1.2, 512),
.color = glm::vec3(0.388235, 0.372549, 0.384314),
.anchored = true,
.locked = true,
}));
ui->mainWidget->lastPart->name = "Baseplate";
gWorkspace()->SyncPartPhysics(ui->mainWidget->lastPart);
gWorkspace()->AddChild(ui->mainWidget->lastPart = Part::New({
.position = glm::vec3(0),
.rotation = glm::vec3(-2.6415927, 1.1415926, 2.57075),
.size = glm::vec3(4, 1.2, 2),
.color = glm::vec3(0.639216f, 0.635294f, 0.647059f),
}));
gWorkspace()->SyncPartPhysics(ui->mainWidget->lastPart);
auto part0 = ui->mainWidget->lastPart;
gWorkspace()->AddChild(ui->mainWidget->lastPart = Part::New({
.position = glm::vec3(1.7610925, 0.48568499, -0.82623518),
// .rotation = glm::vec3(0.5, 2, 1),
.rotation = glm::vec3(-2.6415927, 1.1415926, -2.141639),
.size = glm::vec3(4, 1.2, 2),
.color = glm::vec3(0.639216f, 0.635294f, 0.647059f),
}));
gWorkspace()->SyncPartPhysics(ui->mainWidget->lastPart);
auto part1 = ui->mainWidget->lastPart;
auto snap = Snap::New();
snap->part0 = part0;
snap->part1 = part1;
snap->c0 = part1->cframe;
snap->c1 = part0->cframe;
// gWorkspace()->AddChild(snap);
gWorkspace()->AddChild(snap);
snap->UpdateProperty("Part0");
snap->UpdateProperty("Part1");
placeDocument = new PlaceDocument(this);
ui->mdiArea->addSubWindow(placeDocument);
ui->mdiArea->currentSubWindow()->showMaximized();
ui->mdiArea->findChild<QTabBar*>()->setExpanding(false);
placeDocument->init();
}
void MainWindow::closeEvent(QCloseEvent* evt) {
@ -215,22 +172,6 @@ void MainWindow::handleLog(Logger::LogLevel logLevel, std::string message) {
ui->outputTextView->appendHtml(QString("<p style=\"color:rgb(255, 0, 0); font-weight: bold;\">%1</p>").arg(QString::fromStdString(message)));
}
static std::chrono::time_point lastTime = std::chrono::steady_clock::now();
void MainWindow::timerEvent(QTimerEvent* evt) {
if (evt->timerId() != timer.timerId()) {
QWidget::timerEvent(evt);
return;
}
float deltaTime = std::chrono::duration_cast<std::chrono::duration<float>>(std::chrono::steady_clock::now() - lastTime).count();
lastTime = std::chrono::steady_clock::now();
if (runState == RUN_RUNNING)
gWorkspace()->PhysicsStep(deltaTime);
ui->mainWidget->update();
ui->mainWidget->updateCycle();
}
void MainWindow::connectActionHandlers() {
// Explorer View
@ -263,46 +204,23 @@ void MainWindow::connectActionHandlers() {
ui->actionToggleEditSounds->setChecked(true);
connect(ui->actionRunSimulation, &QAction::triggered, this, [&]() {
if (runState == RUN_RUNNING) return;
RunState prevState = placeDocument->runState();
placeDocument->setRunState(RUN_RUNNING);
if (runState == RUN_PAUSED) {
runState = RUN_RUNNING;
ui->actionRunSimulation->setEnabled(false);
ui->actionPauseSimulation->setEnabled(true);
return;
}
runState = RUN_RUNNING;
ui->actionRunSimulation->setEnabled(false);
ui->actionPauseSimulation->setEnabled(true);
ui->actionStopSimulation->setEnabled(true);
std::shared_ptr<DataModel> newModel = editModeDataModel->CloneModel();
gDataModel = newModel;
gDataModel->Init();
ui->explorerView->updateRoot(gDataModel);
if (prevState == RUN_STOPPED)
ui->explorerView->updateRoot(gDataModel);
updateToolbars();
});
connect(ui->actionPauseSimulation, &QAction::triggered, this, [&]() {
if (runState != RUN_RUNNING) return;
runState = RUN_PAUSED;
ui->actionRunSimulation->setEnabled(true);
ui->actionPauseSimulation->setEnabled(false);
placeDocument->setRunState(RUN_PAUSED);
updateToolbars();
});
connect(ui->actionStopSimulation, &QAction::triggered, this, [&]() {
if (runState == RUN_STOPPED) return;
runState = RUN_STOPPED;
ui->actionRunSimulation->setEnabled(true);
ui->actionPauseSimulation->setEnabled(false);
ui->actionStopSimulation->setEnabled(false);
// GC: Check to make sure gDataModel gets properly garbage collected prior to this
gDataModel = editModeDataModel;
gDataModel->Init();
placeDocument->setRunState(RUN_STOPPED);
ui->explorerView->updateRoot(gDataModel);
updateToolbars();
});
ui->actionRunSimulation->setEnabled(true);
@ -347,14 +265,15 @@ void MainWindow::connectActionHandlers() {
// be deleted before their parent DataModel is. So it expects rigidBody to not be null, and tries
// to destroy it, causing a segfault since it's already been destroyed. This is important for the later code.
// TL;DR: This stinks and I need to fix it.)
ui->mainWidget->lastPart = Part::New();
placeDocument->placeWidget->lastPart = Part::New();
gDataModel = DataModel::New();
editModeDataModel = DataModel::New();
gDataModel = editModeDataModel;
gDataModel->Init();
ui->explorerView->updateRoot(gDataModel);
// Baseplate
gWorkspace()->AddChild(ui->mainWidget->lastPart = Part::New({
gWorkspace()->AddChild(placeDocument->placeWidget->lastPart = Part::New({
.position = glm::vec3(0, -5, 0),
.rotation = glm::vec3(0),
.size = glm::vec3(512, 1.2, 512),
@ -362,8 +281,8 @@ void MainWindow::connectActionHandlers() {
.anchored = true,
.locked = true,
}));
ui->mainWidget->lastPart->name = "Baseplate";
gWorkspace()->SyncPartPhysics(ui->mainWidget->lastPart);
placeDocument->placeWidget->lastPart->name = "Baseplate";
gWorkspace()->SyncPartPhysics(placeDocument->placeWidget->lastPart);
});
connect(ui->actionSave, &QAction::triggered, this, [&]() {
@ -397,10 +316,8 @@ void MainWindow::connectActionHandlers() {
ui->explorerView->updateRoot(newModel);
// Reset running state
runState = RUN_STOPPED;
ui->actionRunSimulation->setEnabled(true);
ui->actionPauseSimulation->setEnabled(false);
ui->actionStopSimulation->setEnabled(false);
placeDocument->setRunState(RUN_STOPPED);
updateToolbars();
});
connect(ui->actionDelete, &QAction::triggered, this, [&]() {
@ -539,6 +456,10 @@ void MainWindow::updateToolbars() {
: selectedTool == TOOL_SCALE ? HandlesType::ScaleHandles
: selectedTool == TOOL_ROTATE ? HandlesType::RotateHandles
: HandlesType::ScaleHandles;
ui->actionRunSimulation->setEnabled(placeDocument->runState() != RUN_RUNNING);
ui->actionPauseSimulation->setEnabled(placeDocument->runState() == RUN_RUNNING);
ui->actionStopSimulation->setEnabled(placeDocument->runState() != RUN_STOPPED);
}
std::optional<std::string> MainWindow::openFileDialog(QString filter, QString defaultExtension, QFileDialog::AcceptMode acceptMode, QString title) {

4
editor/mainwindow.h
View file

@ -2,6 +2,7 @@
#define MAINWINDOW_H
#include "logger.h"
#include "placedocument.h"
#include "qbasictimer.h"
#include "qcoreevent.h"
#include <QMainWindow>
@ -48,10 +49,9 @@ public:
Ui::MainWindow *ui;
private:
QBasicTimer timer;
PlaceDocument* placeDocument;
void updateToolbars();
void timerEvent(QTimerEvent*) override;
void closeEvent(QCloseEvent* evt) override;
void handleLog(Logger::LogLevel, std::string);

20
editor/mainwindow.ui
View file

@ -31,7 +31,20 @@
<number>0</number>
</property>
<item>
<widget class="MainGLWidget" name="mainWidget"/>
<widget class="QMdiArea" name="mdiArea">
<property name="viewMode">
<enum>QMdiArea::ViewMode::TabbedView</enum>
</property>
<property name="documentMode">
<bool>true</bool>
</property>
<property name="tabsClosable">
<bool>true</bool>
</property>
<property name="tabsMovable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
@ -721,11 +734,6 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>MainGLWidget</class>
<extends>QOpenGLWidget</extends>
<header>mainglwidget.h</header>
</customwidget>
<customwidget>
<class>ExplorerView</class>
<extends>QTreeView</extends>

1
editor/panes/explorerview.cpp
View file

@ -1,6 +1,7 @@
#include "explorerview.h"
#include "common.h"
#include "../ui_mainwindow.h"
#include "mainwindow.h"
#include "objects/base/instance.h"
#include "objects/meta.h"
#include <memory>

116
editor/placedocument.cpp Normal file
View file

@ -0,0 +1,116 @@
#include "placedocument.h"
#include "common.h"
#include "mainglwidget.h"
#include "objects/joint/snap.h"
#include <cstdio>
#include <memory>
#include <qboxlayout.h>
#include <qevent.h>
#include <qmargins.h>
#include <qmdisubwindow.h>
#include <qlayout.h>
PlaceDocument::PlaceDocument(QWidget* parent):
QMdiSubWindow(parent) {
placeWidget = new MainGLWidget;
setWidget(placeWidget);
_runState = RUN_STOPPED;
}
PlaceDocument::~PlaceDocument() {
}
void PlaceDocument::setRunState(RunState newState) {
if (newState == RUN_RUNNING && _runState != RUN_RUNNING) {
if (_runState == RUN_PAUSED) {
_runState = RUN_RUNNING;
return;
}
_runState = RUN_RUNNING;
std::shared_ptr<DataModel> newModel = editModeDataModel->CloneModel();
gDataModel = newModel;
gDataModel->Init();
} else if (newState == RUN_PAUSED && _runState == RUN_RUNNING) {
_runState = RUN_PAUSED;
} else if (newState == RUN_STOPPED) {
_runState = RUN_STOPPED;
// GC: Check to make sure gDataModel gets properly garbage collected prior to this
gDataModel = editModeDataModel;
gDataModel->Init();
}
}
void PlaceDocument::closeEvent(QCloseEvent *closeEvent) {
// Placeholder
closeEvent->ignore();
}
void PlaceDocument::keyPressEvent(QKeyEvent *keyEvent) {
printf("Getting\n");
}
static std::chrono::time_point lastTime = std::chrono::steady_clock::now();
void PlaceDocument::timerEvent(QTimerEvent* evt) {
if (evt->timerId() != timer.timerId()) {
QWidget::timerEvent(evt);
return;
}
float deltaTime = std::chrono::duration_cast<std::chrono::duration<float>>(std::chrono::steady_clock::now() - lastTime).count();
lastTime = std::chrono::steady_clock::now();
if (_runState == RUN_RUNNING)
gWorkspace()->PhysicsStep(deltaTime);
placeWidget->repaint();
placeWidget->updateCycle();
}
std::shared_ptr<Part> lastPart;
void PlaceDocument::init() {
timer.start(33, this);
// Baseplate
gWorkspace()->AddChild(lastPart = Part::New({
.position = glm::vec3(0, -5, 0),
.rotation = glm::vec3(0),
.size = glm::vec3(512, 1.2, 512),
.color = glm::vec3(0.388235, 0.372549, 0.384314),
.anchored = true,
.locked = true,
}));
lastPart->name = "Baseplate";
gWorkspace()->SyncPartPhysics(lastPart);
gWorkspace()->AddChild(lastPart = Part::New({
.position = glm::vec3(0),
.rotation = glm::vec3(-2.6415927, 1.1415926, 2.57075),
.size = glm::vec3(4, 1.2, 2),
.color = glm::vec3(0.639216f, 0.635294f, 0.647059f),
}));
gWorkspace()->SyncPartPhysics(lastPart);
auto part0 = lastPart;
gWorkspace()->AddChild(lastPart = Part::New({
.position = glm::vec3(1.7610925, 0.48568499, -0.82623518),
// .rotation = glm::vec3(0.5, 2, 1),
.rotation = glm::vec3(-2.6415927, 1.1415926, -2.141639),
.size = glm::vec3(4, 1.2, 2),
.color = glm::vec3(0.639216f, 0.635294f, 0.647059f),
}));
gWorkspace()->SyncPartPhysics(lastPart);
auto part1 = lastPart;
auto snap = Snap::New();
snap->part0 = part0;
snap->part1 = part1;
snap->c0 = part1->cframe;
snap->c1 = part0->cframe;
gWorkspace()->AddChild(snap);
snap->UpdateProperty("Part0");
snap->UpdateProperty("Part1");
}

29
editor/placedocument.h Normal file
View file

@ -0,0 +1,29 @@
#pragma once
#include "mainglwidget.h"
#include <qmdisubwindow.h>
#include <QBasicTimer>
enum RunState {
RUN_STOPPED,
RUN_RUNNING,
RUN_PAUSED
};
class PlaceDocument : public QMdiSubWindow {
QBasicTimer timer;
RunState _runState;
void timerEvent(QTimerEvent*) override;
public:
MainGLWidget* placeWidget;
PlaceDocument(QWidget* parent = nullptr);
~PlaceDocument() override;
inline RunState runState() { return _runState; };
void setRunState(RunState);
void closeEvent(QCloseEvent *closeEvent) override;
void keyPressEvent(QKeyEvent *keyEvent) override;
void init();
};