Skip to content

Commit bac2bfd

Browse files
yoshikiohshimayoshikiohshima
committed
merge master.
2 parents cd3cc49 + 9112f6d commit bac2bfd

19 files changed

+511
-646
lines changed

‎index.html

+47-15
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,13 @@
7070
「自分と同じ形をした仲間が、すぐそばのお隣さんのうち1/3未満しかいなくなった時には、自分もよそを探して引っ越しします。」
7171
</b>
7272
</p>
73-
<iframe playable src="play/mini/mini_unhappy.html" width="250" height="300" scrolling="no" style="float:left; margin:0; margin-left:10px; position:relative; left:-30px" embedded></iframe>
74-
<iframe playable src="play/mini/mini_happy.html" width="250" height="300" scrolling="no" style="float:left; margin:0; margin-left:10px" embedded></iframe>
75-
<iframe playable src="play/mini/mini_bored.html" width="250" height="300" scrolling="no" style="float:left; margin:0; margin-left:10px; position:relative; left:30px" embedded></iframe>
76-
<div style="clear:both;height: 0;position: relative;">
73+
<iframe playable src="play/mini/mini_unhappy.html" width="250" height="320" scrolling="no" style="float:left; margin:0; margin-left:10px; position:relative; left:-30px" embedded></iframe>
74+
<iframe playable src="play/mini/mini_happy.html" width="250" height="320" scrolling="no" style="float:left; margin:0; margin-left:10px" embedded></iframe>
75+
<iframe playable src="play/mini/mini_bored.html" width="250" height="320" scrolling="no" style="float:left; margin:0; margin-left:10px; position:relative; left:30px" embedded></iframe>
76+
<div style="clear:both;height: 0;position: relative;top:-20px;">
7777
<div style="width: 4px; height: 290px; background: #bbb;position: absolute;top: -292px;left: 245px;"></div>
7878
<div style="width: 4px; height: 290px; background: #bbb;position: absolute;top: -292px;left: 537px;"></div>
7979
</div>
80-
<br>
8180

8281
<p>
8382
これって、どうってことはないですよね？
@@ -160,9 +159,10 @@
160159
もし50% だったらどうでしょう。それぞれの子にとってみても、近所で少数派になりたくない、というのは合理的なようにも思えますしね。
161160
</p>
162161

163-
<iframe id="mini_bias_1" playable src="play/mini/mini_bias_1.html" width="310" height="420" scrolling="no" style="float:left; margin:0; margin-left:50px" embedded></iframe>
164-
<iframe id="mini_bias_2" playable src="play/mini/mini_bias_2.html" width="310" height="420" scrolling="no" style="float:right; margin:0; margin-right:50px" embedded></iframe>
165-
<div style="clear:both;height: 0;position: relative;">
162+
<br>
163+
<iframe id="mini_bias_1" playable src="play/mini/mini_bias_1.html" width="310" height="440" scrolling="no" style="float:left; margin:0; margin-left:50px" embedded></iframe>
164+
<iframe id="mini_bias_2" playable src="play/mini/mini_bias_2.html" width="310" height="440" scrolling="no" style="float:right; margin:0; margin-right:50px" embedded></iframe>
165+
<div style="clear:both;height: 0;position: relative;top:-20px;">
166166
<div style="width: 6px; height: 400px; background: #bbb;position: absolute;top: -420px;left: 397px;"></div>
167167
</div>
168168

@@ -329,11 +329,39 @@
329329
<br><br>
330330
<div style="border-bottom: 2px dashed #666"></div>
331331

332+
<span style="font-size:20px; line-height:30px">
333+
334+
<br>
335+
336+
<b style="font-size:25px;">Donate to Diversity!</b>
337+
<br>
338+
<a target="_blank" href="http://www.blackgirlscode.com/">Black Girls Code</a>
339+
- gives coding lessons to girls of color
340+
<br>
341+
<a target="_blank" href="http://girlswhocode.com/">Girls Who Code</a>
342+
- teaches high school girls to code
343+
<br>
344+
<a target="_blank" href="http://code2040.org/">Code 2040</a>
345+
- helps blacks &amp; latina/os get into tech
346+
<br>
347+
<a target="_blank" href="http://codeliberation.org/">Code Liberation</a>
348+
- free workshops to help women make videogames
349+
<br>
350+
<a target="_blank" href="http://adainitiative.org/">Ada Initiative</a>
351+
- supports women in open source &amp; open culture
352+
<!--br>
353+
Nicky's Patreon - makes public domain playables (such as Parable of the Polygons!)-->
354+
355+
</span>
356+
357+
<br><br>
358+
<div style="border-bottom: 2px dashed #666"></div>
359+
332360
<span style="font-size:18px; line-height:22px">
333361

334362
<br>
335363

336-
<b>遊び読みしてくれた皆さん、ありがとう</b><br>
364+
<b>読んで遊んでくれた皆さん、ありがとう</b><br>
337365
Andrea, Astrid, Catherine, Chris, Emily, Glen, Jocelyn, Laura, Marc, Marko, Zak
338366

339367
<br><br>
@@ -347,19 +375,23 @@
347375
<a target="_blank" href="http://jayisgames.com/archives/2014/12/parable_of_the_polygons.php">JayIsGames</a>,
348376
<a target="_blank" href="https://news.ycombinator.com/item?id=8716538">Hacker News</a>,
349377
<a target="_blank" href="http://www.metafilter.com/145147/Parable-of-the-Polygons">MetaFilter</a>,
350-
<a target="_blank" href="http://nymag.com/scienceofus/2014/12/these-cartoon-shapes-are-adorable-but-racist.html">New York Magazine</a>
378+
<a target="_blank" href="http://nymag.com/scienceofus/2014/12/these-cartoon-shapes-are-adorable-but-racist.html">New York Magazine</a>,
379+
<a target="_blank" href="http://www.citylab.com/design/2014/12/an-immersive-game-shows-how-easily-segregation-arisesand-how-we-might-fix-it/383586/">The Atlantic's CityLab</a>
351380

352381
<br><br>
353382

354383
<b>翻訳</b><br>
355-
<a target="_blank" href="http://ncase.me/polygons-es">スペイン語</a>,
356-
<a target="_blank" href="http://ncase.me/polygons-fr">フランス語</a>,
357-
<a target="_blank" href="http://ncase.me/polygons-de">ドイツ語</a>
384+
<a target="_blank" href="http://ncase.me/polygons-es">Spanish</a>,
385+
<a target="_blank" href="http://ncase.me/polygons-fr">French</a>,
386+
<a target="_blank" href="http://ncase.me/polygons-de">German</a>,
387+
<a target="_blank" href="http://ncase.me/polygons-pt-br">Brazilian Portuguese</a>,
388+
<a target="_blank" href="http://ncase.me/polygons-ja">Japanese</a>
358389

359390
<br><br>
360391

361-
<b>Remixes:</b><br>
362-
<a target="_blank" href="http://ncase.me/polygons-pentagons/play/automatic/automatic_sandbox_frame.html">Polygons with Pentagons</a>
392+
<b>Other Stuff Based Off This Thing:</b><br>
393+
<a target="_blank" href="http://ncase.me/polygons-pentagons/play/automatic/automatic_sandbox_frame.html">Polygons with Pentagons</a>,
394+
<a target="_blank" href="https://youtu.be/v02DTSSTc5k">Playthrough Video</a>
363395

364396
</span>
365397

‎js/Mouse.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},false);
2222

2323
document.body.addEventListener("mousemove",onMouseMove = function(event){
24-
Mouse.x = event.pageX - window.scrollX;
25-
Mouse.y = event.pageY - window.scrollY;
24+
Mouse.x = event.pageX;
25+
Mouse.y = event.pageY - window.pageYOffset;
2626

2727
},false);
2828

@@ -36,8 +36,8 @@
3636
},false);
3737

3838
document.body.addEventListener("touchmove",onTouchMove = function(event){
39-
Mouse.x = event.changedTouches[0].clientX - window.scrollX;
40-
Mouse.y = event.changedTouches[0].clientY - window.scrollY;
39+
Mouse.x = event.changedTouches[0].clientX;
40+
Mouse.y = event.changedTouches[0].clientY - window.pageYOffset;
4141
},false);
4242

4343

‎js/intro.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var outro_background = document.getElementById("outro_background");
66
window.onscroll = function(){
77

88
// Playables - PAUSE & UNPAUSE
9-
var scrollY = window.scrollY;
9+
var scrollY = window.pageYOffset;
1010
var innerHeight = window.innerHeight;
1111
for(var i=0;i<playables.length;i++){
1212
var p = playables[i];

‎play/automatic/automatic2.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
}
5656
});
5757

58-
59-
60-
window.IS_IN_SIGHT = true;
58+
//window.IS_IN_SIGHT = true;
6159

6260
</script>

‎play/automatic/doubleslider.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ function DoubleSlider(dom,config){
4848

4949
// Events
5050
(function(dom,i,self){
51-
dom.onmousedown = function(){
51+
var onMouseDown = function(){
5252
self.draggingSliderDOM = dom;
5353
self.draggingSliderIndex = i;
5454
};
55+
dom.addEventListener("mousedown",onMouseDown,true);
56+
dom.addEventListener("touchstart",onMouseDown,true);
5557
})(dom,i,self);
5658

5759
}
@@ -92,11 +94,13 @@ function DoubleSlider(dom,config){
9294
document.body.addEventListener("mousemove",function(event){
9395
var x = event.pageX - myX();
9496
onMouseMove(x);
95-
},true);
97+
},false);
98+
9699
document.body.addEventListener("touchmove",function(event){
97100
var x = event.changedTouches[0].clientX - myX();
98101
onMouseMove(x);
99-
},true);
102+
},false);
103+
100104
document.body.addEventListener("mouseup",onMouseUp,true);
101105
document.body.addEventListener("touchend",onMouseUp,true);
102106
var cacheX = null;

‎play/intro/intro.html

+12
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@
4040
<div id="intro_shading"></div>
4141
<div id="intro_text">
4242
by <a href="http://vihart.com/" target="_blank">vi hart</a> + <a href="http://ncase.me/" target="_blank">nicky case</a>
43+
<span style='font-size:16px; letter-spacing:0;'>
44+
<br>
45+
<a target="_parent" href="http://ncase.me/polygons-es">español</a>
46+
|
47+
<a target="_parent" href="http://ncase.me/polygons-de">deutsch</a>
48+
|
49+
<a target="_parent" href="http://ncase.me/polygons-fr">français</a>
50+
|
51+
<a target="_parent" href="http://ncase.me/polygons-pt-br">português</a>
52+
|
53+
<a target="_parent" href="http://ncase.me/polygons-ja">日本語</a>
54+
</span>
4355
</div>
4456
</div>
4557
</body>

‎play/mini/mini_bias_1.html

+28-21
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
<link href="mini.css" rel="stylesheet" type="text/css">
2-
<canvas id="canvas"></canvas>
3-
<br>
4-
<div style="text-align:center; margin:10px 0; color:#777">
5-
もしお隣さんのうち<span style="color:#dd3939">33% 未満</span>しか
6-
<br>
7-
自分と同じ形がいないのであれば引っ越します
8-
</div>
9-
<div id="reset" onclick="reset()">reset</div>
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<link href="mini.css" rel="stylesheet" type="text/css">
5+
</head>
6+
<body>
7+
<canvas id="canvas"></canvas>
8+
<br>
9+
<div style="text-align:center; margin:10px 0; color:#777">
10+
もしお隣さんのうち<span style="color:#dd3939">33% 未満</span>しか
11+
<br>
12+
自分と同じ形がいないのであれば引っ越します
13+
</div>
14+
<div id="reset" onclick="reset()">reset</div>
1015

11-
<script>
12-
var TILE_SIZE = 100;
13-
var PEEP_SIZE = 100;
16+
<script>
17+
var TILE_SIZE = 100;
18+
var PEEP_SIZE = 100;
1419

15-
var GRID = [
16-
[1,2,1],
17-
[2,0,2],
18-
[1,2,1]
19-
];
20-
</script>
21-
<script src="../lib/Mouse.js"></script>
22-
<script src="mini.js"></script>
23-
<script src="mini_blah.js"></script>
20+
var GRID = [
21+
[1,2,1],
22+
[2,0,2],
23+
[1,2,1]
24+
];
25+
</script>
26+
<script src="../lib/Mouse.js"></script>
27+
<script src="mini.js"></script>
28+
<script src="mini_blah.js"></script>
29+
</body>
30+
</html>

‎play/mini/mini_bias_2.html

+32-25
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
1-
<link href="mini.css" rel="stylesheet" type="text/css">
2-
<canvas id="canvas"></canvas>
3-
<br>
4-
<div style="text-align:center; margin:10px 0; color:#777">
5-
もしお隣さんのうち<span style="color:#dd3939">50% 未満</span>しか
6-
<br>
7-
自分と同じ形がいないのであれば引っ越します
8-
</div>
9-
<div id="reset" onclick="reset()">reset</div>
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<link href="mini.css" rel="stylesheet" type="text/css">
5+
</head>
6+
<body>
7+
<canvas id="canvas"></canvas>
8+
<br>
9+
<div style="text-align:center; margin:10px 0; color:#777">
10+
もしお隣さんのうち<span style="color:#dd3939">50% 未満</span>しか
11+
<br>
12+
自分と同じ形がいないのであれば引っ越します
13+
</div>
14+
<div id="reset" onclick="reset()">reset</div>
1015

