|
@@ -206,11 +206,11 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
|
|
String frameSrc = metaConfig.getVideoFramePath()+"/"+rotateFrameEntity.getDirectory()+"/"+rotateFrameEntity.getFileName();
|
|
String frameSrc = metaConfig.getVideoFramePath()+"/"+rotateFrameEntity.getDirectory()+"/"+rotateFrameEntity.getFileName();
|
|
/// metaConfig.getVideoFramePath()
|
|
/// metaConfig.getVideoFramePath()
|
|
log.info("VideoFramePath{}", metaConfig.getVideoFramePath());
|
|
log.info("VideoFramePath{}", metaConfig.getVideoFramePath());
|
|
- NormalReply res = NormalReply.newBuilder()
|
|
|
|
- .setTraceIds(0, trace_id)
|
|
|
|
|
|
+ NormalReply res = NormalReply.newBuilder()
|
|
|
|
+ .addTraceIds( trace_id)
|
|
//.setVehicle(null)
|
|
//.setVehicle(null)
|
|
- .setNewUserStates(0, userState)
|
|
|
|
- .setActionResponses(0, 0) //这个要查查
|
|
|
|
|
|
+ .addNewUserStates(userState)
|
|
|
|
+ .addActionResponses(0) //这个要查查
|
|
.setGetStateType(0)
|
|
.setGetStateType(0)
|
|
.setCode(0)
|
|
.setCode(0)
|
|
.setMsg("OK")
|
|
.setMsg("OK")
|
|
@@ -310,7 +310,7 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
|
|
Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
|
|
Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
|
|
AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
|
|
AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
|
|
Space camera = createSpace(cameraPosition,cameraAngle);
|
|
Space camera = createSpace(cameraPosition,cameraAngle);
|
|
-
|
|
|
|
|
|
+
|
|
Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
|
|
Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
|
|
String frameSrc = metaConfig.getVideoFramePath()+"/"+_rotateFrameEntity.getDirectory()+"/"+_rotateFrameEntity.getFileName();
|
|
String frameSrc = metaConfig.getVideoFramePath()+"/"+_rotateFrameEntity.getDirectory()+"/"+_rotateFrameEntity.getFileName();
|
|
//添加player,camera,cameraCenter,frameSrc
|
|
//添加player,camera,cameraCenter,frameSrc
|
|
@@ -319,11 +319,11 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
|
|
|
|
|
|
breakpointsEntity = breakpointsService.findByAppIdAndBreakPointId(appId,nextbreakPointId);
|
|
breakpointsEntity = breakpointsService.findByAppIdAndBreakPointId(appId,nextbreakPointId);
|
|
PointPO endPosition = breakpointsEntity.getPosition();
|
|
PointPO endPosition = breakpointsEntity.getPosition();
|
|
-
|
|
|
|
|
|
+
|
|
JSONObject p1 = new JSONObject();
|
|
JSONObject p1 = new JSONObject();
|
|
p1.put("x", playerPoint.getX());
|
|
p1.put("x", playerPoint.getX());
|
|
p1.put("y", playerPoint.getY());
|
|
p1.put("y", playerPoint.getY());
|
|
-
|
|
|
|
|
|
+
|
|
JSONObject p2 = new JSONObject();
|
|
JSONObject p2 = new JSONObject();
|
|
p2.put("x", playerPoint.getX()+1);
|
|
p2.put("x", playerPoint.getX()+1);
|
|
p2.put("y", playerPoint.getY());
|
|
p2.put("y", playerPoint.getY());
|
|
@@ -335,26 +335,26 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
|
|
int _playerAngle = (int)calAngle(p1,p2,p3);
|
|
int _playerAngle = (int)calAngle(p1,p2,p3);
|
|
|
|
|
|
List<MoveFrameEntity> moveFrameEntityList = moveFrameService.findByAppIAndStartBreakPointIdAndEndBreakPointIdAndAngle(appId, breakPointId, nextbreakPointId, (int)(offAngle + angle)/45);
|
|
List<MoveFrameEntity> moveFrameEntityList = moveFrameService.findByAppIAndStartBreakPointIdAndEndBreakPointIdAndAngle(appId, breakPointId, nextbreakPointId, (int)(offAngle + angle)/45);
|
|
-
|
|
|
|
|
|
+
|
|
double offsetX = endPosition.getX() - playerPoint.getX();
|
|
double offsetX = endPosition.getX() - playerPoint.getX();
|
|
double offsetY = endPosition.getY() - playerPoint.getY();
|
|
double offsetY = endPosition.getY() - playerPoint.getY();
|
|
double offsetZ = endPosition.getZ() - playerPoint.getZ();
|
|
double offsetZ = endPosition.getZ() - playerPoint.getZ();
|
|
-
|
|
|
|
|
|
+
|
|
for(int i=0;i<moveFrameEntityList.size();++i) {
|
|
for(int i=0;i<moveFrameEntityList.size();++i) {
|
|
MoveFrameEntity _moveFrameEntityList = moveFrameEntityList.get(i);
|
|
MoveFrameEntity _moveFrameEntityList = moveFrameEntityList.get(i);
|
|
PointPO cameraPoint = _moveFrameEntityList.getCameraPosition();
|
|
PointPO cameraPoint = _moveFrameEntityList.getCameraPosition();
|
|
Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
|
|
Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
|
|
AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
|
|
AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
|
|
Space camera = createSpace(cameraPosition,cameraAngle);
|
|
Space camera = createSpace(cameraPosition,cameraAngle);
|
|
-
|
|
|
|
|
|
+
|
|
Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
|
|
Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
|
|
String frameSrc = metaConfig.getVideoFramePath()+"/"+_moveFrameEntityList.getDirectory()+"/"+_moveFrameEntityList.getFileName();
|
|
String frameSrc = metaConfig.getVideoFramePath()+"/"+_moveFrameEntityList.getDirectory()+"/"+_moveFrameEntityList.getFileName();
|
|
-
|
|
|
|
|
|
+
|
|
Point _playerPosition = createPoint(String.valueOf(playerPoint.getX()+offsetX/moveFrameEntityList.size()),String.valueOf(playerPoint.getY()+offsetY/moveFrameEntityList.size()),String.valueOf(playerPoint.getZ()+offsetZ/moveFrameEntityList.size()));
|
|
Point _playerPosition = createPoint(String.valueOf(playerPoint.getX()+offsetX/moveFrameEntityList.size()),String.valueOf(playerPoint.getY()+offsetY/moveFrameEntityList.size()),String.valueOf(playerPoint.getZ()+offsetZ/moveFrameEntityList.size()));
|
|
//Space _player = createSpace(_playerPosition,_playerAngle);
|
|
//Space _player = createSpace(_playerPosition,_playerAngle);
|
|
//添加player,camera,cameraCenter,frameSrc
|
|
//添加player,camera,cameraCenter,frameSrc
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
// PointPO cameraPoint = rotateFrameEntity.getCameraPosition();
|
|
// PointPO cameraPoint = rotateFrameEntity.getCameraPosition();
|
|
// Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
|
|
// Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
|
|
// AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
|
|
// AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
|