xushiting %!s(int64=3) %!d(string=hai) anos
pai
achega
e0579dadd8
Modificáronse 2 ficheiros con 15 adicións e 36 borrados
  1. 1 31
      src/Signal.js
  2. 14 5
      src/Workers.js

+ 1 - 31
src/Signal.js

@@ -95,37 +95,7 @@ export default class Signal {
             }
             if(this._room.sceneManager.getCurrentShaderMode() !== ECurrentShaderMode.pano && !this._room.isPano && currentUserStates.playerState.camera){
                 // console.error(currentUserStates.playerState)
-
-                // ---------------------------------------------------------------------------------
-                // 周恩光 自定义相机的初始朝向
-                let cameraDirOffset = -Math.PI/2
-
-                let cameraPostion0 = currentUserStates.playerState.camera.position
-                let cameraAngle0 = currentUserStates.playerState.camera.angle
-                let playerPosition = currentUserStates.playerState.player.position
-
-                let rotationQuaternion = BABYLON.Quaternion.RotationAxis( new BABYLON.Vector3(0, 0, 1), cameraDirOffset )
-                let cameraPos = new BABYLON.Vector3( cameraPostion0.x, cameraPostion0.y, cameraPostion0.z )
-                let cameraCenter = new BABYLON.Vector3( playerPosition.x, playerPosition.y, playerPosition.z )
-
-                cameraPos.rotateByQuaternionAroundPointToRef(rotationQuaternion, cameraCenter, cameraPos)
-
-                let cameraState = {
-                    "position": {
-                        "x": cameraPos.x,
-                        "y": cameraPos.y,
-                        "z": cameraPos.z
-                    },
-                    "angle": {
-                        "pitch": cameraAngle0.pitch,
-                        "yaw": cameraAngle0.yaw + cameraDirOffset/Math.PI*180,
-                        "roll": cameraAngle0.roll
-                    }
-                }
-                this._room.camera.setCameraPose(cameraState)
-                // ---------------------------------------------------------------------------------
-
-                // this._room.camera.setCameraPose(currentUserStates.playerState.camera)
+                this._room.camera.setCameraPose(currentUserStates.playerState.camera)
 
                 //console.log('接收数据setCameraPose:'+JSON.stringify(currentUserStates.playerState.camera.angle))
                 //console.log('我们计算:'+ util.ue4Rotation2Xverse(currentUserStates.playerState.camera.angle).y/Math.PI*180)

+ 14 - 5
src/Workers.js

@@ -11,6 +11,8 @@ const USER_ID = "987412365"
   , COS_PREFIX = "error-bitstreams-auto-uploaded-from-application/"
   , FRAME_COMPOSE_LENGTH = 5;
 
+let count = 0
+
 import CircularArray from "./CircularArray.js"
 
 export default class Workers {
@@ -572,11 +574,11 @@ export default class Workers {
                         break
                     }
                 case 5:
-                    this.executeFunction("signal", {
-                        signal: n.data.metadata,
-                        pts: -1,
-                        alreadyUpdateYUV: !1
-                    });
+                    // this.executeFunction("signal", {
+                    //     signal: n.data.metadata,
+                    //     pts: -1,
+                    //     alreadyUpdateYUV: !1
+                    // });
                     break;
                 case 6:
                     defaultLogger.infoAndReportMeasurement(n.data),
@@ -625,6 +627,10 @@ export default class Workers {
         )
     }
     UpdateYUV() {
+        ++count
+        if(count>100){
+            return
+        }
         var t, r;
         const e = this.getPtr;
         if (this.cachedMetas[e] != null && !this.cachedRender[e]) {
@@ -686,6 +692,8 @@ export default class Workers {
             //     this.moveDisplayCircular.add(f),
             //     this.lastMoveDisplayTime = h
             // }
+
+            
             this.executeFunction("signal", {
                 signal: this.cachedMetas[e],
                 pts: this.cachedPtss[e],
@@ -693,6 +701,7 @@ export default class Workers {
             })
             this.cachedRender[e] = !0;
             this.getPtr = (this.getPtr + 1) % this.cachedLength
+            
         }
     }
     unmarshalPano(e) {