Blender Git Loki
Git Commits -> Revision 6be56c1
Revision 6be56c1 by Jacques Lucke (master) December 2, 2020, 14:38 (GMT) |
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 |
Commit Details:
Full Hash: 6be56c13e96048cbc494ba5473a8deaf2cf5a6f8
Parent Commit: ddbe327
Lines Changed: +7494, -1047
33 Added Paths:
/release/scripts/startup/bl_operators/geometry_nodes.py (+60, -0) (View)
/source/blender/blenkernel/BKE_attribute_access.hh (+255, -0) (View)
/source/blender/blenkernel/BKE_geometry_set.h (+42, -0) (View)
/source/blender/blenkernel/BKE_geometry_set.hh (+373, -0) (View)
/source/blender/blenkernel/intern/attribute_access.cc (+1080, -0) (View)
/source/blender/blenkernel/intern/geometry_set.cc (+554, -0) (View)
/source/blender/blenlib/BLI_user_counter.hh (+158, -0) (View)
/source/blender/functions/FN_generic_value_map.hh (+123, -0) (View)
/source/blender/modifiers/intern/MOD_nodes.cc (+1088, -0) (View)
/source/blender/modifiers/MOD_nodes.h (+33, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc (+167, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_boolean.cc (+152, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_common.cc (+45, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc (+96, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc (+276, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_object_info.cc (+94, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc (+139, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc (+87, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc (+160, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc (+113, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_transform.cc (+145, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc (+79, -0) (View)
/source/blender/nodes/geometry/node_geometry_exec.cc (+23, -0) (View)
/source/blender/nodes/geometry/node_geometry_tree.cc (+45, -0) (View)
/source/blender/nodes/geometry/node_geometry_util.cc (+29, -0) (View)
/source/blender/nodes/geometry/node_geometry_util.hh (+39, -0) (View)
/source/blender/nodes/intern/math_functions.cc (+117, -0) (View)
/source/blender/nodes/intern/node_geometry_exec.cc (+103, -0) (View)
/source/blender/nodes/intern/type_callbacks.cc (+76, -0) (View)
/source/blender/nodes/NOD_geometry.h (+43, -0) (View)
/source/blender/nodes/NOD_geometry_exec.hh (+155, -0) (View)
/source/blender/nodes/NOD_math_functions.hh (+200, -0) (View)
/source/blender/nodes/NOD_type_callbacks.hh (+36, -0) (View)
/source/blender/blenkernel/BKE_attribute_access.hh (+255, -0) (View)
/source/blender/blenkernel/BKE_geometry_set.h (+42, -0) (View)
/source/blender/blenkernel/BKE_geometry_set.hh (+373, -0) (View)
/source/blender/blenkernel/intern/attribute_access.cc (+1080, -0) (View)
/source/blender/blenkernel/intern/geometry_set.cc (+554, -0) (View)
/source/blender/blenlib/BLI_user_counter.hh (+158, -0) (View)
/source/blender/functions/FN_generic_value_map.hh (+123, -0) (View)
/source/blender/modifiers/intern/MOD_nodes.cc (+1088, -0) (View)
/source/blender/modifiers/MOD_nodes.h (+33, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc (+167, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_boolean.cc (+152, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_common.cc (+45, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc (+96, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc (+276, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_object_info.cc (+94, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc (+139, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc (+87, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc (+160, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc (+113, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_transform.cc (+145, -0) (View)
/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc (+79, -0) (View)
/source/blender/nodes/geometry/node_geometry_exec.cc (+23, -0) (View)
/source/blender/nodes/geometry/node_geometry_tree.cc (+45, -0) (View)
/source/blender/nodes/geometry/node_geometry_util.cc (+29, -0) (View)
/source/blender/nodes/geometry/node_geometry_util.hh (+39, -0) (View)
/source/blender/nodes/intern/math_functions.cc (+117, -0) (View)
/source/blender/nodes/intern/node_geometry_exec.cc (+103, -0) (View)
/source/blender/nodes/intern/type_callbacks.cc (+76, -0) (View)
/source/blender/nodes/NOD_geometry.h (+43, -0) (View)
/source/blender/nodes/NOD_geometry_exec.hh (+155, -0) (View)
/source/blender/nodes/NOD_math_functions.hh (+200, -0) (View)
/source/blender/nodes/NOD_type_callbacks.hh (+36, -0) (View)
7 Deleted Paths:
/release/scripts/startup/bl_operators/simulation.py (+0, -41)
/source/blender/modifiers/intern/MOD_simulation.cc (+0, -194)
/source/blender/nodes/NOD_simulation.h (+0, -31)
/source/blender/nodes/simulation/nodes/node_sim_common.cc (+0, -45)
/source/blender/nodes/simulation/node_simulation_tree.cc (+0, -45)
/source/blender/nodes/simulation/node_simulation_util.cc (+0, -29)
/source/blender/nodes/simulation/node_simulation_util.h (+0, -37)
/source/blender/modifiers/intern/MOD_simulation.cc (+0, -194)
/source/blender/nodes/NOD_simulation.h (+0, -31)
/source/blender/nodes/simulation/nodes/node_sim_common.cc (+0, -45)
/source/blender/nodes/simulation/node_simulation_tree.cc (+0, -45)
/source/blender/nodes/simulation/node_simulation_util.cc (+0, -29)
/source/blender/nodes/simulation/node_simulation_util.h (+0, -37)
68 Modified Paths:
/release/scripts/startup/bl_operators/__init__.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+4, -7) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+52, -10) (Diff)
/source/blender/blenkernel/BKE_attribute.h (+2, -4) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+4, -3) (Diff)
/source/blender/blenkernel/BKE_node.h (+35, -6) (Diff)
/source/blender/blenkernel/BKE_pointcloud.h (+2, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+5, -0) (Diff)
/source/blender/blenkernel/intern/attribute.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/fluid.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/hair.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/lib_remap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+40, -9) (Diff)
/source/blender/blenkernel/intern/object.c (+15, -2) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+47, -1) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/pointcloud.cc (+65, -60) (Diff)
/source/blender/blenkernel/intern/simulation.cc (+2, -2) (Diff)
/source/blender/blenlib/BLI_rand.h (+6, -0) (Diff)
/source/blender/blenlib/BLI_rand.hh (+1, -0) (Diff)
/source/blender/blenlib/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenlib/intern/rand.cc (+25, -0) (Diff)
/source/blender/blenloader/intern/versioning_290.c (+22, -0) (Diff)
/source/blender/depsgraph/CMakeLists.txt (+1, -0) (Diff)
/source/blender/depsgraph/DEG_depsgraph_build.h (+3, -0) (Diff)
/source/blender/depsgraph/intern/depsgraph_build.cc (+12, -0) (Diff)
/source/blender/editors/include/ED_node.h (+1, -1) (Diff)
/source/blender/editors/object/object_modifier.c (+5, -0) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+60, -5) (Diff)
/source/blender/editors/space_node/node_draw.c (+3, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+9, -5) (Diff)
/source/blender/editors/space_node/node_group.c (+4, -4) (Diff)
/source/blender/editors/space_node/node_relationships.c (+3, -2) (Diff)
/source/blender/editors/space_node/space_node.c (+1, -1) (Diff)
/source/blender/functions/CMakeLists.txt (+1, -0) (Diff)
/source/blender/functions/FN_multi_function.hh (+13, -0) (Diff)
/source/blender/makesdna/DNA_modifier_defaults.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+10, -3) (Diff)
/source/blender/makesdna/DNA_node_types.h (+27, -12) (Diff)
/source/blender/makesdna/DNA_object_types.h (+8, -0) (Diff)
/source/blender/makesdna/intern/dna_defaults.c (+2, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_access.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_attribute.c (+3, -4) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+66, -12) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+256, -28) (Diff)
/source/blender/makesrna/intern/rna_space.c (+0, -48) (Diff)
/source/blender/makesrna/RNA_access.h (+4, -3) (Diff)
/source/blender/modifiers/CMakeLists.txt (+4, -1) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+4, -1) (Diff)
/source/blender/modifiers/intern/MOD_triangulate.c (+11, -5) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+1, -1) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+1, -1) (Diff)
/source/blender/nodes/CMakeLists.txt (+30, -8) (Diff)
/source/blender/nodes/function/nodes/node_fn_float_compare.cc (+1, -1) (Diff)
/source/blender/nodes/function/nodes/node_fn_random_float.cc (+1, -1) (Diff)
/source/blender/nodes/function/node_function_util.cc (+1, -1) (Diff)
/source/blender/nodes/intern/derived_node_tree.cc (+15, -1) (Diff)
/source/blender/nodes/intern/node_socket.cc (+25, -30) (Diff)
/source/blender/nodes/intern/node_tree_multi_function.cc (+188, -39) (Diff)
/source/blender/nodes/intern/node_tree_ref.cc (+42, -0) (Diff)
/source/blender/nodes/NOD_derived_node_tree.hh (+53, -0) (Diff)
/source/blender/nodes/NOD_node_tree_multi_function.hh (+40, -11) (Diff)
/source/blender/nodes/NOD_node_tree_ref.hh (+8, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_math.cc (+38, -276) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+4, -7) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+52, -10) (Diff)
/source/blender/blenkernel/BKE_attribute.h (+2, -4) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+4, -3) (Diff)
/source/blender/blenkernel/BKE_node.h (+35, -6) (Diff)
/source/blender/blenkernel/BKE_pointcloud.h (+2, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+5, -0) (Diff)
/source/blender/blenkernel/intern/attribute.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/fluid.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/hair.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/lib_remap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+40, -9) (Diff)
/source/blender/blenkernel/intern/object.c (+15, -2) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+47, -1) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/pointcloud.cc (+65, -60) (Diff)
/source/blender/blenkernel/intern/simulation.cc (+2, -2) (Diff)
/source/blender/blenlib/BLI_rand.h (+6, -0) (Diff)
/source/blender/blenlib/BLI_rand.hh (+1, -0) (Diff)
/source/blender/blenlib/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenlib/intern/rand.cc (+25, -0) (Diff)
/source/blender/blenloader/intern/versioning_290.c (+22, -0) (Diff)
/source/blender/depsgraph/CMakeLists.txt (+1, -0) (Diff)
/source/blender/depsgraph/DEG_depsgraph_build.h (+3, -0) (Diff)
/source/blender/depsgraph/intern/depsgraph_build.cc (+12, -0) (Diff)
/source/blender/editors/include/ED_node.h (+1, -1) (Diff)
/source/blender/editors/object/object_modifier.c (+5, -0) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+60, -5) (Diff)
/source/blender/editors/space_node/node_draw.c (+3, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+9, -5) (Diff)
/source/blender/editors/space_node/node_group.c (+4, -4) (Diff)
/source/blender/editors/space_node/node_relationships.c (+3, -2) (Diff)
/source/blender/editors/space_node/space_node.c (+1, -1) (Diff)
/source/blender/functions/CMakeLists.txt (+1, -0) (Diff)
/source/blender/functions/FN_multi_function.hh (+13, -0) (Diff)
/source/blender/makesdna/DNA_modifier_defaults.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+10, -3) (Diff)
/source/blender/makesdna/DNA_node_types.h (+27, -12) (Diff)
/source/blender/makesdna/DNA_object_types.h (+8, -0) (Diff)
/source/blender/makesdna/intern/dna_defaults.c (+2, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_access.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_attribute.c (+3, -4) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+66, -12) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+256, -28) (Diff)
/source/blender/makesrna/intern/rna_space.c (+0, -48) (Diff)
/source/blender/makesrna/RNA_access.h (+4, -3) (Diff)
/source/blender/modifiers/CMakeLists.txt (+4, -1) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+4, -1) (Diff)
/source/blender/modifiers/intern/MOD_triangulate.c (+11, -5) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+1, -1) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+1, -1) (Diff)
/source/blender/nodes/CMakeLists.txt (+30, -8) (Diff)
/source/blender/nodes/function/nodes/node_fn_float_compare.cc (+1, -1) (Diff)
/source/blender/nodes/function/nodes/node_fn_random_float.cc (+1, -1) (Diff)
/source/blender/nodes/function/node_function_util.cc (+1, -1) (Diff)
/source/blender/nodes/intern/derived_node_tree.cc (+15, -1) (Diff)
/source/blender/nodes/intern/node_socket.cc (+25, -30) (Diff)
/source/blender/nodes/intern/node_tree_multi_function.cc (+188, -39) (Diff)
/source/blender/nodes/intern/node_tree_ref.cc (+42, -0) (Diff)
/source/blender/nodes/NOD_derived_node_tree.hh (+53, -0) (Diff)
/source/blender/nodes/NOD_node_tree_multi_function.hh (+40, -11) (Diff)
/source/blender/nodes/NOD_node_tree_ref.hh (+8, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_math.cc (+38, -276) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021