v1.1.1: fix serializing chain with loop

piqnt · Nov 30, 2024 · 0e58a85 · 0e58a85
1 parent b4d7ffa
commit 0e58a85
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 39 deletions.
diff --git a/dist/planck-with-testbed.js b/dist/planck-with-testbed.js
@@ -2,7 +2,7 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.planck = {}));
 })(this, function(exports2) {
   "use strict";/**
- * Planck.js v1.1.0
+ * Planck.js v1.1.1
  * @license The MIT license
  * @copyright Copyright (c) 2024 Erin Catto, Ali Shakiba
  *
@@ -6782,7 +6782,7 @@
       ChainShape2.prototype._serialize = function() {
         var data = {
           type: this.m_type,
-          vertices: this.m_vertices,
+          vertices: this.m_isLoop ? this.m_vertices.slice(0, this.m_vertices.length - 1) : this.m_vertices,
           isLoop: this.m_isLoop,
           hasPrevVertex: this.m_hasPrevVertex,
           hasNextVertex: this.m_hasNextVertex,
@@ -6844,19 +6844,20 @@
           vertices[i - 1];
           vertices[i];
         }
+        this.m_vertices = [];
         this.m_count = vertices.length;
         for (var i = 0; i < vertices.length; ++i) {
           this.m_vertices[i] = Vec2.clone(vertices[i]);
         }
-        this.m_hasPrevVertex = false;
-        this.m_hasNextVertex = false;
         this.m_prevVertex = null;
         this.m_nextVertex = null;
+        this.m_hasPrevVertex = false;
+        this.m_hasNextVertex = false;
         return this;
       };
       ChainShape2.prototype._reset = function() {
         if (this.m_isLoop) {
-          this._createLoop(this.m_vertices);
+          this._createLoop(this.m_vertices.slice(0, this.m_vertices.length - 1));
         } else {
           this._createChain(this.m_vertices);
         }

diff --git a/dist/planck-with-testbed.js.map b/dist/planck-with-testbed.js.map
diff --git a/dist/planck-with-testbed.min.js b/dist/planck-with-testbed.min.js
diff --git a/dist/planck-with-testbed.min.js.map b/dist/planck-with-testbed.min.js.map
diff --git a/dist/planck-with-testbed.mjs b/dist/planck-with-testbed.mjs
@@ -1,5 +1,5 @@
 /**
- * Planck.js v1.1.0
+ * Planck.js v1.1.1
  * @license The MIT license
  * @copyright Copyright (c) 2024 Erin Catto, Ali Shakiba
  *
@@ -6778,7 +6778,7 @@ var ChainShape = (
     ChainShape2.prototype._serialize = function() {
       var data = {
         type: this.m_type,
-        vertices: this.m_vertices,
+        vertices: this.m_isLoop ? this.m_vertices.slice(0, this.m_vertices.length - 1) : this.m_vertices,
         isLoop: this.m_isLoop,
         hasPrevVertex: this.m_hasPrevVertex,
         hasNextVertex: this.m_hasNextVertex,
@@ -6840,19 +6840,20 @@ var ChainShape = (
         vertices[i - 1];
         vertices[i];
       }
+      this.m_vertices = [];
       this.m_count = vertices.length;
       for (var i = 0; i < vertices.length; ++i) {
         this.m_vertices[i] = Vec2.clone(vertices[i]);
       }
-      this.m_hasPrevVertex = false;
-      this.m_hasNextVertex = false;
       this.m_prevVertex = null;
       this.m_nextVertex = null;
+      this.m_hasPrevVertex = false;
+      this.m_hasNextVertex = false;
       return this;
     };
     ChainShape2.prototype._reset = function() {
       if (this.m_isLoop) {
-        this._createLoop(this.m_vertices);
+        this._createLoop(this.m_vertices.slice(0, this.m_vertices.length - 1));
       } else {
         this._createChain(this.m_vertices);
       }

diff --git a/dist/planck-with-testbed.mjs.map b/dist/planck-with-testbed.mjs.map
diff --git a/dist/planck.js b/dist/planck.js
diff --git a/dist/planck.js.map b/dist/planck.js.map
diff --git a/dist/planck.min.js b/dist/planck.min.js
diff --git a/dist/planck.min.js.map b/dist/planck.min.js.map
diff --git a/dist/planck.mjs b/dist/planck.mjs
@@ -1,5 +1,5 @@
 /**
- * Planck.js v1.1.0
+ * Planck.js v1.1.1
  * @license The MIT license
  * @copyright Copyright (c) 2024 Erin Catto, Ali Shakiba
  *
@@ -6778,7 +6778,7 @@ var ChainShape = (
     ChainShape2.prototype._serialize = function() {
       var data = {
         type: this.m_type,
-        vertices: this.m_vertices,
+        vertices: this.m_isLoop ? this.m_vertices.slice(0, this.m_vertices.length - 1) : this.m_vertices,
         isLoop: this.m_isLoop,
         hasPrevVertex: this.m_hasPrevVertex,
         hasNextVertex: this.m_hasNextVertex,
@@ -6840,19 +6840,20 @@ var ChainShape = (
         vertices[i - 1];
         vertices[i];
       }
+      this.m_vertices = [];
       this.m_count = vertices.length;
       for (var i = 0; i < vertices.length; ++i) {
         this.m_vertices[i] = Vec2.clone(vertices[i]);
       }
-      this.m_hasPrevVertex = false;
-      this.m_hasNextVertex = false;
       this.m_prevVertex = null;
       this.m_nextVertex = null;
+      this.m_hasPrevVertex = false;
+      this.m_hasNextVertex = false;
       return this;
     };
     ChainShape2.prototype._reset = function() {
       if (this.m_isLoop) {
-        this._createLoop(this.m_vertices);
+        this._createLoop(this.m_vertices.slice(0, this.m_vertices.length - 1));
       } else {
         this._createChain(this.m_vertices);
       }

diff --git a/dist/planck.mjs.map b/dist/planck.mjs.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "planck",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "2D JavaScript/TypeScript physics engine for cross-platform HTML5 game development",
   "homepage": "https://github.com/piqnt/planck.js",
   "keywords": [

diff --git a/src/collision/shape/ChainShape.ts b/src/collision/shape/ChainShape.ts
@@ -86,7 +86,7 @@ export class ChainShape extends Shape {
   _serialize(): object {
     const data = {
       type: this.m_type,
-      vertices: this.m_vertices,
+      vertices: this.m_isLoop ? this.m_vertices.slice(0, this.m_vertices.length - 1) : this.m_vertices,
       isLoop: this.m_isLoop,
       hasPrevVertex: this.m_hasPrevVertex,
       hasNextVertex: this.m_hasNextVertex,
@@ -138,7 +138,6 @@ export class ChainShape extends Shape {
    * Create a loop. This automatically adjusts connectivity.
    *
    * @param vertices an array of vertices, these are copied
-   * @param count the vertex count
    */
   _createLoop(vertices: Vec2Value[]): ChainShape {
     _ASSERT && console.assert(this.m_vertices.length == 0 && this.m_count == 0);
@@ -178,28 +177,29 @@ export class ChainShape extends Shape {
     _ASSERT && console.assert(this.m_vertices.length == 0 && this.m_count == 0);
     _ASSERT && console.assert(vertices.length >= 2);
     for (let i = 1; i < vertices.length; ++i) {
-      // If the code crashes here, it means your vertices are too close together.
       const v1 = vertices[i - 1];
       const v2 = vertices[i];
+      // If the code crashes here, it means your vertices are too close together.
       _ASSERT && console.assert(Vec2.distanceSquared(v1, v2) > Settings.linearSlopSquared);
     }
 
+    this.m_vertices = [];
     this.m_count = vertices.length;
     for (let i = 0; i < vertices.length; ++i) {
       this.m_vertices[i] = Vec2.clone(vertices[i]);
     }
 
-    this.m_hasPrevVertex = false;
-    this.m_hasNextVertex = false;
     this.m_prevVertex = null;
     this.m_nextVertex = null;
+    this.m_hasPrevVertex = false;
+    this.m_hasNextVertex = false;
     return this;
   }
 
   /** @hidden */
   _reset(): void {
     if (this.m_isLoop) {
-      this._createLoop(this.m_vertices);
+      this._createLoop(this.m_vertices.slice(0, this.m_vertices.length - 1));
     } else {
       this._createChain(this.m_vertices);
     }