react-simple-game-engine 0.0.60 → 0.0.63

package/lib/classes/p5.d.ts

@@ -1,8 +1,9 @@
 import p5 from "p5";
 declare type ItemWithPercent<I> = [I, number];
 declare type LastItem<I> = [I];
-declare type Collection<I> = [...ItemWithPercent<I>[], LastItem<I>];
+export declare type Collection<I> = [...ItemWithPercent<I>[], LastItem<I>];
 export declare class P5 extends p5 {
+    constructor(sketch: (p5: P5) => void);
     choose<I = any>(collection: Collection<I>): I;
 }
 export {};

package/lib/classes/p5.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"p5.d.ts","sourceRoot":"","sources":["../../src/classes/p5.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACtC,aAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvB,aAAK,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5D,qBAAa,EAAG,SAAQ,EAAE;IACxB,MAAM,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;CA8B9C"}
+{"version":3,"file":"p5.d.ts","sourceRoot":"","sources":["../../src/classes/p5.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACtC,aAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvB,oBAAY,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnE,qBAAa,EAAG,SAAQ,EAAE;gBACZ,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,IAAI;IAKpC,MAAM,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;CAkC9C"}

package/lib/classes/p5.js

@@ -16,8 +16,10 @@ var __extends = (this && this.__extends) || (function () {
 import p5 from "p5";
 var P5 = /** @class */ (function (_super) {
     __extends(P5, _super);
-    function P5() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function P5(sketch) {
+        var _this = _super.call(this, sketch) || this;
+        window.Renderer = _this;
+        return _this;
     }
     P5.prototype.choose = function (collection) {
         var lastItem = collection[collection.length - 1];
@@ -25,21 +27,21 @@ var P5 = /** @class */ (function (_super) {
         var totalPercentsOfRestItems = restItems.reduce(function (t, item) {
             return t + item[1];
         }, 0);
-        if (totalPercentsOfRestItems > 100) {
-            var overmax = totalPercentsOfRestItems - 100;
-            var avg = 100 / restItems.length;
+        if (totalPercentsOfRestItems > 1) {
+            var overmax = totalPercentsOfRestItems - 1;
+            var avg = 1 / restItems.length;
             for (var _i = 0, restItems_1 = restItems; _i < restItems_1.length; _i++) {
                 var item = restItems_1[_i];
                 if (item[1] > avg) {
                     item[1] -= overmax;
                 }
             }
-            totalPercentsOfRestItems = 100;
+            totalPercentsOfRestItems = 1;
         }
-        lastItem[1] = 100 - totalPercentsOfRestItems;
+        lastItem[1] = 1 - totalPercentsOfRestItems;
         var items = [];
         var _loop_1 = function (item, percent) {
-            Array.from({ length: Math.round(percent) }).forEach(function (_, i) {
+            Array.from({ length: Math.round(percent) * 10 }).forEach(function (_, i) {
                 items.push(item);
             });
         };
@@ -47,7 +49,9 @@ var P5 = /** @class */ (function (_super) {
             var _b = collection_1[_a], item = _b[0], percent = _b[1];
             _loop_1(item, percent);
         }
-        return this.random(this.shuffle(items));
+        this.shuffle(items, true);
+        console.log("Collection generated: ", items);
+        return this.random(items);
     };
     return P5;
 }(p5));

package/lib/export-types.d.ts

@@ -2,6 +2,7 @@ import { Entity } from "./classes/entities/entity";
 import { Sprite } from "./classes/sprites/sprite";
 import type { Body, IChamferableBodyDefinition } from "matter-js";
 import { Initialler } from "./export-interfaces";
+export type { Collection } from "./classes/p5";
 export declare type Sound = HTMLAudioElement;
 export declare type Avatar = ReturnType<import("./classes/p5").P5["loadImage"]>;
 export declare type Color = [number, number, number, number?];

package/lib/export-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-types.d.ts","sourceRoot":"","sources":["../src/export-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElD,OAAO,KAAK,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,oBAAY,KAAK,GAAG,gBAAgB,CAAC;AACrC,oBAAY,MAAM,GAAG,UAAU,CAAC,OAAO,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AACxE,oBAAY,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEtD,oBAAY,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;AAC/D,oBAAY,UAAU,GAAG,IAAI,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,WAAW,CAAC,EAAE,0BAA0B,CAAC;CAC1C,CAAC;AAEF,oBAAY,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;IAE5C,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7C,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,OAAO,2BAA2B,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,oBAAY,UAAU,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IACpD;IACE,QAAQ,CAAC,CAAC;CACX,GACD,CAAC;IAAE,QAAQ,CAAC,CAAA;CAAE,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"export-types.d.ts","sourceRoot":"","sources":["../src/export-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElD,OAAO,KAAK,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,oBAAY,KAAK,GAAG,gBAAgB,CAAC;AACrC,oBAAY,MAAM,GAAG,UAAU,CAAC,OAAO,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AACxE,oBAAY,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEtD,oBAAY,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;AAC/D,oBAAY,UAAU,GAAG,IAAI,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,WAAW,CAAC,EAAE,0BAA0B,CAAC;CAC1C,CAAC;AAEF,oBAAY,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;IAE5C,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7C,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,OAAO,2BAA2B,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,oBAAY,UAAU,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IACpD;IACE,QAAQ,CAAC,CAAC;CACX,GACD,CAAC;IAAE,QAAQ,CAAC,CAAA;CAAE,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/lib/ui-components/Sketch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sketch.d.ts","sourceRoot":"","sources":["../../src/ui-components/Sketch.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,aAAK,WAAW,GAAG;IACjB,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,MAAM,CAAC,EACrB,OAAO,EACP,MAAM,EACN,SAAS,EACT,KAAK,EACL,MAAM,GACP,EAAE,WAAW,eAgDb"}
+{"version":3,"file":"Sketch.d.ts","sourceRoot":"","sources":["../../src/ui-components/Sketch.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,aAAK,WAAW,GAAG;IACjB,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,MAAM,CAAC,EACrB,OAAO,EACP,MAAM,EACN,SAAS,EACT,KAAK,EACL,MAAM,GACP,EAAE,WAAW,eAgCb"}

package/lib/ui-components/Sketch.js

@@ -7,17 +7,15 @@ export function Sketch(_a) {
     var refContainer = useRef(null);
     useEffect(function () {
         var sketch = function (s) {
-            window.Renderer = s;
-            var camera;
+            var camera = new Camera(width, height);
+            //@ts-ignore
+            window.camera = camera;
             s.preload = function () {
                 return onPreload === null || onPreload === void 0 ? void 0 : onPreload();
             };
             s.setup = function () {
-                camera = new Camera(width, height);
                 s.createCanvas(width, height).parent(refContainer.current);
                 onSetup(camera);
-                //@ts-ignore
-                window.camera = camera;
             };
             s.draw = function () {
                 s.scale(camera.scaleX, camera.scaleY);
@@ -25,18 +23,6 @@ export function Sketch(_a) {
                 s.imageMode(s.CENTER);
                 s.rectMode(s.CENTER);
                 onDraw();
-                // if (s.keyIsDown(s.DOWN_ARROW)) {
-                //   camera.y += 2;
-                // }
-                // if (s.keyIsDown(s.UP_ARROW)) {
-                //   camera.y -= 2;
-                // }
-                // if (s.keyIsDown(s.LEFT_ARROW)) {
-                //   camera.x -= 2;
-                // }
-                // if (s.keyIsDown(s.RIGHT_ARROW)) {
-                //   camera.x += 2;
-                // }
             };
         };
         new P5(sketch);

package/lib/utils.js

@@ -94,19 +94,3 @@ export function copyProperties(source, target) {
         }
     }
 }
-function shuffle(array) {
-    var _a;
-    var currentIndex = array.length, randomIndex;
-    // While there remain elements to shuffle.
-    while (currentIndex != 0) {
-        // Pick a remaining element.
-        randomIndex = Math.floor(Math.random() * currentIndex);
-        currentIndex--;
-        // And swap it with the current element.
-        _a = [
-            array[randomIndex],
-            array[currentIndex],
-        ], array[currentIndex] = _a[0], array[randomIndex] = _a[1];
-    }
-    return array;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-simple-game-engine",
-  "version": "0.0.60",
+  "version": "0.0.63",
   "description": "",
   "main": "lib/index.js",
   "types": "lib",