Skip to content

Commit

Permalink
updating assets and cellular color
Browse files Browse the repository at this point in the history
  • Loading branch information
ameerabuf committed Nov 4, 2024
1 parent 712d606 commit cdfd61e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions demo/alpha-mask.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ prepareMedia([media1, media2], 'video', [
`../Engineering Conference Assets/Luminance Mask1.mov`,
`../Engineering Conference Assets/Luminance Mask2.mov`,
]).then((videos) => {
const width = videos[0].videoWidth || videos[0].naturalWidth;
const height = videos[0].videoHeight || videos[0].naturalHeight;
const width = videos[0].videoWidth / 2 || videos[0].naturalWidth;
const height = videos[0].videoHeight / 2 || videos[0].naturalHeight;

alphaMask.isLuminance = true;
alphaMask.mask = videos[1];
Expand Down
2 changes: 1 addition & 1 deletion demo/cellular-noise.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const render = {
u_time: 'float',
},
constant: noise.cellular,
main: 'float noiseAmount = vec3(noise(vec3(gl_FragCoord.xy/u_resolution.xy, u_time * 0.0005))).r; color = noiseAmount * vec3(1.0, 0.643, 0.976) + (1.0 - noiseAmount) * vec3(1.0, 0.886, 0.165);',
main: 'float noiseAmount = vec3(noise(vec3(gl_FragCoord.xy/u_resolution.xy, u_time * 0.0005))).r; noiseAmount *= noiseAmount * noiseAmount; color = noiseAmount * vec3(1.0, 0.643, 0.976) + (1.0 - noiseAmount) * vec3(1.0, 0.886, 0.165);',
},
uniforms: [
{
Expand Down
8 changes: 4 additions & 4 deletions demo/dissolve-gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ const TYPE = 'LIQUID';
const ANIMATIONS = {
SMOKE: {
octaves: 8,
edge: 0.4,
cellFactor: 4,
edge: 0.9,
cellFactor: 1,
},
LIQUID: {
octaves: 1,
edge: 0.03,
octaves: 10,
edge: 0.4,
cellFactor: 2,
},
};
Expand Down
8 changes: 4 additions & 4 deletions demo/dissolve-transition.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ const TYPE = 'LIQUID';
const ANIMATIONS = {
SMOKE: {
octaves: 8,
edge: 0.4,
cellFactor: 4,
edge: 0.9,
cellFactor: 1,
},
LIQUID: {
octaves: 1,
edge: 0.03,
octaves: 10,
edge: 0.4,
cellFactor: 2,
},
};
Expand Down
1 change: 1 addition & 0 deletions demo/turbulence.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ target.height = 480;

const target2 = document.querySelector('#target');
const media1 = document.querySelector('#video5');
target2.style = 'height: 120%';

// uncomment here if you want to see just the turbulence
//target2.parentNode.replaceChild(target, target2);
Expand Down

0 comments on commit cdfd61e

Please sign in to comment.