Skip to content
This repository has been archived by the owner on Apr 28, 2023. It is now read-only.

Compute color to Var #347

Merged
merged 21 commits into from
Dec 2, 2020
Merged

Compute color to Var #347

merged 21 commits into from
Dec 2, 2020

Conversation

tebjan
Copy link
Member

@tebjan tebjan commented Nov 24, 2020 •
edited
Loading

fixes vvvv/VL.StandardLibs#318 and fixes vvvv/VL.StandardLibs#398

  • Material nodes now have Var<Float32> or Var<Vector4> input pins -> VarToComputeX node can be deleted
  • ShaderFX graphs can be properly cached -> instant load once compiled, also after restart
  • Factory node pins use a compiled delegate expression instead of reflection to write to pins -> about 50x faster
  • Added factory node pins that can convert between types

Changes:

  • ValueMap and ColorMap are now implemented with ShaderFX
  • Material nodes moved into ShaderFX document because they now depend on it
  • Forward of Var is in Rendering document because it forwards the nodes from the factory which has this type as pin type

Review and ToDo:

  • @antongit check current help patches with Material nodes
  • @antongit can we remove DiffuseMap, EmissiveMap, ... nodes?

@tebjan
Added ComputeScalarPin and ComputeColorPin. #274
2e89b89
@tebjan
Merge remote-tracking branch 'origin/develop' into dev/tebjan/compute…
2b69c66 
…color-to-gpuvar

# Conflicts:
#	packages/VL.Stride.Runtime/VL.Stride.Rendering.vl
@tebjan
Input value key generation and extracting default values from compute…
6cf5f71 
… color/scalar. #274
@tebjan
Merge remote-tracking branch 'origin/develop' into dev/tebjan/compute…
1a80511 
…color-to-gpuvar

# Conflicts:
#	packages/VL.Stride.Runtime/VL.Stride.Rendering.vl
@tebjan
Shaders generated with ShaderFX Var or Input have stable hash so the …
a50ae1d 
…shader cache works with them. #274
@tebjan
Separated get and set variable from declaration to have unique IDs an…
5b9143f 
…d easily share specific variables for ShaderFX. Fixed all patches. #274
@tebjan
Texture and Buffer inputs now also have stable names per shader. Some…
5c11320 
… code cleanup. #274
@tebjan
WIP: Fixing material nodes
b61f0ad
@tebjan
Updated ShaderFX.cd class diagram
c8da96b
@tebjan
Merge commit 'c2e02a649aa8b70de097fad0ba58f9b00dc4e45a' into dev/tebj…
6de363f 
…an/computecolor-to-gpuvar
@tebjan
Merge branch 'develop' into dev/tebjan/computecolor-to-gpuvar
0292a68
@tebjan
All tests green again. #274
3af5df6
azeno
azeno reviewed Nov 25, 2020
View reviewed changes
Copy link
Member

@azeno azeno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I expected LiveComputeFloat and LiveComputeColor to be gone?

@tebjan
Copy link
Member Author

tebjan commented Nov 26, 2020

I expected LiveComputeFloat and LiveComputeColor to be gone?

Yep, they are deleted now: 3fd25dc

@tebjan tebjan merged commit a52b029 into develop Dec 2, 2020
@tebjan tebjan mentioned this pull request Dec 11, 2020
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@azeno azeno azeno left review comments

@antongit antongit Awaiting requested review from antongit

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@tebjan @azeno @antongit