three-base 1.0.82 → 1.0.84

package/index.js

@@ -25,7 +25,7 @@ export { default as FPScontrol } from "./lib/FPScontrol";
 // 平面文字
 export { default as PlaneText } from "./lib/PlaneText";
 // 精灵文字
-export { default as SpriteText } from "three-spritetext";
+export { default as SpriteText } from "./lib/SpriteText";
 // 精灵文字样式2
 export { default as SpriteText2 } from "./lib/SpriteText2";
 //精灵文本框

package/index.ts

@@ -43,7 +43,7 @@ export { default as FPScontrol } from "./lib/FPScontrol";
 export { default as PlaneText } from "./lib/PlaneText";
 
 // 精灵文字
-export { default as SpriteText } from "three-spritetext";
+export { default as SpriteText } from "./lib/SpriteText";
 
 // 精灵文字样式2
 export { default as SpriteText2 } from "./lib/SpriteText2";

package/lib/ApngTexture.js

@@ -1,82 +1,34 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import parseAPNG from "apng-js";
 import axios from "axios";
 import { CanvasTexture } from "three";
 import threeUtils from "./threeUtils";
-var ApngTexture = /** @class */ (function (_super) {
-    __extends(ApngTexture, _super);
-    function ApngTexture(url) {
-        var _this = _super.call(this, document.createElement("canvas")) || this;
-        // 上一次更新时间
-        _this.preUpdate = 0;
-        // 更新纹理
-        _this.onUpdate = function () {
-            if (_this.preUpdate === ApngTexture.TimeTemp) {
-                return;
-            }
-            _this.preUpdate = ApngTexture.TimeTemp;
-            if (_this.player) {
-                _this.player.renderNextFrame();
-            }
-        };
-        _this.loadApng(url);
-        return _this;
+export default class ApngTexture extends CanvasTexture {
+    constructor(url) {
+        super(document.createElement("canvas"));
+        this.loadApng(url);
     }
+    // 获取时间戳
+    static TimeTemp = performance.now();
+    // 上一次更新时间
+    preUpdate = 0;
+    player;
+    // apng 对象
+    apng;
+    // 更新纹理
+    onUpdate = () => {
+        if (this.preUpdate === ApngTexture.TimeTemp) {
+            return;
+        }
+        this.preUpdate = ApngTexture.TimeTemp;
+        if (this.player) {
+            this.player.renderNextFrame();
+        }
+    };
     // 获取当前帧id
-    ApngTexture.prototype.getUuid = function () {
+    getUuid() {
         if (this.apng) {
-            var currentTime = ApngTexture.TimeTemp % this.apng.playTime;
-            var i = 0;
+            let currentTime = ApngTexture.TimeTemp % this.apng.playTime;
+            let i = 0;
             while (this.apng.frames[i] && currentTime > this.apng.frames[i].delay) {
                 currentTime -= this.apng.frames[i].delay;
                 i++;
@@ -86,43 +38,24 @@ var ApngTexture = /** @class */ (function (_super) {
         else {
             return "";
         }
-    };
+    }
     // 加载apng图片
-    ApngTexture.prototype.loadApng = function (url) {
-        return __awaiter(this, void 0, void 0, function () {
-            var res, blob, reader, apng, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, axios.get(url, { method: "post", responseType: "blob" })];
-                    case 1:
-                        res = _b.sent();
-                        blob = new Blob([res.data]);
-                        reader = new FileReader();
-                        return [4 /*yield*/, new Promise(function (resolve) {
-                                reader.onload = function () { return resolve(); };
-                                reader.readAsArrayBuffer(blob);
-                            })];
-                    case 2:
-                        _b.sent();
-                        apng = parseAPNG(reader.result);
-                        this.dispose();
-                        this.image.width = apng.width;
-                        this.image.height = apng.height;
-                        _a = this;
-                        return [4 /*yield*/, apng.getPlayer(this.image.getContext("2d"))];
-                    case 3:
-                        _a.player = _b.sent();
-                        return [2 /*return*/];
-                }
-            });
+    async loadApng(url) {
+        const res = await axios.get(url, { method: "post", responseType: "blob" });
+        const blob = new Blob([res.data]);
+        const reader = new FileReader();
+        await new Promise((resolve) => {
+            reader.onload = () => resolve();
+            reader.readAsArrayBuffer(blob);
         });
-    };
-    // 获取时间戳
-    ApngTexture.TimeTemp = performance.now();
-    return ApngTexture;
-}(CanvasTexture));
-export default ApngTexture;
+        const apng = parseAPNG(reader.result);
+        this.dispose();
+        this.image.width = apng.width;
+        this.image.height = apng.height;
+        this.player = await apng.getPlayer(this.image.getContext("2d"));
+    }
+}
 // 定时更新时间戳
-threeUtils.addEventListener("requestAnimationFrame", function (e) {
+threeUtils.addEventListener("requestAnimationFrame", (e) => {
     ApngTexture.TimeTemp = e.timeTemp;
 });

package/lib/ApngTextureManage.js

@@ -1,39 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import parseAPNG from "apng-js";
 import axios from "axios";
 import { isEmpty } from "lodash";
@@ -42,22 +6,26 @@ import threeUtils from "./threeUtils";
 /**
  * apng 纹理管理对象
  */
-var apngTextureManage = /** @class */ (function () {
-    function apngTextureManage() {
-        // 每个动态纹理的播放总时长
-        this.playTimes = new Map();
-        // 保存所有的动态纹理
-        this.anpgTextList = {};
+class apngTextureManage {
+    constructor() {
         // 初始化定时更新时间戳
         if (apngTextureManage.isInit) {
             apngTextureManage.isInit = false;
-            threeUtils.addEventListener("requestAnimationFrame5000", function (e) {
+            threeUtils.addEventListener("requestAnimationFrame5000", (e) => {
                 apngTextureManage.TimeTemp = e.timeTemp;
             });
         }
     }
+    static TextureLoader = new TextureLoader();
+    static isInit = true;
+    // 获取时间戳
+    static TimeTemp = performance.now();
+    // 每个动态纹理的播放总时长
+    playTimes = new Map();
+    // 保存所有的动态纹理
+    anpgTextList = {};
     // 获取动态纹理 需要每帧都获取一下
-    apngTextureManage.prototype.getTexture = function (path) {
+    getTexture(path) {
         // 如果 没有这个纹理就返回空同时开始加载这个纹理
         if (!this.anpgTextList[path]) {
             this.anpgTextList[path] = [];
@@ -68,9 +36,9 @@ var apngTextureManage = /** @class */ (function () {
             return null;
         }
         else {
-            var playTime = this.playTimes.get(path);
-            var currentTime = apngTextureManage.TimeTemp % playTime;
-            var i = 0;
+            const playTime = this.playTimes.get(path);
+            let currentTime = apngTextureManage.TimeTemp % playTime;
+            let i = 0;
             while (this.anpgTextList[path][i] && currentTime > Number(this.anpgTextList[path][i].name)) {
                 currentTime -= Number(this.anpgTextList[path][i].name);
                 i++;
@@ -78,59 +46,42 @@ var apngTextureManage = /** @class */ (function () {
             this.anpgTextList[path][i].needsUpdate = true;
             return this.anpgTextList[path][i];
         }
-    };
+    }
     // 加载apng图片
-    apngTextureManage.prototype.loadApng = function (url) {
-        return __awaiter(this, void 0, void 0, function () {
-            var res, blob, reader, apng, i, frame, blobUrl, texture;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, axios.get(url, { method: "post", responseType: "blob" })];
-                    case 1:
-                        res = _a.sent();
-                        blob = new Blob([res.data]);
-                        reader = new FileReader();
-                        return [4 /*yield*/, new Promise(function (resolve) {
-                                reader.onload = function () { return resolve(); };
-                                reader.readAsArrayBuffer(blob);
-                            })];
-                    case 2:
-                        _a.sent();
-                        apng = parseAPNG(reader.result);
-                        // 存储播放时长
-                        this.playTimes.set(url, apng.playTime);
-                        // for (let i = 0; i < apng.frames.length; i++) {
-                        //     const frame = apng.frames[i];
-                        //     frame.createImage();
-                        //     await new Promise(resolve => frame.imageElement!.onload = resolve);
-                        // }
-                        for (i = 0; i < apng.frames.length; i++) {
-                            frame = apng.frames[i];
-                            blobUrl = URL.createObjectURL(frame.imageData);
-                            texture = apngTextureManage.TextureLoader.load(blobUrl);
-                            texture.anisotropy = 16;
-                            texture.wrapS = texture.wrapT = MirroredRepeatWrapping;
-                            // export const RepeatWrapping: Wrapping;
-                            // export const ClampToEdgeWrapping: Wrapping;
-                            // export const MirroredRepeatWrapping: Wrapping;
-                            // magFilter: TextureFilter;
-                            // minFilter: TextureFilter;
-                            texture.name = String(frame.delay);
-                            texture.center.set(0.5, 0.5);
-                            texture.repeat.set(apng.width / frame.width, apng.height / frame.height);
-                            // texture.needsUpdate = true;
-                            this.anpgTextList[url].push(texture);
-                        }
-                        return [2 /*return*/];
-                }
-            });
+    async loadApng(url) {
+        const res = await axios.get(url, { method: "post", responseType: "blob" });
+        const blob = new Blob([res.data]);
+        const reader = new FileReader();
+        await new Promise((resolve) => {
+            reader.onload = () => resolve();
+            reader.readAsArrayBuffer(blob);
         });
-    };
-    apngTextureManage.TextureLoader = new TextureLoader();
-    apngTextureManage.isInit = true;
-    // 获取时间戳
-    apngTextureManage.TimeTemp = performance.now();
-    return apngTextureManage;
-}());
-var ApngTextureManage = new apngTextureManage();
+        const apng = parseAPNG(reader.result);
+        // 存储播放时长
+        this.playTimes.set(url, apng.playTime);
+        // for (let i = 0; i < apng.frames.length; i++) {
+        //     const frame = apng.frames[i];
+        //     frame.createImage();
+        //     await new Promise(resolve => frame.imageElement!.onload = resolve);
+        // }
+        for (let i = 0; i < apng.frames.length; i++) {
+            const frame = apng.frames[i];
+            var blobUrl = URL.createObjectURL(frame.imageData);
+            const texture = apngTextureManage.TextureLoader.load(blobUrl);
+            texture.anisotropy = 16;
+            texture.wrapS = texture.wrapT = MirroredRepeatWrapping;
+            // export const RepeatWrapping: Wrapping;
+            // export const ClampToEdgeWrapping: Wrapping;
+            // export const MirroredRepeatWrapping: Wrapping;
+            // magFilter: TextureFilter;
+            // minFilter: TextureFilter;
+            texture.name = String(frame.delay);
+            texture.center.set(0.5, 0.5);
+            texture.repeat.set(apng.width / frame.width, apng.height / frame.height);
+            // texture.needsUpdate = true;
+            this.anpgTextList[url].push(texture);
+        }
+    }
+}
+const ApngTextureManage = new apngTextureManage();
 export default ApngTextureManage;

package/lib/EventMesh.js

@@ -4,21 +4,6 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2023-02-07 11:19:56
  */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 import { BoxGeometry, CylinderGeometry, DoubleSide, Mesh, MeshBasicMaterial, MeshNormalMaterial } from "three";
 import threeUtils from "./threeUtils";
 // 碰撞的形状
@@ -30,28 +15,35 @@ export var CollisionShaere;
 /**
  * 碰撞检测用的模型
  */
-var EventMesh = /** @class */ (function (_super) {
-    __extends(EventMesh, _super);
-    function EventMesh(type) {
-        if (type === void 0) { type = CollisionShaere.cube; }
-        var _this = _super.call(this) || this;
-        _this.renderOrder = 99;
-        // 是否是碰撞检测专用的模型
-        _this.isEventMesh = true;
-        _this.material = EventMesh.material;
-        _this.setType(type);
+export default class EventMesh extends Mesh {
+    constructor(type = CollisionShaere.cube) {
+        super();
+        this.material = EventMesh.material;
+        this.setType(type);
         // 生产环境 不用渲染
         if (threeUtils.isProd) {
-            _this.material = new MeshBasicMaterial({
+            this.material = new MeshBasicMaterial({
                 side: DoubleSide,
                 transparent: true,
                 opacity: 0.25,
                 alphaTest: 1
             });
         }
-        return _this;
     }
-    EventMesh.prototype.setType = function (type) {
+    static type = CollisionShaere;
+    static material = new MeshNormalMaterial({
+        side: DoubleSide,
+        transparent: true,
+        opacity: 0.3,
+    });
+    renderOrder = 99;
+    // 正方体 网格模型
+    static cubeGeo = new BoxGeometry(1, 1, 1, 1, 1, 1);
+    // 圆柱体 网格模型
+    static cylinderGeo = new CylinderGeometry(1, 1, 1, 50, 1, false, 0, Math.PI * 2);
+    // 是否是碰撞检测专用的模型
+    isEventMesh = true;
+    setType(type) {
         switch (type) {
             case EventMesh.type.cube:
                 this.geometry = EventMesh.cubeGeo;
@@ -63,17 +55,5 @@ var EventMesh = /** @class */ (function (_super) {
                 break;
         }
         this.geometry.computeVertexNormals();
-    };
-    EventMesh.type = CollisionShaere;
-    EventMesh.material = new MeshNormalMaterial({
-        side: DoubleSide,
-        transparent: true,
-        opacity: 0.3,
-    });
-    // 正方体 网格模型
-    EventMesh.cubeGeo = new BoxGeometry(1, 1, 1, 1, 1, 1);
-    // 圆柱体 网格模型
-    EventMesh.cylinderGeo = new CylinderGeometry(1, 1, 1, 50, 1, false, 0, Math.PI * 2);
-    return EventMesh;
-}(Mesh));
-export default EventMesh;
+    }
+}