Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
commit 59a3d76f33ee9269f95d286743720e31f67fde5e 2 parents 681c382 + f12668a
@clnx authored
View
2  data/data.json
1 addition, 1 deletion not shown
View
2  data/datafile_alliances.xml
1 addition, 1 deletion not shown
View
2  data/datafile_towns.xml
1 addition, 1 deletion not shown
View
2  index.html
@@ -36,7 +36,7 @@
void main(void) {
vec4 col = vec4(0., 0., 0., 1.);
- if (show_towns && texture2D(sampler_towns, tex_pos) != 0.) {
+ if (show_towns && texture2D(sampler_towns, tex_pos) != vec4(0.)) {
gl_FragColor = vec4(0., 1., 0., 1.);
return;
}
Please sign in to comment.
Something went wrong with that request. Please try again.