Add more advanced math nodes #1383
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TrueDoctor
reviewed
Aug 12, 2023
node-graph/gcore/src/ops.rs
Outdated
Comment on lines
86
to
142
| // Floor | ||
| pub struct FloorParameterNode; | ||
|
|
||
| #[node_macro::node_fn(FloorParameterNode)] | ||
| fn floor(input: f32) -> f32 { | ||
| input.floor() | ||
| } | ||
|
|
||
| // Ceil | ||
| pub struct CeilParameterNode; | ||
|
|
||
| #[node_macro::node_fn(CeilParameterNode)] | ||
| fn ceil(input: f32) -> f32 { | ||
| input.ceil() | ||
| } | ||
|
|
||
| // Round | ||
| pub struct RoundParameterNode; | ||
|
|
||
| #[node_macro::node_fn(RoundParameterNode)] | ||
| fn round(input: f32) -> f32 { | ||
| input.round() | ||
| } | ||
|
|
||
| // Absolute Value | ||
| pub struct AbsoluteParameterNode; | ||
|
|
||
| #[node_macro::node_fn(AbsoluteParameterNode)] | ||
| fn abs(input: f32) -> f32 { | ||
| input.abs() | ||
| } | ||
|
|
||
| // Log | ||
| pub struct LogParameterNode<Second> { | ||
| second: Second, | ||
| } | ||
|
|
||
| #[node_macro::node_fn(LogParameterNode)] | ||
| fn ln<U: num_traits::float::Float>(first: U, second: U) -> U { | ||
| first.log(second) | ||
| } | ||
|
|
||
| // Natural Log | ||
| pub struct NaturalLogParameterNode; | ||
|
|
||
| #[node_macro::node_fn(NaturalLogParameterNode)] | ||
| fn ln(input: f32) -> f32 { | ||
| input.ln() | ||
| } | ||
|
|
||
| // Sine | ||
| pub struct SineParameterNode; | ||
|
|
||
| #[node_macro::node_fn(SineParameterNode)] | ||
| fn ln(input: f32) -> f32 { | ||
| input.sin() | ||
| } |
There was a problem hiding this comment.
The I think none of these nodes should have Parameter in their name as they don't actually take a second argument. (With AddParameter, the parameter is added to the primary input, this is not the case here)
There was a problem hiding this comment.
Sorry for that, I just copy-pasted without thinking. Should be fixed now
TrueDoctor
approved these changes
Aug 14, 2023
* Floor * Ceil * Round * Absolute Value * Logarithm * Natural Logarithm * sin * cos * tan
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a few more mathematical operations as nodes. With this PR, all operations mentioned in #912 should be implemented + some other operations like rounding and the natural logarithm.
Operations Implemented by this PR: