xushiting преди 3 години
родител
ревизия
aece72162a
променени са 8 файла, в които са добавени 19 реда и са изтрити 16 реда
  1. 0 10
      dist/index.html
  2. 1 1
      src/ActionsHandler.js
  3. 1 1
      src/NetworkController.js
  4. 1 1
      src/Socket.js
  5. 1 1
      src/StaticMeshEvent.js
  6. 12 0
      src/XCameraComponent.js
  7. 1 1
      src/XStaticMeshFromOneGltf.js
  8. 2 1
      src/XverseAvatar.js

+ 0 - 10
dist/index.html

@@ -484,16 +484,6 @@
     , ENGINE_FRAME_RATE = 30
     , ROOT_MESH_ANIM_PROPERTY = ["scaling", "position", "rotation"]
     , MESH_TAG = "XSubSequence";
-
-    function MatrixMul(d, o) {
-        const s = new XMatrix(new XPlane(0,0,0,0),new XPlane(0,0,0,0),new XPlane(0,0,0,0),new XPlane(0,0,0,0));
-        for (let c = 0; c < 4; ++c)
-            for (let _ = 0; _ < 4; ++_)
-                for (let b = 0; b < 4; ++b)
-                    s.M[_][b] += d.M[_][c] * o.M[c][b];
-        return s
-    }
-
     function uuid$2() {
         return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, d=>{
             const o = Math.random() * 16 | 0;

+ 1 - 1
src/ActionsHandler.js

@@ -45,7 +45,7 @@ export default class ActionsHandler {
     }
     async sendData(o) {
         await this.beforeSend(o);
-        const s = uuid$1();
+        const s = util.uuid();
         if (this.room.networkController.sendRtcData({
             ...o.data,
             trace_id: s,

+ 1 - 1
src/NetworkController.js

@@ -246,7 +246,7 @@ export default class NetworkController extends EventEmitter {
         this.socket.send(s)
     }
     quit() {
-        const s = uuid$1()
+        const s = util.uuid()
           , c = {
             action_type: Actions.Exit,
             trace_id: s,

+ 1 - 1
src/Socket.js

@@ -35,7 +35,7 @@ export default class Socket extends EventEmitter {
             id: "start",
             room_id: s,
             user_id: c,
-            trace_id: uuid$1(),
+            trace_id: util.uuid(),
             data: JSON.stringify({
                 avatar_components: JSON.stringify(j),
                 avatar_id: _,

+ 1 - 1
src/StaticMeshEvent.js

@@ -43,7 +43,7 @@ export default class StaticMeshEvent extends EventEmitter {
     }
     onPointerTap(s, c=!1) {
         var b, k;
-        let _ = new PickingInfo;
+        let _ = new BABYLON.PickingInfo;
         if (c) {
             const j = this.scene.multiPick(this.scene.pointerX, this.scene.pointerY, s, void 0, void 0);
             j && j.length > 1 ? _ = j[1] : j && (_ = j[0])

+ 12 - 0
src/XCameraComponent.js

@@ -1,3 +1,15 @@
+ import XMatrix from "./XMatrix.js"
+ import XPlane from "./XPlane.js"
+ 
+
+ function MatrixMul(d, o) {
+    const s = new XMatrix(new XPlane(0,0,0,0),new XPlane(0,0,0,0),new XPlane(0,0,0,0),new XPlane(0,0,0,0));
+    for (let c = 0; c < 4; ++c)
+        for (let _ = 0; _ < 4; ++_)
+            for (let b = 0; b < 4; ++b)
+                s.M[_][b] += d.M[_][c] * o.M[c][b];
+    return s
+}
 export default class XCameraComponent {
     constructor(o, s, c) {
         this.maincameraRotLimitObserver = null,

+ 1 - 1
src/XStaticMeshFromOneGltf.js

@@ -62,7 +62,7 @@ export default class XStaticMeshFromOneGltf {
         s.id != null ? this._id = s.id : this._id = "default",
         s.lod != null ? this._lod = s.lod : this._lod = -1,
         s.skinInfo != null ? this._skinInfo = s.skinInfo : this._skinInfo = "default",
-        this._groupUuid = uuid$2(),
+        this._groupUuid = util.uuid(),
         this._isInScene = !1
     }
     get isinscene() {

+ 2 - 1
src/XverseAvatar.js

@@ -3,6 +3,7 @@ import InternalError from "./error/InternalError.js"
 import EAvatarRelationRank from "./enum/EAvatarRelationRank.js"
 import AvatarGroup from "./enum/AvatarGroup.js"
 import MotionType from "./enum/MotionType.js"
+import MotionAnimtion from "./enum/MotionAnimtion.js"
 import Queue from "./Queue.js"
 import Logger from "./Logger.js"
 import CoreBroadcastType from "./enum/CoreBroadcastType.js"
@@ -257,7 +258,7 @@ export default class XverseAvatar extends EventEmitter {
                 })
             }
             );
-            const _e = uuid$1();
+            const _e = util.uuid();
             if (this._lastAnimTraceId = _e,
             await this.xAvatar.controller.playAnimation(k, c),
             _e === this._lastAnimTraceId && !this.isMoving && !c && s !== b) {