@galacean/engine-loader 2.0.0-alpha.30 → 2.0.0-alpha.32

package/dist/main.js

@@ -709,7 +709,7 @@ var ReflectionParser = /*#__PURE__*/ function() {
     var _proto = ReflectionParser.prototype;
     /**
    * Apply v2 props to a component/object instance.
-   * Each prop value is resolved recursively (handling $ref, $type, $entity, $component, $signal).
+   * Each prop value is resolved recursively (handling $ref, $type, $class, $entity, $component, $signal).
    */ _proto.parseProps = function parseProps(instance, props) {
         var promises = [];
         if (props) {
@@ -777,10 +777,11 @@ var ReflectionParser = /*#__PURE__*/ function() {
    * 2. Array → recurse each element
    * 3. { $ref }       → asset reference
    * 4. { $type }      → polymorphic type construct
-   * 5. { $entity }    → entity reference by path (flat index + optional children descent)
-   * 6. { $component } → component reference
-   * 7. { $signal }    → signal binding
-   * 8. plain object   → recurse values (modify originValue in place if exists)
+   * 5. { $class }     → registered class constructor
+   * 6. { $entity }    → entity reference by path (flat index + optional children descent)
+   * 7. { $component } → component reference
+   * 8. { $signal }    → signal binding
+   * 9. plain object   → recurse values (modify originValue in place if exists)
    */ _proto._resolveValue = function _resolveValue(value, originValue) {
         var _this, _loop = function(key) {
             promises.push(_this._resolveValue(obj[key], target[key]).then(function(v) {
@@ -816,14 +817,14 @@ var ReflectionParser = /*#__PURE__*/ function() {
             var $type = obj.$type, rest = _object_without_properties_loose(obj, [
                 "$type"
             ]);
-            var typeName = $type;
-            var Class = engineCore.Loader.getClass(typeName);
-            if (!Class) return Promise.reject(new Error('Loader.getClass: class "' + typeName + '" is not registered'));
-            var instance = new Class();
-            if (Object.keys(rest).length > 0) {
-                return this.parseProps(instance, rest);
-            }
-            return Promise.resolve(instance);
+            return this._resolveRegisteredClass($type, "$type").then(function(Class) {
+                var instance = new Class();
+                return Object.keys(rest).length > 0 ? _this1.parseProps(instance, rest) : instance;
+            });
+        }
+        // $class — registered class constructor for factory-style methods.
+        if ("$class" in obj) {
+            return this._resolveRegisteredClass(obj.$class, "$class");
         }
         // $entity — entity reference by path (first element = flat index, subsequent = children indices)
         if ("$entity" in obj) {
@@ -845,6 +846,21 @@ var ReflectionParser = /*#__PURE__*/ function() {
             return target;
         });
     };
+    _proto._getRegisteredClass = function _getRegisteredClass(value, sentinel) {
+        if (typeof value !== "string" || value.length === 0) {
+            throw new Error("" + sentinel + " must be a non-empty registered class name string");
+        }
+        var Class = engineCore.Loader.getClass(value);
+        if (!Class) throw new Error('Loader.getClass: class "' + value + '" is not registered');
+        return Class;
+    };
+    /** Promise-adapt {@link _getRegisteredClass} so $type/$class branches can fold into the resolver chain. */ _proto._resolveRegisteredClass = function _resolveRegisteredClass(value, sentinel) {
+        try {
+            return Promise.resolve(this._getRegisteredClass(value, sentinel));
+        } catch (error) {
+            return Promise.reject(error);
+        }
+    };
     _proto._resolveSignal = function _resolveSignal(signal, listeners) {
         var _this = this;
         if (!signal || typeof signal.on !== "function") {
@@ -1518,7 +1534,7 @@ function _instanceof(left, right) {
         }
     };
     _proto._getRootIndices = function _getRootIndices() {
-        return this.data.scene.entities;
+        return this.data.scene.rootEntities;
     };
     _proto._handleRootEntity = function _handleRootEntity(index) {
         this.scene.addRootEntity(this.context.entityInstances[index]);
@@ -1531,8 +1547,8 @@ function _instanceof(left, right) {
 }(HierarchyParser);
 
 var SpecularMode = /*#__PURE__*/ function(SpecularMode) {
-    SpecularMode["Sky"] = "Sky";
-    SpecularMode["Custom"] = "Custom";
+    SpecularMode[SpecularMode["Sky"] = 0] = "Sky";
+    SpecularMode[SpecularMode["Custom"] = 1] = "Custom";
     return SpecularMode;
 }({});
 
@@ -5698,15 +5714,6 @@ var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     return KTXContentRestorer;
 }(engineCore.ContentRestorer);
 
-function parseProperty(object, key, value) {
-    if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === "object") {
-        for(var subKey in value){
-            parseProperty(object[key], subKey, value[subKey]);
-        }
-    } else {
-        object[key] = value;
-    }
-}
 var MaterialLoader = /*#__PURE__*/ function(Loader) {
     _inherits(MaterialLoader, Loader);
     function MaterialLoader() {
@@ -5767,7 +5774,7 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
                     break;
             }
         };
-        var name = materialSchema.name, shaderData = materialSchema.shaderData, macros = materialSchema.macros, renderState = materialSchema.renderState;
+        var name = materialSchema.name, shaderData = materialSchema.shaderData, macros = materialSchema.macros;
         var material = new engineCore.Material(engine, shader);
         material.name = name;
         var texturePromises = new Array();
@@ -5781,7 +5788,6 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
                 materialShaderData.enableMacro(name1, value);
             }
         }
-        parseProperty(material, "renderState", renderState);
         return Promise.all(texturePromises).then(function() {
             return material;
         });
@@ -6323,51 +6329,6 @@ AudioLoader = __decorate([
     ])
 ], AudioLoader);
 
-var ShaderChunkLoader = /*#__PURE__*/ function(Loader) {
-    _inherits(ShaderChunkLoader, Loader);
-    function ShaderChunkLoader() {
-        return Loader.apply(this, arguments) || this;
-    }
-    var _proto = ShaderChunkLoader.prototype;
-    _proto.load = function load(item, resourceManager) {
-        var url = item.url;
-        // @ts-ignore
-        return resourceManager._request(url, _extends({}, item, {
-            type: "text"
-        })).then(function(code) {
-            engineCore.ShaderFactory.registerInclude(url.substring(1), code);
-            return ShaderChunkLoader._loadChunksInCode(code, url, resourceManager);
-        });
-    };
-    /**
-   * @internal
-   */ ShaderChunkLoader._loadChunksInCode = function _loadChunksInCode(code, basePath, resourceManager) {
-        var shaderChunkPaths = new Array();
-        var matches = code.matchAll(ShaderChunkLoader._shaderIncludeRegex);
-        for(var _iterator = _create_for_of_iterator_helper_loose(matches), _step; !(_step = _iterator()).done;){
-            var match = _step.value;
-            var chunkPath = engineCore.Utils.resolveAbsoluteUrl(basePath, match[1]);
-            if (!engineCore.ShaderLib[chunkPath.substring(1)]) {
-                shaderChunkPaths.push(chunkPath);
-            }
-        }
-        return Promise.all(shaderChunkPaths.map(function(chunkPath) {
-            // @ts-ignore
-            return resourceManager.load({
-                type: "ShaderChunk",
-                url: chunkPath
-            });
-        }));
-    };
-    return ShaderChunkLoader;
-}(engineCore.Loader);
-ShaderChunkLoader._shaderIncludeRegex = /#include\s+"([./][^\\"]+)"/gm;
-ShaderChunkLoader = __decorate([
-    engineCore.resourceLoader("ShaderChunk", [
-        "glsl"
-    ])
-], ShaderChunkLoader);
-
 var ShaderLoader = /*#__PURE__*/ function(Loader) {
     _inherits(ShaderLoader, Loader);
     function ShaderLoader() {
@@ -6377,7 +6338,7 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         var url = item.url;
-        if (url.endsWith(".gsp")) {
+        if (url.endsWith(".shaderc")) {
             // @ts-ignore
             return resourceManager._request(url, _extends({}, item, {
                 type: "json"
@@ -6394,10 +6355,7 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
             if (builtinShader) {
                 return engineCore.Shader.find(builtinShader);
             }
-            return ShaderChunkLoader._loadChunksInCode(code, url, resourceManager).then(function() {
-                var shader = engineCore.Shader.create(code, undefined, url);
-                return shader;
-            });
+            return engineCore.Shader.create(code, undefined, url);
         });
     };
     _proto._getBuiltinShader = function _getBuiltinShader(code) {
@@ -6409,7 +6367,8 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
 ShaderLoader._builtinRegex = /^\s*\/\/\s*@builtin\s+(\w+)/;
 ShaderLoader = __decorate([
     engineCore.resourceLoader(engineCore.AssetType.Shader, [
-        "shader"
+        "shader",
+        "shaderc"
     ])
 ], ShaderLoader);