xushiting 3 år sedan
förälder
incheckning
c2fb1f1f0e
1 ändrade filer med 20 tillägg och 15 borttagningar
  1. 20 15
      src/main/java/com/fdkk/fdkkmeta/grpcService/sceneGrpcServer.java

+ 20 - 15
src/main/java/com/fdkk/fdkkmeta/grpcService/sceneGrpcServer.java

@@ -196,8 +196,9 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
     		Event event = createEvent();
     		UserState userState = createUserState( user_id, playerState, renderInfo, event);
 
+    		String frameSrc = "/"+rotateFrameEntity.getDirectory()+"/"+rotateFrameEntity.getFileName();
             /// metaConfig.getVideoFramePath()
-           log.info("VideoFramePath{}", metaConfig.getVideoFramePath());
+            log.info("VideoFramePath{}", metaConfig.getVideoFramePath());
     		NormalReply res = NormalReply.newBuilder()
     				.setTraceIds(0, trace_id)
     				.setVehicle(null)
@@ -206,7 +207,7 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
     				.setGetStateType(0)
     				.setCode(0)
     				.setMsg("OK")
-    				.setFrameSrc(null)                     //从数据库中获取对应的路径
+    				.setFrameSrc(frameSrc)                     //从数据库中获取对应的路径
     				.build();
 
 
@@ -232,9 +233,7 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
         	 * */
      		int action_type= request.getActionType();
      		ClickingAction clicking_action = request.getClickingAction();
-
      		Point end = clicking_action.getClickingPoint();
-
      		State clicking_state = request.getClickingState();
      		String trace_id = request.getTraceId();
      		String user_id = request.getUserId();
@@ -242,7 +241,6 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
             UserEntity user = userService.findById(user_id);
 			Long breakPointId = user.getBreakPointId();
 			BreakpointsEntity breakpointsEntity = breakpointsService.findByAppIdAndBreakPointId(user.getAppId(),breakPointId);
-
             RotateFrameEntity rotateFrameEntity = rotateFrameService.findById(user.getFrameId());
 
             Point start = null;    //从user表里取
@@ -293,19 +291,26 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
             }
 			List<RotateFrameEntity> rotateFrameEntityList = rotateFrameService.findByAppIdAndBreakPointIdBetweenFrameIndex(appId, breakPointId, angle, offAngle + angle);
 			//循环
-            //rotateFrameEntityList for()
-
-            PointPO cameraPoint = rotateFrameEntity.getCameraPosition();
-            Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
-            AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
-            Space camera = createSpace(cameraPosition,cameraAngle);
+            for(int i=0;i<rotateFrameEntityList.size();++i) {
+            	RotateFrameEntity _rotateFrameEntity = rotateFrameEntityList.get(i);
+            	PointPO cameraPoint = _rotateFrameEntity.getCameraPosition();
+                Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
+                AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
+                Space camera = createSpace(cameraPosition,cameraAngle);
+            	Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
+            	//添加camera cameraCenter
+            }
 
-        	Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
-    		State playerState = createPlayerState( player, camera, cameraCenter);
+//          PointPO cameraPoint = rotateFrameEntity.getCameraPosition();
+//          Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
+//          AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
+//          Space camera = createSpace(cameraPosition,cameraAngle);
+            
+//        	Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
+//    		State playerState = createPlayerState( player, camera, cameraCenter);
+    		State playerState = createPlayerState( player, null, null);
     		RenderInfo renderInfo = createRenderInfo();
     		Event event = createEvent();
-
-
     		UserState userState = createUserState( user_id, playerState, renderInfo, event);
 
     		MoveReply res = MoveReply.newBuilder()