Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed overload issue caused by random splats #79

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
42daa88
modified to work with lively.
rocksdanister Nov 6, 2019
9da02a7
Update README.md
rocksdanister Oct 21, 2020
bace4d8
fluid v3
rocksdanister Aug 18, 2021
9c5c06e
Update README.md
rocksdanister Aug 18, 2021
7302b22
Update README.md
rocksdanister Aug 18, 2021
9b6dcd6
license update
rocksdanister Aug 18, 2021
fda8f16
removed images and updated license
rocksdanister Aug 18, 2021
f022090
close enough
dabjulmaros Aug 30, 2022
1cd06a1
console logs
dabjulmaros Aug 30, 2022
147bf45
reset audioReact back to false also var bad
dabjulmaros Aug 30, 2022
be81ed2
Merge pull request #1 from dabjulmaros/lively
rocksdanister Aug 30, 2022
0f02514
uncomment mouse
dabjulmaros Aug 30, 2022
c982fa9
Merge pull request #2 from dabjulmaros/lively
rocksdanister Aug 30, 2022
453d974
fix mouse move
rocksdanister Aug 30, 2022
07c5f07
Fix wallpaper turning white when paused with random splat..
rocksdanister Dec 1, 2023
75d06bb
formatting
rocksdanister Dec 1, 2023
3799ebf
Fixed background image not changing
rocksdanister Dec 1, 2023
afd82c9
Some minor refactor
rocksdanister Dec 1, 2023
853d3bb
minor refactor
rocksdanister Dec 1, 2023
58d4b4c
refactoring path string
rocksdanister Dec 1, 2023
9170984
limit color to range of hues
ac615223s5 Jun 15, 2024
813c2dd
allow adjusting saturation and brightness as well
ac615223s5 Jun 15, 2024
69ae044
allow selecting multiple ranges
ac615223s5 Jun 15, 2024
7841f5a
Update LivelyProperties.json
ac615223s5 Jun 15, 2024
09e6a41
Update LivelyProperties.json
ac615223s5 Jun 15, 2024
e238ec1
Update script.js
ac615223s5 Jun 15, 2024
845431e
change default color range
ac615223s5 Jun 15, 2024
e809719
Update LivelyProperties.json
ac615223s5 Jun 16, 2024
23e6155
Merge pull request #9 from ac615223s5/color-selection
rocksdanister Jun 17, 2024
bd028c0
Overlay, video background and fluid color
rocksdanister Nov 2, 2024
d8f005e
fixed video pause
rocksdanister Nov 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions LivelyInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"AppVersion": "2.0.7.4",
"Title": "Fluids",
"Thumbnail": "thumbnail.jpg",
"Preview": "preview.gif",
"Desc": "Fluid simulation using WebGL, reacts with system audio & cursor.",
"Author": "PavelDoGreat",
"License": "MIT",
"Contact": "https://github.com/rocksdanister/WebGL-Fluid-Simulation",
"Type": 1,
"Arguments": "--audio --pause-event true",
"FileName": "index.html"
}
204 changes: 204 additions & 0 deletions LivelyProperties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
{
"label0": {
"type": "label",
"value": "Audio"
},
"audioReact": {
"type": "checkbox",
"value": true,
"text": "Visualiser"
},
"randomSplats": {
"type": "checkbox",
"value": false,
"text": "Random Splats"
},
"label1": {
"type": "label",
"value": "Performance"
},
"quality": {
"type": "dropdown",
"value": 0,
"text": "Quality",
"items": [
"High",
"Medium",
"Low",
"Very Low"
]
},
"simResolution": {
"type": "dropdown",
"value": 2,
"text": "Sim Resolution",
"items": [
"32",
"64",
"128",
"256"
]
},
"label2": {
"type": "label",
"value": "Color"
},
"colorLeft": {
"text": "Left",
"type": "color",
"value": "#FF0000"
},
"colorRight": {
"text": "Right",
"type": "color",
"value": "#FFFF00"
},
"customColor": {
"type": "checkbox",
"value": false,
"text": "Enable"
},
"label3": {
"type": "label",
"value": "Simulation"
},
"densityDiffusion": {
"max": 40,
"min": 0,
"tick": 41,
"text": "Density Diffusion",
"type": "slider",
"value": 10
},
"velocityDiffusion": {
"max": 400,
"min": 0,
"tick": 401,
"text": "Velocity Diffusion",
"type": "slider",
"value": 100
},
"pressure": {
"max": 100,
"min": 0,
"tick": 101,
"text": "Pressure",
"type": "slider",
"value": 10
},
"vorticity": {
"max": 50,
"min": 0,
"tick": 51,
"text": "Vorticity",
"type": "slider",
"value": 20
},
"splatRadius": {
"max": 100,
"min": 1,
"tick": 100,
"text": "Splat Radius",
"type": "slider",
"value": 20
},
"shading": {
"type": "checkbox",
"value": true,
"text": "Shading"
},
"colorful": {
"type": "checkbox",
"value": true,
"text": "Colorful"
},
"bloomEnable": {
"type": "checkbox",
"value": true,
"text": "Bloom"
},
"bloomIntensity": {
"max": 200,
"min": 10,
"tick": 191,
"text": "Bloom Intensity",
"type": "slider",
"value": 15
},
"bloomThreshold": {
"max": 100,
"min": 0,
"tick": 101,
"text": "Bloom Threshold",
"type": "slider",
"value": 75
},
"sunRaysEnable": {
"type": "checkbox",
"value": true,
"text": "Sunrays"
},
"sunRaysWeight": {
"max": 100,
"min": 30,
"tick": 71,
"text": "Sunray Weight",
"type": "slider",
"value": 40
},
"label4": {
"type": "label",
"value": "Background"
},
"backgroundColor": {
"text": "Color",
"type": "color",
"value": "#000000"
},
"backgroundSrc": {
"type": "folderDropdown",
"value": "pexels-neosiam-601798.jpg",
"text": "Image/WebM Video",
"filter": "*.jpg|*.jpeg|*.webp|*.png|*.webm",
"folder": "wallpapers"
},
"backgroundFit": {
"type": "dropdown",
"value": 2,
"text": "Choose a Fit",
"items": [
"Contain",
"Cover",
"Fill",
"None"
]
},
"backgroundEnabled": {
"type": "checkbox",
"value": false,
"text": "Enable"
},
"label5": {
"type": "label",
"value": "Overlay"
},
"overlaySrc": {
"type": "folderDropdown",
"value": "icon-lively-300.png",
"text": "Image",
"filter": "*.jpg|*.jpeg|*.webp|*.png|*.svg",
"folder": "overlays"
},
"overlaySize": {
"max": 100,
"min": 5,
"text": "Size",
"type": "slider",
"value": 25
},
"overlayEnabled": {
"type": "checkbox",
"value": false,
"text": "Enable"
}
}
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# WebGL Fluid Simulation
Modified to work with [lively](https://github.com/rocksdanister/lively) wallpaper system, reacts with system audio.

[Play here](https://paveldogreat.github.io/WebGL-Fluid-Simulation/)
Download: [Fluids_v3.zip](https://github.com/rocksdanister/WebGL-Fluid-Simulation/releases/download/v3/Fluids_v3.zip)

<img src="/screenshot.jpg?raw=true" width="880">
Drag & drop the file into lively window.

## References

Expand Down
Loading