Add objects, object movement

WKHAllen · WKHAllen · commit 5e3308503b9b · 2019-11-02T02:16:37.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+.vscode
 node_modules
 todo.txt
diff --git a/src/index.js b/src/index.js
@@ -10,11 +10,11 @@ var app = express();
 app.use(express.static(path.join(__dirname, publicDir)));
 
 app.use((req, res, next) => {
-    res.status(404).sendFile(path.join(__dirname, errorDir, '404.html'));
+    res.status(404).sendFile(path.join(errorDir, '404.html'));
 });
 
 app.use((err, req, res, next) => {
-    res.status(500).sendFile(path.join(__dirname, errorDir, '500.html'));
+    res.status(500).sendFile(path.join(errorDir, '500.html'));
 });
 
 app.listen(port, () => {
diff --git a/src/public/bin.js b/src/public/bin.js
@@ -1,5 +1,14 @@
 class Bin {
-    constructor() {
-        
+    constructor(binType, x, y, width, height) {
+        this.type = binType;
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+        this.items = [];
+    }
+
+    draw() {
+        rect(this.x, this.y, this.width, this.height);
     }
 }
diff --git a/src/public/index.html b/src/public/index.html
@@ -1 +1,13 @@
-<!-- TODO: create webpage structure -->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Go Recycle!</title>
+        <link rel="stylesheet" type="text/css" href="main.css">
+        <script type="text/javascript" src="trash.js"></script>
+        <script type="text/javascript" src="bin.js"></script>
+        <script type="text/javascript" src="main.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js" integrity="sha256-WVsM3xrcqyuFNF3W1qtIKbHFsD0977nDQA8DCMp1zCw=" crossorigin="anonymous"></script>
+    </head>
+    <body>
+    </body>
+</html>
diff --git a/src/public/main.js b/src/public/main.js
@@ -1 +1,19 @@
-// TODO: build sketch
+var trash;
+var bin;
+
+function setup() {
+    createCanvas(800, 600);
+    trash = new Trash();
+    bin = new Bin(trashNames[0], width - 50, 10, 40, 40);
+}
+
+function draw() {
+    background(220);
+    if (trash.moveToward(bin)) {
+        bin.draw();
+        trash.draw();
+    } else {
+        // now trash is in the bin
+        console.log('reached the bin!');
+    }
+}
diff --git a/src/public/trash.js b/src/public/trash.js
@@ -1,5 +1,70 @@
+const movementConstant = 20;
+
+const trashNames = {
+    'plastic/metal': [
+
+    ],
+    'cardboard': [
+
+    ],
+    'paper': [
+
+    ],
+    'landfill': [
+
+    ],
+    'compost': [
+
+    ]
+};
+
+function randomTrashType() {
+    var trashTypes = Object.keys(trashNames);
+    return trashTypes[Math.floor(Math.random() * trashTypes.length)];
+}
+
+function randomTrashName(trashType) {
+    var trashTypeNames = trashNames[trashType];
+    return trashTypeNames[Math.floor(Math.random() * trashTypeNames.length)];
+}
+
 class Trash {
     constructor() {
-        
+        this.type = randomTrashType();
+        this.name = randomTrashName(this.type);
+        this.x = width / 2;
+        this.y = height - 10;
+        this.scale = 1;
+    }
+
+    moveToward(bin) {
+        if (this.x === bin.x && this.y === bin.y) return false;
+        var angle = Math.atan((this.y - bin.y) / (bin.x - this.x));
+        if (angle < 0) angle += Math.PI;
+        var newX = this.x + movementConstant * Math.cos(angle);
+        var newY = this.y - movementConstant * Math.sin(angle);
+        var distFromPrev = Math.sqrt((newX - this.x) ** 2 + (newY - this.y) ** 2);
+        var distFromBin = Math.sqrt((newX - bin.x) ** 2 + (newY - bin.y) ** 2);
+        if (distFromBin >= distFromPrev) {
+            this.x = newX;
+            this.y = newY;
+            return true;
+        } else {
+            this.x = bin.x;
+            this.y = bin.y;
+            return false;
+        }
+    }
+
+    draw() {
+        rect(this.x, this.y, 10, 10);
+    }
+
+    inCorrectBin(bin) {
+        return this.type === bin.type;
+    }
+
+    putInBin(bin) {
+        bin.items.push(this);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+.vscode`
`1`	`2`	`node_modules`
`2`	`3`	`todo.txt`