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

feat: working parameter creation

Browse Source
This commit is contained in:
parker
2025-07-23 16:57:27 +01:00
parent 52548a3d58
commit c08fd4e7e8
14 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -21,6 +21,7 @@ set(ENGINE_SOURCES
src/Engine/Operator/OperatorTable.cpp
src/Engine/Operator/Context.cpp
src/Engine/Parameter/Template.cpp
src/Engine/Parameter/Parameter.cpp
src/Engine/Network/NetworkManager.cpp
)

21
src/Engine/Operator/GeometryOperator.cpp
View File

@@ -3,6 +3,8 @@
#include "Engine/Network/NetworkManager.h"
#include <optional>
#include "Engine/Operator/Context.h"
#include "Engine/Parameter/Parameter.h"
#include "Engine/Parameter/Template.h"
#include <iostream>
using namespace enzo;
@@ -23,12 +25,27 @@ void enzo::nt::connectOperators(enzo::nt::OpId inputOpId, unsigned int inputInde
outputOp.addInputConnection(newConnection);
}
nt::GeometryOperator::GeometryOperator(enzo::nt::OpId opId, op::OpInfo opinfo)
: opId_{opId}, opDef_(opinfo.ctorFunc(opId))
nt::GeometryOperator::GeometryOperator(enzo::nt::OpId opId, op::OpInfo opInfo)
: opId_{opId}, opInfo_{opInfo}, opDef_(opInfo.ctorFunc(opId))
{
// TODO: drive by geometry definition
maxInputs_=4;
maxOutputs_=4;
initParameters();
}
void nt::GeometryOperator::initParameters()
{
for(const prm::Template* t = opInfo_.templates; t->isValid(); ++t)
{
std::cout << "name: " << t->getName() << "\n";
// create parameter
parameters_.push_back(
std::make_shared<prm::Parameter>(*t)
);
}
}
void enzo::nt::GeometryOperator::cookOp(op::Context context)

7
src/Engine/Operator/GeometryOperator.h
View File

@@ -2,6 +2,7 @@
#include "Engine/Operator/GeometryConnection.h"
#include "Engine/Operator/OpInfo.h"
#include "Engine/Operator/GeometryOpDef.h"
#include "Engine/Parameter/Parameter.h"
#include "Engine/Types.h"
#include <optional>
#include <memory>
@@ -12,7 +13,7 @@ void connectOperators(enzo::nt::OpId inputOpId, unsigned int inputIndex, enzo::n
class GeometryOperator
{
public:
GeometryOperator(enzo::nt::OpId opId, op::OpInfo opinfo);
GeometryOperator(enzo::nt::OpId opId, op::OpInfo opInfo);
// disable copying
GeometryOperator(const GeometryOperator&) = delete;
@@ -33,12 +34,16 @@ public:
private:
void initParameters();
// TODO: avoid duplicate connections
std::vector<std::shared_ptr<nt::GeometryConnection>> inputConnections_;
std::vector<std::shared_ptr<nt::GeometryConnection>> outputConnections_;
std::vector<std::shared_ptr<prm::Parameter>> parameters_;
unsigned int maxInputs_;
unsigned int maxOutputs_;
std::unique_ptr<enzo::nt::GeometryOpDef> opDef_;
enzo::nt::OpId opId_;
enzo::op::OpInfo opInfo_;
};
}

1
src/Engine/Operator/OpInfo.h
View File

@@ -11,5 +11,6 @@ struct OpInfo
std::string displayName;
enzo::nt::opConstructor ctorFunc;
enzo::prm::Template* templates;
size_t templatesSize;
};
}

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

