From 67aede11956e16e5941d80b4793d9605707d7595 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <dennis@schoepf.co>
Date: Fri, 6 Aug 2021 15:29:30 +0200
Subject: [PATCH] Fix revealable positioning

---
 src/helpers.ts            | 42 ++++++++++++++++++++++++++++++++++++---
 src/scenes/DetailScene.ts | 12 ++---------
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/helpers.ts b/src/helpers.ts
index 355a4f7..0af5290 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -1,7 +1,7 @@
 import { mp5 } from '../main';
 import { SCREEN_HEIGHT, SCREEN_WIDTH } from './constants/screen';
 import { Edge } from './sketchObjects/Edge';
-import { RevealableInterface, RevealableTypes } from './sketchObjects/Revealable';
+import { Revealable, RevealableInterface, RevealableTypes } from './sketchObjects/Revealable';
 import { Coordinates, JSONSubproject, SubProject } from './types';
 
 export function getEdgeDimensions({ size }: JSONSubproject): number {
@@ -90,7 +90,43 @@ export function getRevealablesforSubproject(
     }));
 }
 
-export function generateRevealableCoords(): Coordinates[] {
+export function generateRevealableCoords(existingRevealables: Revealable[]): Coordinates {
+  let newCoords: Coordinates;
+  const existingCoordinates = existingRevealables.map(({ area }) => ({ x: area.x, y: area.y }));
+
+  do {
+    newCoords = generateRandomEdgeCoordinates();
+  } while (isColliding(newCoords, existingCoordinates));
+
+  return newCoords;
+}
+
+export function generateRevealables(revealables: RevealableInterface[]): Revealable[] {
+  let revObjs = [];
+
+  revealables.forEach((revealable) => {
+    const coordinates = generateRevealableCoords(revObjs);
+    revObjs.push({
+      revealable,
+      area: {
+        x: coordinates.x,
+        y: coordinates.y,
+        r: revealable.size < 50 ? 50 : revealable.size > 600 ? 600 : revealable.size,
+      },
+    });
+  });
+
+  return revObjs.map((revObj) => new Revealable(revObj.revealable, revObj.area));
+}
+
+/*export function generateRevealableCoords(revealables: RevealableInterface[]): Coordinates[] {
+  let revealableCoords = [];
+
+  revealables.forEach(revealable => {
+    const coordinates = generateEdgeCoords();
+  })
+
+
   const areaWidth = mp5.width / 3;
   const rowHeight = mp5.height / 2;
 
@@ -105,4 +141,4 @@ export function generateRevealableCoords(): Coordinates[] {
     { x: mp5.random(areaWidth * 2, areaWidth * 3), y: mp5.random(rowHeight, rowHeight * 2) },
     { x: mp5.random(areaWidth * 2, areaWidth * 4 - 25), y: mp5.random(rowHeight, rowHeight * 2) },
   ];
-}
+}*/
diff --git a/src/scenes/DetailScene.ts b/src/scenes/DetailScene.ts
index a7bd4ed..b0f4b21 100644
--- a/src/scenes/DetailScene.ts
+++ b/src/scenes/DetailScene.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { mp5 } from '../../main';
 import { colors } from '../constants/colors';
-import { generateRevealableCoords } from '../helpers';
+import { generateRevealables } from '../helpers';
 import { logger } from '../logger';
 import { Player } from '../sketchObjects/Player';
 import { Revealable, RevealableInterface, RevealableTypes } from '../sketchObjects/Revealable';
@@ -25,15 +25,7 @@ export class DetailScene {
     store.subscribe((state, prevState) => {
       if (!_.isEqual(state.revealables, prevState.revealables)) {
         this.revealables = state.revealables;
-        this.revealableCoords = generateRevealableCoords();
-        this.revealableObjects = this.revealables.map(
-          (revealable, i) =>
-            new Revealable(revealable, {
-              x: this.revealableCoords[i].x,
-              y: this.revealableCoords[i].y,
-              w: this.revealables[i].size,
-            })
-        );
+        this.revealableObjects = generateRevealables(this.revealables);
       }
     });
   }