Skip to content

Commit

Permalink
🔀 Merge branch 'paint-gradient'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cool
  • Loading branch information
JulesFouchy committed Oct 13, 2023
2 parents 459a58d + b9c0bd0 commit 0931ce5
Show file tree
Hide file tree
Showing 21 changed files with 1,391 additions and 173 deletions.
9 changes: 9 additions & 0 deletions Nodes/12 Image Blend/Mix (Light).clbnode
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro

INPUT Oklab 'Color2';
INPUT float 'Percent';

Oklab main(Oklab Color1)
{
return mix(Color1, 'Color2', 'Percent');
}
68 changes: 68 additions & 0 deletions Nodes/12 Image Blend/Mix (Light).clbnode.presets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"Presets": {
"Underlying container": [
{
"first": "92f7e19a-fc1c-49b8-8135-130c88229e1c",
"second": {
"Name": "Default",
"Values": [
{
"index": 7,
"data": {
"Name": "Color2",
"Value": {
"sRGB": {
"x": 1.0,
"y": 0.9998999834060669,
"z": 0.9998999834060669
}
},
"Metadata": {
"Is HDR": false
},
"Default Value": {
"sRGB": {
"x": 1.0,
"y": 0.9998999834060669,
"z": 0.9998999834060669
}
},
"Default Metadata": {
"Is HDR": false
}
}
},
{
"index": 2,
"data": {
"Name": "Percent",
"Value": 0.5,
"Metadata": {
"Bounds": {
"Has min bound": false,
"Min": 0.0,
"Has max bound": false,
"Max": 1.0,
"Drag speed": 0.009999999776482582,
"Use slider": true
}
},
"Default Value": 0.5,
"Default Metadata": {
"Bounds": {
"Has min bound": false,
"Min": 0.0,
"Has max bound": false,
"Max": 1.0,
"Drag speed": 0.009999999776482582,
"Use slider": false
}
}
}
}
]
}
}
]
}
}
9 changes: 9 additions & 0 deletions Nodes/12 Image Blend/Mix (Paint).clbnode
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro

INPUT sRGB 'Color2';
INPUT float 'Percent';

sRGB main(sRGB Color1)
{
return mixbox_lerp(Color1, 'Color2', 'Percent');
}
68 changes: 68 additions & 0 deletions Nodes/12 Image Blend/Mix (Paint).clbnode.presets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"Presets": {
"Underlying container": [
{
"first": "49fbfa3e-7018-44e3-847c-ea57da42f4f0",
"second": {
"Name": "Default",
"Values": [
{
"index": 7,
"data": {
"Name": "Color2",
"Value": {
"sRGB": {
"x": 1.0,
"y": 0.9998999834060669,
"z": 0.9998999834060669
}
},
"Metadata": {
"Is HDR": false
},
"Default Value": {
"sRGB": {
"x": 1.0,
"y": 0.9998999834060669,
"z": 0.9998999834060669
}
},
"Default Metadata": {
"Is HDR": false
}
}
},
{
"index": 2,
"data": {
"Name": "Percent",
"Value": 0.5,
"Metadata": {
"Bounds": {
"Has min bound": true,
"Min": 0.0,
"Has max bound": true,
"Max": 1.0,
"Drag speed": 0.009999999776482582,
"Use slider": true
}
},
"Default Value": 0.5,
"Default Metadata": {
"Bounds": {
"Has min bound": false,
"Min": 0.0,
"Has max bound": false,
"Max": 1.0,
"Drag speed": 0.009999999776482582,
"Use slider": false
}
}
}
}
]
}
}
]
}
}
7 changes: 0 additions & 7 deletions Nodes/12 Image Blend/Mix.clbnode

This file was deleted.

44 changes: 0 additions & 44 deletions Nodes/12 Image Blend/Opacity.clbnode.presets.json

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Presets": {
"Underlying container": [
{
"first": "ef366185-eeb3-4c86-92e6-a139302c3864",
"first": "2dc66228-4356-4c03-b1a4-1b956c1351e8",
"second": {
"Name": "Default",
"Values": [
Expand Down
19 changes: 19 additions & 0 deletions Nodes/12 Image Blend/Over (Paint).clbnode
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro

INPUT sRGB_PremultipliedA 'Background';

sRGB_PremultipliedA main(sRGB_PremultipliedA Foreground)
{
float new_alpha = Foreground.a + (1. - Foreground.a) * 'Background'.a;
return vec4(
premultiply(
mixbox_lerp(
unpremultiply('Background'.rgb, 'Background'.a),
unpremultiply(Foreground.rgb, Foreground.a),
Foreground.a
),
new_alpha
),
new_alpha
);
}
42 changes: 42 additions & 0 deletions Nodes/12 Image Blend/Over (Paint).clbnode.presets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"Presets": {
"Underlying container": [
{
"first": "2fec6af0-2106-498f-930e-94811d87bdbe",
"second": {
"Name": "Default",
"Values": [
{
"index": 8,
"data": {
"Name": "Background",
"Value": {
"sRGB, Straight alpha": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 1.0
}
},
"Metadata": {
"Is HDR": false
},
"Default Value": {
"sRGB, Straight alpha": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 1.0
}
},
"Default Metadata": {
"Is HDR": false
}
}
}
]
}
}
]
}
}
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
## 🐣beta-9 WIP

- ✨ Added Midi support!
- ✨ Added the "Paint" blend mode.
- ✨ Added an Output window that you can project during live shows, while still having your View window on your screen to move the camera and the widgets. To open this window, go in the `Commands` menu and select `Open output window`.
- ✨ Added "Load Backup" in case you accidentally refused to save your unsaved changes.
- 🐛 Fix: the transparency information was sometimes getting lost between nodes.
Expand Down
Loading

0 comments on commit 0931ce5

Please sign in to comment.