[FIX] Ensure consistent function return types

rollup.config.js

@@ -33,7 +33,7 @@ function spacesToTabs() {
 
     return {
         transform(code, id) {
-            if (!filter(id)) return;
+            if (!filter(id)) return undefined;
             return {
                 code: code.replace(/ {2}/g, '\t'),
                 map: null
@@ -50,7 +50,7 @@ function shaderChunks(removeComments) {
 
     return {
         transform(code, id) {
-            if (!filter(id)) return;
+            if (!filter(id)) return undefined;
 
             code = code.replace(/\/\* glsl \*\/\`((.|\r|\n)*)\`/, (match, glsl) => {
 

src/anim/controller/anim-controller.js

@@ -472,12 +472,12 @@ class AnimController {
 
     removeNodeAnimations(nodeName) {
         if (ANIM_CONTROL_STATES.indexOf(nodeName) !== -1) {
-            return;
+            return false;
         }
         const state = this._findState(nodeName);
         if (!state) {
             Debug.error('Attempting to unassign animation tracks from a state that does not exist.');
-            return;
+            return false;
         }
 
         state.animations = [];

src/anim/controller/anim-state.js

@@ -1,3 +1,5 @@
+import { Debug } from '../../core/debug.js';
+
 import { AnimBlendTree1D } from './anim-blend-tree-1d.js';
 import { AnimBlendTreeCartesian2D } from './anim-blend-tree-2d-cartesian.js';
 import { AnimBlendTreeDirectional2D } from './anim-blend-tree-2d-directional.js';
@@ -65,6 +67,9 @@ class AnimState {
             case ANIM_BLEND_DIRECT:
                 return new AnimBlendTreeDirect(state, parent, name, point, parameters, children, syncAnimations, createTree, findParameter);
         }
+
+        Debug.error(`Invalid anim blend type: ${type}`);
+        return undefined;
     }
 
     _getNodeFromPath(path) {

src/framework/app-base.js

@@ -1471,11 +1471,11 @@ class Application extends EventHandler {
      * @returns {object} A object containing the values calculated to use as width and height.
      */
     resizeCanvas(width, height) {
-        if (!this._allowResize) return; // prevent resizing (e.g. if presenting in VR HMD)
+        if (!this._allowResize) return undefined; // prevent resizing (e.g. if presenting in VR HMD)
 
         // prevent resizing when in XR session
         if (this.xr && this.xr.session)
-            return;
+            return undefined;
 
         const windowWidth = window.innerWidth;
         const windowHeight = window.innerHeight;

src/framework/components/anim/component.js

@@ -596,6 +596,7 @@ class AnimComponent extends Component {
             return param.value;
         }
         Debug.log(`Cannot get parameter value. No parameter found in anim controller named "${name}" of type "${type}"`);
+        return undefined;
     }
 
     setParameterValue(name, type, value) {

src/framework/components/collision/system.js

@@ -389,7 +389,7 @@ class CollisionMeshSystemImpl extends CollisionSystemImpl {
     }
 
     createPhysicalShape(entity, data) {
-        if (typeof Ammo === 'undefined') return;
+        if (typeof Ammo === 'undefined') return undefined;
 
         if (data.model || data.render) {
 
@@ -415,6 +415,8 @@ class CollisionMeshSystemImpl extends CollisionSystemImpl {
 
             return shape;
         }
+
+        return undefined;
     }
 
     recreatePhysicalShapes(component) {

src/framework/components/script-legacy/component.js

@@ -21,8 +21,8 @@ class ScriptLegacyComponent extends Component {
             if (fn) {
                 return fn.apply(instances[name].instance, args);
             }
-
         }
+        return undefined;
     }
 
     onEnable() {

src/framework/components/scroll-view/component.js

@@ -1,3 +1,5 @@
+import { Debug } from '../../../core/debug.js';
+
 import { math } from '../../../math/math.js';
 import { Vec2 } from '../../../math/vec2.js';
 import { Vec3 } from '../../../math/vec3.js';
@@ -441,7 +443,8 @@ class ScrollViewComponent extends Component {
             return this.vertical;
         }
 
-        console.warn('Unrecognized orientation: ' + orientation);
+        Debug.warn(`Unrecognized orientation: ${orientation}`);
+        return undefined;
     }
 
     _getScrollbarVisibility(orientation) {
@@ -451,7 +454,8 @@ class ScrollViewComponent extends Component {
             return this.verticalScrollbarVisibility;
         }
 
-        console.warn('Unrecognized orientation: ' + orientation);
+        Debug.warn(`Unrecognized orientation: ${orientation}`);
+        return undefined;
     }
 
     _getSign(orientation) {

src/framework/components/sound/slot.js

@@ -119,7 +119,7 @@ class SoundSlot extends EventHandler {
         // If not loaded and doesn't have asset - then we cannot play it.  Warn and exit.
         if (!this.isLoaded && !this._hasAsset()) {
             Debug.warn(`Trying to play SoundSlot ${this.name} but it is not loaded and doesn't have an asset.`);
-            return;
+            return undefined;
         }
 
         const instance = this._createInstance();

src/graphics/program-lib/programs/standard.js

@@ -105,6 +105,7 @@ const standard = {
             }
             return chan;
         }
+        return undefined;
     },
 
     _setMapTransform: function (codes, name, id, uv) {

src/graphics/reproject-texture.js

@@ -3,7 +3,7 @@ import {
     FILTER_NEAREST,
     TEXTURETYPE_RGBM, TEXTURETYPE_RGBE,
     PIXELFORMAT_RGB16F, PIXELFORMAT_RGB32F, PIXELFORMAT_RGBA16F, PIXELFORMAT_RGBA32F,
-    TEXTUREPROJECTION_OCTAHEDRAL, TEXTUREPROJECTION_EQUIRECT, TEXTUREPROJECTION_CUBE, TEXTUREPROJECTION_NONE
+    TEXTUREPROJECTION_OCTAHEDRAL, TEXTUREPROJECTION_CUBE
 } from './constants.js';
 import { Vec3 } from '../math/vec3.js';
 import { random } from '../math/random.js';
@@ -39,14 +39,13 @@ const getCoding = (texture) => {
 };
 
 const getProjectionName = (projection) => {
-    // default to equirect if not specified
-    if (projection === TEXTUREPROJECTION_NONE) {
-        projection = TEXTUREPROJECTION_EQUIRECT;
-    }
     switch (projection) {
-        case TEXTUREPROJECTION_CUBE: return "Cubemap";
-        case TEXTUREPROJECTION_EQUIRECT: return "Equirect";
-        case TEXTUREPROJECTION_OCTAHEDRAL: return "Octahedral";
+        case TEXTUREPROJECTION_CUBE:
+            return "Cubemap";
+        case TEXTUREPROJECTION_OCTAHEDRAL:
+            return "Octahedral";
+        default: // for anything else, assume equirect
+            return "Equirect";
     }
 };
 

src/graphics/texture.js

@@ -974,19 +974,19 @@ class Texture {
                 const mipSize = this._levels[idx].length;
                 if (!mipSize) {
                     Debug.error(`No byte array for mip ${idx}`);
-                    return;
+                    return undefined;
                 }
                 fsize += mipSize;
             } else {
                 for (let face = 0; face < 6; face++) {
                     if (!this._levels[idx][face]) {
                         Debug.error(`No level data for mip ${idx}, face ${face}`);
-                        return;
+                        return undefined;
                     }
                     const mipSize = this._levels[idx][face].length;
                     if (!mipSize) {
                         Debug.error(`No byte array for mip ${idx}, face ${face}`);
-                        return;
+                        return undefined;
                     }
                     fsize += mipSize;
                 }

src/resources/loader.js

@@ -265,6 +265,7 @@ class ResourceLoader {
         if (this._cache[url + type]) {
             return this._cache[url + type];
         }
+        return undefined;
     }
 
     /**

src/resources/texture.js

@@ -226,7 +226,7 @@ class TextureHandler {
 
     open(url, data, asset) {
         if (!url)
-            return;
+            return undefined;
 
         let texture = this._getParser(url).open(url, data, this._device);
 

src/scene/batching/batch-manager.js

@@ -142,8 +142,8 @@ class BatchManager {
         }
 
         if (this._batchGroups[id]) {
-            Debug.error(`batch group with id ${id} already exists`);
-            return;
+            Debug.error(`Batch group with id ${id} already exists.`);
+            return undefined;
         }
 
         const group = new BatchGroup(id, name, dynamic, maxAabbSize, layers);
@@ -160,7 +160,7 @@ class BatchManager {
      */
     removeGroup(id) {
         if (!this._batchGroups[id]) {
-            Debug.error(`batch group with id ${id} doesn't exist`);
+            Debug.error(`Batch group with id ${id} doesn't exist.`);
             return;
         }
 

src/scene/materials/standard-material-options-builder.js

@@ -297,7 +297,7 @@ class StandardMaterialOptionsBuilder {
 
         const isOpacity = p === "opacity";
         if (isOpacity && stdMat.blendType === BLEND_NONE && stdMat.alphaTest === 0.0 && !stdMat.alphaToCoverage)
-            return options;
+            return;
 
         if (!minimalOptions || isOpacity) {
             if (p !== "height" && stdMat[vname]) {

src/vr/vr-display.js

@@ -353,6 +353,7 @@ class VrDisplay extends EventHandler {
      */
     getFrameData() {
         if (this.display) return this._frameData;
+        return undefined;
     }
 
     /**