mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2025-12-23 10:11:54 +00:00
Make noise generation resolution aware (#1909)
* Make noise generation resolution aware * Invert "Scale" so it's not "Frequency"; make "Clipping" 100x100 not 1x1 --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Dennis Kobert
GitHub
parent
0dfddd529b
commit
c5dde18fd6
5 changed files with 67 additions and 81 deletions
|
|
@ -776,48 +776,10 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
|
|||
identifier: "Noise Pattern",
|
||||
node_template: NodeTemplate {
|
||||
document_node: DocumentNode {
|
||||
implementation: DocumentNodeImplementation::Network(NodeNetwork {
|
||||
exports: vec![NodeInput::node(NodeId(1), 0)],
|
||||
nodes: vec![
|
||||
DocumentNode {
|
||||
inputs: vec![
|
||||
NodeInput::network(concrete!(()), 0),
|
||||
NodeInput::network(concrete!(UVec2), 1),
|
||||
NodeInput::network(concrete!(u32), 2),
|
||||
NodeInput::network(concrete!(f64), 3),
|
||||
NodeInput::network(concrete!(graphene_core::raster::NoiseType), 4),
|
||||
NodeInput::network(concrete!(graphene_core::raster::FractalType), 5),
|
||||
NodeInput::network(concrete!(f64), 6),
|
||||
NodeInput::network(concrete!(graphene_core::raster::FractalType), 7),
|
||||
NodeInput::network(concrete!(u32), 8),
|
||||
NodeInput::network(concrete!(f64), 9),
|
||||
NodeInput::network(concrete!(f64), 10),
|
||||
NodeInput::network(concrete!(f64), 11),
|
||||
NodeInput::network(concrete!(f64), 12),
|
||||
NodeInput::network(concrete!(graphene_core::raster::CellularDistanceFunction), 13),
|
||||
NodeInput::network(concrete!(graphene_core::raster::CellularReturnType), 14),
|
||||
NodeInput::network(concrete!(f64), 15),
|
||||
],
|
||||
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_std::raster::NoisePatternNode<_, _, _, _, _, _, _, _, _, _, _, _, _, _, _>")),
|
||||
..Default::default()
|
||||
},
|
||||
// TODO: Make noise pattern node resolution aware and remove the cull node
|
||||
DocumentNode {
|
||||
inputs: vec![NodeInput::node(NodeId(0), 0)],
|
||||
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::CullNode<_>")),
|
||||
manual_composition: Some(concrete!(Footprint)),
|
||||
..Default::default()
|
||||
},
|
||||
]
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
.map(|(id, node)| (NodeId(id as u64), node))
|
||||
.collect(),
|
||||
..Default::default()
|
||||
}),
|
||||
manual_composition: Some(concrete!(Footprint)),
|
||||
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_std::raster::NoisePatternNode<_, _, _, _, _, _, _, _, _, _, _, _, _, _, _>")),
|
||||
inputs: vec![
|
||||
NodeInput::value(TaggedValue::None, false),
|
||||
NodeInput::value(TaggedValue::UVec2((512, 512).into()), false),
|
||||
NodeInput::value(TaggedValue::Bool(true), false),
|
||||
NodeInput::value(TaggedValue::U32(0), false),
|
||||
NodeInput::value(TaggedValue::F64(10.), false),
|
||||
NodeInput::value(TaggedValue::NoiseType(NoiseType::default()), false),
|
||||
|
|
@ -837,8 +799,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
|
|||
},
|
||||
persistent_node_metadata: DocumentNodePersistentMetadata {
|
||||
input_names: vec![
|
||||
"None".to_string(),
|
||||
"Dimensions".to_string(),
|
||||
"Clip".to_string(),
|
||||
"Seed".to_string(),
|
||||
"Scale".to_string(),
|
||||
"Noise Type".to_string(),
|
||||
|
|
|
|||
|
|
@ -945,15 +945,15 @@ pub fn extract_channel_properties(document_node: &DocumentNode, node_id: NodeId,
|
|||
// As soon as there are more types of noise, this should be uncommented.
|
||||
pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
|
||||
// Get the current values of the inputs of interest so they can set whether certain inputs are disabled based on various conditions.
|
||||
let current_noise_type = match &document_node.inputs[4].as_value() {
|
||||
let current_noise_type = match &document_node.inputs[3].as_value() {
|
||||
Some(&TaggedValue::NoiseType(noise_type)) => Some(noise_type),
|
||||
_ => None,
|
||||
};
|
||||
let current_domain_warp_type = match &document_node.inputs[5].as_value() {
|
||||
let current_domain_warp_type = match &document_node.inputs[4].as_value() {
|
||||
Some(&TaggedValue::DomainWarpType(domain_warp_type)) => Some(domain_warp_type),
|
||||
_ => None,
|
||||
};
|
||||
let current_fractal_type = match &document_node.inputs[7].as_value() {
|
||||
let current_fractal_type = match &document_node.inputs[6].as_value() {
|
||||
Some(&TaggedValue::FractalType(fractal_type)) => Some(fractal_type),
|
||||
_ => None,
|
||||
};
|
||||
|
|
@ -966,28 +966,30 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
!domain_warp_active && (current_fractal_type == Some(FractalType::DomainWarpIndependent) || current_fractal_type == Some(FractalType::DomainWarpProgressive));
|
||||
|
||||
// All
|
||||
let dimensions = vec2_widget(document_node, node_id, 1, "Dimensions", "W", "H", "px", Some(1.), add_blank_assist);
|
||||
let seed = number_widget(document_node, node_id, 2, "Seed", NumberInput::default().min(0.).is_integer(true), true);
|
||||
let scale = number_widget(document_node, node_id, 3, "Scale", NumberInput::default().min(0.).disabled(!coherent_noise_active), true);
|
||||
let noise_type_row = noise_type(document_node, node_id, 4, "Noise Type", true);
|
||||
let clip = LayoutGroup::Row {
|
||||
widgets: bool_widget(document_node, node_id, 0, "Clip", true),
|
||||
};
|
||||
let seed = number_widget(document_node, node_id, 1, "Seed", NumberInput::default().min(0.).is_integer(true), true);
|
||||
let scale = number_widget(document_node, node_id, 2, "Scale", NumberInput::default().min(0.).disabled(!coherent_noise_active), true);
|
||||
let noise_type_row = noise_type(document_node, node_id, 3, "Noise Type", true);
|
||||
|
||||
// Domain Warp
|
||||
let domain_warp_type_row = domain_warp_type(document_node, node_id, 5, "Domain Warp Type", true, !coherent_noise_active);
|
||||
let domain_warp_type_row = domain_warp_type(document_node, node_id, 4, "Domain Warp Type", true, !coherent_noise_active);
|
||||
let domain_warp_amplitude = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
6,
|
||||
5,
|
||||
"Domain Warp Amplitude",
|
||||
NumberInput::default().min(0.).disabled(!coherent_noise_active || !domain_warp_active),
|
||||
true,
|
||||
);
|
||||
|
||||
// Fractal
|
||||
let fractal_type_row = fractal_type(document_node, node_id, 7, "Fractal Type", true, !coherent_noise_active);
|
||||
let fractal_type_row = fractal_type(document_node, node_id, 6, "Fractal Type", true, !coherent_noise_active);
|
||||
let fractal_octaves = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
8,
|
||||
7,
|
||||
"Fractal Octaves",
|
||||
NumberInput::default()
|
||||
.mode_range()
|
||||
|
|
@ -1001,7 +1003,7 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
let fractal_lacunarity = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
9,
|
||||
8,
|
||||
"Fractal Lacunarity",
|
||||
NumberInput::default()
|
||||
.mode_range()
|
||||
|
|
@ -1013,7 +1015,7 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
let fractal_gain = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
10,
|
||||
9,
|
||||
"Fractal Gain",
|
||||
NumberInput::default()
|
||||
.mode_range()
|
||||
|
|
@ -1025,7 +1027,7 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
let fractal_weighted_strength = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
11,
|
||||
10,
|
||||
"Fractal Weighted Strength",
|
||||
NumberInput::default()
|
||||
.mode_range()
|
||||
|
|
@ -1037,7 +1039,7 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
let fractal_ping_pong_strength = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
12,
|
||||
11,
|
||||
"Fractal Ping Pong Strength",
|
||||
NumberInput::default()
|
||||
.mode_range()
|
||||
|
|
@ -1048,12 +1050,12 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
);
|
||||
|
||||
// Cellular
|
||||
let cellular_distance_function_row = cellular_distance_function(document_node, node_id, 13, "Cellular Distance Function", true, !coherent_noise_active || !cellular_noise_active);
|
||||
let cellular_return_type = cellular_return_type(document_node, node_id, 14, "Cellular Return Type", true, !coherent_noise_active || !cellular_noise_active);
|
||||
let cellular_distance_function_row = cellular_distance_function(document_node, node_id, 12, "Cellular Distance Function", true, !coherent_noise_active || !cellular_noise_active);
|
||||
let cellular_return_type = cellular_return_type(document_node, node_id, 13, "Cellular Return Type", true, !coherent_noise_active || !cellular_noise_active);
|
||||
let cellular_jitter = number_widget(
|
||||
document_node,
|
||||
node_id,
|
||||
15,
|
||||
14,
|
||||
"Cellular Jitter",
|
||||
NumberInput::default()
|
||||
.mode_range()
|
||||
|
|
@ -1065,7 +1067,7 @@ pub fn noise_pattern_properties(document_node: &DocumentNode, node_id: NodeId, _
|
|||
|
||||
vec![
|
||||
// All
|
||||
dimensions,
|
||||
clip,
|
||||
LayoutGroup::Row { widgets: seed },
|
||||
LayoutGroup::Row { widgets: scale },
|
||||
noise_type_row,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue