diff --git a/src/main/java/cactusServer/entities/MovableObject.java b/src/main/java/cactusServer/entities/MovableObject.java index 4d6d1a2..6d45442 100644 --- a/src/main/java/cactusServer/entities/MovableObject.java +++ b/src/main/java/cactusServer/entities/MovableObject.java @@ -1,10 +1,12 @@ package cactusServer.entities; +import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; 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.Solid3D; import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; import org.ntlab.radishforandroidstudio.java3d.Box; import org.ntlab.radishforandroidstudio.java3d.Primitive; @@ -36,8 +38,8 @@ public MovableObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Quaternion3D angle, Attribute attribute, int modelID) { setPrim(new Box()); - setObject(new Object3D("", prim)); - setPlaceable(object); + setObject(new Solid3D(new Object3D("", prim))); + setPlaceable(new OvergroundActor((Solid3D) object, null)); setPosition(position); setVelocity(velocity); setAngularVelocity(angularVelocity); @@ -72,7 +74,8 @@ public void setPosition(Position3D position) { this.position = position; - if(placeable != null)((Object3D)(getPlaceable().getBody())).setPosition(position); + if (placeable != null) + ((Object3D) (getPlaceable().getBody())).setPosition(position); } public void setVelocity(Velocity3D velocity) { @@ -85,7 +88,8 @@ public void setAngle(Quaternion3D angle) { this.angle = angle; - if(placeable != null)((Object3D) getPlaceable().getBody()).apply(angle, false); + if (placeable != null) + ((Object3D) getPlaceable().getBody()).apply(angle, false); } public void setAttribute(Attribute attribute) { diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index d6cce3f..d8546e9 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -4,8 +4,6 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; -import org.ntlab.radishforandroidstudio.java3d.Box; -import org.ntlab.radishforandroidstudio.java3d.Primitive; import cactusServer.models.CharacterModelManager; import cactusServer.models.Instances; @@ -20,13 +18,13 @@ private Quaternion3D angle; private CameraState cameraState; private EmoteState emoteState; - private Primitive prim; private long lastUpdateTime = System.nanoTime(); @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @JSONHint(ignore = true) public static final long STOP_TIME_LIMIT = (long) (30 * 1e+9); + @SuppressWarnings("unused") private Player() { // JSONDecode���̌Ăяo���p } @@ -153,6 +151,7 @@ return this; } + @SuppressWarnings("unused") private void updateAreaURI() { String[] areaURISplit = areaURI.split("/"); // �c�c/instances/{instanceId}/areas/{areaId} int splitSize = areaURISplit.length; diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index cdc3bde..122dc21 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -66,6 +66,7 @@ CollisionResult result; result = PhysicsUtility.checkCollision(player.getObject(), null, object.getObject(), null); if (result != null) { + System.out.println("�v���C���[�ƃI�u�W�F�N�g���Փ�"); objMove(result, object, false); } } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index dded3cb..eac1f7e 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -74,7 +74,7 @@ // �_�~�[�L�����N�^�[4�� String accountUri = "/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID("test").getUniqueID(); - Character chara1 = new Character("test1", accountUri, "chara1", new Position3D(), new Quaternion3D(), 0); + Character chara1 = new Character("test1", accountUri, "chara1", new Position3D(0, 0, 0), new Quaternion3D(), 0); Character chara2 = new Character("test2", accountUri, "chara2", new Position3D(), new Quaternion3D(), 0); Instances.getInstance().getInstance("test1").getCharacters().put("chara1", chara1); Instances.getInstance().getInstance("test1").getCharacters().put("chara2", chara2); @@ -126,8 +126,8 @@ String playerId = entry.getKey(); Player player = entry.getValue(); long lastUpdateTime = player.getLastUpdateTime(); - System.out.println( - currentTime + ", " + (lastUpdateTime + Player.STOP_TIME_LIMIT) + " // playerId: " + playerId); +// System.out.println( +// currentTime + ", " + (lastUpdateTime + Player.STOP_TIME_LIMIT) + " // playerId: " + playerId); if (currentTime > (lastUpdateTime + Player.STOP_TIME_LIMIT)) { System.out.println("delete started (playerId: " + playerId + ")"); player.destroy(); @@ -135,6 +135,6 @@ System.out.println("delete finished (playerId: " + playerId + ")"); } } - System.out.println(); +// System.out.println(); } } \ No newline at end of file