Merge pull request #27 from shinshin86/fix/cubism4-no-clipping-crash

Fix crash when model has no clipping masks
Also fixes #12

Author: RaSan147

.github/workflows/test.yml

@@ -18,7 +18,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{github.ref_name}}
           submodules: true
           fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
 

dist/cubism4.es.js

@@ -10824,6 +10824,9 @@ class Cubism4InternalModel extends InternalModel {
       index: null
     };
     this.renderer.startUp(gl);
+    if (!this.renderer._clippingManager) {
+      return;
+    }
     this.renderer._clippingManager._currentFrameNo = glContextID;
     this.renderer._clippingManager._maskTexture = void 0;
     CubismShader_WebGL.getInstance()._shaderSets = [];

dist/cubism4.js

@@ -10826,6 +10826,9 @@ var __async = (__this, __arguments, generator) => {
         index: null
       };
       this.renderer.startUp(gl);
+      if (!this.renderer._clippingManager) {
+        return;
+      }
       this.renderer._clippingManager._currentFrameNo = glContextID;
       this.renderer._clippingManager._maskTexture = void 0;
       CubismShader_WebGL.getInstance()._shaderSets = [];

dist/cubism4.min.js

@@ -8603,6 +8603,9 @@ class Cubism4InternalModel extends InternalModel {
       index: null
     };
     this.renderer.startUp(gl);
+    if (!this.renderer._clippingManager) {
+      return;
+    }
     this.renderer._clippingManager._currentFrameNo = glContextID;
     this.renderer._clippingManager._maskTexture = void 0;
     CubismShader_WebGL.getInstance()._shaderSets = [];

dist/index.es.js

@@ -8605,6 +8605,9 @@ var __async = (__this, __arguments, generator) => {
         index: null
       };
       this.renderer.startUp(gl);
+      if (!this.renderer._clippingManager) {
+        return;
+      }
       this.renderer._clippingManager._currentFrameNo = glContextID;
       this.renderer._clippingManager._maskTexture = void 0;
       CubismShader_WebGL.getInstance()._shaderSets = [];

dist/index.js

@@ -85,7 +85,7 @@
     "webdriverio": "^8.34.1"
   },
   "dependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.37.0",
+    "@rollup/rollup-linux-x64-gnu": "^4.40.0",
     "terser": "^5.30.3"
   }
 }

dist/index.min.js

@@ -142,6 +142,11 @@ export class Cubism4InternalModel extends InternalModel {
             index: null,
         };
         this.renderer.startUp(gl);
+
+        if(!this.renderer._clippingManager) {
+            return;
+        }
+
         this.renderer._clippingManager._currentFrameNo = glContextID;
         this.renderer._clippingManager._maskTexture = undefined;
         CubismShader_WebGL.getInstance()._shaderSets = [];