[Bf-blender-cvs] [93788a9b8d4] geometry-nodes-mesh-primitives: Initial broken implementation
Hans Goudey
noreply at git.blender.org
Thu Mar 11 23:15:07 CET 2021
Commit: 93788a9b8d469c2678ff21e0388049d5df9458e1
Author: Hans Goudey
Date: Mon Feb 15 11:57:18 2021 -0600
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rB93788a9b8d469c2678ff21e0388049d5df9458e1
Initial broken implementation
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
A source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 9d7485a0837..123c827ece4 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -516,6 +516,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeTriangulate"),
NodeItem("GeometryNodeEdgeSplit"),
NodeItem("GeometryNodeSubdivisionSurface"),
+ NodeItem("GeometryNodeMeshCube"),
]),
GeometryNodeCategory("GEO_POINT", "Point", items=[
NodeItem("GeometryNodePointDistribute"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 7984bbc980a..df8e54b3216 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -848,7 +848,7 @@ bool BKE_node_is_connected_to_output(struct bNodeTree *ntree, struct bNode *node
/* ************** COMMON NODES *************** */
#define NODE_UNDEFINED -2 /* node type is not registered */
-#define NODE_CUSTOM -1 /* for dynamically registered custom types */
+#define NODE_CUSTOM -1 /* for dynamically registered custom types */
#define NODE_GROUP 2
// #define NODE_FORLOOP 3 /* deprecated */
// #define NODE_WHILELOOP 4 /* deprecated */
@@ -1372,6 +1372,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_VOLUME_TO_MESH 1026
#define GEO_NODE_ATTRIBUTE_COMBINE_XYZ 1027
#define GEO_NODE_ATTRIBUTE_SEPARATE_XYZ 1028
+#define GEO_NODE_MESH_PRIMITIVE_CUBE 1029
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index e34afd1ce17..2af1a944ff8 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4768,6 +4768,7 @@ static void registerGeometryNodes()
register_node_type_geo_edge_split();
register_node_type_geo_is_viewport();
register_node_type_geo_join_geometry();
+ register_node_type_geo_mesh_primitive_cube();
register_node_type_geo_object_info();
register_node_type_geo_point_distribute();
register_node_type_geo_point_instance();
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 9fd578b625d..2e9898f909b 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -159,6 +159,7 @@ set(SRC
geometry/nodes/node_geo_edge_split.cc
geometry/nodes/node_geo_is_viewport.cc
geometry/nodes/node_geo_join_geometry.cc
+ geometry/nodes/node_geo_mesh_primitive_cube.cc
geometry/nodes/node_geo_object_info.cc
geometry/nodes/node_geo_point_distribute.cc
geometry/nodes/node_geo_point_instance.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 8980855fd51..c91c5ad4ad5 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -38,6 +38,7 @@ void register_node_type_geo_attribute_randomize(void);
void register_node_type_geo_attribute_separate_xyz(void);
void register_node_type_geo_attribute_vector_math(void);
void register_node_type_geo_boolean(void);
+void register_node_type_geo_mesh_primitive_cube(void);
void register_node_type_geo_collection_info(void);
void register_node_type_geo_edge_split(void);
void register_node_type_geo_is_viewport(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 15f078cebf2..2fc3a248fe0 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -297,6 +297,7 @@ DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_PROXIMITY, def_geo_attribute_proximity,
DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COMBINE_XYZ, def_geo_attribute_combine_xyz, "ATTRIBUTE_COMBINE_XYZ", AttributeCombineXYZ, "Attribute Combine XYZ", "")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_SEPARATE_XYZ, def_geo_attribute_separate_xyz, "ATTRIBUTE_SEPARATE_XYZ", AttributeSeparateXYZ, "Attribute Separate XYZ", "")
+DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CUBE, 0, "MESH_PRIMITIVE_CUBE", MeshCube, "Cube", "")
/* undefine macros */
#undef DefNode
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc
new file mode 100644
index 00000000000..984077c4fa4
--- /dev/null
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc
@@ -0,0 +1,177 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "BLI_map.hh"
+#include "BLI_math_matrix.h"
+
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
+#include "BKE_mesh.h"
+
+#include "node_geometry_util.hh"
+
+static bNodeSocketTemplate geo_node_mesh_primitive_cube_in[] = {
+ {SOCK_FLOAT, N_("Size"), 0.0, 0.0, 0.0, 0.0, 0.0f, FLT_MAX, PROP_DISTANCE},
+ {SOCK_VECTOR, N_("Translation"), 0.0f, 0.0f, 0.0f, 1.0f, -FLT_MAX, FLT_MAX, PROP_TRANSLATION},
+ {SOCK_VECTOR, N_("Rotation"), 0.0f, 0.0f, 0.0f, 1.0f, -FLT_MAX, FLT_MAX, PROP_EULER},
+ {-1, ""},
+};
+
+static bNodeSocketTemplate geo_node_mesh_primitive_cube_out[] = {
+ {SOCK_GEOMETRY, N_("Geometry")},
+ {-1, ""},
+};
+
+namespace blender::nodes {
+
+struct NewMesh {
+ Mesh *mesh;
+ MutableSpan<MVert> verts;
+ MutableSpan<MEdge> edges;
+ MutableSpan<MLoop> loops;
+ MutableSpan<MPoly> polys;
+
+ Map<std::pair<int, int>, int> edge_map;
+ int edge_offset = 0;
+ int loop_offset = 0;
+ int poly_offset = 0;
+
+ NewMesh(const int vert_len, const int edge_len, const int corner_len, const int poly_len)
+ {
+ mesh = BKE_mesh_new_nomain(vert_len, edge_len, 0, corner_len, poly_len);
+ BKE_mesh_update_customdata_pointers(mesh, false);
+ verts = MutableSpan<MVert>(mesh->mvert, vert_len);
+ edges = MutableSpan<MEdge>(mesh->medge, edge_len);
+ loops = MutableSpan<MLoop>(mesh->mloop, corner_len);
+ polys = MutableSpan<MPoly>(mesh->mpoly, poly_len);
+
+ edge_map.reserve(edge_len * 2);
+ }
+
+ int create_edge(const int vert_index_a, const int vert_index_b)
+ {
+ BLI_assert(vert_index_a < verts.size());
+ BLI_assert(vert_index_b < verts.size());
+ if (edge_map.contains({vert_index_a, vert_index_b})) {
+ return edge_map.lookup({vert_index_a, vert_index_b});
+ }
+ if (edge_map.contains({vert_index_b, vert_index_a})) {
+ return edge_map.lookup({vert_index_b, vert_index_a});
+ }
+ MEdge &edge = edges[edge_offset];
+ edge.v1 = vert_index_a;
+ edge.v2 = vert_index_b;
+ edge_map.add({vert_index_a, vert_index_b}, edge_offset);
+ edge_offset++;
+ return edge_offset - 1;
+ }
+
+ void create_corner(const int vert_index, const int edge_index)
+ {
+ MLoop &loop = loops[loop_offset];
+ loop.v = vert_index;
+ loop.e = edge_index;
+ loop_offset++;
+ }
+
+ void create_poly(const int loop_index_start, const int loops_len)
+ {
+ MPoly &poly = polys[poly_offset];
+ poly.loopstart = loop_index_start;
+ poly.totloop = loops_len;
+ poly_offset++;
+ }
+};
+
+static Mesh *create_cube_mesh(const float3 location, const float3 rotation, const float size)
+{
+ float4x4 transform;
+ loc_eul_size_to_mat4(transform.values, location, rotation, float3(size));
+
+ NewMesh new_mesh = NewMesh(8, 12, 24, 6);
+
+ const float3 positions[8] = {
+ {-1.0f, -1.0f, -1.0f},
+ {-1.0f, -1.0f, 1.0f},
+ {-1.0f, 1.0f, -1.0f},
+ {-1.0f, 1.0f, 1.0f},
+ {1.0f, -1.0f, -1.0f},
+ {1.0f, -1.0f, 1.0f},
+ {1.0f, 1.0f, -1.0f},
+ {1.0f, 1.0f, 1.0f},
+ };
+
+ for (const int i : new_mesh.verts.index_range()) {
+ MVert &vert = new_mesh.verts[i];
+ float3 transformed = transform * positions[i];
+ copy_v3_v3(vert.co, transformed);
+ }
+
+ Map<std::pair<int, int>, int, 12> edge_map;
+
+ const uint8_t face_vert_indices[6][4] = {
+ {0, 1, 3, 2},
+ {2, 3, 7, 6},
+ {6, 7, 5, 4},
+ {4, 5, 1, 0},
+ {2, 6, 4, 0},
+ {7, 3, 1, 5},
+ };
+
+ for (const int poly_index : new_mesh.polys.index_range()) {
+ for (const int corner_index : IndexRange(4)) {
+ const int corner_index_next = (corner_index + 1) % 4;
+ const int edge_index = new_mesh.create_edge(
+ face_vert_indices[poly_index][corner_index],
+ face_vert_indices[poly_index][corner_index_next]);
+ new_mesh.create_corner(edge_index, face_vert_indices[poly_index][corner_index]);
+ }
+ new_mesh.create_poly(poly_index * 4, 4);
+ }
+
+ BKE_mesh_calc_normals(new_mesh.mesh);
+
+ BLI_assert(BKE_mesh_validate(new_mesh.mesh, true, false));
+
+ return new_mesh.mesh;
+}
+
+static void geo_node_mesh_primitive_cube_exec(GeoNodeExecParams params)
+{
+ GeometrySet geometry_set;
+
+ const float size = params.extract_input<float>("Size");
+ const float3 location = params.extract_input<float3>("Translation");
+ const float3 rotation = params.extract_input<float3>("Rotation");
+
+ geometry_set.replace_mesh(create_cube_mesh(location, rotation, size));
+
+ params.set_output("Geometry", geometry_set);
+}
+
+} // namespace blender::nodes
+
+void register_node_type_geo_mesh_primitive_cube()
+{
+ static bNodeType ntype;
+
+ geo_node_type_base(&ntype, GEO_NODE_MESH_PRIMITIVE_CUBE, "Cube", NODE_CLASS_GEOMETRY, 0);
+ node_type_socket_templates(
+ &ntype, geo_node_mesh_primitive_cube_in, geo_node_mesh_primitive_cube_out);
+ ntype.geometry_node_execute = blender::nodes::geo_node_mesh_primitive_cube_exec;
+ nodeRegisterType(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list