Permalink
Browse files

fixes

  • Loading branch information...
1 parent 5196ef3 commit 717d046490e33f95e6629ef3ae5a76d9ec044fc0 gman committed Sep 8, 2010
@@ -53,20 +53,24 @@
z-index: 2;
color: gray;
font-family: sans-serif;
+ background-color: rgba(0,0,0,0.5);
+ border-radius: 10px;
+ padding: 10px;
}
.fps {
color: white;
}
#uiContainer {
z-index: 2;
- padding: 1em;
position: absolute;
top: 10px;
right: 20px;
width: 250px;
background: rgba(0,0,0,0.5);
color: white;
font-size: xx-small;
+ border-radius: 10px;
+ padding: 10px;
}
#ui {
}
@@ -145,7 +149,8 @@
{ obj: 'fish', name: 'fishYClock', value: 0.17, max: 2},
{ obj: 'fish', name: 'fishZClock', value: 1.09, max: 2},
{ obj: 'innerConst', name: 'refractionFudge', value: 7, max: 50},
- { obj: 'innerConst', name: 'eta', value: 1, max: 1}
+ { obj: 'innerConst', name: 'eta', value: 1, max: 1},
+ { obj: 'innerConst', name: 'tankColorFudge', value: 1, max: 2}
];
var g_skyBoxUrls = [
@@ -1489,6 +1494,7 @@
uniform float specularFactor;
uniform float refractionFudge;
uniform float eta;
+uniform float tankColorFudge;
vec4 lit(float l ,float h, float m) {
return vec4(1.0,
@@ -1497,7 +1503,8 @@
1.0);
}
void main() {
- vec4 diffuse = texture2D(diffuse, v_texCoord) + vec4(10,0,0,1);
+ vec4 diffuse = texture2D(diffuse, v_texCoord) +
+ vec4(tankColorFudge, tankColorFudge, tankColorFudge, 1);
mat3 tangentToWorld = mat3(v_tangent,
v_binormal,
v_normal);
@@ -1514,15 +1521,9 @@
vec3 refractionVec = refract(surfaceToView, normal, eta);
vec4 skyColor = textureCube(skybox, refractionVec);
- vec3 halfVector = normalize(surfaceToLight + surfaceToView);
- vec4 litR = lit(dot(normal, surfaceToLight),
- dot(normal, halfVector), shininess);
- gl_FragColor = vec4(mix(
- skyColor,
- lightColor * (diffuse * litR.y +
- specular * litR.z * specularFactor * normalSpec.a),
- 0.0 /*refraction.r*/).rgb,
- diffuse.a);// * 0.0001 + vec4(normal.xyz * 0.5 + vec3(0.5, 0.5, 0.5), 1);
+ gl_FragColor = vec4(
+ mix(skyColor * diffuse, diffuse, refraction.r).rgb,
+ diffuse.a);
}
</script>
<!-- ===[ SkyBox ]============================================== -->
View
@@ -60,6 +60,9 @@
z-index: 3;
color: white;
font-family: sans-serif;
+ background-color: rgba(0,0,0,0.5);
+ border-radius: 10px;
+ padding: 10px;
}
.fpsContainer a:visited, .fpsContainer a:hover, .fpsContainer a {
color: white;
View
@@ -49,14 +49,15 @@
}
#uiContainer {
z-index: 2;
- padding: 1em;
position: absolute;
top: 10px;
right: 20px;
width: 250px;
background: rgba(0,0,0,0.5);
color: white;
font-size: xx-small;
+ border-radius: 10px;
+ padding: 10px;
}
#ui {
}
@@ -66,6 +67,9 @@
left: 20px;
z-index: 2;
color: white;
+ background-color: rgba(0,0,0,0.5);
+ border-radius: 10px;
+ padding: 10px;
}
#viewContainer {
width: 100%;
@@ -279,7 +283,7 @@
function setCount(elem, count) {
g_numGrass = count;
for (var ii = 0; ii < g_setCountElements.length; ++ii) {
- g_setCountElements[ii].style.color = "gray";
+ g_setCountElements[ii].style.color = "black";
}
elem.style.color = "red";
}
@@ -53,6 +53,9 @@
z-index: 2;
color: gray;
font-family: sans-serif;
+ background-color: rgba(0,0,0,0.5);
+ border-radius: 10px;
+ padding: 10px;
}
.fps {
color: white;
@@ -47,9 +47,9 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: gTrebuchet MS, gTahoma, gVerdana, gArial, sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: gTrebuchet MS, gTahoma, gVerdana, gArial, sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
.ui-widget-content a { color: #333333; }
.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
@@ -311,7 +311,7 @@
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
----------------------------------*/
-.ui-autocomplete { position: absolute; cursor: default; }
+.ui-autocomplete { position: absolute; cursor: default; }
.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
/* workarounds */
@@ -354,8 +354,8 @@
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
/*button text element */
.ui-button .ui-button-text { display: block; line-height: 1.4; }
@@ -387,7 +387,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
----------------------------------*/
.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
@@ -437,7 +437,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-month,
.ui-datepicker select.ui-datepicker-year { width: 49%;}
.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
@@ -53,6 +53,9 @@
z-index: 2;
color: white;
font-family: sans-serif;
+ background-color: rgba(0,0,0,0.5);
+ border-radius: 10px;
+ padding: 10px;
}
#viewContainer {
width: 100%;

0 comments on commit 717d046

Please sign in to comment.