npm - @anov/3d - Versions diffs - 0.0.1-alpha.3 → 0.0.1-alpha.5 - Mend

@anov/3d 0.0.1-alpha.3 → 0.0.1-alpha.5

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.

Files changed (15) hide show

package/README.md CHANGED Viewed

@@ -66,3 +66,79 @@ utils.moveWithRound(box2, 0.2, 100000)
 scene.render(document.querySelector('#app')!)
 scene.startFrameAnimate()
 ```
+## umd usage
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <link rel="stylesheet" type="text/css" href="./source/base.css" />
+    </style>
+</head>
+<body>
+    <div id="describe">基本场景，鼠标点击移入移出点击交互</div>
+    <div id="my-sandbox"></div>
+    <script>
+        javascript: (function () {
+            var script = document.createElement('script');
+            script.onload = function () {
+                var stats = new Stats();
+                document.body.appendChild(stats.dom);
+                requestAnimationFrame(function loop() {
+                    stats.update();
+                    requestAnimationFrame(loop)
+                });
+            };
+            script.src = 'https://mrdoob.github.io/stats.js/build/stats.min.js';
+            document.head.appendChild(script);
+        })()
+    </script>
+    // umd包
+    <script src="./3d.min.js"></script>
+    <script script type="module">
+        const scene = new ANOV.Scene({
+            orbitControls: true,
+        })
+        const geometry = new ANOV.BoxGeometry(2, 2, 2)
+        const material = new ANOV.MeshBasicMaterial()
+        const box = new ANOV.Mesh(geometry, material)
+        const geometry2 = new ANOV.BoxGeometry(2, 2, 2)
+        const material2 = new ANOV.MeshBasicMaterial()
+        const box2 = new ANOV.Mesh(geometry2, material2)
+        box.addNatureEventListener('pointermove', (object3D) => {
+            object3D.material.color.set(0xFF0000)
+        })
+        box.addNatureEventListener('pointerleave', (object3D) => {
+            object3D.material.color.set('#ccc')
+        })
+        box2.addNatureEventListener('click', (object3D) => {
+            object3D.material.color.set(0xFF0000)
+        })
+        box2.addNatureEventListener('pointerleave', (object3D) => {
+            object3D.material.color.set('#fff')
+        })
+        box2.position.set(5, 0, 0)
+        scene.add(box)
+        scene.add(box2)
+        scene.scene.background = new ANOV.Color('#345')
+        scene.render(document.querySelector('#my-sandbox'))
+        scene.startFrameAnimate()
+    </script>
+</body>
+</html>
+```

package/dist/core/camera.d.ts CHANGED Viewed

@@ -18,6 +18,15 @@ declare class PerspectiveCamera extends TPerspectiveCamera {
      * @param animationMethod
      */
     demote: (targetObject3D: Object3D, distance: number, duration?: number, animationMethod?: string) => import("@tweenjs/tween.js").Tween<Vector3>;
-    surround: (targetObject3D: Object3D<import("three").Event>, radius: number, toward: Vector3) => void;
+    /**
+     * 相机曲线漫游
+     * @param vec
+     * @param points
+     * @param linePoints
+     * @param helpLine
+     * @param lookat
+     * @returns
+     */
+    surround: (vec: Vector3[], points?: number, linePoints?: number, helpLine?: boolean, lookat?: Vector3) => import("../utils/move").ControlsRetuenFuncType;
 }
 export { PerspectiveCamera };

package/dist/core/camera.js CHANGED Viewed

