wrap all load* methods with _internal() for future-proofing

Author: avinxshKD

src/image/loading_displaying.js

@@ -136,13 +136,14 @@ function loadingDisplaying(p5, fn){
         pImg.drawingContext.drawImage(img, 0, 0);
       }
 
-      pImg.modified = true;
-
-      if(successCallback){
-        return successCallback(pImg);
-      }else{
-        return pImg;
-      }
+      return this._internal(() => {
+        pImg.modified = true;
+        if(successCallback){
+          return successCallback(pImg);
+        }else{
+          return pImg;
+        }
+      });
 
     } catch(err) {
       p5._friendlyFileLoadError(0, path);

src/io/files.js

@@ -278,8 +278,10 @@ function files(p5, fn){
 
     try{
       const { data } = await request(path, 'json');
-      if (successCallback) return successCallback(data);
-      return data;
+      return this._internal(() => {
+        if (successCallback) return successCallback(data);
+        return data;
+      });
     } catch(err) {
       p5._friendlyFileLoadError(5, path);
       if(errorCallback) {
@@ -414,10 +416,11 @@ function files(p5, fn){
 
     try{
       let { data } = await request(path, 'text');
-      data = data.split(/\r?\n/);
-
-      if (successCallback) return successCallback(data);
-      return data;
+      return this._internal(() => {
+        data = data.split(/\r?\n/);
+        if (successCallback) return successCallback(data);
+        return data;
+      });
     } catch(err) {
       p5._friendlyFileLoadError(3, path);
       if(errorCallback) {
@@ -501,28 +504,29 @@ function files(p5, fn){
 
     try{
       let { data } = await request(path, 'text');
+      return this._internal(() => {
+        let ret = new p5.Table();
+        data = parse(data, {
+          separator
+        });
+
+        if(header){
+          ret.columns = data.shift();
+        }else{
+          ret.columns = Array(data[0].length).fill(null);
+        }
 
-      let ret = new p5.Table();
-      data = parse(data, {
-        separator
-      });
-
-      if(header){
-        ret.columns = data.shift();
-      }else{
-        ret.columns = Array(data[0].length).fill(null);
-      }
+        data.forEach(line => {
+          const row = new p5.TableRow(line);
+          ret.addRow(row);
+        });
 
-      data.forEach(line => {
-        const row = new p5.TableRow(line);
-        ret.addRow(row);
+        if (successCallback) {
+          return successCallback(ret);
+        } else {
+          return ret;
+        }
       });
-
-      if (successCallback) {
-        return successCallback(ret);
-      } else {
-        return ret;
-      }
     } catch(err) {
       p5._friendlyFileLoadError(2, path);
       if(errorCallback) {
@@ -686,11 +690,12 @@ function files(p5, fn){
       const parser = new DOMParser();
 
       let { data } = await request(path, 'text');
-      const parsedDOM = parser.parseFromString(data, 'application/xml');
-      data = new p5.XML(parsedDOM);
-
-      if (successCallback) return successCallback(data);
-      return data;
+      return this._internal(() => {
+        const parsedDOM = parser.parseFromString(data, 'application/xml');
+        data = new p5.XML(parsedDOM);
+        if (successCallback) return successCallback(data);
+        return data;
+      });
     } catch(err) {
       p5._friendlyFileLoadError(1, path);
       if(errorCallback) {
@@ -734,9 +739,11 @@ function files(p5, fn){
   fn.loadBytes = async function (path, successCallback, errorCallback) {
     try{
       let { data } = await request(path, 'arrayBuffer');
-      data = new Uint8Array(data);
-      if (successCallback) return successCallback(data);
-      return data;
+      return this._internal(() => {
+        data = new Uint8Array(data);
+        if (successCallback) return successCallback(data);
+        return data;
+      });
     } catch(err) {
       p5._friendlyFileLoadError(6, path);
       if(errorCallback) {
@@ -789,8 +796,10 @@ function files(p5, fn){
   fn.loadBlob = async function(path, successCallback, errorCallback) {
     try{
       const { data } = await request(path, 'blob');
-      if (successCallback) return successCallback(data);
-      return data;
+      return this._internal(() => {
+        if (successCallback) return successCallback(data);
+        return data;
+      });
     } catch(err) {
       if(errorCallback) {
         return errorCallback(err);

src/type/p5.Font.js

@@ -1578,9 +1578,10 @@ function font(p5, fn) {
         throw err;
       }
     }
-    if (success) return success(pfont);
-
-    return pfont;
+    return this._internal(() => {
+      if (success) return success(pfont);
+      return pfont;
+    });
   };
 };
 

src/webgl/loading.js

@@ -419,50 +419,54 @@ function loading(p5, fn){
     try{
       if (fileType.match(/\.stl$/i)) {
         const { data } = await request(path, 'arrayBuffer');
-        parseSTL(model, data);
+        return this._internal(() => {
+          parseSTL(model, data);
 
-        if (normalize) {
-          model.normalize();
-        }
+          if (normalize) {
+            model.normalize();
+          }
 
-        if (flipU) {
-          model.flipU();
-        }
+          if (flipU) {
+            model.flipU();
+          }
 
-        if (flipV) {
-          model.flipV();
-        }
-        model._makeTriangleEdges();
+          if (flipV) {
+            model.flipV();
+          }
+          model._makeTriangleEdges();
 
-        if (successCallback) {
-          return successCallback(model);
-        } else {
-          return model;
-        }
+          if (successCallback) {
+            return successCallback(model);
+          } else {
+            return model;
+          }
+        });
 
       } else if (fileType.match(/\.obj$/i)) {
         const { data } = await request(path, 'text');
         const lines = data.split('\n');
 
         const parsedMaterials = await getMaterials(lines);
-        parseObj(model, lines, parsedMaterials);
+        return this._internal(() => {
+          parseObj(model, lines, parsedMaterials);
 
-        if (normalize) {
-          model.normalize();
-        }
-        if (flipU) {
-          model.flipU();
-        }
-        if (flipV) {
-          model.flipV();
-        }
-        model._makeTriangleEdges();
+          if (normalize) {
+            model.normalize();
+          }
+          if (flipU) {
+            model.flipU();
+          }
+          if (flipV) {
+            model.flipV();
+          }
+          model._makeTriangleEdges();
 
-        if (successCallback) {
-          return successCallback(model);
-        } else {
-          return model;
-        }
+          if (successCallback) {
+            return successCallback(model);
+          } else {
+            return model;
+          }
+        });
       }
     } catch(err) {
       p5._friendlyFileLoadError(3, path);