Merge branch 'release/v1.6.2'

app/Changelog.md

@@ -1,3 +1,21 @@
+## v1.6.2
+
+*Wed Mar 31 2021*
+
+### ⚡️ General Improvements
+
+* Add JS map files for pixi.js
+* Update pixi.js to v5.3.8
+
+### 🐛 Bug Fixes
+
+* :bento: Fix 2DPhysics example
+
+### 🐉 Misc
+
+* Revert "Modify emitter tandems to use ParticleContainer"
+  This reverts commit b8a47f4273fb08e8377c5489ef8e30464bf41845.
+
 ## v1.6.1
 
 *Sun Mar 29 2021*

app/data/ct.release/emitters.js

@@ -32,7 +32,7 @@
  * @property {Copy|DisplayObject} follow A copy to follow
  * @extends PIXI.Container
  */
-class EmitterTandem extends PIXI.ParticleContainer {
+class EmitterTandem extends PIXI.Container {
     /**
      * Creates a new emitter tandem. This method should not be called directly;
      * better use the methods of `ct.emitters`.
@@ -41,19 +41,7 @@ class EmitterTandem extends PIXI.ParticleContainer {
      * @constructor
      */
     constructor(tandemData, opts) {
-        let batchSize = 0;
-        for (const emt of tandemData) {
-            batchSize += Math.min(
-                emt.settings.maxParticles,
-                emt.settings.lifetime.max / emt.settings.frequency
-            );
-        }
-        super(batchSize, {
-            vertices: true,
-            position: true,
-            rotation: true,
-            tint: true
-        });
+        super();
         this.emitters = [];
         this.delayed = [];
 
@@ -96,7 +84,6 @@ class EmitterTandem extends PIXI.ParticleContainer {
         this.deltaPosition = opts.position;
         this.depth = opts.depth;
         this.paused = this.frozen = false;
-        this.tint = opts.tint;
 
         if (this.isUi) {
             ct.emitters.uiTandems.push(this);
@@ -229,7 +216,7 @@ class EmitterTandem extends PIXI.ParticleContainer {
             x: 1,
             y: 1
         },
-        tint: 0xff0fff,
+        tint: 0xffffff,
         alpha: 1,
         position: {
             x: 0,

app/package.json

@@ -2,7 +2,7 @@
   "main": "index.html",
   "name": "ctjs",
   "description": "ct.js — a free 2D game engine",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "homepage": "https://ctjs.rocks/",
   "author": {
     "name": "Cosmo Myzrail Gorynych",

comigojiChangelog.js

@@ -25,13 +25,13 @@ module.exports = new Promise((resolve, reject) => {
                 branch: 'v1.x'
             }, {
                 since,
-                repo: './docs',
+                repo: './../docs.ctjs.rocks',
                 branch: 'master',
                 forceCategory: 'docs',
                 forceCategoryStrip: /^:(books|pencil|pencil2|memo):/
             }, {
                 since,
-                repo: './../docs.ctjs.rocks',
+                repo: './../ctjs-site',
                 branch: 'master',
                 forceCategory: 'website'
             }],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctjsbuildenvironment",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "",
   "directories": {
     "doc": "docs"

src/examples/2DPhysics.ict

@@ -1,4 +1,4 @@
-ctjsVersion: 1.5.1
+ctjsVersion: 1.6.1
 notes: /* empty */
 libs:
   fittoscreen:
@@ -8,67 +8,6 @@ libs:
   matter:
     matterUseStaticDeltaTime: true
 textures:
-  - name: Star
-    untill: 0
-    grid:
-      - 1
-      - 1
-    axis:
-      - 64.5
-      - 67.5
-    marginx: 0
-    marginy: 0
-    imgWidth: 128
-    imgHeight: 128
-    width: 128
-    height: 128
-    offx: 0
-    offy: 0
-    origname: ibfbb5de9-367a-438a-8cab-ea88479c51be.png
-    shape: strip
-    left: 0
-    right: 787
-    top: 0
-    bottom: 692
-    uid: bfbb5de9-367a-438a-8cab-ea88479c51be
-    padding: 1
-    source: 'D:\JettyCat\img\[email protected]'
-    lastmod: 1615542695704
-    stripPoints:
-      - x: -0.75
-        'y': -65.75
-      - x: 11
-        'y': -58.25
-      - x: 24
-        'y': -33.25
-      - x: 60.75
-        'y': -24.5
-      - x: 64.5
-        'y': -10
-      - x: 39.75
-        'y': 15.25
-      - x: 44.25
-        'y': 49.25
-      - x: 29
-        'y': 59.75
-      - x: -0.5
-        'y': 42.75
-      - x: -29.921346167118823
-        'y': 59.885763470431215
-      - x: -45.2195710804483
-        'y': 49.45615108543885
-      - x: -40.87630005786883
-        'y': 15.43577488492599
-      - x: -65.74239608827918
-        'y': -9.699902313160635
-      - x: -62.05925582802869
-        'y': -24.21702936445152
-      - x: -25.349968411049232
-        'y': -33.13629039536623
-      - x: -12.465313208428675
-        'y': -58.19593245804509
-    closedStrip: true
-    symmetryStrip: true
   - name: WoodenPlank
     untill: 0
     grid:

src/node_requires/exporter/index.js

@@ -146,8 +146,10 @@ const exportCtProject = async (project, projdir, production) => {
     /* Pixi.js */
     if (settings.rendering.usePixiLegacy) {
         await fs.copyFile(basePath + 'ct.release/pixi-legacy.min.js', path.join(writeDir, '/pixi.min.js'));
+        await fs.copyFile(basePath + 'ct.release/pixi-legacy.min.js.map', path.join(writeDir, '/pixi-legacy.min.js.map'));
     } else {
         await fs.copyFile(basePath + 'ct.release/pixi.min.js', path.join(writeDir, '/pixi.min.js'));
+        await fs.copyFile(basePath + 'ct.release/pixi.min.js.map', path.join(writeDir, '/pixi.min.js.map'));
     }
     if (project.emitterTandems && project.emitterTandems.length) {
         await fs.copyFile(basePath + 'ct.release/pixi-particles.min.js', path.join(writeDir, '/pixi-particles.min.js'));
@@ -287,11 +289,11 @@ const exportCtProject = async (project, projdir, production) => {
     /* eslint-enable require-atomic-updates */
 
     /* passthrough copy of files in the `include` folder */
-    if (await fs.exists(projdir + '/include/')) {
+    if (await fs.pathExists(projdir + '/include/')) {
         await fs.copy(projdir + '/include/', writeDir);
     }
     await Promise.all(Object.keys(project.libs).map(async lib => {
-        if (await fs.exists(path.join(basePath, `./ct.libs/${lib}/includes/`))) {
+        if (await fs.pathExists(path.join(basePath, `./ct.libs/${lib}/includes/`))) {
             await fs.copy(path.join(basePath, `./ct.libs/${lib}/includes/`), writeDir);
         }
     }));