Commit: d7b991aeb7021371abc82cf14f15c1ce84ba8746
Author: Jacques Lucke
Date: Sat Nov 30 14:40:07 2019 +0100
Branches: functions
https://developer.blender.org/rBd7b991aeb7021371abc82cf14f15c1ce84ba8746
remove Particle Randomness node
===================================================================
M release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
M release/scripts/startup/nodes/menu.py
M source/blender/simulations/bparticles/particle_function_builder.cpp
M
source/blender/simulations/bparticles/particle_function_input_providers.cpp
M
source/blender/simulations/bparticles/particle_function_input_providers.hpp
===================================================================
diff --git a/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
b/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
index c14fda45f60..2a7a477ae1d 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
@@ -49,11 +49,3 @@ class SurfaceImageNode(bpy.types.Node, SimulationNode):
col = layout.column()
col.prop(self, "image", text="")
col.prop(self, "uv_mode", text="")
-
-
-class ParticleRandomnessInputNode(bpy.types.Node, SimulationNode):
- bl_idname = "fn_ParticleRandomnessInputNode"
- bl_label = "Particle Randomness Input"
-
- def declaration(self, builder: NodeBuilder):
- builder.fixed_output("float_value", "Value", "Float")
diff --git a/release/scripts/startup/nodes/menu.py
b/release/scripts/startup/nodes/menu.py
index b2d6a95aa3c..8f3dd909fe8 100644
--- a/release/scripts/startup/nodes/menu.py
+++ b/release/scripts/startup/nodes/menu.py
@@ -100,7 +100,6 @@ class InputNodesMenu(bpy.types.Menu):
insert_node(layout, "fn_ParticleInfoNode", "Particle Info")
insert_node(layout, "fn_SurfaceInfoNode", "Surface Info")
insert_node(layout, "fn_SurfaceImageNode", "Image Colors")
- insert_node(layout, "fn_ParticleRandomnessInputNode", "Particle
Randomness")
def insert_node(layout, type, text, settings = {}, icon = "NONE"):
diff --git
a/source/blender/simulations/bparticles/particle_function_builder.cpp
b/source/blender/simulations/bparticles/particle_function_builder.cpp
index d96757e1eef..8476eb49c91 100644
--- a/source/blender/simulations/bparticles/particle_function_builder.cpp
+++ b/source/blender/simulations/bparticles/particle_function_builder.cpp
@@ -75,13 +75,6 @@ static ParticleFunctionInputProvider *INPUT_surface_image(
return new SurfaceImageInputProvider(image, uv_map_name);
}
-static ParticleFunctionInputProvider *INPUT_randomness_input(
- VTreeMFNetwork &UNUSED(inlined_tree_data_graph), const XOutputSocket
&xsocket)
-{
- uint seed = BLI_hash_string(xsocket.node().name().data());
- return new RandomFloatInputProvider(seed);
-}
-
static ParticleFunctionInputProvider *INPUT_is_in_group(VTreeMFNetwork
&inlined_tree_data_graph,
const XOutputSocket
&xsocket)
{
@@ -103,7 +96,6 @@ BLI_LAZY_INIT_STATIC(StringMap<BuildInputProvider>,
get_input_providers_map)
StringMap<BuildInputProvider> map;
map.add_new("fn_SurfaceInfoNode", INPUT_surface_info);
map.add_new("fn_SurfaceImageNode", INPUT_surface_image);
- map.add_new("fn_ParticleRandomnessInputNode", INPUT_randomness_input);
map.add_new("fn_IsInGroupNode", INPUT_is_in_group);
return map;
}
diff --git
a/source/blender/simulations/bparticles/particle_function_input_providers.cpp
b/source/blender/simulations/bparticles/particle_function_input_providers.cpp
index 532bf265948..d711ba04603 100644
---
a/source/blender/simulations/bparticles/particle_function_input_providers.cpp
+++
b/source/blender/simulations/bparticles/particle_function_input_providers.cpp
@@ -127,22 +127,6 @@ Optional<ParticleFunctionInputArray>
SurfaceImageInputProvider::compute_colors(
return ParticleFunctionInputArray(colors.as_ref(), true);
}
-Optional<ParticleFunctionInputArray> RandomFloatInputProvider::get(
- InputProviderInterface &interface)
-{
- ArrayRef<int> ids = interface.attributes().get<int>("ID");
-
- uint size = interface.attributes().size();
- auto random_values = BLI::temporary_allocate_array<float>(size);
-
- for (uint pindex : interface.pindices()) {
- float value = BLI_hash_int_01(ids[pindex] + m_seed * 23467);
- random_values[pindex] = value;
- }
-
- return ParticleFunctionInputArray(random_values.as_ref(), true);
-}
-
Optional<ParticleFunctionInputArray>
IsInGroupInputProvider::get(InputProviderInterface &interface)
{
auto is_in_group_output =
BLI::temporary_allocate_array<bool>(interface.attributes().size());
diff --git
a/source/blender/simulations/bparticles/particle_function_input_providers.hpp
b/source/blender/simulations/bparticles/particle_function_input_providers.hpp
index 8de94f374b9..1591107473a 100644
---
a/source/blender/simulations/bparticles/particle_function_input_providers.hpp
+++
b/source/blender/simulations/bparticles/particle_function_input_providers.hpp
@@ -39,18 +39,6 @@ class SurfaceImageInputProvider : public
ParticleFunctionInputProvider {
ArrayRef<uint>
surface_info_mapping);
};
-class RandomFloatInputProvider : public ParticleFunctionInputProvider {
- private:
- uint m_seed;
-
- public:
- RandomFloatInputProvider(uint seed) : m_seed(seed)
- {
- }
-
- Optional<ParticleFunctionInputArray> get(InputProviderInterface &interface)
override;
-};
-
class IsInGroupInputProvider : public ParticleFunctionInputProvider {
private:
std::string m_group_name;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
