Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-05-09 15:21:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up MMShape.

Browse Source
This commit is contained in:
Relintai 2022-06-17 01:38:18 +02:00
parent 18b19d0293
commit a4d5219e26
5 changed files with 174 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/material_maker/SCsub
View File

@ -64,6 +64,8 @@ sources = [
"nodes/transform/kaleidoscope.cpp", "nodes/transform/kaleidoscope.cpp",
"nodes/transform/color_tiler.cpp", "nodes/transform/color_tiler.cpp",
"nodes/transform/circle_map.cpp", "nodes/transform/circle_map.cpp",
"nodes/simple/shape.cpp",
] ]
if env["tools"]: if env["tools"]:

2
modules/material_maker/config.py
View File

@ -34,6 +34,8 @@ def get_doc_classes():
"MMKaleidoscope", "MMKaleidoscope",
"MMColorTiler", "MMColorTiler",
"MMCircleMap", "MMCircleMap",
"MMShape",
] ]
def get_doc_path(): def get_doc_path():

219
modules/material_maker/nodes/simple/shape.cpp
View File

@ -1,230 +1,169 @@
#include "shape.h" #include "shape.h"
#include "../../algos/mm_algos.h"
#include "../../editor/mm_graph_node.h"
#include "../mm_material.h"
Ref<Resource> Shape::get_image() { Ref<MMNodeUniversalProperty> MMShape::get_image() {
return image; return image;
} }
void Shape::set_image(const Ref<Resource> &val) { void MMShape::set_image(const Ref<MMNodeUniversalProperty> &val) {
image = val; image = val;
} }
int MMShape::get_shape_type() const {
int Shape::get_shape_type() const {
return shape_type; return shape_type;
} }
void Shape::set_shape_type(const int val) { void MMShape::set_shape_type(const int val) {
shape_type = val; shape_type = val;
set_dirty(true);
} }
int MMShape::get_sides() const {
int Shape::get_sides() const {
return sides; return sides;
} }
void Shape::set_sides(const int val) { void MMShape::set_sides(const int val) {
sides = val; sides = val;
set_dirty(true);
} }
Ref<MMNodeUniversalProperty> MMShape::get_radius() {
Ref<Resource> Shape::get_radius() {
return radius; return radius;
} }
void Shape::set_radius(const Ref<Resource> &val) { void MMShape::set_radius(const Ref<MMNodeUniversalProperty> &val) {
radius = val; radius = val;
} }
Ref<MMNodeUniversalProperty> MMShape::get_edge() {
Ref<Resource> Shape::get_edge() {
return edge; return edge;
} }
void Shape::set_edge(const Ref<Resource> &val) { void MMShape::set_edge(const Ref<MMNodeUniversalProperty> &val) {
edge = val; edge = val;
} }
void MMShape::_init_properties() {
if (!image.is_valid()) {
//tool; image.instance();
}; image->set_default_type(MMNodeUniversalProperty::DEFAULT_TYPE_IMAGE);
//export(Resource) ;
Ref<Resource> image;
//export(int, "Circle,Polygon,Star,Curved Star,Rays") ;
int shape_type = 0;
//export(int) ;
int sides = 6;
//export(Resource) ;
Ref<Resource> radius;
//export(Resource) ;
Ref<Resource> edge;
void Shape::_init_properties() {
if (!image) {
image = MMNodeUniversalProperty.new();
image.default_type = MMNodeUniversalProperty.DEFAULT_TYPE_IMAGE;
} }
image.output_slot_type = MMNodeUniversalProperty.SLOT_TYPE_IMAGE; image->set_output_slot_type(MMNodeUniversalProperty::SLOT_TYPE_IMAGE);
if (!radius) { if (!radius.is_valid()) {
radius = MMNodeUniversalProperty.new(); radius.instance();
radius.default_type = MMNodeUniversalProperty.DEFAULT_TYPE_FLOAT; radius->set_default_type(MMNodeUniversalProperty::DEFAULT_TYPE_FLOAT);
radius.set_default_value(0.34375); radius->set_default_value(0.34375);
} }
radius.input_slot_type = MMNodeUniversalProperty.SLOT_TYPE_UNIVERSAL; radius->set_input_slot_type(MMNodeUniversalProperty::SLOT_TYPE_UNIVERSAL);
radius.slot_name = "radius"; radius->set_slot_name("radius");
radius.value_step = 0.05; radius->set_value_step(0.05);
if (!edge) { if (!edge.is_valid()) {
edge = MMNodeUniversalProperty.new(); edge.instance();
edge.default_type = MMNodeUniversalProperty.DEFAULT_TYPE_FLOAT; edge->set_default_type(MMNodeUniversalProperty::DEFAULT_TYPE_FLOAT);
edge.set_default_value(0.2); edge->set_default_value(0.2);
} }
edge.input_slot_type = MMNodeUniversalProperty.SLOT_TYPE_UNIVERSAL; edge->set_input_slot_type(MMNodeUniversalProperty::SLOT_TYPE_UNIVERSAL);
edge.slot_name = "edge"; edge->set_slot_name("edge");
edge.value_step = 0.05; edge->set_value_step(0.05);
register_input_property(radius); register_input_property(radius);
register_input_property(edge); register_input_property(edge);
register_output_property(image); register_output_property(image);
} }
void MMShape::_register_methods(MMGraphNode *mm_graph_node) {
mm_graph_node->add_slot_texture_universal(image);
void Shape::_register_methods(const Variant &mm_graph_node) { Array arr;
mm_graph_node.add_slot_texture_universal(image); arr.push_back("Circle");
mm_graph_node.add_slot_enum("get_shape_typoe", "set_shape_typoe", "shape_type", [ "Circle", "Polygon", "Star", "Curved Star", "Rays" ]); arr.push_back("Polygon");
arr.push_back("Star");
arr.push_back("Curved Star");
arr.push_back("Rays");
mm_graph_node->add_slot_enum("get_shape_type", "set_shape_type", "shape_type", arr);
//, Vector2(1, 10)); //, Vector2(1, 10));
mm_graph_node.add_slot_int("get_sides", "set_sides", "sides"); mm_graph_node->add_slot_int("get_sides", "set_sides", "sides");
mm_graph_node.add_slot_float_universal(radius); mm_graph_node->add_slot_float_universal(radius);
mm_graph_node.add_slot_float_universal(edge); mm_graph_node->add_slot_float_universal(edge);
} }
void MMShape::_render(const Ref<MMMaterial> &material) {
void Shape::_render(const Variant &material) {
Ref<Image> img = render_image(material); Ref<Image> img = render_image(material);
image.set_value(img); image->set_value(img);
} }
Color MMShape::_get_value_for(const Vector2 &uv, const int pseed) {
Color Shape::_get_value_for(const Vector2 &uv, const int pseed) {
float c = 0; float c = 0;
float rad = radius.get_value(uv); float rad = radius->get_value(uv);
float edg = edge.get_value(uv); float edg = edge->get_value(uv);
if (rad == 0) { if (rad == 0) {
rad = 0.0000001; rad = 0.0000001;
} }
if (edg == 0) { if (edg == 0) {
edg = 0.0000001; edg = 0.0000001;
} }
if (shape_type == SHAPE_TYPE_CIRCLE) {
if (shape_type == ShapeType.SHAPE_TYPE_CIRCLE) { c = MMAlgos::shape_circle(uv, sides, rad, edg);
c = MMAlgos.shape_circle(uv, sides, rad, edg);
} }
else if (shape_type == SHAPE_TYPE_POLYGON) {
else if (shape_type == ShapeType.SHAPE_TYPE_POLYGON) { c = MMAlgos::shape_polygon(uv, sides, rad, edg);
c = MMAlgos.shape_polygon(uv, sides, rad, edg);
} }
else if (shape_type == SHAPE_TYPE_STAR) {
else if (shape_type == ShapeType.SHAPE_TYPE_STAR) { c = MMAlgos::shape_star(uv, sides, rad, edg);
c = MMAlgos.shape_star(uv, sides, rad, edg);
} }
else if (shape_type == SHAPE_TYPE_CURVED_STAR) {
else if (shape_type == ShapeType.SHAPE_TYPE_CURVED_STAR) { c = MMAlgos::shape_curved_star(uv, sides, rad, edg);
c = MMAlgos.shape_curved_star(uv, sides, rad, edg);
} }
else if (shape_type == SHAPE_TYPE_RAYS) {
else if (shape_type == ShapeType.SHAPE_TYPE_RAYS) { c = MMAlgos::shape_rays(uv, sides, rad, edg);
c = MMAlgos.shape_rays(uv, sides, rad, edg);
} }
return Color(c, c, c, 1); return Color(c, c, c, 1);
} }
MMShape::MMShape() {
int Shape::get_shape_typoe() {
return shape_type;
}
void Shape::set_shape_typoe(const int val) {
shape_type = val;
set_dirty(true);
}
int Shape::get_sides() {
return sides;
}
void Shape::set_sides(const int val) {
sides = val;
set_dirty(true);
}
}
Shape::Shape() {
image;
shape_type = 0; shape_type = 0;
sides = 6; sides = 6;
radius;
edge;
} }
Shape::~Shape() { MMShape::~MMShape() {
} }
void MMShape::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_image"), &MMShape::get_image);
ClassDB::bind_method(D_METHOD("set_image", "value"), &MMShape::set_image);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "MMNodeUniversalProperty"), "set_image", "get_image");
static void Shape::_bind_methods() { ClassDB::bind_method(D_METHOD("get_shape_type"), &MMShape::get_shape_type);
ClassDB::bind_method(D_METHOD("get_image"), &Shape::get_image); ClassDB::bind_method(D_METHOD("set_shape_type", "value"), &MMShape::set_shape_type);
ClassDB::bind_method(D_METHOD("set_image", "value"), &Shape::set_image);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "Ref<Resource>"), "set_image", "get_image");
ClassDB::bind_method(D_METHOD("get_shape_type"), &Shape::get_shape_type);
ClassDB::bind_method(D_METHOD("set_shape_type", "value"), &Shape::set_shape_type);
ADD_PROPERTY(PropertyInfo(Variant::INT, "shape_type"), "set_shape_type", "get_shape_type"); ADD_PROPERTY(PropertyInfo(Variant::INT, "shape_type"), "set_shape_type", "get_shape_type");
ClassDB::bind_method(D_METHOD("get_sides"), &MMShape::get_sides);
ClassDB::bind_method(D_METHOD("get_sides"), &Shape::get_sides); ClassDB::bind_method(D_METHOD("set_sides", "value"), &MMShape::set_sides);
ClassDB::bind_method(D_METHOD("set_sides", "value"), &Shape::set_sides);
ADD_PROPERTY(PropertyInfo(Variant::INT, "sides"), "set_sides", "get_sides"); ADD_PROPERTY(PropertyInfo(Variant::INT, "sides"), "set_sides", "get_sides");
ClassDB::bind_method(D_METHOD("get_radius"), &MMShape::get_radius);
ClassDB::bind_method(D_METHOD("set_radius", "value"), &MMShape::set_radius);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "radius", PROPERTY_HINT_RESOURCE_TYPE, "MMNodeUniversalProperty"), "set_radius", "get_radius");
ClassDB::bind_method(D_METHOD("get_radius"), &Shape::get_radius); ClassDB::bind_method(D_METHOD("get_edge"), &MMShape::get_edge);
ClassDB::bind_method(D_METHOD("set_radius", "value"), &Shape::set_radius); ClassDB::bind_method(D_METHOD("set_edge", "value"), &MMShape::set_edge);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "radius", PROPERTY_HINT_RESOURCE_TYPE, "Ref<Resource>"), "set_radius", "get_radius"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edge", PROPERTY_HINT_RESOURCE_TYPE, "MMNodeUniversalProperty"), "set_edge", "get_edge");
ClassDB::bind_method(D_METHOD("get_edge"), &Shape::get_edge);
ClassDB::bind_method(D_METHOD("set_edge", "value"), &Shape::set_edge);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edge", PROPERTY_HINT_RESOURCE_TYPE, "Ref<Resource>"), "set_edge", "get_edge");
ClassDB::bind_method(D_METHOD("_init_properties"), &Shape::_init_properties);
ClassDB::bind_method(D_METHOD("_register_methods", "mm_graph_node"), &Shape::_register_methods);
ClassDB::bind_method(D_METHOD("_render", "material"), &Shape::_render);
ClassDB::bind_method(D_METHOD("_get_value_for", "uv", "pseed"), &Shape::_get_value_for);
ClassDB::bind_method(D_METHOD("get_shape_typoe"), &Shape::get_shape_typoe);
ClassDB::bind_method(D_METHOD("set_shape_typoe", "val"), &Shape::set_shape_typoe);
ClassDB::bind_method(D_METHOD("get_sides"), &Shape::get_sides);
ClassDB::bind_method(D_METHOD("set_sides", "val"), &Shape::set_sides);
} }

