Commit 4f810c00 authored by amandaghassaei's avatar amandaghassaei

small changes

parent aba96d23
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
vec2 dir = fragCoord - vec2(0.5, 0.5) - u_obstaclePosition; vec2 dir = fragCoord - vec2(0.5, 0.5) - u_obstaclePosition;
float dist = length(dir); float dist = length(dir);
if (dist < u_obstacleRad-2.0){ if (dist < u_obstacleRad){
gl_FragColor = vec4(0); gl_FragColor = vec4(0);
return; return;
} }
if (dist < u_obstacleRad){ if (dist < u_obstacleRad+1.0){
gl_FragColor = u_scale*texture2D(u_texture, (fragCoord + dir/dist*2.0)/u_textureSize); gl_FragColor = u_scale*texture2D(u_texture, (fragCoord + dir/dist*2.0)/u_textureSize);
return; return;
} }
...@@ -56,12 +56,12 @@ ...@@ -56,12 +56,12 @@
void main() { void main() {
vec2 fragCoord = gl_FragCoord.xy; vec2 fragCoord = gl_FragCoord.xy;
if (texture2D(u_obstacle, fragCoord/u_textureSize).x == 1.0){ if (texture2D(u_obstacle, fragCoord/u_textureSize).x == 1.0){
float color = 0.5;
gl_FragColor = vec4(0.925, 0, 0.55, 1); gl_FragColor = vec4(0.925, 0, 0.55, 1);
return; return;
} }
float mat1 = texture2D(u_material, fragCoord/u_textureSize).x; float mat1 = texture2D(u_material, fragCoord/u_textureSize).x;
gl_FragColor = vec4(mat1, mat1, mat1, 1); vec3 color = vec3(250.0/255.0, 235.0/255.0, 215.0/255.0);
gl_FragColor = vec4(mat1*color, 1);
} }
</script> </script>
......
...@@ -22,7 +22,7 @@ canvas { ...@@ -22,7 +22,7 @@ canvas {
z-index: 5; z-index: 5;
top:0; top:0;
right:0; right:0;
background: #444; background: rgba(40, 40, 40, 0.7);
width: 30px; width: 30px;
text-align: center; text-align: center;
position: absolute; position: absolute;
...@@ -44,7 +44,7 @@ canvas { ...@@ -44,7 +44,7 @@ canvas {
} }
a, a:hover, a:visited, a:focus{ a, a:hover, a:visited, a:focus{
color:#8cbaed; color:#ec008b;
} }
a.btn:visited, a.btn:focus{ a.btn:visited, a.btn:focus{
...@@ -119,7 +119,7 @@ input.form-control { ...@@ -119,7 +119,7 @@ input.form-control {
} }
.flat-slider.ui-slider-vertical .ui-slider-handle{ .flat-slider.ui-slider-vertical .ui-slider-handle{
background: #8cbaed; background: #ec008b;
} }
.flat-slider.ui-slider-horizontal .ui-slider-handle { .flat-slider.ui-slider-horizontal .ui-slider-handle {
......
...@@ -36,7 +36,7 @@ function initGL() { ...@@ -36,7 +36,7 @@ function initGL() {
canvas.onmousemove = onMouseMove; canvas.onmousemove = onMouseMove;
canvas.onmousedown = onMouseDown; canvas.onmousedown = onMouseDown;
canvas.onmouseup = onMouseUp; canvas.onmouseup = onMouseUp;
// canvas.onmouseout = onMouseUp; canvas.onmouseout = onMouseUp;
window.onresize = onResize; window.onresize = onResize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment