Skip to content

Commit 500847e

Browse files
b-gb-g
authored
Merge pull request #167 from generative-design/pre-release
Merge branch pre-release
2 parents 5eeeafe + e4f6a40 commit 500847e

File tree

662 files changed

+183724
-2415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

662 files changed

+183724
-2415
lines changed

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
bower_components/
22
node_modules/
3-
/data/
3+
/data/P_4_2_3_supercut-media/*
4+
!/data/P_4_2_3_supercut-media/.gitkeep
5+
/data/twemoji/*
6+
!/data/twemoji/.gitkeep
7+
.DS_Store

‎01_P/P_1_0_01/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="../../libraries/p5/p5.js" type="text/javascript"></script>
6+
<script src="../../libraries/p5/p5.min.js" type="text/javascript"></script>
77

8-
<script src="../../libraries/p5/p5.dom.js" type="text/javascript"></script>
8+
<script src="../../libraries/p5/p5.dom.min.js" type="text/javascript"></script>
99
<script src="../../libraries/generative-design-library/generative-design-library.js" type="text/javascript"></script>
1010

1111
<script src="sketch.js" type="text/javascript"></script>

‎01_P/P_1_0_01/sketch.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// P_1_0_01.pde
1+
// P_1_0_01
22
//
3-
// Generative Gestaltung, ISBN: 978-3-87439-759-9
4-
// First Edition, Hermann Schmidt, Mainz, 2009
5-
// Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
6-
// Copyright 2009 Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
3+
// Generative Gestaltung – Creative Coding im Web
4+
// ISBN: 978-3-87439-902-9, First Edition, Hermann Schmidt, Mainz, 2018
5+
// Benedikt Groß, Hartmut Bohnacker, Julia Laub, Claudius Lazzeroni
6+
// with contributions by Joey Lee and Niels Poldervaart
7+
// Copyright 2018
78
//
89
// http://www.generative-gestaltung.de
910
//
@@ -31,7 +32,7 @@
3132
function setup() {
3233
createCanvas(720, 720);
3334
noCursor();
34-
35+
3536
colorMode(HSB, 360, 100, 100);
3637
rectMode(CENTER);
3738
noStroke();

‎01_P/P_1_1_1_01/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="../../libraries/p5/p5.js" type="text/javascript"></script>
6+
<script src="../../libraries/p5/p5.min.js" type="text/javascript"></script>
77

8-
<script src="../../libraries/p5/p5.dom.js" type="text/javascript"></script>
8+
<script src="../../libraries/p5/p5.dom.min.js" type="text/javascript"></script>
99
<script src="../../libraries/generative-design-library/generative-design-library.js" type="text/javascript"></script>
1010

1111
<script src="sketch.js" type="text/javascript"></script>

‎01_P/P_1_1_1_01/sketch.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// P_1_1_1_01.pde
1+
// P_1_1_1_01
22
//
3-
// Generative Gestaltung, ISBN: 978-3-87439-759-9
4-
// First Edition, Hermann Schmidt, Mainz, 2009
5-
// Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
6-
// Copyright 2009 Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
3+
// Generative Gestaltung – Creative Coding im Web
4+
// ISBN: 978-3-87439-902-9, First Edition, Hermann Schmidt, Mainz, 2018
5+
// Benedikt Groß, Hartmut Bohnacker, Julia Laub, Claudius Lazzeroni
6+
// with contributions by Joey Lee and Niels Poldervaart
7+
// Copyright 2018
78
//
89
// http://www.generative-gestaltung.de
910
//

‎01_P/P_1_1_2_01/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="../../libraries/p5/p5.js" type="text/javascript"></script>
6+
<script src="../../libraries/p5/p5.min.js" type="text/javascript"></script>
77

8-
<script src="../../libraries/p5/p5.dom.js" type="text/javascript"></script>
8+
<script src="../../libraries/p5/p5.dom.min.js" type="text/javascript"></script>
99
<script src="../../libraries/generative-design-library/generative-design-library.js" type="text/javascript"></script>
1010

1111
<script src="sketch.js" type="text/javascript"></script>

‎01_P/P_1_1_2_01/sketch.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// P_1_1_2_01.pde
1+
// P_1_1_2_01
22
//
3-
// Generative Gestaltung, ISBN: 978-3-87439-759-9
4-
// First Edition, Hermann Schmidt, Mainz, 2009
5-
// Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
6-
// Copyright 2009 Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
3+
// Generative Gestaltung – Creative Coding im Web
4+
// ISBN: 978-3-87439-902-9, First Edition, Hermann Schmidt, Mainz, 2018
5+
// Benedikt Groß, Hartmut Bohnacker, Julia Laub, Claudius Lazzeroni
6+
// with contributions by Joey Lee and Niels Poldervaart
7+
// Copyright 2018
78
//
89
// http://www.generative-gestaltung.de
910
//
@@ -45,7 +46,7 @@ function draw() {
4546

4647
beginShape(TRIANGLE_FAN);
4748
vertex(width / 2, height / 2);
48-
49+
4950
for (var angle = 0; angle <= 360; angle += angleStep) {
5051
var vx = width / 2 + cos(radians(angle)) * radius;
5152
var vy = height / 2 + sin(radians(angle)) * radius;

‎01_P/P_1_2_1_01/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="../../libraries/p5/p5.js" type="text/javascript"></script>
6+
<script src="../../libraries/p5/p5.min.js" type="text/javascript"></script>
77

8-
<script src="../../libraries/p5/p5.dom.js" type="text/javascript"></script>
8+
<script src="../../libraries/p5/p5.dom.min.js" type="text/javascript"></script>
99
<script src="../../libraries/generative-design-library/generative-design-library.js" type="text/javascript"></script>
1010

1111
<script src="sketch.js" type="text/javascript"></script>

‎01_P/P_1_2_1_01/sketch.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// P_1_2_1_01.pde
1+
// P_1_2_1_01
22
//
3-
// Generative Gestaltung, ISBN: 978-3-87439-759-9
4-
// First Edition, Hermann Schmidt, Mainz, 2009
5-
// Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
6-
// Copyright 2009 Hartmut Bohnacker, Benedikt Gross, Julia Laub, Claudius Lazzeroni
3+
// Generative Gestaltung – Creative Coding im Web
4+
// ISBN: 978-3-87439-902-9, First Edition, Hermann Schmidt, Mainz, 2018
5+
// Benedikt Groß, Hartmut Bohnacker, Julia Laub, Claudius Lazzeroni
6+
// with contributions by Joey Lee and Niels Poldervaart
7+
// Copyright 2018
78
//
89
// http://www.generative-gestaltung.de
910
//

‎01_P/P_1_2_2_01/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta charset="UTF-8">
55
<title></title>
6-
<script src="../../libraries/p5/p5.js" type="text/javascript"></script>
6+
<script src="../../libraries/p5/p5.min.js" type="text/javascript"></script>
77

8-
<script src="../../libraries/p5/p5.dom.js" type="text/javascript"></script>
8+
<script src="../../libraries/p5/p5.dom.min.js" type="text/javascript"></script>
99
<script src="../../libraries/generative-design-library/generative-design-library.js" type="text/javascript"></script>
1010
<script src="../../libraries/chroma-js/chroma.js" type="text/javascript"></script>
1111

0 commit comments

Comments
 (0)