Implement basic contributor class

metadata/project.json

@@ -5,7 +5,11 @@
       "path": "packages/block",
       "size": 2450,
       "contents": {
-        "contributors": [],
+        "contributors": [
+          {
+            "name": "Peter Dunne"
+          }
+        ],
         "legacy": [],
         "packages": [
           {

src/scenes/DetailScene.ts

@@ -34,7 +34,7 @@ export class DetailScene {
     this.player.follow();
 
     this.contributors.forEach((contributor) => {
-      contributor.place();
+      contributor.draw();
     });
     this.legacy.forEach((legacyObj) => {
       legacyObj.place();

src/sketchObjects/Contributor.ts

@@ -1,22 +1,93 @@
+import { combineLatest, map } from 'rxjs';
 import { mp5 } from '../../main';
+import { playerHead$, areasColliding, revealedArea$ } from '../area';
 import { colors } from '../constants/colors';
+import store from '../store';
+
+enum ContribStates {
+  HIDDEN = 'HIDDEN',
+  REVEALED = 'REVEALED',
+  ACTIVE = 'ACTIVE',
+  INACTIVE = 'INACTIVE',
+}
 
 export class Contributor {
   x: number;
   y: number;
   size: number;
+  currentSize: number;
+  startSize: number = 5;
   name: string;
-  profileURL: string;
+  url: string;
-  revealed: boolean;
+  messageContents: string;
+  wasTouched: boolean = false;
+  wasInteractedWith: boolean = false;
+  hover: boolean = false;
+  contribState: ContribStates = ContribStates.HIDDEN;
 
-  constructor(x: number, y: number, size: number, name?: string, profileURL?: string) {
+  constructor(
+    x: number,
+    y: number,
+    size: number,
+    name?: string,
+    messageContents?: string,
+    packageURL?: string
+  ) {
     this.x = x;
     this.y = y;
     this.size = size;
+    this.name = name;
+    this.url = packageURL;
+    this.currentSize = this.startSize;
+    this.messageContents = messageContents;
+
+    combineLatest([revealedArea$, playerHead$]).subscribe(([revealedArea, playerHead]) => {
+      const isRevealed = areasColliding(
+        { x: this.x, y: this.y, w: this.currentSize },
+        revealedArea
+      );
+
+      if (isRevealed) {
+        this.contribState = ContribStates.REVEALED;
+      } else {
+        this.contribState = ContribStates.HIDDEN;
       }
 
-  public place() {
+      // console.log(this.packageState);
-    mp5.fill(mp5.color(colors.blueGrey));
+    });
-    mp5.ellipse(this.x, this.y, this.size);
+  }
+
+  public draw() {
+    mp5.noStroke();
+    mp5.rectMode('center');
+    mp5.ellipseMode('center');
+
+    if (this.contribState === ContribStates.HIDDEN) {
+    } else if (this.contribState === ContribStates.REVEALED) {
+      mp5.arc(this.x, this.y, this.size, 80, 0, mp5.PI + mp5.QUARTER_PI, mp5.CHORD);
+    } else if (this.contribState === ContribStates.ACTIVE) {
+      // Check if mouse is over the squares, if so animate and enable click
+      const mouseOverShape = areasColliding(
+        { x: mp5.mouseX, y: mp5.mouseY, w: 70 },
+        { x: this.x, y: this.y, w: this.currentSize }
+      );
+
+      if (mouseOverShape) {
+        this.hover = true;
+      } else {
+        this.hover = false;
+      }
+    } else if (this.contribState === ContribStates.INACTIVE) {
+    }
+  }
+
+  public onClick() {
+    if (this.hover && !this.wasInteractedWith) {
+      this.wasInteractedWith = true;
+      store.getState().addInfoMessage({
+        headline: this.name,
+        innerHTML: this.messageContents,
+      });
+    }
   }
 }