55
modules/material_maker/nodes/simple/shape.h
View File

@ -1,14 +1,15 @@
#ifndef SHAPE_H #ifndef MM_SHAPE_H
#define SHAPE_H #define MM_SHAPE_H
#include "../mm_node.h"
#include "../mm_node_universal_property.h"
class Shape : public MMNode { class MMShape : public MMNode {
GDCLASS(Shape, MMNode); GDCLASS(MMShape, MMNode);
public: public:
Ref<MMNodeUniversalProperty> get_image();
Ref<Resource> get_image(); void set_image(const Ref<MMNodeUniversalProperty> &val);
void set_image(const Ref<Resource> &val);
int get_shape_type() const; int get_shape_type() const;
void set_shape_type(const int val); void set_shape_type(const int val);
@ -16,14 +17,13 @@ class Shape : public MMNode {
int get_sides() const; int get_sides() const;
void set_sides(const int val); void set_sides(const int val);
Ref<Resource> get_radius(); Ref<MMNodeUniversalProperty> get_radius();
void set_radius(const Ref<Resource> &val); void set_radius(const Ref<MMNodeUniversalProperty> &val);
Ref<Resource> get_edge(); Ref<MMNodeUniversalProperty> get_edge();
void set_edge(const Ref<Resource> &val); void set_edge(const Ref<MMNodeUniversalProperty> &val);
enum ShapeType {
enum MMShapeType {
SHAPE_TYPE_CIRCLE = 0, SHAPE_TYPE_CIRCLE = 0,
SHAPE_TYPE_POLYGON = 1, SHAPE_TYPE_POLYGON = 1,
SHAPE_TYPE_STAR = 2, SHAPE_TYPE_STAR = 2,
@ -32,33 +32,22 @@ class Shape : public MMNode {
}; };
void _init_properties(); void _init_properties();
void _register_methods(const Variant &mm_graph_node); void _register_methods(MMGraphNode *mm_graph_node);
void _render(const Variant &material); void _render(const Ref<MMMaterial> &material);
Color _get_value_for(const Vector2 &uv, const int pseed); Color _get_value_for(const Vector2 &uv, const int pseed);
int get_shape_typoe();
void set_shape_typoe(const int val);
int get_sides();
void set_sides(const int val);
Shape(); MMShape();
~Shape(); ~MMShape();
protected: protected:
static void _bind_methods(); static void _bind_methods();
//tool Ref<MMNodeUniversalProperty> image;
};
//export(Resource)
Ref<Resource> image;
//export(int, "Circle,Polygon,Star,Curved Star,Rays") //export(int, "Circle,Polygon,Star,Curved Star,Rays")
int shape_type = 0; int shape_type;
//export(int) int sides;
int sides = 6; Ref<MMNodeUniversalProperty> radius;
//export(Resource) Ref<MMNodeUniversalProperty> edge;
Ref<Resource> radius;
//export(Resource)
Ref<Resource> edge;
}; };
#endif #endif

5
modules/material_maker/register_types.cpp
View File

@ -57,6 +57,8 @@ SOFTWARE.
#include "nodes/transform/transform.h" #include "nodes/transform/transform.h"
#include "nodes/transform/translate.h" #include "nodes/transform/translate.h"
#include "nodes/simple/shape.h"
static _MMAlgos *_mm_algos_singleton = nullptr; static _MMAlgos *_mm_algos_singleton = nullptr;
void register_material_maker_types() { void register_material_maker_types() {
@ -101,6 +103,9 @@ void register_material_maker_types() {
ClassDB::register_class<MMCircleMap>(); ClassDB::register_class<MMCircleMap>();
MMAlgos::register_node_class("Transform", "MMCircleMap"); MMAlgos::register_node_class("Transform", "MMCircleMap");
ClassDB::register_class<MMShape>();
MMAlgos::register_node_class("Simple", "MMShape");
_mm_algos_singleton = memnew(_MMAlgos); _mm_algos_singleton = memnew(_MMAlgos);
Engine::get_singleton()->add_singleton(Engine::Singleton("MMAlgos", _MMAlgos::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("MMAlgos", _MMAlgos::get_singleton()));