easy-threesdk 1.0.6 → 1.0.7

package/README.md

@@ -4,7 +4,7 @@
 
 ThreeSDK 是一个基于 Three.js 的封装库，旨在简化 3D 场景的搭建、模型加载、交互控制以及标签系统的开发。通过封装常用的 Three.js 功能，开发者可以更快速地构建具有漫游、交互和标注功能的 3D 应用。
 
-**当前版本：** 1.0.3
+**当前版本：** 1.0.7
 
 ## 2. 安装
 

package/index.js

@@ -170,20 +170,20 @@ class ThreeSdk {
 
     //初始化控制器
     this.controls = new OrbitControls(this.camera, this.renderer.domElement);
-    this.controls.target.set(target.x, target.y, target.z);
-    this.controls.enableDamping = enableDamping;
-    this.controls.dampingFactor = dampingFactor;
-    this.controls.minDistance = minDistance;
-    this.controls.maxDistance = maxDistance;
-    this.controls.maxPolarAngle = maxPolarAngle;
+    this.controls.target.set(target.x, target.y, target.z); //设置控制器的目标位置
+    this.controls.enableDamping = enableDamping; //设置控制器是否启用阻尼
+    this.controls.dampingFactor = dampingFactor; //设置控制器阻尼因子
+    this.controls.minDistance = minDistance; //设置控制器最小距离
+    this.controls.maxDistance = maxDistance; //设置控制器最大距离
+    this.controls.maxPolarAngle = maxPolarAngle; //设置控制器最大极角
 
     // 保存 OrbitControls 的原始配置（用于退出第一人称模式时恢复）
-    this._OrbitControlsConfig.enablePan = this.controls.enablePan;
-    this._OrbitControlsConfig.enableZoom = this.controls.enableZoom;
-    this._OrbitControlsConfig.minDistance = this.controls.minDistance;
-    this._OrbitControlsConfig.maxDistance = this.controls.maxDistance;
-    this._OrbitControlsConfig.maxPolarAngle = this.controls.maxPolarAngle;
-    this._OrbitControlsConfig.target = this.controls.target.clone();
+    this._OrbitControlsConfig.enablePan = this.controls.enablePan; //保存控制器是否启用平移
+    this._OrbitControlsConfig.enableZoom = this.controls.enableZoom; //保存控制器是否启用缩放
+    this._OrbitControlsConfig.minDistance = this.controls.minDistance; //保存控制器最小距离
+    this._OrbitControlsConfig.maxDistance = this.controls.maxDistance; //保存控制器最大距离
+    this._OrbitControlsConfig.maxPolarAngle = this.controls.maxPolarAngle; //保存控制器最大极角
+    this._OrbitControlsConfig.target = this.controls.target.clone(); //保存控制器目标位置
 
     // 初始化场景灯光
     this.scene.add(new THREE.AmbientLight(ambientLight, ambientLightIntensity)); // 调亮环境光
@@ -212,8 +212,8 @@ class ThreeSdk {
       const w = this.container.clientWidth;
       const h = this.container.clientHeight;
       this.camera.aspect = w / h;
-      this.camera.updateProjectionMatrix();
-      this.renderer.setSize(w, h);
+      this.camera.updateProjectionMatrix(); //更新相机投影矩阵
+      this.renderer.setSize(w, h); //设置渲染器大小
     });
 
     this._handleWindowEvent();
@@ -855,9 +855,9 @@ class ThreeSdk {
     }
 
     // 如果当前选中了该 mesh，更新 TransformControls
-    if (selectedMesh === mesh && transformControls) {
-      transformControls.updateMatrixWorld();
-    }
+    // if (selectedMesh === mesh && transformControls) {
+    //   transformControls.updateMatrixWorld();
+    // }
 
     // console.log("✅ 信息已应用到 mesh:", mesh.userData.name || "未命名对象");
   }

package/loader/WaterMaterial/index.js

@@ -1,7 +1,8 @@
 import { Water } from "three/examples/jsm/objects/Water.js";
 import * as THREE from "three";
 import waterNormalMap from "./resource/textures/waternormals.jpg";
