diff --git a/zoneb/bin/data/gradient.jpg b/zoneb/bin/data/gradient.jpg new file mode 100644 index 0000000..defb5ae Binary files /dev/null and b/zoneb/bin/data/gradient.jpg differ diff --git a/zoneb/bin/data/gradient2.jpg b/zoneb/bin/data/gradient2.jpg new file mode 100644 index 0000000..4a3b86b Binary files /dev/null and b/zoneb/bin/data/gradient2.jpg differ diff --git a/zoneb/bin/data/gradient3.jpg b/zoneb/bin/data/gradient3.jpg new file mode 100644 index 0000000..0b8dece Binary files /dev/null and b/zoneb/bin/data/gradient3.jpg differ diff --git a/zoneb/bin/data/shaders/particles/draw.frag b/zoneb/bin/data/shaders/particles/draw.frag index 0bd2880..bda1ce3 100755 --- a/zoneb/bin/data/shaders/particles/draw.frag +++ b/zoneb/bin/data/shaders/particles/draw.frag @@ -16,5 +16,5 @@ void main() // fragColor = vec4(1);//vec4(texture(u_world, texCoordVarying.st).rgb,1); // fragColor = vec4(texCoordVarying.st/100,1.0,1.0);//vec4(texture(u_world, texCoordVarying.st).rgb,1); // fragColor = vec4(texture(u_v4l2cam, texCoordVarying.st).rgb,1); - fragColor = vec4(texture(imageTexture, vec2(vTemperature*1024, 0.5)).xyz,max(0, 1 - pow(vAge,4))); + fragColor = vec4(texture(imageTexture, vec2(vTemperature*1600, 0.5)).xyz,max(0, 1 - pow(vAge,4))); } diff --git a/zoneb/src/ofApp.cpp b/zoneb/src/ofApp.cpp index c137ee3..ada2ecc 100644 --- a/zoneb/src/ofApp.cpp +++ b/zoneb/src/ofApp.cpp @@ -78,7 +78,7 @@ void ofApp::setup() fbos.insert({"ofcam", ofFbo()}); fbos.at("ofcam").allocate(ofGetWidth(), ofGetHeight(), GL_RGBA32F_ARB); - gradient.load("gradient.png"); + gradient.load("gradient.jpg"); // 1,000,000 particles unsigned w = 512;