@anov/3d-ability 0.0.166 → 0.0.168

package/dist/core/PostEffects/colorifyPass.d.ts

@@ -1,5 +1,5 @@
-import type { Color, SceneControl } from '@anov/3d-core';
-declare const addColorifyPass: (color: Color, alpha: number, sceneControl: SceneControl) => {
+import type { Color } from '@anov/3d-core';
+declare const addColorifyPass: (color: Color, alpha?: number) => {
     clean: () => void;
     setColor: (color: Color) => void;
 };

package/dist/core/PostEffects/colorifyPass.js

@@ -1,14 +1,14 @@
-import { lib, use } from '@anov/3d-core';
+import { lib, use, utils } from '@anov/3d-core';
 import ColorifyShader from "./shader/colorify";
+var storeManagement = utils.storeManagement;
 var CopyShader = lib.CopyShader,
   ShaderPass = lib.ShaderPass;
 var addColorifyPass = function addColorifyPass(color) {
   var alpha = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.5;
-  var sceneControl = arguments.length > 2 ? arguments[2] : undefined;
-  var _use$useScene = use.useScene(sceneControl),
+  var _use$useScene = use.useScene(),
     scene = _use$useScene.scene,
     camera = _use$useScene.camera;
-  var composer = sceneControl.context.storeManagement.get('composer');
+  var composer = storeManagement.get('composer');
   if (!scene || !camera) throw new Error('scene or camera is not defined,');
   if (!composer) throw new Error('composer is not defined, please initPostEffects first');
   var effectCopy = new ShaderPass(CopyShader);

package/dist/core/PostEffects/colorifyPass.js.map

@@ -1 +1 @@
-{"version":3,"names":["lib","use","ColorifyShader","CopyShader","ShaderPass","addColorifyPass","color","alpha","arguments","length","undefined","sceneControl","_use$useScene","useScene","scene","camera","composer","context","storeManagement","get","Error","effectCopy","renderToScreen","colorify","enabled","uniforms","value","addPass","clean","removePass","setColor"],"sources":["../../../src/core/PostEffects/colorifyPass.ts"],"sourcesContent":["import { lib, use } from '@anov/3d-core'\nimport type { Color, SceneControl } from '@anov/3d-core'\nimport ColorifyShader from './shader/colorify'\n\nconst { CopyShader, ShaderPass } = lib\n\nconst addColorifyPass = (color: Color, alpha = 0.5, sceneControl: SceneControl) => {\n  const { scene, camera } = use.useScene(sceneControl)\n  const composer = sceneControl.context.storeManagement.get('composer') as lib.EffectComposer | undefined\n\n  if (!scene || !camera)\n    throw new Error('scene or camera is not defined,')\n\n  if (!composer)\n    throw new Error('composer is not defined, please initPostEffects first')\n\n  const effectCopy = new ShaderPass(CopyShader)\n  effectCopy.renderToScreen = true\n\n  const colorify = new ShaderPass(ColorifyShader)\n  colorify.enabled = true\n\n  colorify.uniforms.color.value = color\n  colorify.uniforms.alpha.value = alpha\n\n  composer.addPass(colorify)\n  composer.addPass(effectCopy)\n\n  return {\n    clean: () => {\n      composer.removePass(effectCopy)\n      composer.removePass(colorify)\n    },\n    setColor: (color: Color) => {\n      colorify.uniforms.color.value = color\n    },\n  }\n}\n\nexport default addColorifyPass"],"mappings":"AAAA,SAASA,GAAG,EAAEC,GAAG,QAAQ,eAAe;AAExC,OAAOC,cAAc;AAErB,IAAQC,UAAU,GAAiBH,GAAG,CAA9BG,UAAU;EAAEC,UAAU,GAAKJ,GAAG,CAAlBI,UAAU;AAE9B,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAIC,KAAY,EAA8C;EAAA,IAA5CC,KAAK,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAAA,IAAEG,YAA0B,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAC5E,IAAAE,aAAA,GAA0BX,GAAG,CAACY,QAAQ,CAACF,YAAY,CAAC;IAA5CG,KAAK,GAAAF,aAAA,CAALE,KAAK;IAAEC,MAAM,GAAAH,aAAA,CAANG,MAAM;EACrB,IAAMC,QAAQ,GAAGL,YAAY,CAACM,OAAO,CAACC,eAAe,CAACC,GAAG,CAAC,UAAU,CAAmC;EAEvG,IAAI,CAACL,KAAK,IAAI,CAACC,MAAM,EACnB,MAAM,IAAIK,KAAK,CAAC,iCAAiC,CAAC;EAEpD,IAAI,CAACJ,QAAQ,EACX,MAAM,IAAII,KAAK,CAAC,uDAAuD,CAAC;EAE1E,IAAMC,UAAU,GAAG,IAAIjB,UAAU,CAACD,UAAU,CAAC;EAC7CkB,UAAU,CAACC,cAAc,GAAG,IAAI;EAEhC,IAAMC,QAAQ,GAAG,IAAInB,UAAU,CAACF,cAAc,CAAC;EAC/CqB,QAAQ,CAACC,OAAO,GAAG,IAAI;EAEvBD,QAAQ,CAACE,QAAQ,CAACnB,KAAK,CAACoB,KAAK,GAAGpB,KAAK;EACrCiB,QAAQ,CAACE,QAAQ,CAAClB,KAAK,CAACmB,KAAK,GAAGnB,KAAK;EAErCS,QAAQ,CAACW,OAAO,CAACJ,QAAQ,CAAC;EAC1BP,QAAQ,CAACW,OAAO,CAACN,UAAU,CAAC;EAE5B,OAAO;IACLO,KAAK,EAAE,SAAAA,MAAA,EAAM;MACXZ,QAAQ,CAACa,UAAU,CAACR,UAAU,CAAC;MAC/BL,QAAQ,CAACa,UAAU,CAACN,QAAQ,CAAC;IAC/B,CAAC;IACDO,QAAQ,EAAE,SAAAA,SAACxB,KAAY,EAAK;MAC1BiB,QAAQ,CAACE,QAAQ,CAACnB,KAAK,CAACoB,KAAK,GAAGpB,KAAK;IACvC;EACF,CAAC;AACH,CAAC;AAED,eAAeD,eAAe"}
+{"version":3,"names":["lib","use","utils","ColorifyShader","storeManagement","CopyShader","ShaderPass","addColorifyPass","color","alpha","arguments","length","undefined","_use$useScene","useScene","scene","camera","composer","get","Error","effectCopy","renderToScreen","colorify","enabled","uniforms","value","addPass","clean","removePass","setColor"],"sources":["../../../src/core/PostEffects/colorifyPass.ts"],"sourcesContent":["import type { Color } from '@anov/3d-core'\nimport { lib, use, utils } from '@anov/3d-core'\nimport ColorifyShader from './shader/colorify'\n\nconst { storeManagement } = utils\nconst { CopyShader, ShaderPass } = lib\n\nconst addColorifyPass = (color: Color, alpha = 0.5) => {\n  const { scene, camera } = use.useScene()\n  const composer = storeManagement.get('composer') as lib.EffectComposer | undefined\n\n  if (!scene || !camera)\n    throw new Error('scene or camera is not defined,')\n\n  if (!composer)\n    throw new Error('composer is not defined, please initPostEffects first')\n\n  const effectCopy = new ShaderPass(CopyShader)\n  effectCopy.renderToScreen = true\n\n  const colorify = new ShaderPass(ColorifyShader)\n  colorify.enabled = true\n\n  colorify.uniforms.color.value = color\n  colorify.uniforms.alpha.value = alpha\n\n  composer.addPass(colorify)\n  composer.addPass(effectCopy)\n\n  return {\n    clean: () => {\n      composer.removePass(effectCopy)\n      composer.removePass(colorify)\n    },\n    setColor: (color: Color) => {\n      colorify.uniforms.color.value = color\n    },\n  }\n}\n\nexport default addColorifyPass"],"mappings":"AACA,SAASA,GAAG,EAAEC,GAAG,EAAEC,KAAK,QAAQ,eAAe;AAC/C,OAAOC,cAAc;AAErB,IAAQC,eAAe,GAAKF,KAAK,CAAzBE,eAAe;AACvB,IAAQC,UAAU,GAAiBL,GAAG,CAA9BK,UAAU;EAAEC,UAAU,GAAKN,GAAG,CAAlBM,UAAU;AAE9B,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAIC,KAAY,EAAkB;EAAA,IAAhBC,KAAK,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAChD,IAAAG,aAAA,GAA0BZ,GAAG,CAACa,QAAQ,CAAC,CAAC;IAAhCC,KAAK,GAAAF,aAAA,CAALE,KAAK;IAAEC,MAAM,GAAAH,aAAA,CAANG,MAAM;EACrB,IAAMC,QAAQ,GAAGb,eAAe,CAACc,GAAG,CAAC,UAAU,CAAmC;EAElF,IAAI,CAACH,KAAK,IAAI,CAACC,MAAM,EACnB,MAAM,IAAIG,KAAK,CAAC,iCAAiC,CAAC;EAEpD,IAAI,CAACF,QAAQ,EACX,MAAM,IAAIE,KAAK,CAAC,uDAAuD,CAAC;EAE1E,IAAMC,UAAU,GAAG,IAAId,UAAU,CAACD,UAAU,CAAC;EAC7Ce,UAAU,CAACC,cAAc,GAAG,IAAI;EAEhC,IAAMC,QAAQ,GAAG,IAAIhB,UAAU,CAACH,cAAc,CAAC;EAC/CmB,QAAQ,CAACC,OAAO,GAAG,IAAI;EAEvBD,QAAQ,CAACE,QAAQ,CAAChB,KAAK,CAACiB,KAAK,GAAGjB,KAAK;EACrCc,QAAQ,CAACE,QAAQ,CAACf,KAAK,CAACgB,KAAK,GAAGhB,KAAK;EAErCQ,QAAQ,CAACS,OAAO,CAACJ,QAAQ,CAAC;EAC1BL,QAAQ,CAACS,OAAO,CAACN,UAAU,CAAC;EAE5B,OAAO;IACLO,KAAK,EAAE,SAAAA,MAAA,EAAM;MACXV,QAAQ,CAACW,UAAU,CAACR,UAAU,CAAC;MAC/BH,QAAQ,CAACW,UAAU,CAACN,QAAQ,CAAC;IAC/B,CAAC;IACDO,QAAQ,EAAE,SAAAA,SAACrB,KAAY,EAAK;MAC1Bc,QAAQ,CAACE,QAAQ,CAAChB,KAAK,CAACiB,KAAK,GAAGjB,KAAK;IACvC;EACF,CAAC;AACH,CAAC;AAED,eAAeD,eAAe"}

package/dist/core/PostEffects/index.d.ts

@@ -1,4 +1,4 @@
-import type { Camera, Scene, SceneControl, WebGLRenderer } from '@anov/3d-core';
+import type { Camera, Scene, WebGLRenderer } from '@anov/3d-core';
 import { lib } from '@anov/3d-core';
 type InitPostEffectsOptions = {
     type: 'main' | 'sub';
@@ -6,9 +6,18 @@ type InitPostEffectsOptions = {
     afterhooks?: () => void;
     renderToScreen?: boolean;
 };
-export declare const initPostEffects: (scene: Scene, renderer: WebGLRenderer, camera: Camera, options: InitPostEffectsOptions | undefined, sceneControl: SceneControl) => {
+/**
+ * init post effects
+ * @param scene
+ * @param renderer
+ * @param camera
+ * @param beforehooks composer render before hook
+ * @param afterhooks composer render after hook
+ * @returns
+ */
+export declare const initPostEffects: (scene: Scene, renderer: WebGLRenderer, camera: Camera, options?: InitPostEffectsOptions) => {
     composer: lib.EffectComposer<import("@anov/3d-core").WebGLRenderTarget<import("@anov/3d-core").Texture>>;
     clean: () => void;
 };
-export { OutlinePass, createHighSelectedTool } from './outlinePass';
-export { createBloomSelectedTool } from './bloomSelect';
+export * from './outlinePass';
+export * from './bloomSelect';

package/dist/core/PostEffects/index.js

@@ -1,10 +1,21 @@
-import { lib, use } from '@anov/3d-core';
+import { lib, use, utils } from '@anov/3d-core';
 var EffectComposer = lib.EffectComposer,
   RenderPass = lib.RenderPass;
+var storeManagement = utils.storeManagement;
 var useSubComposerFrame = use.useSubComposerFrame,
   useComposerFrame = use.useComposerFrame;
 var clean;
-export var initPostEffects = function initPostEffects(scene, renderer, camera, options, sceneControl) {
+
+/**
+ * init post effects
+ * @param scene
+ * @param renderer
+ * @param camera
+ * @param beforehooks composer render before hook
+ * @param afterhooks composer render after hook
+ * @returns
+ */
+export var initPostEffects = function initPostEffects(scene, renderer, camera, options) {
   var _ref = options || {
       type: 'main'
     },
@@ -17,27 +28,22 @@ export var initPostEffects = function initPostEffects(scene, renderer, camera, o
   var renderPass = new RenderPass(scene, camera);
   var func = type === 'main' ? useComposerFrame : useSubComposerFrame;
   clean && clean();
-  sceneControl.context.storeManagement.set('composer', composer);
-  sceneControl.context.storeManagement.set('renderPass', renderPass);
+  storeManagement.set('composer', composer);
+  storeManagement.set('renderPass', renderPass);
   composer.addPass(renderPass);
   composer.renderToScreen = renderToScreen;
 
   // @ts-ignore
   composer.isNeedRender = true;
-  var cleanEffectsframe = sceneControl ? func(sceneControl, function () {
-    beforehooks && beforehooks();
-    // @ts-ignore
-    composer.isNeedRender && composer.render();
-    afterhooks && afterhooks();
-  }) : func(function () {
+  var cleanEffectsframe = func(function () {
     beforehooks && beforehooks();
     // @ts-ignore
     composer.isNeedRender && composer.render();
     afterhooks && afterhooks();
   });
   clean = function clean() {
-    sceneControl.context.storeManagement.delete('composer');
-    sceneControl.context.storeManagement.delete('renderPass');
+    storeManagement.delete('composer');
+    storeManagement.delete('renderPass');
     cleanEffectsframe();
   };
   return {
@@ -45,6 +51,6 @@ export var initPostEffects = function initPostEffects(scene, renderer, camera, o
     clean: clean
   };
 };
-export { OutlinePass, createHighSelectedTool } from "./outlinePass";
-export { createBloomSelectedTool } from "./bloomSelect";
+export * from "./outlinePass";
+export * from "./bloomSelect";
 //# sourceMappingURL=index.js.map

package/dist/core/PostEffects/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["lib","use","EffectComposer","RenderPass","useSubComposerFrame","useComposerFrame","clean","initPostEffects","scene","renderer","camera","options","sceneControl","_ref","type","beforehooks","afterhooks","_ref$renderToScreen","renderToScreen","composer","renderPass","func","context","storeManagement","set","addPass","isNeedRender","cleanEffectsframe","render","delete","OutlinePass","createHighSelectedTool","createBloomSelectedTool"],"sources":["../../../src/core/PostEffects/index.ts"],"sourcesContent":["import type { Camera, Scene, SceneControl, WebGLRenderer } from '@anov/3d-core'\nimport { lib, use } from '@anov/3d-core'\n\nconst { EffectComposer, RenderPass } = lib\nconst { useSubComposerFrame, useComposerFrame } = use\n\ntype InitPostEffectsOptions = {\n  type: 'main' | 'sub'\n  beforehooks?: () => void\n  afterhooks?: () => void\n  renderToScreen?: boolean\n}\n\nlet clean: () => void\n\nexport const initPostEffects = (\n  scene: Scene,\n  renderer: WebGLRenderer,\n  camera: Camera,\n  options: InitPostEffectsOptions | undefined,\n  sceneControl: SceneControl,\n) => {\n  const { type, beforehooks, afterhooks, renderToScreen = true } = options || { type: 'main' }\n  const composer = new EffectComposer(renderer)\n  const renderPass = new RenderPass(scene, camera)\n  const func = type === 'main' ? useComposerFrame : useSubComposerFrame\n\n  clean && clean()\n\n  sceneControl.context.storeManagement.set('composer', composer)\n  sceneControl.context.storeManagement.set('renderPass', renderPass)\n\n  composer.addPass(renderPass)\n  composer.renderToScreen = renderToScreen\n\n  // @ts-ignore\n  composer.isNeedRender = true\n\n  const cleanEffectsframe = sceneControl\n    ? func(sceneControl, () => {\n      beforehooks && beforehooks()\n      // @ts-ignore\n      composer.isNeedRender && composer.render()\n      afterhooks && afterhooks()\n    })\n    : (func as any)(() => {\n        beforehooks && beforehooks()\n        // @ts-ignore\n        composer.isNeedRender && composer.render()\n        afterhooks && afterhooks()\n      })\n\n  clean = () => {\n    sceneControl.context.storeManagement.delete('composer')\n    sceneControl.context.storeManagement.delete('renderPass')\n\n    cleanEffectsframe()\n  }\n\n  return {\n    composer,\n    clean,\n  }\n}\n\nexport { OutlinePass, createHighSelectedTool } from './outlinePass'\nexport { createBloomSelectedTool } from './bloomSelect'\n"],"mappings":"AACA,SAASA,GAAG,EAAEC,GAAG,QAAQ,eAAe;AAExC,IAAQC,cAAc,GAAiBF,GAAG,CAAlCE,cAAc;EAAEC,UAAU,GAAKH,GAAG,CAAlBG,UAAU;AAClC,IAAQC,mBAAmB,GAAuBH,GAAG,CAA7CG,mBAAmB;EAAEC,gBAAgB,GAAKJ,GAAG,CAAxBI,gBAAgB;AAS7C,IAAIC,KAAiB;AAErB,OAAO,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAC1BC,KAAY,EACZC,QAAuB,EACvBC,MAAc,EACdC,OAA2C,EAC3CC,YAA0B,EACvB;EACH,IAAAC,IAAA,GAAiEF,OAAO,IAAI;MAAEG,IAAI,EAAE;IAAO,CAAC;IAApFA,IAAI,GAAAD,IAAA,CAAJC,IAAI;IAAEC,WAAW,GAAAF,IAAA,CAAXE,WAAW;IAAEC,UAAU,GAAAH,IAAA,CAAVG,UAAU;IAAAC,mBAAA,GAAAJ,IAAA,CAAEK,cAAc;IAAdA,cAAc,GAAAD,mBAAA,cAAG,IAAI,GAAAA,mBAAA;EAC5D,IAAME,QAAQ,GAAG,IAAIjB,cAAc,CAACO,QAAQ,CAAC;EAC7C,IAAMW,UAAU,GAAG,IAAIjB,UAAU,CAACK,KAAK,EAAEE,MAAM,CAAC;EAChD,IAAMW,IAAI,GAAGP,IAAI,KAAK,MAAM,GAAGT,gBAAgB,GAAGD,mBAAmB;EAErEE,KAAK,IAAIA,KAAK,CAAC,CAAC;EAEhBM,YAAY,CAACU,OAAO,CAACC,eAAe,CAACC,GAAG,CAAC,UAAU,EAAEL,QAAQ,CAAC;EAC9DP,YAAY,CAACU,OAAO,CAACC,eAAe,CAACC,GAAG,CAAC,YAAY,EAAEJ,UAAU,CAAC;EAElED,QAAQ,CAACM,OAAO,CAACL,UAAU,CAAC;EAC5BD,QAAQ,CAACD,cAAc,GAAGA,cAAc;;EAExC;EACAC,QAAQ,CAACO,YAAY,GAAG,IAAI;EAE5B,IAAMC,iBAAiB,GAAGf,YAAY,GAClCS,IAAI,CAACT,YAAY,EAAE,YAAM;IACzBG,WAAW,IAAIA,WAAW,CAAC,CAAC;IAC5B;IACAI,QAAQ,CAACO,YAAY,IAAIP,QAAQ,CAACS,MAAM,CAAC,CAAC;IAC1CZ,UAAU,IAAIA,UAAU,CAAC,CAAC;EAC5B,CAAC,CAAC,GACCK,IAAI,CAAS,YAAM;IAClBN,WAAW,IAAIA,WAAW,CAAC,CAAC;IAC5B;IACAI,QAAQ,CAACO,YAAY,IAAIP,QAAQ,CAACS,MAAM,CAAC,CAAC;IAC1CZ,UAAU,IAAIA,UAAU,CAAC,CAAC;EAC5B,CAAC,CAAC;EAENV,KAAK,GAAG,SAAAA,MAAA,EAAM;IACZM,YAAY,CAACU,OAAO,CAACC,eAAe,CAACM,MAAM,CAAC,UAAU,CAAC;IACvDjB,YAAY,CAACU,OAAO,CAACC,eAAe,CAACM,MAAM,CAAC,YAAY,CAAC;IAEzDF,iBAAiB,CAAC,CAAC;EACrB,CAAC;EAED,OAAO;IACLR,QAAQ,EAARA,QAAQ;IACRb,KAAK,EAALA;EACF,CAAC;AACH,CAAC;AAED,SAASwB,WAAW,EAAEC,sBAAsB;AAC5C,SAASC,uBAAuB"}
+{"version":3,"names":["lib","use","utils","EffectComposer","RenderPass","storeManagement","useSubComposerFrame","useComposerFrame","clean","initPostEffects","scene","renderer","camera","options","_ref","type","beforehooks","afterhooks","_ref$renderToScreen","renderToScreen","composer","renderPass","func","set","addPass","isNeedRender","cleanEffectsframe","render","delete"],"sources":["../../../src/core/PostEffects/index.ts"],"sourcesContent":["import type { Camera, Scene, WebGLRenderer } from '@anov/3d-core'\nimport { lib, use, utils } from '@anov/3d-core'\n\nconst { EffectComposer, RenderPass } = lib\nconst { storeManagement } = utils\nconst { useSubComposerFrame, useComposerFrame } = use\n\ntype InitPostEffectsOptions = {\n  type: 'main' | 'sub'\n  beforehooks?: () => void\n  afterhooks?: () => void\n  renderToScreen?: boolean\n}\n\nlet clean: () => void\n\n/**\n * init post effects\n * @param scene\n * @param renderer\n * @param camera\n * @param beforehooks composer render before hook\n * @param afterhooks composer render after hook\n * @returns\n */\nexport const initPostEffects = (\n  scene: Scene,\n  renderer: WebGLRenderer,\n  camera: Camera,\n  options?: InitPostEffectsOptions,\n) => {\n  const { type, beforehooks, afterhooks, renderToScreen = true } = options || { type: 'main' }\n  const composer = new EffectComposer(renderer)\n  const renderPass = new RenderPass(scene, camera)\n  const func = type === 'main' ? useComposerFrame : useSubComposerFrame\n\n  clean && clean()\n\n  storeManagement.set('composer', composer)\n  storeManagement.set('renderPass', renderPass)\n\n  composer.addPass(renderPass)\n  composer.renderToScreen = renderToScreen\n\n  // @ts-ignore\n  composer.isNeedRender = true\n\n  const cleanEffectsframe = func (() => {\n    beforehooks && beforehooks()\n    // @ts-ignore\n    composer.isNeedRender && composer.render()\n    afterhooks && afterhooks()\n  })\n\n  clean = () => {\n    storeManagement.delete('composer')\n    storeManagement.delete('renderPass')\n\n    cleanEffectsframe()\n  }\n\n  return {\n    composer,\n    clean,\n  }\n}\n\nexport * from './outlinePass'\nexport * from './bloomSelect'"],"mappings":"AACA,SAASA,GAAG,EAAEC,GAAG,EAAEC,KAAK,QAAQ,eAAe;AAE/C,IAAQC,cAAc,GAAiBH,GAAG,CAAlCG,cAAc;EAAEC,UAAU,GAAKJ,GAAG,CAAlBI,UAAU;AAClC,IAAQC,eAAe,GAAKH,KAAK,CAAzBG,eAAe;AACvB,IAAQC,mBAAmB,GAAuBL,GAAG,CAA7CK,mBAAmB;EAAEC,gBAAgB,GAAKN,GAAG,CAAxBM,gBAAgB;AAS7C,IAAIC,KAAiB;;AAErB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAC1BC,KAAY,EACZC,QAAuB,EACvBC,MAAc,EACdC,OAAgC,EAC7B;EACH,IAAAC,IAAA,GAAiED,OAAO,IAAI;MAAEE,IAAI,EAAE;IAAO,CAAC;IAApFA,IAAI,GAAAD,IAAA,CAAJC,IAAI;IAAEC,WAAW,GAAAF,IAAA,CAAXE,WAAW;IAAEC,UAAU,GAAAH,IAAA,CAAVG,UAAU;IAAAC,mBAAA,GAAAJ,IAAA,CAAEK,cAAc;IAAdA,cAAc,GAAAD,mBAAA,cAAG,IAAI,GAAAA,mBAAA;EAC5D,IAAME,QAAQ,GAAG,IAAIjB,cAAc,CAACQ,QAAQ,CAAC;EAC7C,IAAMU,UAAU,GAAG,IAAIjB,UAAU,CAACM,KAAK,EAAEE,MAAM,CAAC;EAChD,IAAMU,IAAI,GAAGP,IAAI,KAAK,MAAM,GAAGR,gBAAgB,GAAGD,mBAAmB;EAErEE,KAAK,IAAIA,KAAK,CAAC,CAAC;EAEhBH,eAAe,CAACkB,GAAG,CAAC,UAAU,EAAEH,QAAQ,CAAC;EACzCf,eAAe,CAACkB,GAAG,CAAC,YAAY,EAAEF,UAAU,CAAC;EAE7CD,QAAQ,CAACI,OAAO,CAACH,UAAU,CAAC;EAC5BD,QAAQ,CAACD,cAAc,GAAGA,cAAc;;EAExC;EACAC,QAAQ,CAACK,YAAY,GAAG,IAAI;EAE5B,IAAMC,iBAAiB,GAAGJ,IAAI,CAAE,YAAM;IACpCN,WAAW,IAAIA,WAAW,CAAC,CAAC;IAC5B;IACAI,QAAQ,CAACK,YAAY,IAAIL,QAAQ,CAACO,MAAM,CAAC,CAAC;IAC1CV,UAAU,IAAIA,UAAU,CAAC,CAAC;EAC5B,CAAC,CAAC;EAEFT,KAAK,GAAG,SAAAA,MAAA,EAAM;IACZH,eAAe,CAACuB,MAAM,CAAC,UAAU,CAAC;IAClCvB,eAAe,CAACuB,MAAM,CAAC,YAAY,CAAC;IAEpCF,iBAAiB,CAAC,CAAC;EACrB,CAAC;EAED,OAAO;IACLN,QAAQ,EAARA,QAAQ;IACRZ,KAAK,EAALA;EACF,CAAC;AACH,CAAC;AAED;AACA"}

package/dist/core/PostEffects/outlinePass.d.ts

@@ -1,4 +1,4 @@
-import type { Camera, Object3D, Scene, SceneControl } from '@anov/3d-core';
+import type { Camera, Object3D, Scene } from '@anov/3d-core';
 import { EffectPass } from 'postprocessing';
 type HighParamsType = {
     edgeStrength?: number;
@@ -13,7 +13,7 @@ type HighParamsType = {
  * @param highParams
  * @returns
  */
-export declare const createHighSelectedTool: (highParams: HighParamsType | undefined, sceneControl: SceneControl) => (object3dArray: Object3D[]) => void;
+export declare const createHighSelectedTool: (highParams?: HighParamsType) => (object3dArray: Object3D[]) => void;
 export declare class OutlinePass extends EffectPass {
     private outlinePass;
     constructor(scene: Scene, camera: Camera);

package/dist/core/PostEffects/outlinePass.js

@@ -14,8 +14,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { OutlinePassExtend, OutputPass, Vector2, lib, use } from '@anov/3d-core';
+import { OutlinePassExtend, OutputPass, Vector2, lib, use, utils } from '@anov/3d-core';
 import { EffectPass } from 'postprocessing';
+var storeManagement = utils.storeManagement;
 var ShaderPass = lib.ShaderPass,
   GammaCorrectionShader = lib.GammaCorrectionShader;
 var useScene = use.useScene;
@@ -32,12 +33,12 @@ var baseHighParams = {
  * @param highParams
  * @returns
  */
-export var createHighSelectedTool = function createHighSelectedTool(highParams, sceneControl) {
+export var createHighSelectedTool = function createHighSelectedTool(highParams) {
   var lastHighParams = _objectSpread(_objectSpread({}, baseHighParams), highParams);
-  var _useScene = useScene(sceneControl),
+  var _useScene = useScene(),
     scene = _useScene.scene,
     camera = _useScene.camera;
-  var composer = sceneControl.context.storeManagement.get('composer');
+  var composer = storeManagement.get('composer');
   if (!scene || !camera) throw new Error('scene or camera is not defined,');
   if (!composer) {
     console.error('composer is not defined, please initPostEffects first');

package/dist/core/PostEffects/outlinePass.js.map

@@ -1 +1 @@
-{"version":3,"names":["OutlinePassExtend","OutputPass","Vector2","lib","use","EffectPass","ShaderPass","GammaCorrectionShader","useScene","baseHighParams","edgeStrength","edgeGlow","edgeThickness","visibleEdgeColor","hiddenEdgeColor","createHighSelectedTool","highParams","sceneControl","lastHighParams","_objectSpread","_useScene","scene","camera","composer","context","storeManagement","get","Error","console","error","outlinePass","window","innerWidth","innerHeight","pulsePeriod","set","addPass","gammaCorrectionShader","object3dArray","selectedObjects","OutlinePass","_EffectPass","_inherits","_super","_createSuper","_this","_classCallCheck","call","_defineProperty","_assertThisInitialized","_createClass","key","value"],"sources":["../../../src/core/PostEffects/outlinePass.ts"],"sourcesContent":["import type { Camera, Object3D, Scene, SceneControl } from '@anov/3d-core'\nimport { OutlinePassExtend, OutputPass, Vector2, lib, use } from '@anov/3d-core'\nimport { EffectPass } from 'postprocessing'\n\ntype HighParamsType = {\n  edgeStrength?: number // 边缘强度\n  edgeGlow?: number // 缓缓接近\n  edgeThickness?: number // 边缘厚度\n  pulsePeriod?: number // 脉冲周期\n  visibleEdgeColor?: string // 可见边缘颜色\n  hiddenEdgeColor?: string // 隐藏边缘颜色\n}\n\nconst { ShaderPass, GammaCorrectionShader } = lib\nconst { useScene } = use\n\nconst baseHighParams: HighParamsType = {\n  edgeStrength: 10,\n  edgeGlow: 1,\n  edgeThickness: 3,\n  visibleEdgeColor: '#FF5713',\n  hiddenEdgeColor: '#FF5713',\n}\n\n/**\n *\n * @param highParams\n * @returns\n */\nexport const createHighSelectedTool = (highParams: HighParamsType | undefined, sceneControl: SceneControl) => {\n  const lastHighParams = {\n    ...baseHighParams,\n    ...highParams,\n  }\n\n  const { scene, camera } = useScene(sceneControl)\n  const composer = sceneControl.context.storeManagement.get('composer') as lib.EffectComposer | undefined\n\n  if (!scene || !camera)\n    throw new Error('scene or camera is not defined,')\n\n  if (!composer) {\n    console.error('composer is not defined, please initPostEffects first')\n    return null\n    // throw new Error('composer is not defined, please initPostEffects first')\n  }\n\n  const outlinePass = new OutlinePassExtend(new Vector2(window.innerWidth, window.innerHeight), scene, camera)\n\n  outlinePass.edgeStrength = lastHighParams.edgeStrength\n  outlinePass.edgeGlow = lastHighParams.edgeGlow\n  outlinePass.edgeThickness = lastHighParams.edgeThickness\n  lastHighParams.pulsePeriod && (outlinePass.pulsePeriod = lastHighParams.pulsePeriod)\n  outlinePass.visibleEdgeColor.set(lastHighParams.visibleEdgeColor)\n\n  composer.addPass(outlinePass)\n  composer.addPass(new OutputPass())\n\n  const gammaCorrectionShader = new ShaderPass(GammaCorrectionShader)\n\n  // if (!storeManagement.get<boolean>('__&&__gammaCorrectionShader')) {\n  //   composer.addPass(gammaCorrectionShader)\n  //   storeManagement.set('__&&__gammaCorrectionShader', true)\n  // }\n\n  return (object3dArray: Object3D[]) => {\n    outlinePass.selectedObjects = object3dArray\n  }\n}\n\nexport class OutlinePass extends EffectPass {\n  private outlinePass: OutlinePassExtend\n\n  constructor(scene: Scene, camera: Camera) {\n    super()\n\n    this.outlinePass = new OutlinePassExtend(new Vector2(window.innerWidth, window.innerHeight), scene, camera)\n\n    this.outlinePass.edgeStrength = baseHighParams.edgeStrength\n    this.outlinePass.edgeGlow = baseHighParams.edgeGlow\n    this.outlinePass.edgeThickness = baseHighParams.edgeThickness\n    this.outlinePass.visibleEdgeColor.set(baseHighParams.visibleEdgeColor)\n    this.outlinePass.hiddenEdgeColor.set(baseHighParams.hiddenEdgeColor)\n  }\n\n  public selectedObjects(object3dArray: Object3D[]) {\n    this.outlinePass.selectedObjects = object3dArray\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["OutlinePassExtend","OutputPass","Vector2","lib","use","utils","EffectPass","storeManagement","ShaderPass","GammaCorrectionShader","useScene","baseHighParams","edgeStrength","edgeGlow","edgeThickness","visibleEdgeColor","hiddenEdgeColor","createHighSelectedTool","highParams","lastHighParams","_objectSpread","_useScene","scene","camera","composer","get","Error","console","error","outlinePass","window","innerWidth","innerHeight","pulsePeriod","set","addPass","gammaCorrectionShader","object3dArray","selectedObjects","OutlinePass","_EffectPass","_inherits","_super","_createSuper","_this","_classCallCheck","call","_defineProperty","_assertThisInitialized","_createClass","key","value"],"sources":["../../../src/core/PostEffects/outlinePass.ts"],"sourcesContent":["import type { Camera, Object3D, Scene } from '@anov/3d-core'\nimport { OutlinePassExtend, OutputPass, Vector2, lib, use, utils } from '@anov/3d-core'\nimport { EffectPass } from 'postprocessing'\n\ntype HighParamsType = {\n  edgeStrength?: number // 边缘强度\n  edgeGlow?: number // 缓缓接近\n  edgeThickness?: number // 边缘厚度\n  pulsePeriod?: number // 脉冲周期\n  visibleEdgeColor?: string // 可见边缘颜色\n  hiddenEdgeColor?: string // 隐藏边缘颜色\n}\n\nconst { storeManagement } = utils\nconst { ShaderPass, GammaCorrectionShader } = lib\nconst { useScene } = use\n\nconst baseHighParams: HighParamsType = {\n  edgeStrength: 10,\n  edgeGlow: 1,\n  edgeThickness: 3,\n  visibleEdgeColor: '#FF5713',\n  hiddenEdgeColor: '#FF5713',\n}\n\n/**\n *\n * @param highParams\n * @returns\n */\nexport const createHighSelectedTool = (highParams?: HighParamsType) => {\n  const lastHighParams = {\n    ...baseHighParams,\n    ...highParams,\n  }\n\n  const { scene, camera } = useScene()\n  const composer = storeManagement.get('composer') as lib.EffectComposer | undefined\n\n  if (!scene || !camera)\n    throw new Error('scene or camera is not defined,')\n\n  if (!composer) {\n    console.error('composer is not defined, please initPostEffects first')\n    return null\n    // throw new Error('composer is not defined, please initPostEffects first')\n  }\n\n  const outlinePass = new OutlinePassExtend(new Vector2(window.innerWidth, window.innerHeight), scene, camera)\n\n  outlinePass.edgeStrength = lastHighParams.edgeStrength\n  outlinePass.edgeGlow = lastHighParams.edgeGlow\n  outlinePass.edgeThickness = lastHighParams.edgeThickness\n  lastHighParams.pulsePeriod && (outlinePass.pulsePeriod = lastHighParams.pulsePeriod)\n  outlinePass.visibleEdgeColor.set(lastHighParams.visibleEdgeColor)\n\n  composer.addPass(outlinePass)\n  composer.addPass(new OutputPass())\n\n  const gammaCorrectionShader = new ShaderPass(GammaCorrectionShader)\n\n  // if (!storeManagement.get<boolean>('__&&__gammaCorrectionShader')) {\n  //   composer.addPass(gammaCorrectionShader)\n  //   storeManagement.set('__&&__gammaCorrectionShader', true)\n  // }\n\n  return (object3dArray: Object3D[]) => {\n    outlinePass.selectedObjects = object3dArray\n  }\n}\n\nexport class OutlinePass extends EffectPass {\n  private outlinePass: OutlinePassExtend\n\n  constructor(scene: Scene, camera: Camera) {\n    super()\n\n    this.outlinePass = new OutlinePassExtend(new Vector2(window.innerWidth, window.innerHeight), scene, camera)\n\n    this.outlinePass.edgeStrength = baseHighParams.edgeStrength\n    this.outlinePass.edgeGlow = baseHighParams.edgeGlow\n    this.outlinePass.edgeThickness = baseHighParams.edgeThickness\n    this.outlinePass.visibleEdgeColor.set(baseHighParams.visibleEdgeColor)\n    this.outlinePass.hiddenEdgeColor.set(baseHighParams.hiddenEdgeColor)\n  }\n\n  public selectedObjects(object3dArray: Object3D[]) {\n    this.outlinePass.selectedObjects = object3dArray\n  }\n}\n"],"mappings":"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"}

package/dist/core/PostEffects/postprocessing.d.ts

@@ -1,2 +1,2 @@
-import type { Camera, Scene, SceneControl, WebGLRenderer } from '@anov/3d-core';
-export declare const initPostEffectsV2: (scene: Scene, renderer: WebGLRenderer, camera: Camera, sceneControl: SceneControl) => void;
+import { type Camera, type Scene, type WebGLRenderer } from '@anov/3d-core';
+export declare const initPostEffectsV2: (scene: Scene, renderer: WebGLRenderer, camera: Camera) => void;

package/dist/core/PostEffects/postprocessing.js

@@ -1,7 +1,7 @@
 import { use } from '@anov/3d-core';
 import { BlendFunction, DepthDownsamplingPass, EdgeDetectionMode, EffectComposer, EffectPass, NormalPass, PredicationMode, RenderPass, SMAAEffect, SMAAPreset, SSAOEffect, TextureEffect } from 'postprocessing';
 var useComposerFrame = use.useComposerFrame;
-export var initPostEffectsV2 = function initPostEffectsV2(scene, renderer, camera, sceneControl) {
+export var initPostEffectsV2 = function initPostEffectsV2(scene, renderer, camera) {
   var composer = new EffectComposer(renderer);
   composer.addPass(new RenderPass(scene, camera));
   var normalPass = new NormalPass(scene, camera);
@@ -48,7 +48,7 @@ export var initPostEffectsV2 = function initPostEffectsV2(scene, renderer, camer
   composer.addPass(normalPass);
   composer.addPass(depthDownsamplingPass);
   composer.addPass(effectPass);
-  useComposerFrame(sceneControl, function () {
+  useComposerFrame(function () {
     composer.render();
   });
 };

package/dist/core/PostEffects/postprocessing.js.map

@@ -1 +1 @@
-{"version":3,"names":["use","BlendFunction","DepthDownsamplingPass","EdgeDetectionMode","EffectComposer","EffectPass","NormalPass","PredicationMode","RenderPass","SMAAEffect","SMAAPreset","SSAOEffect","TextureEffect","useComposerFrame","initPostEffectsV2","scene","renderer","camera","sceneControl","composer","addPass","normalPass","depthDownsamplingPass","normalBuffer","texture","resolutionScale","normalDepthBuffer","smaaEffect","preset","MEDIUM","edgeDetectionMode","COLOR","predicationMode","DEPTH","edgeDetectionMaterial","setEdgeDetectionThreshold","ssaoEffect","blendFunction","MULTIPLY","distanceScaling","depthAwareUpsampling","samples","rings","distanceThreshold","distanceFalloff","rangeThreshold","rangeFalloff","luminanceInfluence","minRadiusScale","radius","intensity","bias","fade","color","textureEffect","SKIP","effectPass","render"],"sources":["../../../src/core/PostEffects/postprocessing.ts"],"sourcesContent":["import type { Camera, Scene, SceneControl, WebGLRenderer } from '@anov/3d-core'\nimport { use } from '@anov/3d-core'\nimport { BlendFunction, DepthDownsamplingPass, EdgeDetectionMode, EffectComposer, EffectPass, NormalPass, PredicationMode, RenderPass, SMAAEffect, SMAAPreset, SSAOEffect, TextureEffect } from 'postprocessing'\n\nconst { useComposerFrame } = use\n\nexport const initPostEffectsV2 = (\n  scene: Scene,\n  renderer: WebGLRenderer,\n  camera: Camera,\n  sceneControl: SceneControl,\n) => {\n  const composer = new EffectComposer(renderer)\n  composer.addPass(new RenderPass(scene, camera))\n\n  const normalPass = new NormalPass(scene, camera)\n  const depthDownsamplingPass = new DepthDownsamplingPass({\n    normalBuffer: normalPass.texture,\n    resolutionScale: 0.5,\n  })\n\n  const normalDepthBuffer = depthDownsamplingPass.texture\n\n  const smaaEffect = new SMAAEffect({\n    preset: SMAAPreset.MEDIUM,\n    edgeDetectionMode: EdgeDetectionMode.COLOR,\n    predicationMode: PredicationMode.DEPTH,\n  })\n\n  smaaEffect.edgeDetectionMaterial.setEdgeDetectionThreshold(0.01)\n\n  const ssaoEffect = new SSAOEffect(camera, normalPass.texture, {\n    blendFunction: BlendFunction.MULTIPLY,\n    distanceScaling: true,\n    depthAwareUpsampling: true,\n    normalDepthBuffer,\n    samples: 9,\n    rings: 7,\n    distanceThreshold: 0.02, // Render up to a distance of ~20 world units\n    distanceFalloff: 0.0025, // with an additional ~2.5 units of falloff.\n    rangeThreshold: 0.0003, // Occlusion proximity of ~0.3 world units\n    rangeFalloff: 0.0001, // with ~0.1 units of falloff.\n    luminanceInfluence: 0.7,\n    minRadiusScale: 0.33,\n    radius: 0.1,\n    intensity: 1.33,\n    bias: 0.025,\n    fade: 0.01,\n    color: null,\n    resolutionScale: 0.5,\n  })\n\n  const textureEffect = new TextureEffect({\n    blendFunction: BlendFunction.SKIP,\n    texture: depthDownsamplingPass.texture,\n  })\n\n  const effectPass = new EffectPass(camera, smaaEffect, ssaoEffect, textureEffect)\n\n  composer.addPass(normalPass)\n  composer.addPass(depthDownsamplingPass)\n  composer.addPass(effectPass)\n\n  useComposerFrame(sceneControl, () => {\n    composer.render()\n  })\n}"],"mappings":"AACA,SAASA,GAAG,QAAQ,eAAe;AACnC,SAASC,aAAa,EAAEC,qBAAqB,EAAEC,iBAAiB,EAAEC,cAAc,EAAEC,UAAU,EAAEC,UAAU,EAAEC,eAAe,EAAEC,UAAU,EAAEC,UAAU,EAAEC,UAAU,EAAEC,UAAU,EAAEC,aAAa,QAAQ,gBAAgB;AAEhN,IAAQC,gBAAgB,GAAKb,GAAG,CAAxBa,gBAAgB;AAExB,OAAO,IAAMC,iBAAiB,GAAG,SAApBA,iBAAiBA,CAC5BC,KAAY,EACZC,QAAuB,EACvBC,MAAc,EACdC,YAA0B,EACvB;EACH,IAAMC,QAAQ,GAAG,IAAIf,cAAc,CAACY,QAAQ,CAAC;EAC7CG,QAAQ,CAACC,OAAO,CAAC,IAAIZ,UAAU,CAACO,KAAK,EAAEE,MAAM,CAAC,CAAC;EAE/C,IAAMI,UAAU,GAAG,IAAIf,UAAU,CAACS,KAAK,EAAEE,MAAM,CAAC;EAChD,IAAMK,qBAAqB,GAAG,IAAIpB,qBAAqB,CAAC;IACtDqB,YAAY,EAAEF,UAAU,CAACG,OAAO;IAChCC,eAAe,EAAE;EACnB,CAAC,CAAC;EAEF,IAAMC,iBAAiB,GAAGJ,qBAAqB,CAACE,OAAO;EAEvD,IAAMG,UAAU,GAAG,IAAIlB,UAAU,CAAC;IAChCmB,MAAM,EAAElB,UAAU,CAACmB,MAAM;IACzBC,iBAAiB,EAAE3B,iBAAiB,CAAC4B,KAAK;IAC1CC,eAAe,EAAEzB,eAAe,CAAC0B;EACnC,CAAC,CAAC;EAEFN,UAAU,CAACO,qBAAqB,CAACC,yBAAyB,CAAC,IAAI,CAAC;EAEhE,IAAMC,UAAU,GAAG,IAAIzB,UAAU,CAACM,MAAM,EAAEI,UAAU,CAACG,OAAO,EAAE;IAC5Da,aAAa,EAAEpC,aAAa,CAACqC,QAAQ;IACrCC,eAAe,EAAE,IAAI;IACrBC,oBAAoB,EAAE,IAAI;IAC1Bd,iBAAiB,EAAjBA,iBAAiB;IACjBe,OAAO,EAAE,CAAC;IACVC,KAAK,EAAE,CAAC;IACRC,iBAAiB,EAAE,IAAI;IAAE;IACzBC,eAAe,EAAE,MAAM;IAAE;IACzBC,cAAc,EAAE,MAAM;IAAE;IACxBC,YAAY,EAAE,MAAM;IAAE;IACtBC,kBAAkB,EAAE,GAAG;IACvBC,cAAc,EAAE,IAAI;IACpBC,MAAM,EAAE,GAAG;IACXC,SAAS,EAAE,IAAI;IACfC,IAAI,EAAE,KAAK;IACXC,IAAI,EAAE,IAAI;IACVC,KAAK,EAAE,IAAI;IACX5B,eAAe,EAAE;EACnB,CAAC,CAAC;EAEF,IAAM6B,aAAa,GAAG,IAAI1C,aAAa,CAAC;IACtCyB,aAAa,EAAEpC,aAAa,CAACsD,IAAI;IACjC/B,OAAO,EAAEF,qBAAqB,CAACE;EACjC,CAAC,CAAC;EAEF,IAAMgC,UAAU,GAAG,IAAInD,UAAU,CAACY,MAAM,EAAEU,UAAU,EAAES,UAAU,EAAEkB,aAAa,CAAC;EAEhFnC,QAAQ,CAACC,OAAO,CAACC,UAAU,CAAC;EAC5BF,QAAQ,CAACC,OAAO,CAACE,qBAAqB,CAAC;EACvCH,QAAQ,CAACC,OAAO,CAACoC,UAAU,CAAC;EAE5B3C,gBAAgB,CAACK,YAAY,EAAE,YAAM;IACnCC,QAAQ,CAACsC,MAAM,CAAC,CAAC;EACnB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"names":["use","BlendFunction","DepthDownsamplingPass","EdgeDetectionMode","EffectComposer","EffectPass","NormalPass","PredicationMode","RenderPass","SMAAEffect","SMAAPreset","SSAOEffect","TextureEffect","useComposerFrame","initPostEffectsV2","scene","renderer","camera","composer","addPass","normalPass","depthDownsamplingPass","normalBuffer","texture","resolutionScale","normalDepthBuffer","smaaEffect","preset","MEDIUM","edgeDetectionMode","COLOR","predicationMode","DEPTH","edgeDetectionMaterial","setEdgeDetectionThreshold","ssaoEffect","blendFunction","MULTIPLY","distanceScaling","depthAwareUpsampling","samples","rings","distanceThreshold","distanceFalloff","rangeThreshold","rangeFalloff","luminanceInfluence","minRadiusScale","radius","intensity","bias","fade","color","textureEffect","SKIP","effectPass","render"],"sources":["../../../src/core/PostEffects/postprocessing.ts"],"sourcesContent":["import { type Camera, type Scene, type WebGLRenderer, use } from '@anov/3d-core'\nimport { BlendFunction, DepthDownsamplingPass, EdgeDetectionMode, EffectComposer, EffectPass, NormalPass, PredicationMode, RenderPass, SMAAEffect, SMAAPreset, SSAOEffect, TextureEffect } from 'postprocessing'\n\nconst { useComposerFrame } = use\n\nexport const initPostEffectsV2 = (\n  scene: Scene,\n  renderer: WebGLRenderer,\n  camera: Camera,\n) => {\n  const composer = new EffectComposer(renderer)\n  composer.addPass(new RenderPass(scene, camera))\n\n  const normalPass = new NormalPass(scene, camera)\n  const depthDownsamplingPass = new DepthDownsamplingPass({\n    normalBuffer: normalPass.texture,\n    resolutionScale: 0.5,\n  })\n\n  const normalDepthBuffer = depthDownsamplingPass.texture\n\n  const smaaEffect = new SMAAEffect({\n    preset: SMAAPreset.MEDIUM,\n    edgeDetectionMode: EdgeDetectionMode.COLOR,\n    predicationMode: PredicationMode.DEPTH,\n  })\n\n  smaaEffect.edgeDetectionMaterial.setEdgeDetectionThreshold(0.01)\n\n  const ssaoEffect = new SSAOEffect(camera, normalPass.texture, {\n    blendFunction: BlendFunction.MULTIPLY,\n    distanceScaling: true,\n    depthAwareUpsampling: true,\n    normalDepthBuffer,\n    samples: 9,\n    rings: 7,\n    distanceThreshold: 0.02, // Render up to a distance of ~20 world units\n    distanceFalloff: 0.0025, // with an additional ~2.5 units of falloff.\n    rangeThreshold: 0.0003, // Occlusion proximity of ~0.3 world units\n    rangeFalloff: 0.0001, // with ~0.1 units of falloff.\n    luminanceInfluence: 0.7,\n    minRadiusScale: 0.33,\n    radius: 0.1,\n    intensity: 1.33,\n    bias: 0.025,\n    fade: 0.01,\n    color: null,\n    resolutionScale: 0.5,\n  })\n\n  const textureEffect = new TextureEffect({\n    blendFunction: BlendFunction.SKIP,\n    texture: depthDownsamplingPass.texture,\n  })\n\n  const effectPass = new EffectPass(camera, smaaEffect, ssaoEffect, textureEffect)\n\n  composer.addPass(normalPass)\n  composer.addPass(depthDownsamplingPass)\n  composer.addPass(effectPass)\n\n  useComposerFrame(() => {\n    composer.render()\n  })\n}"],"mappings":"AAAA,SAAsDA,GAAG,QAAQ,eAAe;AAChF,SAASC,aAAa,EAAEC,qBAAqB,EAAEC,iBAAiB,EAAEC,cAAc,EAAEC,UAAU,EAAEC,UAAU,EAAEC,eAAe,EAAEC,UAAU,EAAEC,UAAU,EAAEC,UAAU,EAAEC,UAAU,EAAEC,aAAa,QAAQ,gBAAgB;AAEhN,IAAQC,gBAAgB,GAAKb,GAAG,CAAxBa,gBAAgB;AAExB,OAAO,IAAMC,iBAAiB,GAAG,SAApBA,iBAAiBA,CAC5BC,KAAY,EACZC,QAAuB,EACvBC,MAAc,EACX;EACH,IAAMC,QAAQ,GAAG,IAAId,cAAc,CAACY,QAAQ,CAAC;EAC7CE,QAAQ,CAACC,OAAO,CAAC,IAAIX,UAAU,CAACO,KAAK,EAAEE,MAAM,CAAC,CAAC;EAE/C,IAAMG,UAAU,GAAG,IAAId,UAAU,CAACS,KAAK,EAAEE,MAAM,CAAC;EAChD,IAAMI,qBAAqB,GAAG,IAAInB,qBAAqB,CAAC;IACtDoB,YAAY,EAAEF,UAAU,CAACG,OAAO;IAChCC,eAAe,EAAE;EACnB,CAAC,CAAC;EAEF,IAAMC,iBAAiB,GAAGJ,qBAAqB,CAACE,OAAO;EAEvD,IAAMG,UAAU,GAAG,IAAIjB,UAAU,CAAC;IAChCkB,MAAM,EAAEjB,UAAU,CAACkB,MAAM;IACzBC,iBAAiB,EAAE1B,iBAAiB,CAAC2B,KAAK;IAC1CC,eAAe,EAAExB,eAAe,CAACyB;EACnC,CAAC,CAAC;EAEFN,UAAU,CAACO,qBAAqB,CAACC,yBAAyB,CAAC,IAAI,CAAC;EAEhE,IAAMC,UAAU,GAAG,IAAIxB,UAAU,CAACM,MAAM,EAAEG,UAAU,CAACG,OAAO,EAAE;IAC5Da,aAAa,EAAEnC,aAAa,CAACoC,QAAQ;IACrCC,eAAe,EAAE,IAAI;IACrBC,oBAAoB,EAAE,IAAI;IAC1Bd,iBAAiB,EAAjBA,iBAAiB;IACjBe,OAAO,EAAE,CAAC;IACVC,KAAK,EAAE,CAAC;IACRC,iBAAiB,EAAE,IAAI;IAAE;IACzBC,eAAe,EAAE,MAAM;IAAE;IACzBC,cAAc,EAAE,MAAM;IAAE;IACxBC,YAAY,EAAE,MAAM;IAAE;IACtBC,kBAAkB,EAAE,GAAG;IACvBC,cAAc,EAAE,IAAI;IACpBC,MAAM,EAAE,GAAG;IACXC,SAAS,EAAE,IAAI;IACfC,IAAI,EAAE,KAAK;IACXC,IAAI,EAAE,IAAI;IACVC,KAAK,EAAE,IAAI;IACX5B,eAAe,EAAE;EACnB,CAAC,CAAC;EAEF,IAAM6B,aAAa,GAAG,IAAIzC,aAAa,CAAC;IACtCwB,aAAa,EAAEnC,aAAa,CAACqD,IAAI;IACjC/B,OAAO,EAAEF,qBAAqB,CAACE;EACjC,CAAC,CAAC;EAEF,IAAMgC,UAAU,GAAG,IAAIlD,UAAU,CAACY,MAAM,EAAES,UAAU,EAAES,UAAU,EAAEkB,aAAa,CAAC;EAEhFnC,QAAQ,CAACC,OAAO,CAACC,UAAU,CAAC;EAC5BF,QAAQ,CAACC,OAAO,CAACE,qBAAqB,CAAC;EACvCH,QAAQ,CAACC,OAAO,CAACoC,UAAU,CAAC;EAE5B1C,gBAAgB,CAAC,YAAM;IACrBK,QAAQ,CAACsC,MAAM,CAAC,CAAC;EACnB,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/PostEffects/saoPass.d.ts

@@ -1,7 +1,6 @@
-import type { SceneControl } from '@anov/3d-core';
 /**
  * add ssao 环境光遮蔽
  * @returns
  */
-declare const addSAOPass: (sceneControl: SceneControl) => () => void;
+declare const addSAOPass: () => () => void;
 export default addSAOPass;

package/dist/core/PostEffects/saoPass.js

@@ -1,15 +1,16 @@
-import { OutputPass, lib, use } from '@anov/3d-core';
+import { OutputPass, lib, use, utils } from '@anov/3d-core';
+var storeManagement = utils.storeManagement;
 var SAOPass = lib.SAOPass;
 
 /**
  * add ssao 环境光遮蔽
  * @returns
  */
-var addSAOPass = function addSAOPass(sceneControl) {
-  var _use$useScene = use.useScene(sceneControl),
+var addSAOPass = function addSAOPass() {
+  var _use$useScene = use.useScene(),
     scene = _use$useScene.scene,
     camera = _use$useScene.camera;
-  var composer = sceneControl.context.storeManagement.get('composer');
+  var composer = storeManagement.get('composer');
   if (!scene || !camera) throw new Error('scene or camera is not defined,');
   if (!composer) throw new Error('composer is not defined, please initPostEffects first');
   var saoPass = new SAOPass(scene, camera);

package/dist/core/PostEffects/saoPass.js.map

@@ -1 +1 @@
-{"version":3,"names":["OutputPass","lib","use","SAOPass","addSAOPass","sceneControl","_use$useScene","useScene","scene","camera","composer","context","storeManagement","get","Error","saoPass","addPass","outputPass","removePass"],"sources":["../../../src/core/PostEffects/saoPass.ts"],"sourcesContent":["import type { SceneControl } from '@anov/3d-core'\nimport { OutputPass, lib, use } from '@anov/3d-core'\n\nconst { SAOPass } = lib\n\n/**\n * add ssao 环境光遮蔽\n * @returns\n */\nconst addSAOPass = (sceneControl: SceneControl) => {\n  const { scene, camera } = use.useScene(sceneControl)\n  const composer = sceneControl.context.storeManagement.get('composer') as lib.EffectComposer | undefined\n\n  if (!scene || !camera)\n    throw new Error('scene or camera is not defined,')\n\n  if (!composer)\n    throw new Error('composer is not defined, please initPostEffects first')\n\n  const saoPass = new SAOPass(scene, camera)\n  composer.addPass(saoPass)\n\n  const outputPass = new OutputPass()\n  composer.addPass(outputPass)\n\n  return () => {\n    composer.removePass(saoPass)\n    composer.removePass(outputPass)\n  }\n}\n\nexport default addSAOPass\n"],"mappings":"AACA,SAASA,UAAU,EAAEC,GAAG,EAAEC,GAAG,QAAQ,eAAe;AAEpD,IAAQC,OAAO,GAAKF,GAAG,CAAfE,OAAO;;AAEf;AACA;AACA;AACA;AACA,IAAMC,UAAU,GAAG,SAAbA,UAAUA,CAAIC,YAA0B,EAAK;EACjD,IAAAC,aAAA,GAA0BJ,GAAG,CAACK,QAAQ,CAACF,YAAY,CAAC;IAA5CG,KAAK,GAAAF,aAAA,CAALE,KAAK;IAAEC,MAAM,GAAAH,aAAA,CAANG,MAAM;EACrB,IAAMC,QAAQ,GAAGL,YAAY,CAACM,OAAO,CAACC,eAAe,CAACC,GAAG,CAAC,UAAU,CAAmC;EAEvG,IAAI,CAACL,KAAK,IAAI,CAACC,MAAM,EACnB,MAAM,IAAIK,KAAK,CAAC,iCAAiC,CAAC;EAEpD,IAAI,CAACJ,QAAQ,EACX,MAAM,IAAII,KAAK,CAAC,uDAAuD,CAAC;EAE1E,IAAMC,OAAO,GAAG,IAAIZ,OAAO,CAACK,KAAK,EAAEC,MAAM,CAAC;EAC1CC,QAAQ,CAACM,OAAO,CAACD,OAAO,CAAC;EAEzB,IAAME,UAAU,GAAG,IAAIjB,UAAU,CAAC,CAAC;EACnCU,QAAQ,CAACM,OAAO,CAACC,UAAU,CAAC;EAE5B,OAAO,YAAM;IACXP,QAAQ,CAACQ,UAAU,CAACH,OAAO,CAAC;IAC5BL,QAAQ,CAACQ,UAAU,CAACD,UAAU,CAAC;EACjC,CAAC;AACH,CAAC;AAED,eAAeb,UAAU"}
+{"version":3,"names":["OutputPass","lib","use","utils","storeManagement","SAOPass","addSAOPass","_use$useScene","useScene","scene","camera","composer","get","Error","saoPass","addPass","outputPass","removePass"],"sources":["../../../src/core/PostEffects/saoPass.ts"],"sourcesContent":["import { OutputPass, lib, use, utils } from '@anov/3d-core'\n\nconst { storeManagement } = utils\nconst { SAOPass } = lib\n\n/**\n * add ssao 环境光遮蔽\n * @returns\n */\nconst addSAOPass = () => {\n  const { scene, camera } = use.useScene()\n  const composer = storeManagement.get('composer') as lib.EffectComposer | undefined\n\n  if (!scene || !camera)\n    throw new Error('scene or camera is not defined,')\n\n  if (!composer)\n    throw new Error('composer is not defined, please initPostEffects first')\n\n  const saoPass = new SAOPass(scene, camera)\n  composer.addPass(saoPass)\n\n  const outputPass = new OutputPass()\n  composer.addPass(outputPass)\n\n  return () => {\n    composer.removePass(saoPass)\n    composer.removePass(outputPass)\n  }\n}\n\nexport default addSAOPass\n"],"mappings":"AAAA,SAASA,UAAU,EAAEC,GAAG,EAAEC,GAAG,EAAEC,KAAK,QAAQ,eAAe;AAE3D,IAAQC,eAAe,GAAKD,KAAK,CAAzBC,eAAe;AACvB,IAAQC,OAAO,GAAKJ,GAAG,CAAfI,OAAO;;AAEf;AACA;AACA;AACA;AACA,IAAMC,UAAU,GAAG,SAAbA,UAAUA,CAAA,EAAS;EACvB,IAAAC,aAAA,GAA0BL,GAAG,CAACM,QAAQ,CAAC,CAAC;IAAhCC,KAAK,GAAAF,aAAA,CAALE,KAAK;IAAEC,MAAM,GAAAH,aAAA,CAANG,MAAM;EACrB,IAAMC,QAAQ,GAAGP,eAAe,CAACQ,GAAG,CAAC,UAAU,CAAmC;EAElF,IAAI,CAACH,KAAK,IAAI,CAACC,MAAM,EACnB,MAAM,IAAIG,KAAK,CAAC,iCAAiC,CAAC;EAEpD,IAAI,CAACF,QAAQ,EACX,MAAM,IAAIE,KAAK,CAAC,uDAAuD,CAAC;EAE1E,IAAMC,OAAO,GAAG,IAAIT,OAAO,CAACI,KAAK,EAAEC,MAAM,CAAC;EAC1CC,QAAQ,CAACI,OAAO,CAACD,OAAO,CAAC;EAEzB,IAAME,UAAU,GAAG,IAAIhB,UAAU,CAAC,CAAC;EACnCW,QAAQ,CAACI,OAAO,CAACC,UAAU,CAAC;EAE5B,OAAO,YAAM;IACXL,QAAQ,CAACM,UAAU,CAACH,OAAO,CAAC;IAC5BH,QAAQ,CAACM,UAAU,CAACD,UAAU,CAAC;EACjC,CAAC;AACH,CAAC;AAED,eAAeV,UAAU"}

package/dist/core/SceneEffect/grow/grow.d.ts

@@ -1,11 +1,9 @@
-import type { SceneControl } from '@anov/3d-core';
 import type { GrowOption } from './type';
 export declare class Grow {
     private objs;
     private option;
     private growStyle;
-    private sceneControl;
-    constructor(opt: GrowOption | undefined, sceneControl: SceneControl);
+    constructor(opt?: GrowOption);
     in(callback: () => void): void;
     out(callback: () => void): void;
     init(opt: GrowOption): void;

package/dist/core/SceneEffect/grow/grow.js

@@ -11,17 +11,15 @@ import { GrowStyleDown, GrowStyleUp } from "./growStyle";
 
 // 生长动画对象
 export var Grow = /*#__PURE__*/function () {
-  function Grow(opt, sceneControl) {
+  function Grow(opt) {
     _classCallCheck(this, Grow);
     _defineProperty(this, "objs", void 0);
     _defineProperty(this, "option", void 0);
     _defineProperty(this, "growStyle", void 0);
-    _defineProperty(this, "sceneControl", void 0);
     this.objs = [];
     this.option = {};
     // @ts-ignore
     this.growStyle = null;
-    this.sceneControl = sceneControl;
     this.init(opt || {});
   }
 
@@ -84,12 +82,12 @@ export var Grow = /*#__PURE__*/function () {
       this.objs.length = 0;
       // 获取所有对象
       if (this.option.tag === '*') {
-        use.useScene(this.sceneControl).scene.traverseVisible(function (object) {
+        use.useScene().scene.traverseVisible(function (object) {
           if (object instanceof Object3D) _this3.objs.push(object);
         });
       } else {
         // 获取指定tag对象
-        use.useScene(this.sceneControl).scene.traverseVisible(function (object) {
+        use.useScene().scene.traverseVisible(function (object) {
           if (object instanceof Object3D && object.userData.tag && Array.isArray(object.userData.tag) && object.userData.tag.includes(_this3.option.tag)) _this3.objs.push(object);
         });
       }

package/dist/core/SceneEffect/grow/grow.js.map

@@ -1 +1 @@
-{"version":3,"names":["Box3","Object3D","Vector3","use","EEaseType","ESceneGrowType","GrowStyleDown","GrowStyleUp","Grow","opt","sceneControl","_classCallCheck","_defineProperty","objs","option","growStyle","init","_createClass","key","value","_in","callback","_this","onGrowInStart","getTimeLine","eventCallback","onGrowInCompleted","in","out","_this2","onGrowOutStart","onGrowOutCompleted","_this3","tag","type","Up","time","gapTime","ease","SineInOut","center","scale","distance","isRotate","isScale","Object","assign","length","useScene","scene","traverseVisible","object","push","userData","Array","isArray","includes","boundingBox","i","expandByObject","getCenter","Down","onGrowInitCompleted"],"sources":["../../../../src/core/SceneEffect/grow/grow.ts"],"sourcesContent":["import { Box3, Object3D, Vector3, gsap, use } from '@anov/3d-core'\nimport type { SceneControl } from '@anov/3d-core'\nimport type { GrowOption, IGrowStyle } from './type'\nimport { EEaseType, ESceneGrowType } from './type'\nimport { GrowStyleDown, GrowStyleUp } from './growStyle'\n\n// 生长动画对象\nexport class Grow {\n  private objs: Array<Object3D>\n  private option: GrowOption\n  private growStyle: IGrowStyle\n  private sceneControl: SceneControl\n\n  constructor(opt: GrowOption | undefined, sceneControl: SceneControl) {\n    this.objs = []\n    this.option = {}\n    // @ts-ignore\n    this.growStyle = null\n    this.sceneControl = sceneControl\n    this.init(opt || {})\n  }\n\n  // 生长\n  in(callback: () => void) {\n    // 入场事件\n    this.option.onGrowInStart && this.option.onGrowInStart()\n\n    this.growStyle.getTimeLine().eventCallback('onComplete', () => {\n      this.option.onGrowInCompleted && this.option.onGrowInCompleted()\n      callback && callback()\n    })\n\n    this.growStyle.in()\n  }\n\n  // 消退\n  out(callback: () => void) {\n    // 出场事件\n    this.option.onGrowOutStart && this.option.onGrowOutStart()\n\n    this.growStyle.getTimeLine().eventCallback('onReverseComplete', () => {\n      this.option.onGrowOutCompleted && this.option.onGrowOutCompleted()\n\n      callback && callback()\n    })\n\n    this.growStyle.out()\n  }\n\n  // 初始化\n  init(opt: GrowOption) {\n    this.option = {\n      tag: '*', // 可选,进场对象Tag, 默认 \"*\" 所有可见MESH对象,\n      type: ESceneGrowType.Up, // 可选,进场动画类型,默认 ESceneGrowType.Up向上生长\n      time: 0.5, // 可选,单对象进场时间,默认0.5秒\n      gapTime: 0.2, // 可选,多个对象之间间隔事件,默认0.2秒\n      ease: EEaseType.SineInOut, // 可选,默认缓入缓出\n      center: null, // 可选,生长中心位置,默认包围盒中心点\n      scale: 1, // 可选，倍速，默认为1。\n      distance: 1000, // 可选,初始化UP/DOWN起始距离，默认1000\n      isRotate: true, // 可选,初始化UP/DOWN起始旋转角度，默认true\n      isScale: true, // 可选,初始化UP/DOWN起始缩放大小，默认true\n    }\n    Object.assign(this.option, opt)\n    // ------- 1.初始化目标对象 --------\n    this.objs.length = 0\n    // 获取所有对象\n    if (this.option.tag === '*') {\n      use.useScene(this.sceneControl).scene!.traverseVisible((object) => {\n        if (object instanceof Object3D)\n          this.objs.push(object)\n      })\n    }\n    else { // 获取指定tag对象\n      use.useScene(this.sceneControl).scene!.traverseVisible((object) => {\n        if (object instanceof Object3D && object.userData.tag && Array.isArray(object.userData.tag) && object.userData.tag.includes(this.option.tag))\n          this.objs.push(object)\n      })\n    }\n\n    // ------- 2.中心点 ------------\n    if (!this.option.center) {\n      const boundingBox = new Box3()\n\n      // 将每个物体的边界框扩展到包围盒中\n      for (let i = 0; i < this.objs.length; i++) {\n        const object = this.objs[i]\n        boundingBox.expandByObject(object)\n      }\n      // 计算包围盒的中心点\n      const center = new Vector3()\n      this.option.center = boundingBox.getCenter(center)\n    }\n\n    // ------- 2.初始化目标对象 生长前状态 --------\n    switch (this.option.type) {\n      case ESceneGrowType.Up:\n        this.growStyle = new GrowStyleUp(this.objs, this.option)\n        break\n      case ESceneGrowType.Down:\n        this.growStyle = new GrowStyleDown(this.objs, this.option)\n        break\n      default:\n        this.growStyle = new GrowStyleUp(this.objs, this.option)\n        break\n    }\n    this.growStyle.init()\n    this.option.onGrowInitCompleted && this.option.onGrowInitCompleted()\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["Box3","Object3D","Vector3","use","EEaseType","ESceneGrowType","GrowStyleDown","GrowStyleUp","Grow","opt","_classCallCheck","_defineProperty","objs","option","growStyle","init","_createClass","key","value","_in","callback","_this","onGrowInStart","getTimeLine","eventCallback","onGrowInCompleted","in","out","_this2","onGrowOutStart","onGrowOutCompleted","_this3","tag","type","Up","time","gapTime","ease","SineInOut","center","scale","distance","isRotate","isScale","Object","assign","length","useScene","scene","traverseVisible","object","push","userData","Array","isArray","includes","boundingBox","i","expandByObject","getCenter","Down","onGrowInitCompleted"],"sources":["../../../../src/core/SceneEffect/grow/grow.ts"],"sourcesContent":["import { Box3, Object3D, Vector3, gsap, use } from '@anov/3d-core'\nimport type { GrowOption, IGrowStyle } from './type'\nimport { EEaseType, ESceneGrowType } from './type'\nimport { GrowStyleDown, GrowStyleUp } from './growStyle'\n\n// 生长动画对象\nexport class Grow {\n  private objs: Array<Object3D>\n  private option: GrowOption\n  private growStyle: IGrowStyle\n\n  constructor(opt?: GrowOption) {\n    this.objs = []\n    this.option = {}\n    // @ts-ignore\n    this.growStyle = null\n    this.init(opt || {})\n  }\n\n  // 生长\n  in(callback: () => void) {\n    // 入场事件\n    this.option.onGrowInStart && this.option.onGrowInStart()\n\n    this.growStyle.getTimeLine().eventCallback('onComplete', () => {\n      this.option.onGrowInCompleted && this.option.onGrowInCompleted()\n      callback && callback()\n    })\n\n    this.growStyle.in()\n  }\n\n  // 消退\n  out(callback: () => void) {\n    // 出场事件\n    this.option.onGrowOutStart && this.option.onGrowOutStart()\n\n    this.growStyle.getTimeLine().eventCallback('onReverseComplete', () => {\n      this.option.onGrowOutCompleted && this.option.onGrowOutCompleted()\n\n      callback && callback()\n    })\n\n    this.growStyle.out()\n  }\n\n  // 初始化\n  init(opt: GrowOption) {\n    this.option = {\n      tag: '*', // 可选,进场对象Tag, 默认 \"*\" 所有可见MESH对象,\n      type: ESceneGrowType.Up, // 可选,进场动画类型,默认 ESceneGrowType.Up向上生长\n      time: 0.5, // 可选,单对象进场时间,默认0.5秒\n      gapTime: 0.2, // 可选,多个对象之间间隔事件,默认0.2秒\n      ease: EEaseType.SineInOut, // 可选,默认缓入缓出\n      center: null, // 可选,生长中心位置,默认包围盒中心点\n      scale: 1, // 可选，倍速，默认为1。\n      distance: 1000, // 可选,初始化UP/DOWN起始距离，默认1000\n      isRotate: true, // 可选,初始化UP/DOWN起始旋转角度，默认true\n      isScale: true, // 可选,初始化UP/DOWN起始缩放大小，默认true\n    }\n    Object.assign(this.option, opt)\n    // ------- 1.初始化目标对象 --------\n    this.objs.length = 0\n    // 获取所有对象\n    if (this.option.tag === '*') {\n      use.useScene().scene!.traverseVisible((object) => {\n        if (object instanceof Object3D)\n          this.objs.push(object)\n      })\n    }\n    else { // 获取指定tag对象\n      use.useScene().scene!.traverseVisible((object) => {\n        if (object instanceof Object3D && object.userData.tag && Array.isArray(object.userData.tag) && object.userData.tag.includes(this.option.tag))\n          this.objs.push(object)\n      })\n    }\n\n    // ------- 2.中心点 ------------\n    if (!this.option.center) {\n      const boundingBox = new Box3()\n\n      // 将每个物体的边界框扩展到包围盒中\n      for (let i = 0; i < this.objs.length; i++) {\n        const object = this.objs[i]\n        boundingBox.expandByObject(object)\n      }\n      // 计算包围盒的中心点\n      const center = new Vector3()\n      this.option.center = boundingBox.getCenter(center)\n    }\n\n    // ------- 2.初始化目标对象 生长前状态 --------\n    switch (this.option.type) {\n      case ESceneGrowType.Up:\n        this.growStyle = new GrowStyleUp(this.objs, this.option)\n        break\n      case ESceneGrowType.Down:\n        this.growStyle = new GrowStyleDown(this.objs, this.option)\n        break\n      default:\n        this.growStyle = new GrowStyleUp(this.objs, this.option)\n        break\n    }\n    this.growStyle.init()\n    this.option.onGrowInitCompleted && this.option.onGrowInitCompleted()\n  }\n}\n"],"mappings":"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"}

package/dist/core/WeatherSystem/DynamicWeatherSystem.d.ts

@@ -1,4 +1,3 @@
-import type { SceneControl } from '@anov/3d-core';
 import { Object3D } from '@anov/3d-core';
 import { SkySystem } from './sky';
 import { WeatherSystem as WeatherLayer } from './weather';
@@ -12,12 +11,11 @@ export declare class DynamicWeatherSystem extends Object3D {
     skyLayer: SkySystem;
     weatherLayer: WeatherLayer;
     private _weatherRoot;
-    private sceneControl;
     get time(): string;
     set time(time: string);
     get weather(): string;
     set weather(weather: string);
-    constructor(sceneControl: SceneControl);
+    constructor();
     setTime(time: string): void;
     setWeather(weather: string): void;
 }

package/dist/core/WeatherSystem/DynamicWeatherSystem.js

@@ -25,7 +25,7 @@ import { handleTimeString } from "./utils/math";
 export var DynamicWeatherSystem = /*#__PURE__*/function (_Object3D) {
   _inherits(DynamicWeatherSystem, _Object3D);
   var _super = _createSuper(DynamicWeatherSystem);
-  function DynamicWeatherSystem(sceneControl) {
+  function DynamicWeatherSystem() {
     var _this;
     _classCallCheck(this, DynamicWeatherSystem);
     _this = _super.call(this);
@@ -34,16 +34,14 @@ export var DynamicWeatherSystem = /*#__PURE__*/function (_Object3D) {
     _defineProperty(_assertThisInitialized(_this), "skyLayer", void 0);
     _defineProperty(_assertThisInitialized(_this), "weatherLayer", void 0);
     _defineProperty(_assertThisInitialized(_this), "_weatherRoot", new Object3D());
-    _defineProperty(_assertThisInitialized(_this), "sceneControl", void 0);
-    _this.sceneControl = sceneControl;
     _this.skyLayer = new SkySystem();
-    _this.weatherLayer = new WeatherLayer(undefined, sceneControl);
+    _this.weatherLayer = new WeatherLayer();
     _this.add(_this.skyLayer);
     _this.add(_this.weatherLayer);
     _this.skyLayer.setTime(handleTimeString(_this._time));
     _this.weatherLayer.setWeather(EWeatherType.Sunny, _this._time.split(':').map(Number)[0]);
-    use.useframe(_this.sceneControl, function () {
-      var _use$useScene = use.useScene(_this.sceneControl),
+    use.useframe(function () {
+      var _use$useScene = use.useScene(),
         camera = _use$useScene.camera;
 
       // 假设天空中心在 (0,0,0)，你可以改成其他场景中心点

package/dist/core/WeatherSystem/DynamicWeatherSystem.js.map

@@ -1 +1 @@
-{"version":3,"names":["Object3D","Vector3","use","EWeatherType","SkySystem","WeatherSystem","WeatherLayer","handleTimeString","DynamicWeatherSystem","_Object3D","_inherits","_super","_createSuper","sceneControl","_this","_classCallCheck","call","_defineProperty","_assertThisInitialized","skyLayer","weatherLayer","undefined","add","setTime","_time","setWeather","Sunny","split","map","Number","useframe","_use$useScene","useScene","camera","skyCenter","distance","position","distanceTo","minDistance","maxDistance","_weatherRoot","lerp","scale","setScalar","_createClass","key","get","set","time","_weather","weather","value"],"sources":["../../../src/core/WeatherSystem/DynamicWeatherSystem.ts"],"sourcesContent":["import type { SceneControl } from '@anov/3d-core'\nimport { Object3D, Vector3, use } from '@anov/3d-core'\nimport { EWeatherType } from './utils/type'\nimport { SkySystem } from './sky'\nimport { WeatherSystem as WeatherLayer } from './weather'\nimport { handleTimeString } from './utils/math'\n\n/**\n * 天气时间系统\n * base version\n */\nexport class DynamicWeatherSystem extends Object3D {\n  private _time = '08:00'\n  private _weather: string\n\n  public skyLayer: SkySystem\n  public weatherLayer: WeatherLayer\n  private _weatherRoot: Object3D = new Object3D()\n  private sceneControl: SceneControl\n\n  public get time() {\n    return this._time\n  }\n\n  public set time(time: string) {\n    this.setTime(time)\n  }\n\n  public get weather() {\n    return this._weather\n  }\n\n  public set weather(weather: string) {\n    this.setWeather(weather)\n  }\n\n  constructor(sceneControl: SceneControl) {\n    super()\n    this.sceneControl = sceneControl\n\n    this.skyLayer = new SkySystem()\n    this.weatherLayer = new WeatherLayer(undefined, sceneControl)\n\n    this.add(this.skyLayer)\n    this.add(this.weatherLayer)\n\n    this.skyLayer.setTime(handleTimeString(this._time))\n    this.weatherLayer.setWeather(EWeatherType.Sunny, this._time.split(':').map(Number)[0])\n    use.useframe(this.sceneControl, () => {\n      const { camera } = use.useScene(this.sceneControl)\n\n      // 假设天空中心在 (0,0,0)，你可以改成其他场景中心点\n      const skyCenter = new Vector3(0, 0, 0)\n      const distance = camera.position.distanceTo(skyCenter)\n\n      const minDistance = 10 // 太近不显示\n      const maxDistance = 8500 // 太远不显示\n\n      // this.skyLayer.updateSky(camera)\n      // 根据距离决定显示\n      if (distance > maxDistance) {\n        this._weatherRoot.position.lerp(camera.position, 0.3)\n        const scale = distance * 0.000135\n        this.weatherLayer.scale.setScalar(scale)\n      }\n      else {\n        this.weatherLayer.scale.setScalar(1)\n        this.skyLayer.scale.setScalar(1)\n      }\n    })\n  }\n\n  setTime(time: string) {\n    this._time = time\n\n    this.skyLayer.setTime(handleTimeString(time))\n    this.weatherLayer.setTime(time.split(':').map(Number)[0])\n  }\n\n  setWeather(weather: string) {\n    this._weather = weather\n    this.weatherLayer.setWeather(weather, this._time.split(':').map(Number)[0])\n  }\n}"],"mappings":"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"}
+{"version":3,"names":["Object3D","Vector3","use","EWeatherType","SkySystem","WeatherSystem","WeatherLayer","handleTimeString","DynamicWeatherSystem","_Object3D","_inherits","_super","_createSuper","_this","_classCallCheck","call","_defineProperty","_assertThisInitialized","skyLayer","weatherLayer","add","setTime","_time","setWeather","Sunny","split","map","Number","useframe","_use$useScene","useScene","camera","skyCenter","distance","position","distanceTo","minDistance","maxDistance","_weatherRoot","lerp","scale","setScalar","_createClass","key","get","set","time","_weather","weather","value"],"sources":["../../../src/core/WeatherSystem/DynamicWeatherSystem.ts"],"sourcesContent":["import { MathUtils, Object3D, Vector3, use } from '@anov/3d-core'\nimport { EWeatherType } from './utils/type'\nimport { SkySystem } from './sky'\nimport { WeatherSystem as WeatherLayer } from './weather'\nimport { handleTimeString } from './utils/math'\n\n/**\n * 天气时间系统\n * base version\n */\nexport class DynamicWeatherSystem extends Object3D {\n  private _time = '08:00'\n  private _weather: string\n\n  public skyLayer: SkySystem\n  public weatherLayer: WeatherLayer\n  private _weatherRoot: Object3D = new Object3D()\n\n  public get time() {\n    return this._time\n  }\n\n  public set time(time: string) {\n    this.setTime(time)\n  }\n\n  public get weather() {\n    return this._weather\n  }\n\n  public set weather(weather: string) {\n    this.setWeather(weather)\n  }\n\n  constructor() {\n    super()\n\n    this.skyLayer = new SkySystem()\n    this.weatherLayer = new WeatherLayer()\n\n    this.add(this.skyLayer)\n    this.add(this.weatherLayer)\n\n    this.skyLayer.setTime(handleTimeString(this._time))\n    this.weatherLayer.setWeather(EWeatherType.Sunny, this._time.split(':').map(Number)[0])\n    use.useframe(() => {\n      const { camera } = use.useScene()\n\n      // 假设天空中心在 (0,0,0)，你可以改成其他场景中心点\n      const skyCenter = new Vector3(0, 0, 0)\n      const distance = camera.position.distanceTo(skyCenter)\n\n      const minDistance = 10 // 太近不显示\n      const maxDistance = 8500 // 太远不显示\n\n      // this.skyLayer.updateSky(camera)\n      // 根据距离决定显示\n      if (distance > maxDistance) {\n        this._weatherRoot.position.lerp(camera.position, 0.3)\n        const scale = distance * 0.000135\n        this.weatherLayer.scale.setScalar(scale)\n      }\n      else {\n        this.weatherLayer.scale.setScalar(1)\n        this.skyLayer.scale.setScalar(1)\n      }\n    })\n  }\n\n  setTime(time: string) {\n    this._time = time\n\n    this.skyLayer.setTime(handleTimeString(time))\n    this.weatherLayer.setTime(time.split(':').map(Number)[0])\n  }\n\n  setWeather(weather: string) {\n    this._weather = weather\n    this.weatherLayer.setWeather(weather, this._time.split(':').map(Number)[0])\n  }\n}"],"mappings":"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"}

package/dist/core/WeatherSystem/color/index.d.ts

@@ -1,11 +1,8 @@
-import type { SceneControl } from '@anov/3d-core';
 import { Object3D } from '@anov/3d-core';
 export declare class ColorSky extends Object3D {
     private _color;
     private _alpha;
     private _intensity;
-    private sceneControl?;
-    constructor(sceneControl?: SceneControl);
     get color(): string | number;
     get alpha(): number;
     get intensity(): number;

package/dist/core/WeatherSystem/color/index.js

@@ -12,19 +12,20 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { Color, Object3D, use } from '@anov/3d-core';
+import { use, Object3D, Color } from '@anov/3d-core';
 export var ColorSky = /*#__PURE__*/function (_Object3D) {
   _inherits(ColorSky, _Object3D);
   var _super = _createSuper(ColorSky);
-  function ColorSky(sceneControl) {
+  function ColorSky() {
     var _this;
     _classCallCheck(this, ColorSky);
-    _this = _super.call(this);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "_color", void 0);
     _defineProperty(_assertThisInitialized(_this), "_alpha", void 0);
     _defineProperty(_assertThisInitialized(_this), "_intensity", 100);
-    _defineProperty(_assertThisInitialized(_this), "sceneControl", void 0);
-    _this.sceneControl = sceneControl;
     return _this;
   }
   _createClass(ColorSky, [{
@@ -54,13 +55,17 @@ export var ColorSky = /*#__PURE__*/function (_Object3D) {
   }, {
     key: "apply",
     value: function apply(color, alpha, intensity) {
-      var _use$useScene = use.useScene(this.sceneControl),
+      var _use$useScene = use.useScene(),
         scene = _use$useScene.scene,
         renderer = _use$useScene.renderer;
 
       // 只在参数存在时更新属性值
-      if (color !== undefined) this._color = color;
-      if (alpha !== undefined) this._alpha = Math.max(0, Math.min(1, alpha));
+      if (color !== undefined) {
+        this._color = color;
+      }
+      if (alpha !== undefined) {
+        this._alpha = Math.max(0, Math.min(1, alpha));
+      }
       if (intensity !== undefined) {
         this._intensity = intensity;
         this.setIntensity(intensity);
@@ -91,7 +96,7 @@ export var ColorSky = /*#__PURE__*/function (_Object3D) {
   }, {
     key: "setIntensity",
     value: function setIntensity(value) {
-      // if (this._intensity === value)
+      if (this._intensity === value) return;
       // const c = new Color(this._color).multiplyScalar(value / 100)
       // const { scene, renderer } = use.useScene()
       // renderer.setClearColor(c, this._alpha)