gemercheung il y a 3 ans
Parent
commit
d4209da375
2 fichiers modifiés avec 15 ajouts et 13 suppressions
  1. 4 4
      src/move/move.service.ts
  2. 11 9
      src/scene/scene.service.ts

+ 4 - 4
src/move/move.service.ts

@@ -158,7 +158,7 @@ export class MoveService {
       //纠正,旋转传到缓存里
       const checkReplys = [];
       // console.log('矫正: ' + angle + ' 度');
-      if(angle>22){
+      if (angle > 22) {
         for (let i = 0; i < angle; ++i) {
           // console.warn('矫正一次:' + i);
           const reply = await this.rotateService.rotateForAngle(userId, 1);
@@ -175,8 +175,8 @@ export class MoveService {
           reply.actionResponses.push(actionResponse);
           checkReplys.push(reply);
         }
-      }else{
-        for (let i = angle; i >-1; --i) {
+      } else {
+        for (let i = angle; i > -1; --i) {
           // console.warn('矫正一次:' + i);
           const reply = await this.rotateService.rotateForAngle(userId, -1);
           // console.warn(
@@ -502,7 +502,7 @@ export class MoveService {
           redisData.fileName +
           '?m=' +
           new Date().getTime();
-          console.log('人物旋转:'+user.player.angle.yaw);
+        console.log('人物旋转:' + user.player.angle.yaw);
         return this.reply;
       }
       //选择过渡

+ 11 - 9
src/scene/scene.service.ts

@@ -15,6 +15,7 @@ import { DelayQueue, RxQueue, ThrottleQueue, DebounceQueue } from 'rx-queue';
 import { MoveService } from 'src/move/move.service';
 import { GetRouterService } from 'src/get-router/get-router.service';
 import { join } from 'path';
+import e from 'express';
 
 @Injectable()
 export class SceneService implements OnModuleInit, OnModuleDestroy {
@@ -24,7 +25,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
     private rotateService: RotateService,
     private moveService: MoveService,
     private getRouterService: GetRouterService, // @InjectQueue('rotate') private rotateQueue: Queue, // @InjectQueue('walking') private walkingQueue: Queue,
-  ) { }
+  ) {}
   @Client(grpcClientOptions) private readonly client: ClientGrpc;
 
   public _frameInteval: NodeJS.Timeout;
@@ -296,7 +297,6 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
 
   async walking(req) {
     try {
-      console.log('walking', req);
       this.clickQueue.next(req);
       this.walkingSub = this.clickQueue.subscribe(async (request) => {
         const user = this.moveService.users[this.user_id];
@@ -316,6 +316,8 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
             rotateCamData.forEach((item: StreamReplyType) => {
               item.type = 'rotate';
             });
+          } else {
+            console.log('rotateCamData无数据');
           }
           // walkingRes marker to everybody
           const seqs = Array.from(
@@ -325,8 +327,8 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
           if (seqs?.length) {
             const lastSeq = rotateCamData?.length
               ? (Array.from(rotateCamData).concat(
-                seqs,
-              ) as any as StreamReplyType[])
+                  seqs,
+                ) as any as StreamReplyType[])
               : seqs;
             this.handleSeqMoving(lastSeq);
           } else {
@@ -366,8 +368,8 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
               if (seqs?.length || rotateCamData?.length) {
                 const lastSeq = rotateCamData?.length
                   ? (Array.from(rotateCamData).concat(
-                    seqs,
-                  ) as any as StreamReplyType[])
+                      seqs,
+                    ) as any as StreamReplyType[])
                   : seqs;
                 this.handleSeqMoving(lastSeq);
               } else {
@@ -396,7 +398,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
     this.onMoving.next(true);
     this.holdSteam();
 
-    seqs.forEach((frame: StreamReplyType, index:number) => {
+    seqs.forEach((frame: StreamReplyType, index: number) => {
       const mediaSrc = frame.mediaSrc;
       const src = mediaSrc.split('?')[0];
       // 临时本地替换路经
@@ -407,7 +409,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
       console.log('type', frame.type);
       delete frame.mediaSrc;
       delete frame.type;
-      //TODO 
+      //TODO
       const random_boolean = Math.random() < 0.3;
       // const random_index === 1 ? 3 : random_boolean ? 1 : 3;
       const stream: StreamFrameType = {
@@ -644,7 +646,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
               delete redisData.mediaSrc;
               this.logger.log(
                 `user:${this.user_id}:first render stream` +
-                JSON.stringify({ path: clipPath, meta: redisData }),
+                  JSON.stringify({ path: clipPath, meta: redisData }),
               );
               const status = await this.pushFirstRender(
                 clipPath,