@@ -3,15 +3,17 @@
#include <iostream>
void enzo::op::OperatorTable::addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc, prm::Template* templates)
void enzo::op::OperatorTable::addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc, prm::Template templates[])
{
std::cout << "OPERATOR TABLE ADDED\n";
std::cout << "adding operator: " << displayName << "\n";
std::cout << "tempalate size: " << sizeof(templates) << "\n";
enzo::op::OpInfo info {
internalName,
displayName,
ctorFunc,
templates
templates,
sizeof(*templates)
};
opInfoStore_.push_back(info);

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

@@ -13,7 +13,7 @@ namespace enzo::op
class BOOST_SYMBOL_EXPORT OperatorTable
{
public:
static void addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc, prm::Template* templates);
static void addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc, prm::Template templates[]);
static nt::opConstructor getOpConstructor(std::string name);
static const std::optional<op::OpInfo> getOpInfo(std::string name);
static std::vector<OpInfo> getData();
@@ -22,6 +22,6 @@ public:
private:
static std::vector<OpInfo> opInfoStore_;
};
using addOperatorPtr = void (*)(const char* internalName, const char* displayName, nt::opConstructor ctorFunc, prm::Template* templateList);
using addOperatorPtr = void (*)(const char* internalName, const char* displayName, nt::opConstructor ctorFunc, prm::Template templateList[]);
}

7
src/Engine/Parameter/FloatParm.cpp
View File

@@ -1,7 +0,0 @@
#include "Engine/Parameter/FloatParm.h"
enzo::prm::FloatParm::FloatParm(Template prmTemplate)
: template_{prmTemplate}
{
}

18
src/Engine/Parameter/FloatParm.h
View File

@@ -1,18 +0,0 @@
#pragma once
#include "Engine/Parameter/Template.h"
#include "Engine/Types.h"
namespace enzo::prm
{
class FloatParm
{
public:
FloatParm(Template prmTemplate);
inline bt::floatT getValue() const {return value_;}
inline void setValue(bt::floatT value) {value_ = value;}
private:
Template template_;
bt::floatT value_ = 0;
};
}

9
src/Engine/Parameter/Parameter.cpp Normal file
View File

@@ -0,0 +1,9 @@
#include "Engine/Parameter/Parameter.h"
#include <iostream>
enzo::prm::Parameter::Parameter(Template prmTemplate)
: template_{prmTemplate}
{
std::cout << "created new parameter: " << prmTemplate.getName() << "\n";
}

18
src/Engine/Parameter/Parameter.h Normal file
View File

@@ -0,0 +1,18 @@
#pragma once
#include "Engine/Parameter/Template.h"
#include "Engine/Types.h"
namespace enzo::prm
{
class Parameter
{
public:
Parameter(Template prmTemplate);
inline bt::floatT evalFloat() const {return floatValue_;}
inline void setFloat(bt::floatT value) {floatValue_ = value;}
private:
Template template_;
bt::floatT floatValue_ = 0;
};
}

17
src/Engine/Parameter/Template.cpp
View File

@@ -6,3 +6,20 @@ enzo::prm::Template::Template(enzo::prm::Type type, const char* name)
{
}
enzo::prm::Template::Template()
{
}
bool enzo::prm::Template::isValid() const
{
return name_!=nullptr;
}
const char* enzo::prm::Template::getName() const
{
return name_;
}

5
src/Engine/Parameter/Template.h
View File

@@ -8,6 +8,9 @@ class Template
{
public:
Template(enzo::prm::Type type, const char* name);
Template();
const char* getName() const;
bool isValid() const;
private:
enzo::prm::Type type_;
// TODO: make a class that holds token and name
@@ -15,5 +18,7 @@ private:
};
inline enzo::prm::Template Terminator = enzo::prm::Template();
}

5
src/OpDefs/GopHouse.cpp
View File

@@ -79,4 +79,7 @@ void GOP_house::cookOp(enzo::op::Context context)
// }
}
enzo::prm::Template GOP_house::parameterList[] = {};
enzo::prm::Template GOP_house::parameterList[] =
{
enzo::prm::Terminator
};

4
src/OpDefs/GopTransform.cpp
View File

@@ -1,5 +1,6 @@
#include "OpDefs/GopTransform.hpp"
#include "Engine/Operator/AttributeHandle.h"
#include "Engine/Parameter/Template.h"
GopTransform::GopTransform(enzo::nt::OpId opId)
: enzo::nt::GeometryOpDef(opId)
@@ -40,6 +41,7 @@ void GopTransform::cookOp(enzo::op::Context context)
enzo::prm::Template GopTransform::parameterList[] = {
enzo::prm::Template(enzo::prm::Type::FLOAT, "Test"),
enzo::prm::Template(enzo::prm::Type::FLOAT, "Test2")
enzo::prm::Template(enzo::prm::Type::FLOAT, "Test2"),
enzo::prm::Terminator
};