11-
<script>
12-
var TILE_SIZE = 100;
13-
var PEEP_SIZE = 100;
16+
<script>
17+
var TILE_SIZE = 100;
18+
var PEEP_SIZE = 100;
1419

15-
var GRID = [
16-
[1,2,1],
17-
[2,0,2],
18-
[1,2,1]
19-
];
20-
</script>
21-
<script src="../lib/Mouse.js"></script>
22-
<script src="mini.js"></script>
23-
<script src="mini_blah.js"></script>
24-
<script>
25-
NONCONFORM = 1.00;
26-
BIAS = 0.50;
27-
</script>
20+
var GRID = [
21+
[1,2,1],
22+
[2,0,2],
23+
[1,2,1]
24+
];
25+
</script>
26+
<script src="../lib/Mouse.js"></script>
27+
<script src="mini.js"></script>
28+
<script src="mini_blah.js"></script>
29+
<script>
30+
NONCONFORM = 1.00;
31+
BIAS = 0.50;
32+
</script>
33+
</body>
34+
</html>

‎play/mini/mini_bored.html

+26-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
<link href="mini.css" rel="stylesheet" type="text/css">
2-
<canvas id="canvas"></canvas>
3-
<br>
4-
<div style="text-align:center; margin:10px 0; color:#777; font-size:15px">
5-
<span style="color:#dd3939">だめ</span>
6-
お隣さんが皆同じ形だよ (お隣さんがだれもいないのも、だめ)
7-
</div>
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<link href="mini.css" rel="stylesheet" type="text/css">
5+
</head>
6+
<body>
7+
<canvas id="canvas"></canvas>
8+
<br>
9+
<div style="text-align:center; margin:10px 0; color:#777; font-size:15px">
10+
<span style="color:#dd3939">だめ</span>
11+
お隣さんが皆同じ形だよ (お隣さんがだれもいないのも、だめ)
12+
</div>
813

9-
<script>
10-
var TILE_SIZE = 80;
11-
var PEEP_SIZE = 80;
14+
<script>
15+
var TILE_SIZE = 80;
16+
var PEEP_SIZE = 80;
1217

13-
var GRID = [
14-
[2,0,2],
15-
[2,2,2],
16-
[2,0,2]
17-
];
18-
</script>
19-
<script src="../lib/Mouse.js"></script>
20-
<script src="mini.js"></script>
21-
<script src="mini_blah.js"></script>
18+
var GRID = [
19+
[2,0,2],
20+
[2,2,2],
21+
[2,0,2]
22+
];
23+
</script>
24+
<script src="../lib/Mouse.js"></script>
25+
<script src="mini.js"></script>
26+
<script src="mini_blah.js"></script>
27+
</body>
28+
</html>

‎play/mini/mini_checkerboard.html

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
<link href="mini.css" rel="stylesheet" type="text/css">
2-
<canvas id="canvas"></canvas>
3-
<div id="reset" onclick="reset()">reset</div>
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<link href="mini.css" rel="stylesheet" type="text/css">
5+
</head>
6+
<body>
7+
<canvas id="canvas"></canvas>
8+
<div id="reset" onclick="reset()">reset</div>
49

5-
<script>
6-
var TILE_SIZE = 60;
7-
var PEEP_SIZE = 60;
10+
<script>
11+
var TILE_SIZE = 60;
12+
var PEEP_SIZE = 60;
813

9-
var GRID = [
10-
[1,1,2,1,2,1,2,1,2,1,2,0],
11-
[1,2,1,2,1,2,1,2,1,2,1,2],
12-
[1,1,2,1,2,1,2,1,2,1,2,0]
13-
];
14-
</script>
15-
<script src="../lib/Mouse.js"></script>
16-
<script src="mini.js"></script>
17-
<script src="mini_blah.js"></script>
14+
var GRID = [
15+
[1,1,2,1,2,1,2,1,2,1,2,0],
16+
[1,2,1,2,1,2,1,2,1,2,1,2],
17+
[1,1,2,1,2,1,2,1,2,1,2,0]
18+
];
19+
</script>
20+
<script src="../lib/Mouse.js"></script>
21+
<script src="mini.js"></script>
22+
<script src="mini_blah.js"></script>
23+
</body>
24+
</html>

0 commit comments

Comments
 (0)