diff options
author | Jacques Lucke <jacques@blender.org> | 2020-12-02 15:25:25 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-12-02 17:38:47 +0300 |
commit | 6be56c13e96048cbc494ba5473a8deaf2cf5a6f8 (patch) | |
tree | 83435d439b3d106eb1405b2b815bf1d5aa1fdd43 /source/blender/makesdna/DNA_node_types.h | |
parent | ddbe3274eff68523547bc8eb70dd95c3d411b89b (diff) |
Geometry Nodes: initial scattering and geometry nodes
This is the initial merge from the geometry-nodes branch.
Nodes:
* Attribute Math
* Boolean
* Edge Split
* Float Compare
* Object Info
* Point Distribute
* Point Instance
* Random Attribute
* Random Float
* Subdivision Surface
* Transform
* Triangulate
It includes the initial evaluation of geometry node groups in the Geometry Nodes modifier.
Notes on the Generic attribute access API
The API adds an indirection for attribute access. That has the following benefits:
* Most code does not have to care about how an attribute is stored internally.
This is mainly necessary, because we have to deal with "legacy" attributes
such as vertex weights and attributes that are embedded into other structs
such as vertex positions.
* When reading from an attribute, we generally don't care what domain the
attribute is stored on. So we want to abstract away the interpolation that
that adapts attributes from one domain to another domain (this is not
actually implemented yet).
Other possible improvements for later iterations include:
* Actually implement interpolation between domains.
* Don't use inheritance for the different attribute types. A single class for read
access and one for write access might be enough, because we know all the ways
in which attributes are stored internally. We don't want more different internal
structures in the future. On the contrary, ideally we can consolidate the different
storage formats in the future to reduce the need for this indirection.
* Remove the need for heap allocations when creating attribute accessors.
It includes commits from:
* Dalai Felinto
* Hans Goudey
* Jacques Lucke
* Léo Depoix
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index fdae3559599..29c83d2d4ed 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -504,7 +504,7 @@ typedef struct bNodeTree { #define NTREE_SHADER 0 #define NTREE_COMPOSIT 1 #define NTREE_TEXTURE 2 -#define NTREE_SIMULATION 3 +#define NTREE_GEOMETRY 3 /* ntree->init, flag */ #define NTREE_TYPE_INIT 1 @@ -1437,17 +1437,32 @@ typedef enum NodeShaderOutputTarget { SHD_OUTPUT_CYCLES = 2, } NodeShaderOutputTarget; -/* Particle Time Step Event node */ -typedef enum NodeSimParticleTimeStepEventType { - NODE_PARTICLE_TIME_STEP_EVENT_BEGIN = 0, - NODE_PARTICLE_TIME_STEP_EVENT_END = 1, -} NodeSimParticleTimeStepEventType; - -/* Simulation Time node */ -typedef enum NodeSimInputTimeType { - NODE_SIM_INPUT_SIMULATION_TIME = 0, - NODE_SIM_INPUT_SCENE_TIME = 1, -} NodeSimInputTimeType; +/* Geometry Nodes */ + +/* Boolean Node */ +typedef enum GeometryNodeBooleanOperation { + GEO_NODE_BOOLEAN_INTERSECT = 0, + GEO_NODE_BOOLEAN_UNION = 1, + GEO_NODE_BOOLEAN_DIFFERENCE = 2, +} GeometryNodeBooleanOperation; + +/* Triangulate Node */ +typedef enum GeometryNodeTriangulateNGons { + GEO_NODE_TRIANGULATE_NGON_BEAUTY = 0, + GEO_NODE_TRIANGULATE_NGON_EARCLIP = 1, +} GeometryNodeTriangulateNGons; + +typedef enum GeometryNodeTriangulateQuads { + GEO_NODE_TRIANGULATE_QUAD_BEAUTY = 0, + GEO_NODE_TRIANGULATE_QUAD_FIXED = 1, + GEO_NODE_TRIANGULATE_QUAD_ALTERNATE = 2, + GEO_NODE_TRIANGULATE_QUAD_SHORTEDGE = 3, +} GeometryNodeTriangulateQuads; + +typedef enum GeometryNodeUseAttributeFlag { + GEO_NODE_USE_ATTRIBUTE_A = (1 << 0), + GEO_NODE_USE_ATTRIBUTE_B = (1 << 1), +} GeometryNodeUseAttributeFlag; #ifdef __cplusplus } |