This commit is contained in:
micuat 2020-11-01 20:23:25 +01:00
parent 4903c4671b
commit 0f90dbfa37
6 changed files with 10 additions and 7 deletions

BIN
zoneb/bin/data/cold6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

View file

@ -3,8 +3,8 @@
<XY>61.2245, -12.2449</XY>
<scale>1.7965</scale>
<device>video3</device>
<thermo_delay>4</thermo_delay>
<thermo_delay>7</thermo_delay>
<blend_add>1</blend_add>
<render_times>0</render_times>
<trace_times>10</trace_times>
<trace_times>21</trace_times>
</ZONE_B>

View file

@ -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;

View file

@ -173,7 +173,7 @@ void main()
thermo = misc.x;
}
else { // wandering
age += 0.1;
age += 10.1;
thermo = misc.x;
}

View file

@ -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);

View file

@ -53,7 +53,7 @@ private:
std::vector<ofFbo> traces;
int curTrace;
std::map<string, ofFloatImage> gradients;
std::vector<std::string> gradientNames {"warm1", "warm2", "warm3", "cold1", "cold2", "cold3", "cold4", "cold5"};
std::vector<std::string> gradientNames {"warm1", "warm2", "warm3", "cold1", "cold2", "cold3", "cold4", "cold5", "cold6"};
ofxV4L2 v4l2Cam;
ofTexture v4l2Tex;