diff --git a/src/main/java/cactusServer/entities/CameraState.java b/src/main/java/cactusServer/entities/CameraState.java index fc98f7c..cdca7b1 100644 --- a/src/main/java/cactusServer/entities/CameraState.java +++ b/src/main/java/cactusServer/entities/CameraState.java @@ -8,8 +8,11 @@ private double tilt; // �`���g(rad) private double fov; // ����p(rad) - private CameraState() { - // JSONDecode���̌Ăяo���p + public CameraState() { + distance = 10; + angle = new Quaternion3D(); + tilt = 0; + fov = 1.0; } public CameraState(double distance, Quaternion3D angle, double tilt, double fov) { diff --git a/src/main/java/cactusServer/entities/EmoteState.java b/src/main/java/cactusServer/entities/EmoteState.java index 8b617f5..e7fef2a 100644 --- a/src/main/java/cactusServer/entities/EmoteState.java +++ b/src/main/java/cactusServer/entities/EmoteState.java @@ -9,8 +9,8 @@ public class EmoteState { private EmoteType emoteType; - private EmoteState() { - // JSONDecode���̌Ăяo���p + public EmoteState() { + this.emoteType = EmoteType.DUMMY; } public EmoteState(EmoteType emoteType) { diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 6728b16..703fc56 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -28,8 +28,16 @@ EmoteState.EmoteType animationClassToStart) { setInstanceURI(instanceURI); setCharacterURI(characterURI); - setCameraState(cameraState); - setAnimationClassToStart(animationClassToStart); + if (cameraState != null) { + setCameraState(cameraState); + } else { + setCameraState(new CameraState()); + } + if (animationClassToStart != null) { + setAnimationClassToStart(animationClassToStart); + } else { + setEmoteState(new EmoteState()); + } Character character = getCharacter(characterURI); readCharacterData(character); initPlaceable(character.getModelID()); diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index a937e73..32b989e 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -54,7 +54,7 @@ EmoteState.EmoteType animationClassToStart) { String id = RandomStringGenerator.generateUniqueString(Player.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, playerMap.keySet()); - Player player = new Player(instanceURI, characterURI, cameraState, animationClassToStart); + Player player = new Player(instanceURI, characterURI,cameraState, animationClassToStart); playerMap.put(id, player); HashMap returnedMap = new HashMap<>(); returnedMap.put(id, player); diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 2284104..65c7d02 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -70,7 +70,7 @@ CameraState cameraState = new CameraState(1.24, new Quaternion3D(), 2.38, 3); String instanceTest1URI = InstancesRest.INSTANCES_URI + "/" + "test1"; String characterTest1URi = instanceTest1URI + "/" + "characters" + "/" + "chara1"; - Player player1 = new Player(instanceTest1URI , characterTest1URi, cameraState, EmoteType.DUMMY); + Player player1 = new Player(instanceTest1URI , characterTest1URi, null, null); Instances.getInstance().getPlayers().put("player1", player1); String instanceTest2URI = InstancesRest.INSTANCES_URI + "/" + "test2"; String characterTest2URi = instanceTest2URI + "/" + "characters" + "/" + "chara2";