-function createWaterLoader(scene) {
+import waterTestMap from "./resource/textures/test.png";
+export function createWater1Loader(scene) {
   // 创建 PlaneGeometry 网格
   const planeGeometry = new THREE.PlaneGeometry(10, 10);
 
@@ -9,14 +10,15 @@ function createWaterLoader(scene) {
     textureWidth: 512,
     textureHeight: 512,
     waterNormals: new THREE.TextureLoader().load(
-      waterNormalMap,
+      waterTestMap,
       function (texture) {
         texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
       }
     ),
     sunDirection: new THREE.Vector3(),
     sunColor: 0xffffff,
-    waterColor: 0x001e0f,
+    // waterColor: 0x001e0f,
+    waterColor: "#187da0",
     distortionScale: 3.7,
     fog: scene.fog !== undefined,
   });
@@ -32,4 +34,44 @@ function createWaterLoader(scene) {
   animate();
   return planeMesh;
 }
-export default createWaterLoader;
+
+export function createWater2Loader(scene) {
+  // 添加基础光照
+  const ambientLight = new THREE.AmbientLight(0xffffff, 0.5);
+  scene.add(ambientLight);
+
+  const directionalLight = new THREE.DirectionalLight(0xffffff, 0.8);
+  directionalLight.position.set(5, 10, 5);
+  scene.add(directionalLight);
+
+  // 创建水面
+  const waterGeometry = new THREE.PlaneGeometry(10, 10);
+
+  const water = new Water(waterGeometry, {
+    textureWidth: 512,
+    textureHeight: 512,
+    waterNormals: new THREE.TextureLoader().load(
+      waterNormalMap,
+      function (texture) {
+        texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
+      }
+    ),
+    sunDirection: new THREE.Vector3(0, 1, 0),
+    sunColor: 0xffffff,
+    waterColor: 0x001e0f,
+    distortionScale: 3.7,
+    fog: scene.fog !== undefined,
+  });
+
+  water.rotation.x = -Math.PI / 2;
+  scene.add(water);
+
+  function animate() {
+    water.material.uniforms["time"].value += 1.0 / 60.0;
+
+    requestAnimationFrame(animate);
+  }
+
+  animate();
+  return water;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-threesdk",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "����Threejs��װ�ij��ù��ܵ�sdk",
   "main": "index.js",
   "private": false,

package/plugins/ModelControl.js

@@ -263,8 +263,8 @@ export default class ModelControl {
         // );
         // console.log(`对象信息:`, clickedObject.userData);
 
-        // 执行点击动画
-        this._animateClick(clickedObject);
+        // 执行点击触发后的动画
+        // this._animateClick(clickedObject);
 
         callback(clickedObject);
       } else {
@@ -328,5 +328,6 @@ export default class ModelControl {
           break;
       }
     });
+    return controls;
   }
 }

package/three/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright © 2010-2023 three.js authors
+Copyright © 2010-2025 three.js authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/three/README.md

@@ -3,12 +3,12 @@
 [![NPM Package][npm]][npm-url]
 [![Build Size][build-size]][build-size-url]
 [![NPM Downloads][npm-downloads]][npmtrends-url]
-[![DeepScan][deepscan]][deepscan-url]
+[![jsDelivr Downloads][jsdelivr-downloads]][jsdelivr-url]
 [![Discord][discord]][discord-url]
 
 #### JavaScript 3D library
 
-The aim of the project is to create an easy-to-use, lightweight, cross-browser, general-purpose 3D library. The current builds only include a WebGL renderer but WebGPU (experimental), SVG and CSS3D renderers are also available as addons.
+The aim of the project is to create an easy-to-use, lightweight, cross-browser, general-purpose 3D library. The current builds only include WebGL and WebGPU renderers but SVG and CSS3D renderers are also available as addons.
 
 [Examples](https://threejs.org/examples/) —
 [Docs](https://threejs.org/docs/) —
@@ -43,12 +43,12 @@ scene.add( mesh );
 
 const renderer = new THREE.WebGLRenderer( { antialias: true } );
 renderer.setSize( width, height );
-renderer.setAnimationLoop( animation );
+renderer.setAnimationLoop( animate );
 document.body.appendChild( renderer.domElement );
 
 // animation
 
-function animation( time ) {
+function animate( time ) {
 
 	mesh.rotation.x = time / 2000;
 	mesh.rotation.y = time / 1000;
@@ -58,7 +58,7 @@ function animation( time ) {
 }
 ```
 
-If everything goes well, you should see [this](https://jsfiddle.net/2nyxkmco/).
+If everything goes well, you should see [this](https://jsfiddle.net/w43x5Lgh/).
 
 ### Cloning this repository
 
@@ -79,8 +79,7 @@ git clone --depth=1 https://github.com/mrdoob/three.js.git
 [build-size-url]: https://bundlephobia.com/result?p=three
 [npm-downloads]: https://img.shields.io/npm/dw/three
 [npmtrends-url]: https://www.npmtrends.com/three
-[deepscan]: https://deepscan.io/api/teams/16600/projects/19901/branches/525701/badge/grade.svg
-[deepscan-url]: https://deepscan.io/dashboard#view=project&tid=16600&pid=19901&bid=525701
+[jsdelivr-downloads]: https://data.jsdelivr.com/v1/package/npm/three/badge?style=rounded
+[jsdelivr-url]: https://www.jsdelivr.com/package/npm/three
 [discord]: https://img.shields.io/discord/685241246557667386
 [discord-url]: https://discord.gg/56GBJwAnUS
-