xushiting 3 gadi atpakaļ
vecāks
revīzija
44e1e2938b

+ 21 - 8
src/main/java/com/fdkk/fdkkmeta/grpcService/sceneGrpcServer.java

@@ -244,6 +244,8 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
             RotateFrameEntity rotateFrameEntity = rotateFrameService.findById(user.getFrameId());
 
             Point start = null;    //从user表里取
+            
+            boolean isEnd = false;
      		//计算路径
 
 
@@ -270,7 +272,9 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
 				maps.remove(0);
 				redisCache.setCacheObject("route:"+trace_id,maps);
 			}
-
+			else {
+				isEnd = true;
+			}
 
 
 
@@ -303,7 +307,8 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
                 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
+            	//添加camera
+            	
             }
 
 //          PointPO cameraPoint = rotateFrameEntity.getCameraPosition();
@@ -326,11 +331,11 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
     				.setGetStateType(0)
     				.setCode(0)
     				.setMsg("OK")
-    				//.setPlayer(index, value)
-    				//.setCamera(index, value)
-    				//.setCameraCenter(index, value)
-    				//.setFrameSrc(index, value)
-    				.setIsEnd(false)
+			    				//.setPlayer(index, value)
+			    				//.setCamera(index, value)
+			    				//.setCameraCenter(index, value)
+			    				//.setFrameSrc(index, value)
+    				.setIsEnd(isEnd)
     				.build();
     	}
     	catch(Exception e) {
@@ -352,6 +357,8 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
      		String trace_id = request.getTraceId();
      		boolean needNext = request.getNext();
 
+     		boolean isEnd = false;
+     		
             UserEntity user = userService.findById(user_id);
             BreakpointsEntity breakpointsEntity = breakpointsService.findByAppIdAndBreakPointId(user.getAppId(),user.getBreakPointId());
             RotateFrameEntity rotateFrameEntity = rotateFrameService.findById(user.getFrameId());
@@ -385,6 +392,12 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
 					cacheObject.remove(0);
 					redisCache.setCacheObject("route:"+trace_id,cacheObject);
 				}
+				else {
+					isEnd = true;
+				}
+			}
+			else {
+				isEnd = true;
 			}
 
 			//循环
@@ -412,7 +425,7 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
     				//.setCamera(index, value)
     				//.setCameraCenter(index, value)
     				//.setFrameSrc(index, value)
-    				.setIsEnd(false)
+    				.setIsEnd(isEnd)
     				.build();
     	}
     	catch(Exception e) {