zhouenguang 3 年之前
父节点
当前提交
643d7ae789
共有 3 个文件被更改,包括 12 次插入12 次删除
  1. 2 2
      dist/index.html
  2. 9 10
      src/ActionsHandler.js
  3. 1 0
      src/XMaterialComponent.js

+ 2 - 2
dist/index.html

@@ -38,12 +38,12 @@
     <script src="./libs/nipplejs.min.js"></script>
     <script src="./shader.js"></script>
 
-    <!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
+    <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
     <script>
         // init vConsole
         var vConsole = new VConsole();
         console.log('Hello world');
-    </script> -->
+    </script>
 
     <!-- <script src="./webrtc//adapter-7.4.0.min.js"></script>
     <script src="./webrtc/srs.sdk.js"></script> -->

+ 9 - 10
src/ActionsHandler.js

@@ -61,7 +61,7 @@ export default class ActionsHandler {
 
         
         window.connection.socket.on("getRoute", (pathArr) => {
-            console.error("getRoute", pathArr);
+            console.log("getRoute", pathArr);
 
             if(!pathArr) return
             
@@ -76,9 +76,11 @@ export default class ActionsHandler {
             const frameRate = 29    // fps
 
             let walkPoints = []
-            let walkFrames = []
+            let sumWalkFrame = 0
             let videoArr = []
             for(let i = 0; i < pathArr.length - 1; i++) {
+                // 目前视频返回帧数到159条会停止
+                if(sumWalkFrame + walkFrame > 159) break
 
                 let point0 = new BABYLON.Vector3(pathArr[i].location.x, pathArr[i].location.y, pathArr[i].location.z)
                 let point1 = new BABYLON.Vector3(pathArr[i+1].location.x, pathArr[i+1].location.y, pathArr[i+1].location.z)
@@ -92,19 +94,16 @@ export default class ActionsHandler {
                     path: ossVideoDir + pathArr[i].id + "/" + pathArr[i].id + "_" + pathArr[i+1].id + "_" + dircNum,
                     frame: walkFrame
                 })
-                walkFrames.push(walkFrame)
+                sumWalkFrame += walkFrame
                 for(let currentFrame = 1; currentFrame <= walkFrame; currentFrame++) {
                     walkPoints.push(point0.add(dir.scale(distancePerFrame * 100 * currentFrame)))   // 单位转换成cm
                 }
             }
 
-            console.error(walkPoints)
+            console.log("[Walk]::path", walkPoints)
 
             window.walkSettings = {
-                "frameNum": walkFrames.reduce(function(prev, curr){
-                    // 计算总帧数
-                    return prev + curr;
-                }),
+                "frameNum": sumWalkFrame,
                 "walkPoints": walkPoints,
             }
 
@@ -236,7 +235,7 @@ export default class ActionsHandler {
         let closestPoint = window.room.sceneManager.getClosestPointData(t)
         let closestPointSelf = window.room.sceneManager.getClosestPointData(player.position)
 
-        console.error(closestPointSelf.position0, closestPoint.position0)
+        console.log("[Walk]::from", closestPointSelf.position0, ":to", closestPoint.position0)
         window.connection.socket.emit("getRoute", {
             sceneCode: "testApp",
             userId: "testUser",
@@ -661,7 +660,7 @@ export default class ActionsHandler {
     }
 
     mutiFetchData({type, videoDataArr}){
-        console.error(videoDataArr)
+        console.log("[Walk]::videoData", videoDataArr)
         if(window.workerReady){
             // https://laser-data.oss-cn-shenzhen.aliyuncs.com/test-video/optest/0/0_1_0/
             let sendData = []

+ 1 - 0
src/XMaterialComponent.js

@@ -297,6 +297,7 @@ export default class XMaterialComponent {
 
             let targetPos = window.walkSettings.walkPoints[data.renderStateId]
 
+            // console.error(data.renderStateId, window.walkSettings.frameNum)
             if(data.renderStateId < window.walkSettings.frameNum - 1) {
                 window.room.moveTo({
                     position: targetPos,