@anov/3d 0.0.296 → 0.0.298

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/anov3d.js CHANGED
@@ -17,6 +17,7 @@ import { object2Vector3 } from "./utils/index";
17
17
  import { defaultCameraParams } from "./index";
18
18
  var Anov3D = /*#__PURE__*/function () {
19
19
  function Anov3D(opts) {
20
+ var _camera$limit;
20
21
  _classCallCheck(this, Anov3D);
21
22
  _defineProperty(this, "zoomRatio", 1);
22
23
  _defineProperty(this, "opts", void 0);
@@ -33,6 +34,11 @@ var Anov3D = /*#__PURE__*/function () {
33
34
  var defaultPosition = defaultCameraParams.position,
34
35
  defaultRest = _objectWithoutProperties(defaultCameraParams, _excluded);
35
36
 
37
+ // 俯仰角转换,SCC取值范围是-90-90,转换到0-180
38
+ if ((_camera$limit = camera.limit) !== null && _camera$limit !== void 0 && _camera$limit.pitch) {
39
+ var pitch = camera.limit.pitch;
40
+ camera.limit.pitch = [pitch[0] + 90, pitch[1] + 90];
41
+ }
36
42
  // 初始化相机参数
37
43
  var cameraParams = _objectSpread(_objectSpread(_objectSpread({
38
44
  limit: {}
@@ -1 +1 @@
1
- {"version":3,"names":["MathUtils","SceneControl","Vector3","utils","initPostEffects","EventBus","object2Vector3","defaultCameraParams","Anov3D","opts","_classCallCheck","_defineProperty","_opts$camera","camera","_opts$container","container","clientWidth","clientHeight","defaultPosition","position","defaultRest","_objectWithoutProperties","_excluded","cameraParams","_objectSpread","limit","fromArray","orbitControls","scene","defCameraOps","aspect","rendererOps","shadowMap","reset","css2DRenderer","css3DRenderer","ambientLight","render","controls","target","copy","lookAt","renderer","emitter","emit","sceneControl","eventBus","storeManagement","set","_createClass","key","value","getOrbitControls","params","pitch","yaw","distance","length","minPolarAngle","degToRad","maxPolarAngle","minAzimuthAngle","maxAzimuthAngle","minDistance","maxDistance"],"sources":["../src/anov3d.ts"],"sourcesContent":["import { MathUtils, SceneControl, Vector3, utils } from '@anov/3d-core'\nimport { initPostEffects } from '@anov/3d-ability'\nimport EventBus from './module/eventBus'\nimport { object2Vector3 } from './utils/index'\nimport type { InitOptions } from './applicationApiType'\nimport { defaultCameraParams } from './index'\n\ntype Anov3DOptions = {\n container: HTMLElement\n camera?: InitOptions['camera']\n}\n\nclass Anov3D {\n zoomRatio = 1\n opts: Anov3DOptions\n sceneControl: SceneControl\n eventBus: EventBus\n\n constructor(opts: Anov3DOptions) {\n this.opts = opts\n\n // 获取默认和传入的相机参数\n const { camera = {}, container: { clientWidth, clientHeight } } = opts\n const { position: defaultPosition, ...defaultRest } = defaultCameraParams\n\n // 初始化相机参数\n const cameraParams = {\n limit: {},\n ...defaultRest,\n ...camera,\n position: camera.position ? new Vector3().fromArray(camera.position) : object2Vector3(defaultPosition),\n }\n // const orbitControls = this.getOrbitControls(cameraParams.limit) // 控制器参数\n const orbitControls = { limit: cameraParams.limit } // 控制器参数\n const scene = new SceneControl({\n defCameraOps: {\n ...cameraParams,\n aspect: clientWidth / clientHeight,\n },\n rendererOps: {\n shadowMap: true,\n },\n orbitControls,\n reset: true,\n css2DRenderer: true,\n css3DRenderer: true,\n ambientLight: true,\n })\n\n scene.render(opts.container)\n scene.controls.target.copy(object2Vector3(defaultCameraParams.lookAt))\n\n initPostEffects(scene.scene, scene.renderer, scene.camera)\n\n utils.emitter.emit('scene-completed', scene)\n\n // 不考虑 tree-shaking\n this.sceneControl = scene\n this.eventBus = new EventBus(this as any)\n\n utils.storeManagement.set('event-bus', this.eventBus)\n utils.emitter.emit('instantiation-completed', this)\n }\n\n getOrbitControls(params: { pitch?: number[]\n yaw?: number[]\n distance?: number[] }) {\n const { pitch, yaw, distance } = params\n const orbitControls: any = {}\n if (pitch?.length > 1) {\n orbitControls.minPolarAngle = MathUtils.degToRad(pitch[0])\n orbitControls.maxPolarAngle = MathUtils.degToRad(pitch[1])\n }\n if (yaw?.length > 1) {\n orbitControls.minAzimuthAngle = MathUtils.degToRad(yaw[0])\n orbitControls.maxAzimuthAngle = MathUtils.degToRad(yaw[1])\n }\n if (distance?.length > 1) {\n orbitControls.minDistance = distance[0]\n orbitControls.maxDistance = distance[1]\n }\n return orbitControls\n }\n}\n\nexport default Anov3D"],"mappings":"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"}
1
+ {"version":3,"names":["MathUtils","SceneControl","Vector3","utils","initPostEffects","EventBus","object2Vector3","defaultCameraParams","Anov3D","opts","_camera$limit","_classCallCheck","_defineProperty","_opts$camera","camera","_opts$container","container","clientWidth","clientHeight","defaultPosition","position","defaultRest","_objectWithoutProperties","_excluded","limit","pitch","cameraParams","_objectSpread","fromArray","orbitControls","scene","defCameraOps","aspect","rendererOps","shadowMap","reset","css2DRenderer","css3DRenderer","ambientLight","render","controls","target","copy","lookAt","renderer","emitter","emit","sceneControl","eventBus","storeManagement","set","_createClass","key","value","getOrbitControls","params","yaw","distance","length","minPolarAngle","degToRad","maxPolarAngle","minAzimuthAngle","maxAzimuthAngle","minDistance","maxDistance"],"sources":["../src/anov3d.ts"],"sourcesContent":["import { MathUtils, SceneControl, Vector3, utils } from '@anov/3d-core'\nimport { initPostEffects } from '@anov/3d-ability'\nimport EventBus from './module/eventBus'\nimport { object2Vector3 } from './utils/index'\nimport type { InitOptions } from './applicationApiType'\nimport { defaultCameraParams } from './index'\n\ntype Anov3DOptions = {\n container: HTMLElement\n camera?: InitOptions['camera']\n}\n\nclass Anov3D {\n zoomRatio = 1\n opts: Anov3DOptions\n sceneControl: SceneControl\n eventBus: EventBus\n\n constructor(opts: Anov3DOptions) {\n this.opts = opts\n\n // 获取默认和传入的相机参数\n const { camera = {}, container: { clientWidth, clientHeight } } = opts\n const { position: defaultPosition, ...defaultRest } = defaultCameraParams\n\n // 俯仰角转换,SCC取值范围是-90-90,转换到0-180\n if (camera.limit?.pitch) {\n const { pitch } = camera.limit\n camera.limit.pitch = [pitch[0] + 90, pitch[1] + 90]\n }\n // 初始化相机参数\n const cameraParams = {\n limit: {},\n ...defaultRest,\n ...camera,\n position: camera.position ? new Vector3().fromArray(camera.position) : object2Vector3(defaultPosition),\n }\n // const orbitControls = this.getOrbitControls(cameraParams.limit) // 控制器参数\n const orbitControls = { limit: cameraParams.limit } // 控制器参数\n const scene = new SceneControl({\n defCameraOps: {\n ...cameraParams,\n aspect: clientWidth / clientHeight,\n },\n rendererOps: {\n shadowMap: true,\n },\n orbitControls,\n reset: true,\n css2DRenderer: true,\n css3DRenderer: true,\n ambientLight: true,\n })\n\n scene.render(opts.container)\n scene.controls.target.copy(object2Vector3(defaultCameraParams.lookAt))\n\n initPostEffects(scene.scene, scene.renderer, scene.camera)\n\n utils.emitter.emit('scene-completed', scene)\n\n // 不考虑 tree-shaking\n this.sceneControl = scene\n this.eventBus = new EventBus(this as any)\n\n utils.storeManagement.set('event-bus', this.eventBus)\n utils.emitter.emit('instantiation-completed', this)\n }\n\n getOrbitControls(params: { pitch?: number[]\n yaw?: number[]\n distance?: number[] }) {\n const { pitch, yaw, distance } = params\n const orbitControls: any = {}\n if (pitch?.length > 1) {\n orbitControls.minPolarAngle = MathUtils.degToRad(pitch[0])\n orbitControls.maxPolarAngle = MathUtils.degToRad(pitch[1])\n }\n if (yaw?.length > 1) {\n orbitControls.minAzimuthAngle = MathUtils.degToRad(yaw[0])\n orbitControls.maxAzimuthAngle = MathUtils.degToRad(yaw[1])\n }\n if (distance?.length > 1) {\n orbitControls.minDistance = distance[0]\n orbitControls.maxDistance = distance[1]\n }\n return orbitControls\n }\n}\n\nexport default Anov3D"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["../src/applicationApiType.ts"],"sourcesContent":["export type InitOptions = {\n camera?: {\n position?: [\n number,\n number,\n number,\n ]\n }\n set?: {\n zoomRatio?: number\n }\n}\n"],"mappings":""}
1
+ {"version":3,"names":[],"sources":["../src/applicationApiType.ts"],"sourcesContent":["export type InitOptions = {\n camera?: {\n position?: [\n number,\n number,\n number,\n ]\n limit?: {\n pitch?: [number, number]\n distance?: [number, number]\n }\n }\n set?: {\n zoomRatio?: number\n }\n}\n"],"mappings":""}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@anov/3d",
3
- "version": "0.0.296",
3
+ "version": "0.0.298",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "license": "MIT",
@@ -29,8 +29,8 @@
29
29
  "rxjs": "7.8.1",
30
30
  "three-mesh-bvh": "^0.9.0",
31
31
  "uuid": "^9.0.1",
32
- "@anov/3d-core": "^0.0.89",
33
- "@anov/3d-ability": "^0.0.148"
32
+ "@anov/3d-ability": "^0.0.150",
33
+ "@anov/3d-core": "^0.0.90"
34
34
  },
35
35
  "devDependencies": {
36
36
  "@types/uuid": "^9.0.7",