Browse Source

added files from player evaluation - BUILDING completed -

windows
Katharina Ott 5 years ago
parent
commit
4399c724d3
39 changed files with 284 additions and 0 deletions
  1. BIN
      bin/data/AlltagTechnikUmwelt.png
  2. BIN
      bin/data/AlltagWissenschaftUmwelt.png
  3. BIN
      bin/data/Danke_4070_2.png
  4. BIN
      bin/data/FINAL_Logo.png
  5. BIN
      bin/data/HexAlltagTechnikUmwelt.png
  6. BIN
      bin/data/HexAlltagWissenschaftUmwelt.png
  7. BIN
      bin/data/HexTechnikUmwelt.png
  8. BIN
      bin/data/HexUmweltTechnik.png
  9. BIN
      bin/data/HexUmweltWissenschaft.png
  10. BIN
      bin/data/Hexagon.png
  11. BIN
      bin/data/Ohm.png
  12. BIN
      bin/data/PktAlltagTechnikUmwelt.png
  13. BIN
      bin/data/PktAlltagWissenschaftUmwelt.png
  14. BIN
      bin/data/PktTechnikUmwelt.png
  15. BIN
      bin/data/PktUmweltTechnik.png
  16. BIN
      bin/data/PktUmweltWissenschaft.png
  17. BIN
      bin/data/TechnikUmwelt.png
  18. BIN
      bin/data/UmweltTechnik.png
  19. BIN
      bin/data/UmweltWissenschaft.png
  20. BIN
      bin/data/Wolke.png
  21. BIN
      bin/data/img/beer.png
  22. BIN
      bin/data/img/br.png
  23. BIN
      bin/data/img/tex.png
  24. BIN
      bin/data/img/tr.png
  25. 24
    0
      bin/data/settings.json
  26. 16
    0
      bin/data/shaders/ofxWarp/ControlPoint.frag
  27. 23
    0
      bin/data/shaders/ofxWarp/ControlPoint.vert
  28. 57
    0
      bin/data/shaders/ofxWarp/WarpBilinear.frag
  29. 21
    0
      bin/data/shaders/ofxWarp/WarpBilinear.vert
  30. 38
    0
      bin/data/shaders/ofxWarp/WarpPerspective.frag
  31. 21
    0
      bin/data/shaders/ofxWarp/WarpPerspective.vert
  32. BIN
      bin/data/testcard.png
  33. 10
    0
      bin/data/xml/attractor.xml
  34. 10
    0
      bin/data/xml/default.xml
  35. 10
    0
      bin/data/xml/detractor.xml
  36. 10
    0
      bin/data/xml/radial.xml
  37. 10
    0
      bin/data/xml/rain.xml
  38. 21
    0
      bin/data/xml/symbol.xml
  39. 13
    0
      src/particle.cpp

BIN
bin/data/AlltagTechnikUmwelt.png View File


BIN
bin/data/AlltagWissenschaftUmwelt.png View File


BIN
bin/data/Danke_4070_2.png View File


BIN
bin/data/FINAL_Logo.png View File


BIN
bin/data/HexAlltagTechnikUmwelt.png View File


BIN
bin/data/HexAlltagWissenschaftUmwelt.png View File


BIN
bin/data/HexTechnikUmwelt.png View File


BIN
bin/data/HexUmweltTechnik.png View File


BIN
bin/data/HexUmweltWissenschaft.png View File


BIN
bin/data/Hexagon.png View File


BIN
bin/data/Ohm.png View File


BIN
bin/data/PktAlltagTechnikUmwelt.png View File


BIN
bin/data/PktAlltagWissenschaftUmwelt.png View File


BIN
bin/data/PktTechnikUmwelt.png View File


BIN
bin/data/PktUmweltTechnik.png View File


BIN
bin/data/PktUmweltWissenschaft.png View File


BIN
bin/data/TechnikUmwelt.png View File


BIN
bin/data/UmweltTechnik.png View File


BIN
bin/data/UmweltWissenschaft.png View File


BIN
bin/data/Wolke.png View File


BIN
bin/data/img/beer.png View File


BIN
bin/data/img/br.png View File


BIN
bin/data/img/tex.png View File


BIN
bin/data/img/tr.png View File


+ 24
- 0
bin/data/settings.json View File

{
"warps": [
{
"blend": {
"edges": "0, 0, 0.5, 0.5",
"exponent": 2.0,
"gamma": "1, 1, 1",
"luminance": "0.5, 0.5, 0.5"
},
"brightness": 1.0,
"type": 2,
"warp": {
"columns": 2,
"control points": [
"0, 0",
"1, 0",
"1, 1",
"0, 1"
],
"rows": 2
}
}
]
}

+ 16
- 0
bin/data/shaders/ofxWarp/ControlPoint.frag View File

