@galacean/effects-plugin-model 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/runtime/common.d.ts

@@ -73,6 +73,8 @@ export declare enum PShadowType {
     variance = 2,
     expVariance = 3
 }
+export declare const PBRShaderGUID = "pbr00000000000000000000000000000";
+export declare const UnlitShaderGUID = "unlit000000000000000000000000000";
 /**
  * 插件变换类
  */

package/dist/runtime/material.d.ts

@@ -1,7 +1,6 @@
 import type { Texture } from '@galacean/effects';
-import { Material } from '@galacean/effects';
-import { spec } from '@galacean/effects';
-import type { ModelMaterialOptions, ModelMaterialUnlitOptions, ModelMaterialPBROptions } from '../index';
+import { spec, Material } from '@galacean/effects';
+import type { ModelMaterialOptions, ModelMaterialUnlitOptions, ModelMaterialPBROptions, MacroInfo } from '../index';
 import { Vector3, Vector4, Matrix3 } from './math';
 import { PMaterialType, PBlendMode, PFaceSideMode } from './common';
 import { PObject } from './object';
@@ -48,6 +47,7 @@ export declare abstract class PMaterialBase extends PObject {
      * @returns 特性列表
      */
     getShaderFeatures(): string[];
+    getShaderMacros(): MacroInfo[];
     /**
      * 根据材质状态，更新 GE 材质状态
      * @param material - GE 材质
@@ -60,6 +60,7 @@ export declare abstract class PMaterialBase extends PObject {
      */
     build(inFeatureList?: string[]): void;
     getFeatureList(inFeatureList?: string[]): string[];
+    getMacroList(inMacroList?: MacroInfo[]): MacroInfo[];
     /**
      * 获取混合模式，根据 GE 混合模式
      * @param mode - GE 混合模式
@@ -132,13 +133,13 @@ export declare abstract class PMaterialBase extends PObject {
  * 无光照材质类，负责无关照或者不接受光照情况下的物体材质效果
  */
 export declare class PMaterialUnlit extends PMaterialBase {
-    private baseColorFactor;
     private baseColorTexture?;
     /**
      * 创建无光照材质，支持基础颜色纹理
      * @param options - 无光照材质参数
      */
     create(options: ModelMaterialUnlitOptions): void;
+    createFromMaterial(mat: Material): void;
     /**
      * 销毁材质
      */
@@ -148,6 +149,7 @@ export declare class PMaterialUnlit extends PMaterialBase {
      * @returns 着色器特性列表
      */
     getShaderFeatures(): string[];
+    getShaderMacros(): MacroInfo[];
     /**
      * 更新对应的 GE 材质中着色器的 Uniform 数据
      * @param material - GE 材质
@@ -168,16 +170,6 @@ export declare class PMaterialUnlit extends PMaterialBase {
      * @param val - 纹理对象
      */
     setBaseColorTexture(val: Texture): void;
-    /**
-     * 获取基础颜色值
-     * @returns
-     */
-    getBaseColorFactor(): Vector4;
-    /**
-     * 设置基础颜色值
-     * @param val - 颜色值
-     */
-    setBaseColorFactor(val: Vector4 | spec.vec4): void;
 }
 /**
  * PBR 材质类，负责基于物理的材质效果，也是渲染中最常用的材质。
@@ -272,6 +264,7 @@ export declare class PMaterialPBR extends PMaterialBase {
      * @returns 材质特性列表
      */
     getShaderFeatures(): string[];
+    getShaderMacros(): MacroInfo[];
     /**
      * 更新关联的 GE 材质中着色器的 Uniform 数据
      * @param material - GE 材质

package/dist/runtime/mesh.d.ts

@@ -1,5 +1,5 @@
-import type { Engine, math, VFXItemContent, VFXItem, Renderer } from '@galacean/effects';
-import { Geometry, spec, Mesh, Material } from '@galacean/effects';
+import type { Engine, math, VFXItemContent, VFXItem, Renderer, Geometry } from '@galacean/effects';
+import { spec, Mesh, Material } from '@galacean/effects';
 import type { ModelMeshComponentData, ModelMeshPrimitiveData } from '../index';
 import { PEntity } from './object';
 import type { PMaterial } from './material';
@@ -207,6 +207,7 @@ export declare class PPrimitive {
         [k: string]: any;
     }, skybox?: PSkybox): void;
     private getFeatureList;
+    private getMacroList;
     /**
      * 销毁，需要释放创建的 GE 对象
      */
@@ -354,4 +355,8 @@ export declare class PGeometry {
      */
     hasWeights(): boolean;
 }
+export interface MacroInfo {
+    name: string;
+    value?: boolean | number;
+}
 export {};

package/dist/runtime/shader-libs/standard-shader-source.d.ts

@@ -10,4 +10,5 @@ export declare namespace StandardShaderSource {
      * @returns 最终代码
      */
     function build(source: string, features: string[], isWebGL2: boolean): string;
+    function getSourceCode(source: string, isWebGL2?: boolean): string;
 }

package/dist/runtime/shader-libs/standard-shader.d.ts

@@ -1,3 +1,4 @@
+import { PMaterialType } from '../common';
 import type { PShaderContext } from '../shader';
 /**
  * 着色器代码生成类
@@ -19,4 +20,11 @@ export declare class StandardShader {
      * @returns
      */
     static getFragmentShaderCode(context: PShaderContext): string;
+    static genVertexShaderCode(materialType: PMaterialType, isWebGL2?: boolean): string;
+    /**
+     * 获取片段着色器代码
+     * @param materialType - 材质类型
+     * @returns
+     */
+    static genFragmentShaderCode(materialType: PMaterialType, isWebGL2?: boolean): string;
 }

package/dist/utility/shader-helper.d.ts

@@ -1,4 +1,6 @@
 import type { PShaderContext, PShaderResults } from '../runtime/shader';
+export declare function fetchPBRShaderCode(isWebGL2?: boolean): PShaderResults;
+export declare function fetchUnlitShaderCode(isWebGL2?: boolean): PShaderResults;
 /**
  * 获取 PBR 材质着色器代码
  * @param context - 着色器上下文

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-model",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.8",
   "description": "Galacean Effects player model plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -33,15 +33,15 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-helper": "2.0.0-alpha.6"
+    "@galacean/effects-helper": "2.0.0-alpha.8"
   },
   "devDependencies": {
-    "@vvfx/resource-detection": "0.4.2-alpha.22",
+    "@vvfx/resource-detection": "0.6.0-alpha.2",
     "@types/hammerjs": "^2.0.45",
     "fpsmeter": "^0.3.1",
     "hammerjs": "^2.0.8",
-    "@galacean/effects": "2.0.0-alpha.6",
-    "@galacean/effects-plugin-editor-gizmo": "2.0.0-alpha.6"
+    "@galacean/effects": "2.0.0-alpha.8",
+    "@galacean/effects-plugin-editor-gizmo": "2.0.0-alpha.8"
   },
   "scripts": {
     "dev": "vite",