diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d7116a2..ad96293 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java index 28e3d06..9588659 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java @@ -9,6 +9,7 @@ import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Property3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; import org.ntlab.radishforandroidstudio.framework.network.CallBack; @@ -17,6 +18,7 @@ import org.ntlab.radishforandroidstudio.java3d.Material; import org.ntlab.radishforandroidstudio.java3d.Vector3d; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -88,14 +90,16 @@ continue; } + DummyBullet bull = entry.getValue(); + // 情報の取得 // Map position = (Map)player.get("position"); // Map angle = (Map)player.get("angle"); // Position3D positionProp = new Position3D(((BigDecimal)position.get("x")).doubleValue(), ((BigDecimal)position.get("y")).doubleValue(), ((BigDecimal)position.get("z")).doubleValue()); // Quaternion3D quaProp = new Quaternion3D(((BigDecimal)angle.get("x")).doubleValue(), ((BigDecimal)angle.get("y")).doubleValue(), ((BigDecimal)angle.get("z")).doubleValue(), ((BigDecimal)angle.get("w")).doubleValue()); -// properties.add(player.getPosition()); -// properties.add(player.getAngle()); + properties.add(bull.getPosition()); + properties.add(bull.getAngle()); if (!universe.doHaveObj(entry.getKey())) { Appearance ap1 = new Appearance(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java index c900e77..8c80dc9 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java @@ -1,4 +1,71 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; +import net.arnx.jsonic.JSONHint; + +import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; + public class DummyBullet { + private String playerID; + private Position3D position; + private Quaternion3D angle; + private boolean isAlive = true; + + public DummyBullet() { + // JSONエンコード時の呼び出し用 + } + + public DummyBullet(String playerID, Position3D position, Quaternion3D angle) { +// Object3D body = BulletModelManager.getInstance().getBulletModel(0).createObject(); // モデルIDは仮に0を指定 +// setPlaceable(body); + setPlayerID(playerID); + setPosition(position); + setAngle(angle); + } + + public String getPlayerID() { + return playerID; + } + + public Position3D getPosition() { + return position; + } + + public Quaternion3D getAngle() { + return angle; + } + + @JSONHint(ignore = true) + public boolean isAlive() { + return isAlive; + } + + public void setPlayerID(String playerID) { + this.playerID = playerID; + } + + public void setPosition(Position3D position) { + this.position = position; +// if (this.placeable != null) { +// ((Object3D)this.placeable.getBody()).setPosition(position); +// } + } + + public void setAngle(Quaternion3D angle) { + this.angle = angle; +// if (this.placeable != null) { +// ((Object3D)this.placeable.getBody()).apply(angle, false); +// } + } + + @JSONHint(ignore = true) + public void setAlive(boolean isAlive) { + this.isAlive = isAlive; + } + + public void update(Position3D position, Quaternion3D angle) { + setPosition(position); + setAngle(angle); + } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java index fff180f..e74e5b3 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -102,7 +102,5 @@ if(testFlag == false)connection.doPut(); } }); - - } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java index 9d42402..6893c1a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -94,6 +94,4 @@ } }); } - - } \ No newline at end of file