#version 150

in vec2 vTexCoord;
in vec4 vColor;

out vec4 fragColor;

void main(void)
{
vec2 uv = vTexCoord * 2.0 - 1.0;
float d = dot(uv, uv);
float rim = smoothstep(0.7, 0.8, d);
rim += smoothstep(0.3, 0.4, d) - smoothstep(0.5, 0.6, d);
rim += smoothstep(0.1, 0.0, d);
fragColor = mix(vec4( 0.0, 0.0, 0.0, 0.25), vColor, rim);
}

+ 23
- 0
bin/data/shaders/ofxWarp/ControlPoint.vert View File

#version 150

// OF default uniforms and attributes
uniform mat4 modelViewProjectionMatrix;
uniform vec4 globalColor;

in vec4 position;
in vec2 texcoord;
in vec4 color;

// App uniforms and attributes
in vec4 iPositionScale;
in vec4 iColor;

out vec2 vTexCoord;
out vec4 vColor;

void main(void)
{
vTexCoord = texcoord;
vColor = globalColor * iColor;
gl_Position = modelViewProjectionMatrix * vec4(position.xy * iPositionScale.z + iPositionScale.xy, position.zw);
}

+ 57
- 0
bin/data/shaders/ofxWarp/WarpBilinear.frag View File

#version 150

uniform sampler2D uTexture;
uniform vec4 uExtends;
uniform vec3 uLuminance;
uniform vec3 uGamma;
uniform vec4 uEdges;
uniform vec4 uCorners;
uniform float uExponent;
uniform bool uEditing;

in vec2 vTexCoord;
in vec4 vColor;

out vec4 fragColor;

float map(in float value, in float inMin, in float inMax, in float outMin, in float outMax)
{
return outMin + (outMax - outMin) * (value - inMin) / (inMax - inMin);
}

float grid(in vec2 uv, in vec2 size)
{
vec2 coord = uv / size;
vec2 grid = abs(fract(coord - 0.5) - 0.5) / (2.0 * fwidth(coord));
float line = min(grid.x, grid.y);
return 1.0 - min(line, 1.0);
}

void main(void)
{
vec4 texColor = texture(uTexture, vTexCoord);

vec2 mapCoord = vec2(map(vTexCoord.x, uCorners.x, uCorners.z, 0.0, 1.0), map(vTexCoord.y, uCorners.y, uCorners.w, 0.0, 1.0));

float a = 1.0;
if (uEdges.x > 0.0) a *= clamp(mapCoord.x / uEdges.x, 0.0, 1.0);
if (uEdges.y > 0.0) a *= clamp(mapCoord.y / uEdges.y, 0.0, 1.0);
if (uEdges.z > 0.0) a *= clamp((1.0 - mapCoord.x) / uEdges.z, 0.0, 1.0);
if (uEdges.w > 0.0) a *= clamp((1.0 - mapCoord.y) / uEdges.w, 0.0, 1.0);

const vec3 one = vec3(1.0);
vec3 blend = (a < 0.5) ? (uLuminance * pow(2.0 * a, uExponent)) : one - (one - uLuminance) * pow(2.0 * (1.0 - a), uExponent);

texColor.rgb *= pow(blend, one / uGamma);

if (uEditing)
{
float f = grid(mapCoord.xy * uExtends.xy, uExtends.zw);
vec4 gridColor = vec4(1.0f);
fragColor = mix(texColor * vColor, gridColor, f);
}
else
{
fragColor = texColor * vColor;
}
}

+ 21
- 0
bin/data/shaders/ofxWarp/WarpBilinear.vert View File

#version 150

// OF default uniforms and attributes
uniform mat4 modelViewProjectionMatrix;
uniform vec4 globalColor;

in vec4 position;
in vec2 texcoord;
in vec4 color;

// App uniforms and attributes
out vec2 vTexCoord;
out vec4 vColor;

void main(void)
{
vTexCoord = texcoord;
vColor = globalColor;

gl_Position = modelViewProjectionMatrix * position;
}

+ 38
- 0
bin/data/shaders/ofxWarp/WarpPerspective.frag View File

#version 150

uniform sampler2D uTexture;
uniform vec3 uLuminance;
uniform vec3 uGamma;
uniform vec4 uEdges;
uniform vec4 uCorners;
uniform float uExponent;

in vec2 vTexCoord;
in vec4 vColor;

out vec4 fragColor;

float map(in float value, in float inMin, in float inMax, in float outMin, in float outMax)
{
return outMin + (outMax - outMin) * (value - inMin) / (inMax - inMin);
}

