diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index 0b9d975..0a9c5b0 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -42,7 +42,7 @@ setAttribute(attribute); setModel(modelID); setPrim(new Box()); - setObject(new Object3D("",prim)); + setObject(new Object3D("", prim)); setPlaceable(object); } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 930028c..2c2aa6c 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -46,11 +46,11 @@ System.out.println("pass"); } - @Override - public void run() { - //System.out.println("�^�X�N�����s"); + @Override + public void run() { + // System.out.println("�^�X�N�����s"); CollisionManager.getCollision().collisionRun(); - removeInactivePlayers(); + removeInactivePlayers(); } public void start(int interval) { @@ -84,25 +84,25 @@ 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), new Velocity3D(), - new AngularVelocity3D(), new Quaternion3D(), new Attribute(true,1), 0); -// // �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)); - -// JSON json = new JSON(); -// String characterId = player1.getCharacterID(); -// String encodeCharacterId = json.encode(characterId); -// System.out.println(characterId); -// System.out.println(encodeCharacterId); -// String position = json.encode(player1.getPosition()); -// System.out.println(position); + Instances.getInstance().getInstance("test1").createObject(new Position3D(0, 0, 0), new Velocity3D(), + new AngularVelocity3D(), new Quaternion3D(), new Attribute(true, 1), 0); + // // �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)); + + // JSON json = new JSON(); + // String characterId = player1.getCharacterID(); + // String encodeCharacterId = json.encode(characterId); + // System.out.println(characterId); + // System.out.println(encodeCharacterId); + // String position = json.encode(player1.getPosition()); + // System.out.println(position); } - + private void removeInactivePlayers() { long currentTime = System.nanoTime(); Iterator> it = Instances.getInstance().getPlayers().entrySet().iterator(); @@ -111,7 +111,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(); diff --git a/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/CollisionResult.java b/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/CollisionResult.java index 436d9d0..9a43a08 100644 --- a/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/CollisionResult.java +++ b/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/CollisionResult.java @@ -2,7 +2,6 @@ import org.ntlab.radishforandroidstudio.java3d.Vector3d; - public class CollisionResult { public Position3D collisionPoint = new Position3D(); public Vector3d normal = new Vector3d(); diff --git a/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/PhysicsUtility.java b/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/PhysicsUtility.java index e98c3df..f0d06e4 100644 --- a/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/PhysicsUtility.java +++ b/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/PhysicsUtility.java @@ -12,6 +12,7 @@ /** * 物理演算のコア + * * @author 新田直也 * */ @@ -24,7 +25,9 @@ /** * 物体に加わる重力を求める - * @param body 対象物体 + * + * @param body + * 対象物体 * @return bodyに加わる重力 */ public static Force3D getGravity(Solid3D body) { @@ -34,7 +37,7 @@ /** * @param v - * :単位ベクトル、あるいはゼロベクトルを引数で渡すこと + * :単位ベクトル、あるいはゼロベクトルを引数で渡すこと */ public static void setGravityDirection(Vector3d v) { gravityDirection = new Vector3d(v.x, v.y, v.z); @@ -55,9 +58,13 @@ /** * 物体の反発係数から衝突時に加わる力を求める - * @param interval 衝突している時間 - * @param nor 物体がぶつかった面の宝仙ベクトル - * @param solid 物体 + * + * @param interval + * 衝突している時間 + * @param nor + * 物体がぶつかった面の宝仙ベクトル + * @param solid + * 物体 * @return 衝突時に加わる力 */ public static Force3D calcForce(long interval, Vector3d nor, Solid3D solid) { @@ -71,8 +78,11 @@ /** * 物体と地面との衝突判定 - * @param obj 物体 - * @param ground 地面 + * + * @param obj + * 物体 + * @param ground + * 地面 * @return 衝突情報(nullのとき衝突なし) */ public static CollisionResult doesIntersect(Solid3D obj, Ground ground) { @@ -129,10 +139,15 @@ /** * 物体同士の衝突判定 - * @param obj1 物体1 - * @param part1 判定する物体1の部品の名称 - * @param obj2 物体2 - * @param part2 判定する物体2の部品の名称 + * + * @param obj1 + * 物体1 + * @param part1 + * 判定する物体1の部品の名称 + * @param obj2 + * 物体2 + * @param part2 + * 判定する物体2の部品の名称 * @return 衝突情報 nullのとき衝突なし */ public static CollisionResult checkCollision(Object3D obj1, String part1, Object3D obj2, String part2) { @@ -141,7 +156,7 @@ // BoundingSphereを使って大雑把に衝突判定を行う boolean f = false; if (obj1.bs != null && obj2.bs != null) { - // sol1 の BoundingSphere を計算 + // sol1 の BoundingSphere を計算 BoundingSphere bs1 = (BoundingSphere) (obj1.bs.clone()); Transform3D t3d = new Transform3D(); obj1.center.getTransform(t3d); @@ -153,7 +168,7 @@ obj1.pos.getTransform(t3d); bs1.transform(t3d); - // sol2 の BoundingSphere を計算 + // sol2 の BoundingSphere を計算 BoundingSphere bs2 = (BoundingSphere) (obj2.bs.clone()); obj2.center.getTransform(t3d); bs2.transform(t3d);