diff --git a/zoneb/bin/data/cold6.png b/zoneb/bin/data/cold6.png new file mode 100644 index 0000000..74572f9 Binary files /dev/null and b/zoneb/bin/data/cold6.png differ diff --git a/zoneb/bin/data/settings.xml b/zoneb/bin/data/settings.xml index d043dd1..bc0a73d 100644 --- a/zoneb/bin/data/settings.xml +++ b/zoneb/bin/data/settings.xml @@ -3,8 +3,8 @@ 61.2245, -12.2449 1.7965 video3 - 4 + 7 1 0 - 10 + 21 diff --git a/zoneb/bin/data/shaders/particles/draw.frag b/zoneb/bin/data/shaders/particles/draw.frag index 7ff3a09..d3869d8 100755 --- a/zoneb/bin/data/shaders/particles/draw.frag +++ b/zoneb/bin/data/shaders/particles/draw.frag @@ -14,6 +14,7 @@ uniform sampler2DRect cold2; uniform sampler2DRect cold3; uniform sampler2DRect cold4; uniform sampler2DRect cold5; +uniform sampler2DRect cold6; uniform float uAreThereTwoPeopleTween; @@ -113,7 +114,7 @@ void main() if(gAge >= 1) discard; vec2 palette = vec2(gTemperature*3425, 0.5); vec3 remapedColorW = texture(warm1, palette).xyz; - vec3 remapedColorC = texture(cold2, palette).xyz; + vec3 remapedColorC = mix(texture(cold2, palette).xyz, texture(cold5, palette).xyz, 0.6); float d = 80; float D = 600; float n = (simplex3d(gPos * vec3(0.01, 0.01, 0.1 * sin(u_time * 0.01)))) * 100; @@ -122,7 +123,7 @@ void main() vec3 remapedColor = mix(remapedColorC, remapedColorW, rate); float alpha = min(1, max(0, 1 - pow(gAge,4))); if(uEnergy > 0) { - alpha *= 0.05; + alpha *= 0.075; } else { alpha *= 0.15; diff --git a/zoneb/bin/data/shaders/particles/update.frag b/zoneb/bin/data/shaders/particles/update.frag index 958c0e2..b5daaee 100755 --- a/zoneb/bin/data/shaders/particles/update.frag +++ b/zoneb/bin/data/shaders/particles/update.frag @@ -173,7 +173,7 @@ void main() thermo = misc.x; } else { // wandering - age += 0.1; + age += 10.1; thermo = misc.x; } diff --git a/zoneb/src/ofApp.cpp b/zoneb/src/ofApp.cpp index e6ec9c5..3cad025 100644 --- a/zoneb/src/ofApp.cpp +++ b/zoneb/src/ofApp.cpp @@ -188,6 +188,8 @@ void ofApp::exit() ofVec3f ofApp::getDepthAt(int x, int y) { + if (x > 512 || y > 512) + return ofVec3f(x, y, 100); auto ray = kinectDevice.getDepthToWorldPix().getColor(x, y); auto depthShort = kinectDevice.getDepthPix().getColor(x, y).r; float depth = -depthShort; @@ -248,7 +250,7 @@ void ofApp::updateThermal() if (dummyMode == false) { - if (uBetweenDistance > 500 || hotspots.size() < 2) + if (uBetweenDistance > 1500 || hotspots.size() < 2) { hotspot0 = ofVec3f(100000, 100000, 0); hotspot1 = ofVec3f(100000, 100000, 0); diff --git a/zoneb/src/ofApp.h b/zoneb/src/ofApp.h index 631ce1d..549c5dd 100644 --- a/zoneb/src/ofApp.h +++ b/zoneb/src/ofApp.h @@ -53,7 +53,7 @@ private: std::vector traces; int curTrace; std::map gradients; - std::vector gradientNames {"warm1", "warm2", "warm3", "cold1", "cold2", "cold3", "cold4", "cold5"}; + std::vector gradientNames {"warm1", "warm2", "warm3", "cold1", "cold2", "cold3", "cold4", "cold5", "cold6"}; ofxV4L2 v4l2Cam; ofTexture v4l2Tex;