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

Added more splat colour control #58

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
51 changes: 46 additions & 5 deletions script.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ let config = {
SUNRAYS: true,
SUNRAYS_RESOLUTION: 196,
SUNRAYS_WEIGHT: 1.0,
COLOR_RED: true,
COLOR_GREEN: true,
COLOR_BLUE: true,
}

function pointerPrototype () {
Expand Down Expand Up @@ -231,6 +234,11 @@ function startGUI () {
sunraysFolder.add(config, 'SUNRAYS').name('enabled').onFinishChange(updateKeywords);
sunraysFolder.add(config, 'SUNRAYS_WEIGHT', 0.3, 1.0).name('weight');

let colorFolder = gui.addFolder('Colors');
colorFolder.add(config, 'COLOR_RED').name('Reds')
colorFolder.add(config, 'COLOR_GREEN').name('Greens')
colorFolder.add(config, 'COLOR_BLUE').name('Blues')

let captureFolder = gui.addFolder('Capture');
captureFolder.addColor(config, 'BACK_COLOR').name('background color');
captureFolder.add(config, 'TRANSPARENT').name('transparent');
Expand Down Expand Up @@ -1419,6 +1427,7 @@ function blur (target, temp, iterations) {
}

function splatPointer (pointer) {
if (config.PAUSED) return;
let dx = pointer.deltaX * config.SPLAT_FORCE;
let dy = pointer.deltaY * config.SPLAT_FORCE;
splat(pointer.texcoordX, pointer.texcoordY, dx, dy, pointer.color);
Expand Down Expand Up @@ -1563,11 +1572,43 @@ function correctDeltaY (delta) {
}

function generateColor () {
let c = HSVtoRGB(Math.random(), 1.0, 1.0);
c.r *= 0.15;
c.g *= 0.15;
c.b *= 0.15;
return c;

function chooseRed() {
var hue = (Math.random() * (1/3)) - (1/6)
if (hue >= 0) {
return hue
} else {
return 1 + hue
}
}

function chooseGreen() {
return (Math.random() * (1/3)) + (1/6)
}

function chooseBlue() {
return (Math.random() * (1/3)) + (1/2)
}

let hues = []
if (config.COLOR_RED) hues.push(chooseRed())
if (config.COLOR_GREEN) hues.push(chooseGreen())
if (config.COLOR_BLUE) hues.push(chooseBlue())
if (hues.length == 0) {
let c = HSVtoRGB(0, 0, 1)
c.r *= 0.1;
c.g *= 0.1;
c.b *= 0.1;
return c;
} else {
let chosenHue = hues[Math.floor(Math.random() * hues.length)]

let c = HSVtoRGB(chosenHue, 1.0, 1.0);
c.r *= 0.15;
c.g *= 0.15;
c.b *= 0.15;
return c;
}
}

function HSVtoRGB (h, s, v) {
Expand Down