Updates for errors

uclaconditional · Aug 11, 2019 · dc90a70 · dc90a70
1 parent e74097d
commit dc90a70
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore this stuff
+.DS_Store
diff --git a/TTZ-190811/Outline-01.txt b/TTZ-190811/Outline-01.txt
@@ -2,19 +2,21 @@
 
 Processing: https://processing.org/download/
 
-All code files: https://we.tl/t-01mnxf6Yev
+All code files: https://github.com/uclaconditional/workshops/tree/master/TTZ-190811
+
+Watch, code, etc.
 
 //
 
-1. Processing Basics
-3. Form + Code 
-4. Zine Assembly
+- Processing Basics
+- Form + Code 
+- Zine Assembly
 
 //
 
 PROCESSING BASICS
 
-- Play / Stop
+- Play
   . size(width, height)
 - Sketchbook
 - Reference
@@ -26,7 +28,7 @@ FORM + CODE
 1 - Line
     . Statement
       - background(gray)
-      - line(x, y, width, height)
+      - line(x1, y1, x2, y2)
     . PDF Export Library
     . Drawing properties
       - background(r, g, b)

diff --git a/TTZ-190811/code/Bonus/RandomBook/RandomBook.pdf b/TTZ-190811/code/Bonus/RandomBook/RandomBook.pdf
diff --git a/TTZ-190811/code/Page_01/TTZ_P1_02/page_1.pdf b/TTZ-190811/code/Page_01/TTZ_P1_02/page_1.pdf
diff --git a/TTZ-190811/code/Page_01/TTZ_P1_03/page_1.pdf b/TTZ-190811/code/Page_01/TTZ_P1_03/page_1.pdf
diff --git a/TTZ-190811/code/Page_02/TTZ_P2_01/page_2.pdf b/TTZ-190811/code/Page_02/TTZ_P2_01/page_2.pdf
diff --git a/TTZ-190811/code/Page_02/TTZ_P2_02/page_2.pdf b/TTZ-190811/code/Page_02/TTZ_P2_02/page_2.pdf
diff --git a/TTZ-190811/code/Page_03/TTZ_P3_01/page_3.pdf b/TTZ-190811/code/Page_03/TTZ_P3_01/page_3.pdf
diff --git a/TTZ-190811/code/Page_04/TTZ_P4_01/page_4.pdf b/TTZ-190811/code/Page_04/TTZ_P4_01/page_4.pdf
diff --git a/TTZ-190811/code/Page_05/TTZ_P5_01/page_5.pdf b/TTZ-190811/code/Page_05/TTZ_P5_01/page_5.pdf
diff --git a/TTZ-190811/code/Page_05/TTZ_P5_02/page_5.pdf b/TTZ-190811/code/Page_05/TTZ_P5_02/page_5.pdf
diff --git a/TTZ-190811/code/Page_05/TTZ_P5_03/TTZ_P5_03.pde b/TTZ-190811/code/Page_05/TTZ_P5_03/TTZ_P5_03.pde
@@ -4,8 +4,12 @@ import processing.pdf.*;
 
 size(396, 612);
 beginRecord(PDF, "page_5.pdf");
-background(255);
-for (int i = 0; i < 100; i++) {
+int r = int(random(255));
+int g = int(random(255));
+int b = int(random(255));
+background(r, g, b);
+int num = int(random(10, 1000));
+for (int i = 0; i < num; i = i+1) {
   float x1 = random(0, width);
   float y1 = random(0, height);
   float x2 = random(0, width);

diff --git a/TTZ-190811/code/Page_05/TTZ_P5_03/page_5.pdf b/TTZ-190811/code/Page_05/TTZ_P5_03/page_5.pdf
diff --git a/TTZ-190811/code/Page_06/TTZ_P6_02/TTZ_P6_02.pde b/TTZ-190811/code/Page_06/TTZ_P6_02/TTZ_P6_02.pde
@@ -16,4 +16,5 @@ void draw() {
 
 void keyPressed() {
   endRecord(); 
+  exit();
 }
diff --git a/TTZ-190811/code/Page_06/TTZ_P6_02/page_6.pdf b/TTZ-190811/code/Page_06/TTZ_P6_02/page_6.pdf
diff --git a/TTZ-190811/code/Page_Cover/TTZ_Cover_01/cover.pdf b/TTZ-190811/code/Page_Cover/TTZ_Cover_01/cover.pdf
diff --git a/TTZ-190811/code/Page_Cover/TTZ_Cover_03/cover.pdf b/TTZ-190811/code/Page_Cover/TTZ_Cover_03/cover.pdf
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,5 @@ void draw() { @@
     void keyPressed() {
       endRecord();
+      exit();
     }