void main(void)
{
vec4 texColor = texture(uTexture, vTexCoord);

vec2 mapCoord = vec2(map(vTexCoord.x, uCorners.x, uCorners.z, 0.0, 1.0), map(vTexCoord.y, uCorners.y, uCorners.w, 0.0, 1.0));

float a = 1.0;
if (uEdges.x > 0.0) a *= clamp(mapCoord.x / uEdges.x, 0.0, 1.0);
if (uEdges.y > 0.0) a *= clamp(mapCoord.y / uEdges.y, 0.0, 1.0);
if (uEdges.z > 0.0) a *= clamp((1.0 - mapCoord.x) / uEdges.z, 0.0, 1.0);
if (uEdges.w > 0.0) a *= clamp((1.0 - mapCoord.y) / uEdges.w, 0.0, 1.0);

const vec3 one = vec3(1.0);
vec3 blend = (a < 0.5) ? (uLuminance * pow(2.0 * a, uExponent)) : one - (one - uLuminance) * pow(2.0 * (1.0 - a), uExponent);

texColor.rgb *= pow(blend, one / uGamma);

fragColor = texColor * vColor;
}

+ 21
- 0
bin/data/shaders/ofxWarp/WarpPerspective.vert View File

#version 150

// OF default uniforms and attributes
uniform mat4 modelViewProjectionMatrix;
uniform vec4 globalColor;

in vec4 position;
in vec2 texcoord;
in vec4 color;

// App uniforms and attributes
out vec2 vTexCoord;
out vec4 vColor;

void main(void)
{
vTexCoord = texcoord;
vColor = globalColor;

gl_Position = modelViewProjectionMatrix * position;
}

BIN
bin/data/testcard.png View File


+ 10
- 0
bin/data/xml/attractor.xml View File

<default>
<sizeMin>0.05</sizeMin>
<sizeMax>4</sizeMax>
<mass>100</mass>
<drag>0</drag>
<maxLife>10</maxLife>
<velMin>-80</velMin>
<velMax>80</velMax>
<color></color>
</default>

+ 10
- 0
bin/data/xml/default.xml View File

<default>
<sizeMin>0.05</sizeMin>
<sizeMax>4</sizeMax>
<mass>100</mass>
<drag>0</drag>
<maxLife>10</maxLife>
<velMin>-80</velMin>
<velMax>80</velMax>
<color></color>
</default>

+ 10
- 0
bin/data/xml/detractor.xml View File

<default>
<sizeMin>0.05</sizeMin>
<sizeMax>4</sizeMax>
<mass>100</mass>
<drag>0</drag>
<maxLife>10</maxLife>
<velMin>-80</velMin>
<velMax>80</velMax>
<color></color>
</default>

+ 10
- 0
bin/data/xml/radial.xml View File

<default>
<sizeMin>0.05</sizeMin>
<sizeMax>4</sizeMax>
<mass>100</mass>
<drag>0</drag>
<maxLife>10</maxLife>
<velMin>-80</velMin>
<velMax>80</velMax>
<color></color>
</default>

+ 10
- 0
bin/data/xml/rain.xml View File

<default>
<sizeMin>0.05</sizeMin>
<sizeMax>4</sizeMax>
<mass>100</mass>
<drag>0</drag>
<maxLife>10</maxLife>
<velMin>-80</velMin>
<velMax>80</velMax>
<color></color>
</default>

+ 21
- 0
bin/data/xml/symbol.xml View File

<default>
<sizeMin>0.01</sizeMin>
<sizeMax>4.0</sizeMax>
<massMin>100</massMin>
<massMax>250</massMax>
<drag>0</drag>
<maxLife>ofRandom(maxAge - 5, maxAge)</maxLife>
<velMin>-80</velMin>
<velMax>80</velMax>
<color>(5, 241, 219)</color>
<age>0.0</age>
<valueToMoveToTop>0</valueToMoveToTop>
<valueToMoveToRight>0</valueToMoveToRight>
<counterToMoveParticlesToRight>70</counterToMoveParticlesToRight>
<particleLeftScene>false</particleLeftScene>
</default>

vel.set(ofRandom(-20.0, 20.0), ofRandom(-90, -100));


+ 13
- 0
src/particle.cpp View File





} }

// ----------------------------------- // -----------------------------------


Particle::~Particle() Particle::~Particle()


} }


//--------------------------------------------------------------
void Particle::doMovementOfParticlesAtRain(bool tornadoIsFinished, double deltaT, float sceneSizeX)
{
if (tornadoIsFinished == false) { //Movement of partile from bottom to top
position += vel * deltaT;
age += deltaT;

if (position.x >= sceneSizeX) {
position.x = ofRandom(-1, -5);
}
}
}


//-------------------------------------------------------------- //--------------------------------------------------------------
void Particle::doMovementOfParticlesAtSymbols(double deltaT, ofVec2f &attractor) void Particle::doMovementOfParticlesAtSymbols(double deltaT, ofVec2f &attractor)

Loading…
Cancel
Save