diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index d5ea26a..7b91d59 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Multimedia LinguistTools) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Multimedia LinguistTools) -find_package(QScintilla) +find_package(QScintilla REQUIRED) set(TS_FILES editor_en_US.ts) diff --git a/editor/mainwindow.cpp b/editor/mainwindow.cpp index 99f37a9..80c5cb3 100644 --- a/editor/mainwindow.cpp +++ b/editor/mainwindow.cpp @@ -3,12 +3,8 @@ #include "common.h" #include "logger.h" #include "objects/datamodel.h" -#include "objects/jointsservice.h" -#include "objects/joint/snap.h" -#include "objects/script.h" #include "placedocument.h" #include "script/scriptdocument.h" -#include #include #include #include @@ -145,10 +141,6 @@ MainWindow::MainWindow(QWidget *parent) placeDocument->init(); ui->mdiArea->setTabsClosable(true); - - // auto script = Script::New(); - // gWorkspace()->AddChild(script); - // ui->mdiArea->addSubWindow(new ScriptDocument(script)); } void MainWindow::closeEvent(QCloseEvent* evt) { diff --git a/editor/placedocument.cpp b/editor/placedocument.cpp index a65d673..be6cc53 100644 --- a/editor/placedocument.cpp +++ b/editor/placedocument.cpp @@ -1,7 +1,9 @@ #include "placedocument.h" #include "common.h" #include "mainglwidget.h" +#include "mainwindow.h" #include "objects/joint/snap.h" +#include "objects/script.h" #include "rendering/surface.h" #include #include @@ -125,4 +127,9 @@ void PlaceDocument::init() { // part0->backSurface = SurfaceHinge; part0->backSurface = SurfaceMotor; // part1->frontSurface = SurfaceHinge; + + std::shared_ptr