lythreeframe 1.2.0 → 1.2.2

package/dist/bundle.cjs.js

@@ -17,7 +17,7 @@ var gsap = require('gsap');
 var three = require('three');
 var SkyMesh_js = require('three/examples/jsm/objects/SkyMesh.js');
 var CSS2DRenderer_js = require('three/examples/jsm/renderers/CSS2DRenderer.js');
-var PointerLockControls = require('three/examples/jsm/controls/PointerLockControls');
+var PointerLockControls_js = require('three/examples/jsm/controls/PointerLockControls.js');
 var TransformControls_js = require('three/examples/jsm/controls/TransformControls.js');
 
 /*
@@ -929,7 +929,8 @@ class MaterialAssetPointer extends TAssetPointer {
         }
         try {
             this.textures.set(name, texturePtr);
-            this.getValue()[name] = texture;
+            const matAny = mat;
+            matAny[name] = texture;
             texturePtr.addRef();
             mat.needsUpdate = true;
         }
@@ -1159,8 +1160,9 @@ class AssetManager {
         if (!pointer) {
             let textureMap = new Map();
             for (let k in asset) {
-                if (asset[k] instanceof webgpu.Texture) {
-                    let ptr = this.addTextureAsset(asset[k], 1);
+                const value = asset[k];
+                if (value instanceof webgpu.Texture) {
+                    let ptr = this.addTextureAsset(value, 1);
                     textureMap.set(k, ptr);
                 }
             }
@@ -1740,7 +1742,6 @@ class Viewport {
                 this.smaaPass = null;
             }
         }
-        console.log(this.postProcessParam, "sssssssssssssssssssss");
         this.postProcessing.outputNode = finalNode;
         this.markRenderStateDirty();
     }
@@ -2973,7 +2974,7 @@ class BoxActor extends Actor {
         super(app, uuid);
     }
     constructRootComponent() {
-        this.rootComponent = new BoxComponent(this.app);
+        return new BoxComponent(this.app, 1, 1, 1, 1, 1, 1, new webgpu.MeshBasicMaterial(), this.uuid);
     }
 }
 
@@ -3000,7 +3001,6 @@ class SkyComponent extends SceneComponent {
     }
     constructor(app, skyparam, uuid) {
         super(app, uuid);
-        this.obj = null;
         this.skyParam = DefaultSkyParam;
         this.sunPosition = new webgpu.Vector3();
         if (skyparam) {
@@ -3025,17 +3025,17 @@ class SkyComponent extends SceneComponent {
     }
     destroyObject() {
         if (this.obj) {
-            ThreeObjectLibrary.disposeMeshResource(this.obj);
+            ThreeObjectLibrary.disposeMeshResource(this.threeObject);
         }
     }
 }
 
 class SkyActor extends Actor {
-    constructor(app) {
-        super(app);
+    constructor(app, uuid) {
+        super(app, uuid);
         this._name = "SkyActor";
         this.skyComponent = null;
-        this.name = "DirectionalLightActor";
+        this.name = "SkyActor";
         this.skyComponent = this.rootComponent;
         this.rootComponent.name = `${this.rootComponent.name}(Root)`;
         this.setScale(45000, 45000, 45000);
@@ -3149,7 +3149,7 @@ const DefaultSSRParam = {
 class FirstPerson extends Pawn {
     constructor(controller) {
         super(controller);
-        this._control = new PointerLockControls.PointerLockControls(controller.camera, controller.viewPort.canvas);
+        this._control = new PointerLockControls_js.PointerLockControls(controller.camera, controller.viewPort.canvas);
     }
 }
 

package/dist/bundle.esm.js

@@ -1,4 +1,4 @@
-import { MathUtils, Object3D, Vector3, Box3, Quaternion, Euler, Matrix4, Mesh, LoadingManager, BufferGeometry, Texture, FileLoader, Material, NoToneMapping, LinearToneMapping, ReinhardToneMapping, CineonToneMapping, ACESFilmicToneMapping, AgXToneMapping, NeutralToneMapping, WebGPURenderer, PostProcessing, Color, Vector2, Raycaster, PerspectiveCamera, OrthographicCamera, Clock, DirectionalLight, MeshStandardMaterial, BoxGeometry, PlaneGeometry, MeshBasicMaterial, SphereGeometry } from 'three/webgpu';
+import { MathUtils, Object3D, Vector3, Box3, Quaternion, Euler, Matrix4, Mesh, LoadingManager, BufferGeometry, Texture, FileLoader, Material, NoToneMapping, LinearToneMapping, ReinhardToneMapping, CineonToneMapping, ACESFilmicToneMapping, AgXToneMapping, NeutralToneMapping, WebGPURenderer, PostProcessing, Color, Vector2, Raycaster, PerspectiveCamera, OrthographicCamera, Clock, DirectionalLight, MeshStandardMaterial, BoxGeometry, MeshBasicMaterial, PlaneGeometry, SphereGeometry } from 'three/webgpu';
 import { GLTFLoader, DRACOLoader, CSS2DRenderer, OrbitControls } from 'three/examples/jsm/Addons.js';
 import { pass, mrt, output, uniform, velocity, metalness, transformedNormalView, blendColor, time, oscSine } from 'three/tsl';
 import { bloom } from 'three/examples/jsm/tsl/display/BloomNode.js';
@@ -15,7 +15,7 @@ import { gsap } from 'gsap';
 import { Scene } from 'three';
 import { SkyMesh } from 'three/examples/jsm/objects/SkyMesh.js';
 import { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
-import { PointerLockControls } from 'three/examples/jsm/controls/PointerLockControls';
+import { PointerLockControls } from 'three/examples/jsm/controls/PointerLockControls.js';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
 
 /*
@@ -927,7 +927,8 @@ class MaterialAssetPointer extends TAssetPointer {
         }
         try {
             this.textures.set(name, texturePtr);
-            this.getValue()[name] = texture;
+            const matAny = mat;
+            matAny[name] = texture;
             texturePtr.addRef();
             mat.needsUpdate = true;
         }
@@ -1157,8 +1158,9 @@ class AssetManager {
         if (!pointer) {
             let textureMap = new Map();
             for (let k in asset) {
-                if (asset[k] instanceof Texture) {
-                    let ptr = this.addTextureAsset(asset[k], 1);
+                const value = asset[k];
+                if (value instanceof Texture) {
+                    let ptr = this.addTextureAsset(value, 1);
                     textureMap.set(k, ptr);
                 }
             }
@@ -1738,7 +1740,6 @@ class Viewport {
                 this.smaaPass = null;
             }
         }
-        console.log(this.postProcessParam, "sssssssssssssssssssss");
         this.postProcessing.outputNode = finalNode;
         this.markRenderStateDirty();
     }
@@ -2971,7 +2972,7 @@ class BoxActor extends Actor {
         super(app, uuid);
     }
     constructRootComponent() {
-        this.rootComponent = new BoxComponent(this.app);
+        return new BoxComponent(this.app, 1, 1, 1, 1, 1, 1, new MeshBasicMaterial(), this.uuid);
     }
 }
 
@@ -2998,7 +2999,6 @@ class SkyComponent extends SceneComponent {
     }
     constructor(app, skyparam, uuid) {
         super(app, uuid);
-        this.obj = null;
         this.skyParam = DefaultSkyParam;
         this.sunPosition = new Vector3();
         if (skyparam) {
@@ -3023,17 +3023,17 @@ class SkyComponent extends SceneComponent {
     }
     destroyObject() {
         if (this.obj) {
-            ThreeObjectLibrary.disposeMeshResource(this.obj);
+            ThreeObjectLibrary.disposeMeshResource(this.threeObject);
         }
     }
 }
 
 class SkyActor extends Actor {
-    constructor(app) {
-        super(app);
+    constructor(app, uuid) {
+        super(app, uuid);
         this._name = "SkyActor";
         this.skyComponent = null;
-        this.name = "DirectionalLightActor";
+        this.name = "SkyActor";
         this.skyComponent = this.rootComponent;
         this.rootComponent.name = `${this.rootComponent.name}(Root)`;
         this.setScale(45000, 45000, 45000);

package/dist/lythreeframe/Frame/Parameters/AppParameter.d.ts

@@ -1,4 +1,3 @@
-import { WebGPURendererParameters } from "three/src/renderers/webgpu/WebGPURenderer";
 import { CameraParam } from "./CameraParameter";
 import { WorldParam } from "./WorldParameter";
 import { Controller } from "../Controller";
@@ -7,6 +6,7 @@ import { Viewport } from "../Viewport";
 import { ViewportParam } from "./ViewportParameters";
 import { AssetManager } from "../../AssetManagement/AssetManager";
 import { PostProcessParam } from "../../PostProcess/PostProcessParam";
+import { WebGPURendererParameters } from "three/src/renderers/webgpu/WebGPURenderer.js";
 export interface AppClass {
     assetManagerClass: typeof AssetManager;
     controllerClass: typeof Controller;

package/dist/lythreeframe/Object/Actors/Shape/BoxActor.d.ts

@@ -1,6 +1,7 @@
 import { Actor } from "../../Actor";
+import { BoxComponent } from "../../Components/Mesh/Shape/BoxComponent";
 import { ThreeJsApp } from "../../../ThreeJsApp";
 export declare class BoxActor extends Actor {
     constructor(app: ThreeJsApp, uuid?: string);
-    protected constructRootComponent(): void;
+    protected constructRootComponent(): BoxComponent;
 }

package/dist/lythreeframe/Object/Actors/Sky/SkyActor.d.ts

@@ -4,6 +4,6 @@ import { SkyComponent } from "../../Components/Sky/SkyComponent";
 export declare class SkyActor extends Actor {
     protected _name: string;
     protected skyComponent: SkyComponent | null;
-    constructor(app: ThreeJsApp);
+    constructor(app: ThreeJsApp, uuid?: string);
     protected constructRootComponent(): SkyComponent;
 }

package/dist/lythreeframe/Object/Components/Mesh/Sprite/SpriteComponent.d.ts

@@ -4,6 +4,6 @@ import { ThreeJsApp } from "../../../../ThreeJsApp";
 export declare class SpriteComponent extends SceneComponent {
     get threeObject(): Sprite;
     set threeObject(newThreeObject: Sprite);
-    protected obj: Sprite;
-    constructor(app: ThreeJsApp, texture: Texture);
+    constructor(app: ThreeJsApp, texture: Texture, uuid?: string);
+    protected createDefaultObject(): Sprite;
 }

package/dist/lythreeframe/Object/Components/Sky/SkyComponent.d.ts

@@ -12,8 +12,7 @@ export interface SkyComponentParam {
 export declare const DefaultSkyParam: SkyComponentParam;
 export declare class SkyComponent extends SceneComponent {
     get threeObject(): SkyMesh;
-    set threeObject(newThreeObject: SkyMesh);
-    protected obj: SkyMesh | null;
+    protected set threeObject(newThreeObject: SkyMesh);
     private skyParam;
     private sunPosition;
     constructor(app: ThreeJsApp, skyparam?: SkyComponentParam, uuid?: string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",