diff --git a/src/js/Flame.js b/src/js/Flame.js index b27e6b2..70423b4 100644 --- a/src/js/Flame.js +++ b/src/js/Flame.js @@ -24,7 +24,22 @@ export default class Flame { const fireTex = globals.loader.load("assets/flame/FireOrig.png"); const volumetricFire = new THREE.Fire(fireTex); - volumetricFire.scale.set(6, 6.8, 6.0); //width, height, z + + // volumetricFire.material.uniforms.magnitude.value = 0.5; //PREV: higher = spaciness + // volumetricFire.material.uniforms.lacunarity.value = 0.1; //PREV: lower = more cartoony + // volumetricFire.material.uniforms.lacunarity.gain = 0.1; //PREV: more = less height + + // volumetricFire.material.uniforms.magnitude.value = 0.7; + volumetricFire.material.uniforms.magnitude.value = 1.0; + volumetricFire.material.uniforms.lacunarity.value = 1.8; //lower = more cartoony + // volumetricFire.material.uniforms.lacunarity.value = 2.0; //lower = more cartoony + //volumetricFire.material.uniforms.lacunarity.value = 1.0; //higher = more grainy + //volumetricFire.material.uniforms.noiseScale.value.x = 2.5; //num of fires horiz + + // volumetricFire.scale.set(6, 6.8, 6.0); //PREV: width, height, z + volumetricFire.scale.set(6, 7.5, 6.0); //width, height, z + // volumetricFire.scale.set(15, 22, 15); // + // volumetricFire.scale.set(150, 220, 150); // TODO: fix scale for higher values & position // volumetricFire.position.set(globals.posBehindX + 30, 3.5, globals.posBehindZ); // volumetricFire.position.set(pos.x, 3.5, globals.posBehindZ); diff --git a/src/js/audio.js b/src/js/audio.js index 011616b..cc0d3ce 100644 --- a/src/js/audio.js +++ b/src/js/audio.js @@ -123,7 +123,8 @@ var animationPart = new Tone.Part(function(time, instr) { // ["0:0:0", globals.instr.flameCenter], ["0:0:0", globals.instr.flameCenter], ]); -animationPart.start("6:5:0"); +animationPart.start("6:4:3"); +// animationPart.start("0:0:0"); var animationPart2 = new Tone.Part(function(time, instr) { physics.addBody(true, time * globals.multiplierPosX, instr); diff --git a/src/js/globals.js b/src/js/globals.js index d1b656a..7894259 100644 --- a/src/js/globals.js +++ b/src/js/globals.js @@ -5,7 +5,7 @@ export default { activeInstrColor: '#9F532A', //red // activeInstrColor: '#0018F9', //music wheel I blue autoScroll: true, - autoStart: true, + autoStart: false, autoStartTime: 9000, camera: new THREE.PerspectiveCamera(40, window.innerWidth / window.innerHeight, 0.1, 1000), cameraPositionBehind: true, diff --git a/webpack.config.js b/webpack.config.js index 152df45..73471bc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,6 +4,7 @@ const path = require('path'); +// TODO: include Three.js here instead of in index.html, resolve all in src folder and node_modules to fix GitHub Pages 404s const config = { entry: { 'bundle.js': [