Home Explore Help
Register Sign In
xushiting
/
Metaverse
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'myrtc' of http://192.168.0.115:3000/xushiting/Metaverse into myrtc

# Conflicts:
#	src/main.js
xushiting 3 years ago
parent
36e0802573 10c31a89a0
commit
a4c508569c
6 changed files with 17 additions and 8 deletions
Split View Show Diff Stats
  1. BIN
      dist/assets/loading.gif
  2. 9 1
      dist/index.html
  3. 1 1
      src/EventsManager.js
  4. 1 1
      src/XSceneManager.js
  5. 3 2
      src/Xverse_Room.js
  6. 3 3
      src/main.js

BIN
dist/assets/loading.gif
View File


+ 9 - 1
dist/index.html
View File 

@@ -8,7 +8,14 @@
 
     <!-- <link rel="stylesheet" href="./index.css" /> -->
 
    
     <link rel="stylesheet" href="./css/toastify.min.css" />
 
-   
+    <style>
 
+        .loading {
 
+            position: absolute;
 
+            width: 100%;
 
+            height: 100%;
 
+            background: #fff url("./assets/loading.gif") center;
 
+        }
 
+    </style>
 
 </head>
 
 <body>
 
 
@@ -734,6 +741,7 @@
 
     </script>
 
 
     <div id="root">
 
+        <div class="loading" style="z-index: 9999"></div>
 
         <div class = "App">
 
             <canvas id = "canvas" class = "stream unselect">

+ 1 - 1
src/EventsManager.js
View File 

@@ -35,7 +35,7 @@ export default class EventsManager extends EventEmitter {
 
     async track(e, t) 
     {
 
         const traceId = e.traceId;
 
-        this.traceId = traceId  // todo 写死数据纠正
 
+        // this.traceId = traceId  // todo 写死数据纠正
 
 
         this.emitTraceIdToDecoder(e);

+ 1 - 1
src/XSceneManager.js
View File 

@@ -59,7 +59,7 @@ export default class XSceneManager {
 
         this.engine.doNotHandleContextLost = !0,
 
         this.scene.clearCachedVertexData(),
 
         this.scene.cleanCachedTextureBuffer(),
 
-        this.scene.debugLayer.show({ embedMode: true, }),    // BABYLON调试工具栏
 
+        location.href.indexOf("debug") > -1 && this.scene.debugLayer.show({ embedMode: true, }),    // BABYLON调试工具栏
 
 
         this.urlTransformer = options.urlTransformer || (s=>Promise.resolve(s)),
 
         options.logger && defaultLog.setLogger(options.logger),

+ 3 - 2
src/Xverse_Room.js
View File 

@@ -101,14 +101,14 @@ export default class Xverse_Room extends EventEmitter {
 
         // data.signal.newUserStates && data.signal.newUserStates[0].playerState.camera 
         // && console.error(data.signal.actionResponses, data.signal.newUserStates[0].playerState.camera.position)
 
         // 更新坐标数据
 
-        data.signal.newUserStates && data.signal.newUserStates[0] && (data.signal.newUserStates[0].userId = this.userId)  // todo 写死数据纠正
 
+        // data.signal.newUserStates && data.signal.newUserStates[0] && (data.signal.newUserStates[0].userId = this.userId)  // todo 写死数据纠正
 
         this.signal.handleSignal(data, reject)
 
         
         // data.signal.newUserStates 
         // && data.signal.newUserStates[0] 
         // && data.signal.newUserStates[0].playerState 
         // && data.signal.newUserStates[0].playerState.camera 
-        // && console.error(data.signal.newUserStates[0].playerState.camera.position, xversePosition2Ue4(this.sceneManager._cameraManager.mainCamera.position))
 
+        // && console.error(data.signal.newUserStates[0].playerState.camera.position, data.signal.newUserStates[0].playerState.camera.angle.yaw)
 
       }),
 
 
       workers.registerFunction("stream", data => {
 
@@ -269,6 +269,7 @@ export default class Xverse_Room extends EventEmitter {
 
       this.beforeJoinRoomResolveHook();
 
   }
 
   afterJoinRoom() {
 
+    document.querySelector(".loading").style.zIndex = -9999;
 
     (this.joined = !0),
 
       this.viewMode === "observer" && this.setViewModeToObserver(),
 
       logger.infoAndReportMeasurement({

+ 3 - 3
src/main.js
View File 

@@ -35,9 +35,9 @@ const l = async()=>{
 
             roomId: 'e629ef3e-022d-4e64-8654-703bb96410eb',
 
             userId: nickname,
 
             //wsServerUrl: 'wss://uat-eks.xverse.cn/ws',
 
-            //wsServerUrl: "ws://localhost:6688/ws",
 
-            wsServerUrl: "wss://meta-socket1.4dage.com/ws",
 
-            //appId: "10016",
 
+            // wsServerUrl: "ws://localhost:6688/ws",
 
+            wsServerUrl: "wss://meta-socket.4dage.com/ws",
 
+            // appId: "10016",
 
             appId: "0000000002",
 
             token: " ",
 
             nickname: nickname,