ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(opTable): store op info in table, convert table pos getter to name getter

Browse Source
This commit is contained in:
parker
2025-07-16 17:53:39 +01:00
parent d2dda549eb
commit a56d379442
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Engine/Operator/OperatorTable.cpp
View File

@@ -6,12 +6,19 @@ void enzo::op::OperatorTable::addOperator(const char* internalName, const char*
{ {
std::cout << "OPERATOR TABLE ADDED\n"; std::cout << "OPERATOR TABLE ADDED\n";
std::cout << "adding operator: " << displayName << "\n"; std::cout << "adding operator: " << displayName << "\n";
ctorStore_.push_back(ctorFunc); opInfoStore_.push_back({internalName, displayName, ctorFunc});
} }
enzo::nt::opConstructor enzo::op::OperatorTable::getOpConstructor(size_t pos) enzo::nt::opConstructor enzo::op::OperatorTable::getOpConstructor(std::string name)
{ {
return ctorStore_.at(pos); for(auto it = opInfoStore_.begin(); it!=opInfoStore_.end(); ++it)
{
if(it->internalName==name)
{
return it->ctorFunc;
}
}
return nullptr;
} }
std::vector<enzo::nt::opConstructor> enzo::op::OperatorTable::ctorStore_; std::vector<enzo::op::OpInfo> enzo::op::OperatorTable::opInfoStore_;

12
src/Engine/Operator/OperatorTable.h
View File

@@ -4,15 +4,23 @@
#include "Engine/Network/NetworkManager.h" #include "Engine/Network/NetworkManager.h"
#include "Engine/Operator/GeometryOpDef.h" #include "Engine/Operator/GeometryOpDef.h"
namespace enzo::op namespace enzo::op
{ {
struct OpInfo
{
std::string internalName;
std::string displayName;
enzo::nt::opConstructor ctorFunc;
};
class BOOST_SYMBOL_EXPORT OperatorTable class BOOST_SYMBOL_EXPORT OperatorTable
{ {
public: public:
static void addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc); static void addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc);
static nt::opConstructor getOpConstructor(size_t pos); static nt::opConstructor getOpConstructor(std::string name);
private: private:
static std::vector<nt::opConstructor> ctorStore_; static std::vector<OpInfo> opInfoStore_;
}; };
using addOperatorPtr = void (*)(const char* internalName, const char* displayName, nt::opConstructor ctorFunc); using addOperatorPtr = void (*)(const char* internalName, const char* displayName, nt::opConstructor ctorFunc);
} }

4
src/Gui/Network/Network.cpp
View File

@@ -314,7 +314,7 @@ void Network::keyPressEvent(QKeyEvent *event)
} }
case(Qt::Key_G): case(Qt::Key_G):
{ {
if(auto newNode = createNode(op::OperatorTable::getOpConstructor(1))) if(auto newNode = createNode(op::OperatorTable::getOpConstructor("transform")))
{ {
newNode->setPos(viewPos); newNode->setPos(viewPos);
} }
@@ -323,7 +323,7 @@ void Network::keyPressEvent(QKeyEvent *event)
} }
case(Qt::Key_F): case(Qt::Key_F):
{ {
if(auto newNode = createNode(op::OperatorTable::getOpConstructor(0))) if(auto newNode = createNode(op::OperatorTable::getOpConstructor("house")))
{ {
newNode->setPos(viewPos); newNode->setPos(viewPos);
} }