|
@@ -26,7 +26,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
private rotateService: RotateService,
|
|
private rotateService: RotateService,
|
|
private moveService: MoveService,
|
|
private moveService: MoveService,
|
|
private getRouterService: GetRouterService, // @InjectQueue('rotate') private rotateQueue: Queue, // @InjectQueue('walking') private walkingQueue: Queue,
|
|
private getRouterService: GetRouterService, // @InjectQueue('rotate') private rotateQueue: Queue, // @InjectQueue('walking') private walkingQueue: Queue,
|
|
- ) { }
|
|
|
|
|
|
+ ) {}
|
|
@Client(grpcClientOptions) private readonly client: ClientGrpc;
|
|
@Client(grpcClientOptions) private readonly client: ClientGrpc;
|
|
|
|
|
|
public _frameInteval: NodeJS.Timeout;
|
|
public _frameInteval: NodeJS.Timeout;
|
|
@@ -324,16 +324,16 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
const playerAngle = newUserStates.playerState.player.angle;
|
|
const playerAngle = newUserStates.playerState.player.angle;
|
|
this.logger.log(
|
|
this.logger.log(
|
|
'stop-data-0' +
|
|
'stop-data-0' +
|
|
- 'trace_id: ' +
|
|
|
|
- trace_id +
|
|
|
|
- 'userId:' +
|
|
|
|
- userId +
|
|
|
|
- 'breakPointId :' +
|
|
|
|
- breakPointId +
|
|
|
|
- 'cameraAngle :' +
|
|
|
|
- JSON.stringify(cameraAngle) +
|
|
|
|
- 'playerAngle: ' +
|
|
|
|
- JSON.stringify(playerAngle),
|
|
|
|
|
|
+ 'trace_id: ' +
|
|
|
|
+ trace_id +
|
|
|
|
+ 'userId:' +
|
|
|
|
+ userId +
|
|
|
|
+ 'breakPointId :' +
|
|
|
|
+ breakPointId +
|
|
|
|
+ 'cameraAngle :' +
|
|
|
|
+ JSON.stringify(cameraAngle) +
|
|
|
|
+ 'playerAngle: ' +
|
|
|
|
+ JSON.stringify(playerAngle),
|
|
);
|
|
);
|
|
//debugger;
|
|
//debugger;
|
|
redisMeta = await this.moveService.stop(
|
|
redisMeta = await this.moveService.stop(
|
|
@@ -468,7 +468,20 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
this._rotateCount = 0;
|
|
this._rotateCount = 0;
|
|
const user = this.moveService.users[this.user_id];
|
|
const user = this.moveService.users[this.user_id];
|
|
console.log('进入1 - searchRoad');
|
|
console.log('进入1 - searchRoad');
|
|
|
|
+ this.logger.log(
|
|
|
|
+ 'handleWalking-users' +
|
|
|
|
+ JSON.stringify(this.moveService.users) +
|
|
|
|
+ ' this.user_id: ' +
|
|
|
|
+ this.user_id,
|
|
|
|
+ );
|
|
|
|
+ this.logger.log(
|
|
|
|
+ 'handleWalking-currentUser' +
|
|
|
|
+ JSON.stringify(user) +
|
|
|
|
+ ' this.user_id: ' +
|
|
|
|
+ this.user_id,
|
|
|
|
+ );
|
|
console.log('path-start' + user.breakPointId);
|
|
console.log('path-start' + user.breakPointId);
|
|
|
|
+
|
|
const path = await this.getRouterService.searchRoad(
|
|
const path = await this.getRouterService.searchRoad(
|
|
user.appId,
|
|
user.appId,
|
|
user.breakPointId,
|
|
user.breakPointId,
|
|
@@ -588,7 +601,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
const joystickRes = await this.moveService.seqExeJoystick(request);
|
|
const joystickRes = await this.moveService.seqExeJoystick(request);
|
|
this.logger.log(
|
|
this.logger.log(
|
|
'joystick-breakPointId:' +
|
|
'joystick-breakPointId:' +
|
|
- this.moveService.users[this.user_id].breakPointId,
|
|
|
|
|
|
+ this.moveService.users[this.user_id].breakPointId,
|
|
);
|
|
);
|
|
// 有数据 [0]是rotate数据,[1-infinity]是walking数据
|
|
// 有数据 [0]是rotate数据,[1-infinity]是walking数据
|
|
this.logger.log('joystickRes-1', joystickRes);
|
|
this.logger.log('joystickRes-1', joystickRes);
|
|
@@ -754,14 +767,14 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
};
|
|
};
|
|
this.logger.log(
|
|
this.logger.log(
|
|
'[media-move]: ' +
|
|
'[media-move]: ' +
|
|
- ', moveframeCnt: ' +
|
|
|
|
- this.moveframeCnt +
|
|
|
|
- ', clipPath: ' +
|
|
|
|
- stream.clipPath +
|
|
|
|
- ', mType: ' +
|
|
|
|
- stream.mType +
|
|
|
|
- ', DIR: ' +
|
|
|
|
- stream.DIR,
|
|
|
|
|
|
+ ', moveframeCnt: ' +
|
|
|
|
+ this.moveframeCnt +
|
|
|
|
+ ', clipPath: ' +
|
|
|
|
+ stream.clipPath +
|
|
|
|
+ ', mType: ' +
|
|
|
|
+ stream.mType +
|
|
|
|
+ ', DIR: ' +
|
|
|
|
+ stream.DIR,
|
|
// stream.metaData,
|
|
// stream.metaData,
|
|
);
|
|
);
|
|
this.logger.log(
|
|
this.logger.log(
|
|
@@ -951,7 +964,8 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
|
|
|
|
const IDRflag = this._rotateCurrentFame % 5 === 0 ? 1 : 3;
|
|
const IDRflag = this._rotateCurrentFame % 5 === 0 ? 1 : 3;
|
|
this.logger.log(
|
|
this.logger.log(
|
|
- `当前rotate ,mainframeCnt:${this.frameCnt.getValue()}, _rotateCurrentFame:${this._rotateCurrentFame
|
|
|
|
|
|
+ `当前rotate ,mainframeCnt:${this.frameCnt.getValue()}, _rotateCurrentFame:${
|
|
|
|
+ this._rotateCurrentFame
|
|
} IDRflag:${IDRflag}`,
|
|
} IDRflag:${IDRflag}`,
|
|
);
|
|
);
|
|
stream.DIR = this.rotateFirstIDR ? 1 : IDRflag;
|
|
stream.DIR = this.rotateFirstIDR ? 1 : IDRflag;
|
|
@@ -962,12 +976,12 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
|
|
|
|
this.logger.log(
|
|
this.logger.log(
|
|
'[media-rotate]: ' +
|
|
'[media-rotate]: ' +
|
|
- ', frame: ' +
|
|
|
|
- stream.frame +
|
|
|
|
- ', rotateframeCnt: ' +
|
|
|
|
- this.rotateframeCnt +
|
|
|
|
- ', clipPath: ' +
|
|
|
|
- stream.clipPath,
|
|
|
|
|
|
+ ', frame: ' +
|
|
|
|
+ stream.frame +
|
|
|
|
+ ', rotateframeCnt: ' +
|
|
|
|
+ this.rotateframeCnt +
|
|
|
|
+ ', clipPath: ' +
|
|
|
|
+ stream.clipPath,
|
|
// stream.metaData,
|
|
// stream.metaData,
|
|
);
|
|
);
|
|
// this.logger.log(
|
|
// this.logger.log(
|
|
@@ -1025,12 +1039,12 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
this.logger.log('frame', frame);
|
|
this.logger.log('frame', frame);
|
|
console.log(
|
|
console.log(
|
|
'mock' +
|
|
'mock' +
|
|
- ' maxMessageSize: ' +
|
|
|
|
- this.channel.maxMessageSize() +
|
|
|
|
- ' bytesReceived: ' +
|
|
|
|
- this.peer.bytesReceived() +
|
|
|
|
- ' bytesSent: ' +
|
|
|
|
- this.peer.bytesSent(),
|
|
|
|
|
|
+ ' maxMessageSize: ' +
|
|
|
|
+ this.channel.maxMessageSize() +
|
|
|
|
+ ' bytesReceived: ' +
|
|
|
|
+ this.peer.bytesReceived() +
|
|
|
|
+ ' bytesSent: ' +
|
|
|
|
+ this.peer.bytesSent(),
|
|
);
|
|
);
|
|
if (frame === 1) {
|
|
if (frame === 1) {
|
|
redisData = await this.rotateService.echo(this.user_id, true);
|
|
redisData = await this.rotateService.echo(this.user_id, true);
|
|
@@ -1045,7 +1059,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
delete redisData.mediaSrc;
|
|
delete redisData.mediaSrc;
|
|
this.logger.log(
|
|
this.logger.log(
|
|
`user:${this.user_id}:first render stream` +
|
|
`user:${this.user_id}:first render stream` +
|
|
- JSON.stringify({ path: clipPath, meta: redisData }),
|
|
|
|
|
|
+ JSON.stringify({ path: clipPath, meta: redisData }),
|
|
);
|
|
);
|
|
const status = await this.pushFirstRender(
|
|
const status = await this.pushFirstRender(
|
|
clipPath,
|
|
clipPath,
|