refactor: move GOP_test to plugin system

This commit is contained in:
parker
2025-07-16 16:37:14 +01:00
parent 1ac5af190b
commit d2dda549eb
8 changed files with 60 additions and 56 deletions

View File

@@ -3,7 +3,6 @@
#include "Engine/Network/NetworkManager.h"
#include <optional>
#include "Engine/Operator/Context.h"
#include "Engine/Operator/GOP_test.h"
#include <iostream>
using namespace enzo;

View File

@@ -19,7 +19,6 @@
#include <qgraphicsitem.h>
#include <qnamespace.h>
#include <QLine>
#include "Engine/Operator/GOP_test.h"
#include "Gui/Network/TabMenu.h"
using namespace enzo;
@@ -315,7 +314,7 @@ void Network::keyPressEvent(QKeyEvent *event)
}
case(Qt::Key_G):
{
if(auto newNode = createNode(&GOP_test::ctor))
if(auto newNode = createNode(op::OperatorTable::getOpConstructor(1)))
{
newNode->setPos(viewPos);
}

View File

@@ -8,7 +8,7 @@ find_package (Eigen3 3.3 REQUIRED NO_MODULE)
set(libName enzoOps1)
add_library(${libName} SHARED
main.cpp
RegisterPlugin.cpp
../Engine/Operator/OperatorTable.cpp
../Engine/Operator/GeometryOpDef.cpp
../Engine/Operator/GeometryOperator.cpp
@@ -17,6 +17,8 @@ add_library(${libName} SHARED
../Engine/Operator/Geometry.cpp
../Engine/Operator/Attribute.cpp
../Engine/Network/NetworkManager.cpp
GopTransform.cpp
GopHouse.cpp
)
target_link_libraries(${libName} PRIVATE Qt6::Core Qt6::Widgets Qt6::SvgWidgets Qt6::OpenGLWidgets glm::glm Eigen3::Eigen TBB::tbb)

View File

@@ -1,14 +1,14 @@
#include "Engine/Operator/GOP_test.h"
#include "OpDefs/GopHouse.h"
#include "Engine/Operator/AttributeHandle.h"
#include <oneapi/tbb/parallel_for.h>
GOP_test::GOP_test(enzo::nt::OpId opId)
GOP_house::GOP_house(enzo::nt::OpId opId)
: enzo::nt::GeometryOpDef(opId)
{
}
void GOP_test::cookOp(enzo::op::Context context)
void GOP_house::cookOp(enzo::op::Context context)
{
using namespace enzo;
// std::cout << "COOKING\n";

View File

@@ -1,15 +1,15 @@
#pragma once
#include "Engine/Operator/GeometryOpDef.h"
class GOP_test
class GOP_house
: public enzo::nt::GeometryOpDef
{
public:
GOP_test(enzo::nt::OpId opId);
GOP_house(enzo::nt::OpId opId);
virtual void cookOp(enzo::op::Context context);
static enzo::nt::GeometryOpDef* ctor(enzo::nt::OpId opId)
{
return new GOP_test(opId);
return new GOP_house(opId);
}
};

View File

@@ -1,23 +1,5 @@
#include "Engine/Operator/OperatorTable.h"
#include "OpDefs/GopTransform.hpp"
#include <boost/config.hpp>
#include <boost/dll.hpp>
#include <string>
#include "Engine/Operator/AttributeHandle.h"
#include <iostream>
extern "C"
{
BOOST_SYMBOL_EXPORT void newSopOperator(enzo::op::addOperatorPtr addOperator)
{
addOperator(
"transform",
"Transform",
&GopTransform::ctor
);
}
}
GopTransform::GopTransform(enzo::nt::OpId opId)
: enzo::nt::GeometryOpDef(opId)

View File

@@ -0,0 +1,23 @@
#include "Engine/Operator/OperatorTable.h"
#include "GopHouse.h"
#include "OpDefs/GopTransform.hpp"
#include <boost/config.hpp>
#include <boost/dll.hpp>
extern "C"
{
BOOST_SYMBOL_EXPORT void newSopOperator(enzo::op::addOperatorPtr addOperator)
{
addOperator(
"transform",
"Transform",
&GopTransform::ctor
);
addOperator(
"house",
"House",
&GOP_house::ctor
);
}
}