diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index d3ae812..89f5e1a 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -88,7 +88,7 @@ private boolean moveable; // �“� private double cof; // ���C�W�� - private Attribute() { + public Attribute() { } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 1980c80..8eaa967 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -8,12 +8,16 @@ import javax.ws.rs.core.Application; import org.glassfish.jersey.server.ResourceConfig; +import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; +import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; +import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; import cactusServer.entities.*; import cactusServer.entities.Character; import cactusServer.entities.EmoteState.EmoteType; +import cactusServer.entities.Object.*; import cactusServer.models.Accounts; import cactusServer.models.CharacterModelManager; import cactusServer.models.Instances; @@ -61,25 +65,25 @@ Instances.getInstance().getInstance("test1").getCharacters().put("chara2", chara2); Instances.getInstance().getInstance("test2").getCharacters().put("chara1", chara1); Instances.getInstance().getInstance("test2").getCharacters().put("chara2", chara2); - accountUri = "/CactusServer/rest/accounts/" - + Accounts.getInstance().getAccountByID("test2").getUniqueID(); + accountUri = "/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID("test2").getUniqueID(); chara1 = new Character("test2", accountUri, "chara3", new Position3D(), new Quaternion3D(), 0); Instances.getInstance().getInstance("test2").getCharacters().put("chara3", chara1); // �_�~�[�v���C���[2�� chara1.setPosition(new Position3D(34.5, 23.4, 19)); CameraState cameraState = new CameraState(1.24, new Quaternion3D(), 2.38, 3); - Player player1 = new Player("test1" , "chara1", null, null); + Player player1 = new Player("test1", "chara1", null, null); Instances.getInstance().getPlayers().put("player1", player1); - Player player2 = new Player("test2" , "chara2", cameraState, EmoteType.DUMMY); + Player player2 = new Player("test2", "chara2", cameraState, EmoteType.DUMMY); Instances.getInstance().getPlayers().put("player2", player2); // �_�~�[�I�u�W�F�N�g - //Instances.getInstance().getInstance("test1").createObject(new Position3D(0, 0, 0), velocity, angularVelocity, angle, attribute, model); + Instances.getInstance().getInstance("test1").createObject(new Position3D(0, 0, 0), new Velocity3D(), + new AngularVelocity3D(), new Quaternion3D(), new Attribute(), new String()); // �m�F�p -// String player1Encode = JSON.encode(player1, true); -// String player2Encode = JSON.encode(player2, true); -// Player player1Decode = JSON.decode(player1Encode, Player.class); -// Player player2Decode = JSON.decode(player2Encode, Player.class); -// System.out.println(JSON.encode(player1Decode, true)); -// System.out.println(JSON.encode(player2Decode, true)); + // String player1Encode = JSON.encode(player1, true); + // String player2Encode = JSON.encode(player2, true); + // Player player1Decode = JSON.decode(player1Encode, Player.class); + // Player player2Decode = JSON.decode(player2Encode, Player.class); + // System.out.println(JSON.encode(player1Decode, true)); + // System.out.println(JSON.encode(player2Decode, true)); } } \ No newline at end of file