@@ -1,4 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -12,16 +18,9 @@ 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { PerspectiveCamera as TPerspectiveCamera } from 'three';
-import { Direction, moveTo } from "../utils/move";
-/**
- * 相机围绕目标物体旋转
- * @param targetObject3D
- * @param radius
- * @param toward
- */
-var surround = function surround(targetObject3D, radius, toward) {};
+import { BufferGeometry, CatmullRomCurve3, Line, LineBasicMaterial, PerspectiveCamera as TPerspectiveCamera } from 'three';
+import { Direction, moveTo, moveWithLine } from "../utils/move";
+import globalObjectManage from "./global";
 var PerspectiveCamera = /*#__PURE__*/function (_TPerspectiveCamera) {
   _inherits(PerspectiveCamera, _TPerspectiveCamera);
   var _super = _createSuper(PerspectiveCamera);
@@ -32,7 +31,20 @@ var PerspectiveCamera = /*#__PURE__*/function (_TPerspectiveCamera) {
     _defineProperty(_assertThisInitialized(_this), "demote", function (targetObject3D, distance, duration, animationMethod) {
       return moveTo(_assertThisInitialized(_this), targetObject3D, distance, Direction.minus, duration, animationMethod);
     });
-    _defineProperty(_assertThisInitialized(_this), "surround", surround);
+    _defineProperty(_assertThisInitialized(_this), "surround", function (vec) {
+      var points = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
+      var linePoints = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 500;
+      var helpLine = arguments.length > 3 ? arguments[3] : undefined;
+      var lookat = arguments.length > 4 ? arguments[4] : undefined;
+      var curve = new CatmullRomCurve3(_toConsumableArray(vec), true);
+      var geometry = new BufferGeometry().setFromPoints(curve.getPoints(points));
+      var material = new LineBasicMaterial({
+        color: '#fff'
+      });
+      var curveObject = new Line(geometry, material);
+      globalObjectManage.scene.add(curveObject);
+      return moveWithLine(_assertThisInitialized(_this), curve, linePoints, lookat);
+    });
     return _this;
   }

package/dist/core/mesh.js CHANGED Viewed

@@ -72,13 +72,13 @@ var Mesh = /*#__PURE__*/function (_TMesh) {
      */
   }, {
     key: "handleClick",
-    value: function handleClick(natureEvent) {
+    value: function handleClick(natureEvent, intersect) {
       var _this2 = this;
       if (!globalObjectManage.triggerClick) return;
       // get nature event
       natureEvent.forEach(function (handlefn) {
-        handlefn(_this2);
+        handlefn(_this2, intersect);
       });
     }
@@ -89,10 +89,10 @@ var Mesh = /*#__PURE__*/function (_TMesh) {
      */
   }, {
     key: "handlePointerMove",
-    value: function handlePointerMove(natureEvent) {
+    value: function handlePointerMove(natureEvent, intersect) {
       var _this3 = this;
       natureEvent.forEach(function (handlefn) {
-        handlefn(_this3);
+        handlefn(_this3, intersect);
       });
     }
@@ -129,10 +129,10 @@ var Mesh = /*#__PURE__*/function (_TMesh) {
       var object = intersect && intersect.object;
       if (object === this) {
         this.entered = true;
-        clickCallback && clickCallback.length > 0 && this.handleClick(clickCallback);
-        pointerupCallback && pointerupCallback.length > 0 && this.handleClick(pointerupCallback);
-        pointerdownCallback && pointerdownCallback.length > 0 && this.handleClick(pointerdownCallback);
-        pointermoveCallback && pointermoveCallback.length > 0 && this.handlePointerMove(pointermoveCallback);
+        clickCallback && clickCallback.length > 0 && this.handleClick(clickCallback, intersect);
+        pointerupCallback && pointerupCallback.length > 0 && this.handleClick(pointerupCallback, intersect);
+        pointerdownCallback && pointerdownCallback.length > 0 && this.handleClick(pointerdownCallback, intersect);
+        pointermoveCallback && pointermoveCallback.length > 0 && this.handlePointerMove(pointermoveCallback, intersect);
       } else {
         if (this.entered) {
           this.handlePointerleave();

package/dist/core/scene.d.ts CHANGED Viewed

@@ -90,6 +90,7 @@ declare class Scene {
     private initAmbientLight;
     /**
      * frame render
+     * @param frameAnimate
      */
     startFrameAnimate(frameAnimate?: (renderer: WebGLRenderer) => void): void;
     /**

package/dist/core/scene.js CHANGED Viewed

@@ -126,6 +126,7 @@ var Scene = /*#__PURE__*/function () {
     /**
      * frame render
+     * @param frameAnimate
      */
   }, {
     key: "startFrameAnimate",

package/dist/export.d.ts ADDED Viewed

@@ -0,0 +1,28 @@
+import Scene from './core/scene';
+import Mesh from './core/mesh';
+import { PerspectiveCamera } from './core/camera';
+import ModelLoader from './core/model';
+import { ModelType } from './commonEnu';
+import { createLabel } from './utils/createLabel';
+import { Direction } from './utils/move';
+declare const utils: {
+    moveTo: (currentObject3D: import("three").Object3D<import("three").Event>, targetObject3D: import("three").Object3D<import("three").Event>, distance: number, direction: Direction, duration?: number | undefined, animationMethod?: string | undefined) => import("@tweenjs/tween.js").Tween<import("three").Vector3>;
+    moveLine: (currentObject3D: import("three").Object3D<import("three").Event>, targetObject3D: import("three").Object3D<import("three").Event>) => void;
+    moveWithRound: (currentObject3d: import("three").Object3D<import("three").Event>, speed?: number, duration?: number | undefined) => void;
+    moveWithLine: (currentObject: import("three").Object3D<import("three").Event>, curve: import("three").CatmullRomCurve3, points?: number, lookat?: import("three").Vector3 | undefined) => import("./utils/move").ControlsRetuenFuncType;
+};
+declare const dom: {
+    appendChildren: (node: HTMLElement, children: HTMLElement[]) => void;
+    create: (...tags: string[]) => ((options?: import("./utils/createElement").OpsType, children?: HTMLElement[]) => HTMLElement)[];
+    createElement: (tag: string, options?: import("./utils/createElement").OpsType, children?: HTMLElement[]) => HTMLElement;
+    setAttributes: (el: HTMLElement, attrs?: {
+        [key: string]: string;
+    } | undefined) => void;
+    setClassList: (el: HTMLElement, classList: string[]) => void;
+    setEventListeners: (el: HTMLElement, events?: {
+        [key: string]: () => void;
+    } | undefined) => void;
+};
+export * from 'three';
+export * from './threeCell';
+export { Scene, Mesh, PerspectiveCamera, ModelLoader, createLabel, ModelType, Direction, utils, dom, };

package/dist/export.js ADDED Viewed

@@ -0,0 +1,26 @@
+/* eslint-disable import/export */
+import Scene from "./core/scene";
+import Mesh from "./core/mesh";
+import { PerspectiveCamera } from "./core/camera";
+import ModelLoader from "./core/model";
+import { ModelType } from "./commonEnu";
+import { createLabel } from "./utils/createLabel";
+import { Direction, moveLine, moveTo, moveWithLine, moveWithRound } from "./utils/move";
+import { appendChildren, create, createElement, setAttributes, setClassList, setEventListeners } from "./utils/createElement";
+var utils = {
+  moveTo: moveTo,
+  moveLine: moveLine,
+  moveWithRound: moveWithRound,
+  moveWithLine: moveWithLine
+};
+var dom = {
+  appendChildren: appendChildren,
+  create: create,
+  createElement: createElement,
+  setAttributes: setAttributes,
+  setClassList: setClassList,
+  setEventListeners: setEventListeners
+};
+export * from 'three';
+export * from "./threeCell";
+export { Scene, Mesh, PerspectiveCamera, ModelLoader, createLabel, ModelType, Direction, utils, dom };

package/dist/index.d.ts CHANGED Viewed

@@ -1,27 +1,3 @@
-import Scene from './core/scene';
-import Mesh from './core/mesh';
-import { PerspectiveCamera } from './core/camera';
-import ModelLoader from './core/model';
-import { ModelType } from './commonEnu';
-import { createLabel } from './utils/createLabel';
-import { Direction } from './utils/move';
-declare const utils: {
-    moveTo: (currentObject3D: import("three").Object3D<import("three").Event>, targetObject3D: import("three").Object3D<import("three").Event>, distance: number, direction: Direction, duration?: number | undefined, animationMethod?: string | undefined) => import("@tweenjs/tween.js").Tween<import("three").Vector3>;
-    moveLine: (currentObject3D: import("three").Object3D<import("three").Event>, targetObject3D: import("three").Object3D<import("three").Event>) => void;
-    moveWithRound: (currentObject3d: import("three").Object3D<import("three").Event>, speed?: number, duration?: number | undefined) => void;
-};
-declare const dom: {
-    appendChildren: (node: HTMLElement, children: HTMLElement[]) => void;
-    create: (...tags: string[]) => ((options?: import("./utils/createElement").OpsType, children?: HTMLElement[]) => HTMLElement)[];
-    createElement: (tag: string, options?: import("./utils/createElement").OpsType, children?: HTMLElement[]) => HTMLElement;
-    setAttributes: (el: HTMLElement, attrs?: {
-        [key: string]: string;
-    } | undefined) => void;
-    setClassList: (el: HTMLElement, classList: string[]) => void;
-    setEventListeners: (el: HTMLElement, events?: {
-        [key: string]: () => void;
-    } | undefined) => void;
-};
-export * from 'three';
-export * from './threeCell';
-export { Scene, Mesh, PerspectiveCamera, ModelLoader, createLabel, ModelType, Direction, utils, dom, };
+import * as anov3d from './export';
+export * from './export';
+export { anov3d as ANOV, };

package/dist/index.js CHANGED Viewed

@@ -1,25 +1,5 @@
-/* eslint-disable import/export */
-import Scene from "./core/scene";
-import Mesh from "./core/mesh";
-import { PerspectiveCamera } from "./core/camera";
-import ModelLoader from "./core/model";
-import { ModelType } from "./commonEnu";
-import { createLabel } from "./utils/createLabel";
-import { Direction, moveLine, moveTo, moveWithRound } from "./utils/move";
-import { appendChildren, create, createElement, setAttributes, setClassList, setEventListeners } from "./utils/createElement";
-var utils = {
-  moveTo: moveTo,
-  moveLine: moveLine,
-  moveWithRound: moveWithRound
-};
-var dom = {
-  appendChildren: appendChildren,
-  create: create,
-  createElement: createElement,
-  setAttributes: setAttributes,
-  setClassList: setClassList,
-  setEventListeners: setEventListeners
-};
-export * from 'three';
-export * from "./threeCell";
-export { Scene, Mesh, PerspectiveCamera, ModelLoader, createLabel, ModelType, Direction, utils, dom };
+import * as anov3d from "./export";
+export * from "./export";
+// umd
+export { anov3d as ANOV };

package/dist/type.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
-import type TwinsThreeMesh from './core/mesh';
+import type { Intersection } from 'three';
+import type Mesh from './core/mesh';
 export declare type CubeEventType = 'click' | 'pointerup' | 'pointerdown' | 'pointermove' | 'pointerleave';
-export declare type EventHandleFn<T> = (event: TwinsThreeMesh) => void;
+export declare type EventHandleFn<T> = (event: Mesh, intersect?: Intersection) => void;

package/dist/utils/move.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import type { Object3D, Vector3 } from 'three';
+import { CatmullRomCurve3 } from 'three';
 import * as TWEEN from '@tweenjs/tween.js';
 export declare enum Direction {
     plus = "plus",
@@ -14,16 +15,19 @@ export declare enum Direction {
  * @param animationMethod
  */
 export declare const moveTo: (currentObject3D: Object3D, targetObject3D: Object3D, distance: number, direction: Direction, duration?: number, animationMethod?: string) => TWEEN.Tween<Vector3>;
-export declare const moveWithLine: (points: Vector3[], duration?: number) => void;
+export interface ControlsRetuenFuncType {
+    remove: () => void;
+    increaseSpeed: (currentStep: number) => void;
+    recoverSpeed: () => void;
+}
 /**
- * 圆周运动
- * 1. 一个法向量
- * 2. 一个半径
- * 3. 圆心位置
- * 4. 需要运动的物体
- * 5. 运动的时间
- * 6. 运动的方式
+ * 曲线路径移动
+ * @param currentObject
+ * @param curve
+ * @param points 曲线分割数, 同时也决定了运动速度
+ * @param lookat 默认曲线方向
  */
+export declare const moveWithLine: (currentObject: Object3D, curve: CatmullRomCurve3, points?: number, lookat?: Vector3) => ControlsRetuenFuncType;
 /**
  * base 圆周运动
  * @param currentObject3d
@@ -33,7 +37,6 @@ export declare const moveWithLine: (points: Vector3[], duration?: number) => voi
 export declare const moveWithRound: (currentObject3d: Object3D, speed?: number, duration?: number) => void;
 /**
  * move 方法2 移动辅助线
- * todo bug待修复
  * @param currentObject3D
  * @param targetObject3D
  */

package/dist/utils/move.js CHANGED Viewed

@@ -68,19 +68,45 @@ var createLine = function createLine(points) {
   });
   return [new Line(geometry, material), curve];
 };
-export var moveWithLine = function moveWithLine(points, duration) {
-  // const line = createLine(points)
-};
 /**
- * 圆周运动
- * 1. 一个法向量
- * 2. 一个半径
- * 3. 圆心位置
- * 4. 需要运动的物体
- * 5. 运动的时间
- * 6. 运动的方式
+ * 曲线路径移动
+ * @param currentObject
+ * @param curve
+ * @param points 曲线分割数, 同时也决定了运动速度
+ * @param lookat 默认曲线方向
  */
+export var moveWithLine = function moveWithLine(currentObject, curve) {
+  var points = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 500;
+  var lookat = arguments.length > 3 ? arguments[3] : undefined;
+  var totlePoints = curve.getPoints(points);
+  var totle = totlePoints.length;
+  var index = 0;
+  var step = 1;
+  var calcIndex = function calcIndex(index) {
+    return index > totle ? index - totle - 1 : index;
+  };
+  var handleCallback = function handleCallback() {
+    if (index >= totle) index = calcIndex(index);
+    var nextPoint = totlePoints[calcIndex(index) % totle];
+    currentObject.position.set(nextPoint.x, nextPoint.y, nextPoint.z);
+    if (lookat) currentObject.lookAt(lookat);else currentObject.lookAt(totlePoints[calcIndex(index + 1) % totle]);
+    index += step;
+  };
+  globalControl.add(handleCallback, 100000);
+  globalControl.start();
+  return {
+    remove: function remove() {
+      return globalControl.remove(handleCallback);
+    },
+    increaseSpeed: function increaseSpeed() {
+      var currentStep = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+      step = currentStep + step;
+    },
+    recoverSpeed: function recoverSpeed() {
+      step = 1;
+    }
+  };
+};
 /**
  * base 圆周运动
@@ -106,7 +132,6 @@ export var moveWithRound = function moveWithRound(currentObject3d) {
 /**
  * move 方法2 移动辅助线
- * todo bug待修复
  * @param currentObject3D
  * @param targetObject3D
  */