diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java index 4ee4826..16032b6 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java @@ -3,7 +3,7 @@ import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; public class BulletCreateConnection extends HttpAsyncConnection { -public BulletCreateConnection(String instanceId, String playerId) { + public BulletCreateConnection(String instanceId, String playerId) { super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId); } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java index 2a52994..59cbc73 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java @@ -5,7 +5,7 @@ public class CharactersFragmentConnection extends HttpAsyncConnection { public CharactersFragmentConnection(String instanceId) { - super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/"+ instanceId +"/characters"); + super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/characters"); } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/factory/NormalBulletFactory.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/factory/NormalBulletFactory.java index facfaf4..cd5062e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/factory/NormalBulletFactory.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/factory/NormalBulletFactory.java @@ -20,5 +20,7 @@ } @Override - protected float getScale() { return 0.5f; } + protected float getScale() { + return 0.5f; + } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java index 8e38502..1304ec5 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java @@ -5,7 +5,8 @@ public class Account { private String id, name, token, pass, uniqueID; private boolean login = false; - private Account(){ + + private Account() { } public Account(String userID, String userName, String userPass, String uniqueID) { @@ -33,7 +34,7 @@ this.name = name; } - @JSONHint(ignore=true) + @JSONHint(ignore = true) public String getPass() { return pass; } @@ -50,7 +51,7 @@ this.login = login; } - public void setToken(String token){ + public void setToken(String token) { this.token = token; } @@ -64,7 +65,7 @@ return token; } - @JSONHint(ignore=true) + @JSONHint(ignore = true) public String getUniqueID() { return uniqueID; } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Area.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Area.java index 6b76158..46366fa 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Area.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Area.java @@ -1,11 +1,11 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.util.HashSet; +import net.arnx.jsonic.JSONHint; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -import net.arnx.jsonic.JSONHint; +import java.util.HashSet; public class Area extends Entity { private String name; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Bullet.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Bullet.java index 1c86634..59e0915 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Bullet.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Bullet.java @@ -2,11 +2,10 @@ 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 Bullet extends Entity{ +public class Bullet extends Entity { private String playerID; private Position3D position; private Quaternion3D angle; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java index 1aca284..3f810b6 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java @@ -9,14 +9,12 @@ 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; import org.ntlab.radishforandroidstudio.java3d.Appearance; import org.ntlab.radishforandroidstudio.java3d.Material; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -57,8 +55,8 @@ /** * 玉の状態を更新する * - * @author s.iwatani * @param interval 前回の更新からの時間差 + * @author s.iwatani */ @Override public void update(double interval) { @@ -78,7 +76,8 @@ visibleBullets.clear(); JSON json = new JSON(); if (!response.equals("{}")) { - ArrayList> m = json.decode(response, new TypeReference>>() {}); + ArrayList> m = json.decode(response, new TypeReference>>() { + }); for (Map eachPlayerBullets : m) { for (Map.Entry entry : eachPlayerBullets.entrySet()) { visibleBullets.put(entry.getKey(), 1); @@ -129,7 +128,7 @@ } // 消えた弾の削除(プレイヤーのみ) - for(String key: lastPlayerVisibleBullets.keySet()) { + for (String key : lastPlayerVisibleBullets.keySet()) { bulletsSet.add(key); } } @@ -142,7 +141,7 @@ public ArrayList getDeletedPlayerBullets() { ArrayList bullets = new ArrayList<>(); - for(String key : bulletsSet) { + for (String key : bulletsSet) { bullets.add(key); } bulletsSet.clear(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java index 29f4261..d4e6125 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java @@ -1,13 +1,11 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; -import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModelManager; -import org.ntlab.radishforandroidstudio.framework.model3D.Universe; /** * モデルを管理する - * + *

* singleton * * @author s.iwatani @@ -20,10 +18,10 @@ } public void setInstanceId(String id) { - for(GameBaseModel model : models) { + for (GameBaseModel model : models) { model.setInstanceId(id); } - for(GameBaseModel model : nextAddModels) { + for (GameBaseModel model : nextAddModels) { model.setInstanceId(id); } instanceId = id; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Character.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Character.java index 2c5dbf8..820d6c9 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Character.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Character.java @@ -1,14 +1,12 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.util.HashMap; +import net.arnx.jsonic.JSONHint; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; - - -import net.arnx.jsonic.JSONHint; +import java.util.HashMap; public class Character extends Entity { private String accountURI; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CharacterModelManager.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CharacterModelManager.java index 07a4dc8..a42d3d0 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CharacterModelManager.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CharacterModelManager.java @@ -1,16 +1,13 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.io.IOException; +import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; + import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; -import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; -import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; -import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException; - public class CharacterModelManager { private static CharacterModelManager theInstance = null; private HashMap characterModels = new HashMap<>(); @@ -22,7 +19,7 @@ } private void initCharacterModels() { - String[] initCharacterModelFileNames = { "pocha.stl", "Head4.obj" }; + String[] initCharacterModelFileNames = {"pocha.stl", "Head4.obj"}; for (String fileName : initCharacterModelFileNames) { addCharacterModel(fileName); } @@ -61,11 +58,11 @@ private Model3D loadModel(String fileName) { /***************************************************************************************************** - try { - return ModelFactory.loadModel(fileName, null, false, true); - } catch (IOException | ModelFileFormatException e) { - e.printStackTrace(); - } + try { + return ModelFactory.loadModel(fileName, null, false, true); + } catch (IOException | ModelFileFormatException e) { + e.printStackTrace(); + } *****************************************************************************************************/ return null; } 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 deleted file mode 100644 index e69de29..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java +++ /dev/null diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/EmoteState.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/EmoteState.java index de81264..82e4f69 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/EmoteState.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/EmoteState.java @@ -4,8 +4,8 @@ /** * エモートの情報を表すクラス
* 内部にエモートの種類を表す列挙型も定義 - * @author r-isitani * + * @author r-isitani */ public class EmoteState { private EmoteType emoteType; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java index 9507a22..bf9cf2e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java @@ -2,8 +2,8 @@ /** * AddressedEntityクラスにて扱う実体を表す抽象クラス - * @author r-isitani * + * @author r-isitani */ public abstract class Entity { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity3D.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity3D.java index 351eec7..c99bfe0 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity3D.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity3D.java @@ -1,10 +1,10 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import org.ntlab.radishforandroidstudio.framework.model3D.Placeable; - import net.arnx.jsonic.JSONHint; +import org.ntlab.radishforandroidstudio.framework.model3D.Placeable; + public abstract class Entity3D extends Entity { private Placeable placeable; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java index 2ec03c6..0da5009 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java @@ -1,23 +1,22 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.util.HashMap; -import java.util.HashSet; +import net.arnx.jsonic.JSONHint; +import org.ntlab.radishforandroidstudio.cactusClient.models.Area.Allowed; 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.model3D.Universe; import org.ntlab.radishforandroidstudio.framework.physics.Ground; -import net.arnx.jsonic.JSONHint; -import org.ntlab.radishforandroidstudio.cactusClient.models.Area.Allowed; +import java.util.HashMap; +import java.util.HashSet; /** * インスタンス * * @author r-isitani - * */ public class Instance extends Entity { private String name; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instances.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instances.java index ce0cf28..3718482 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instances.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instances.java @@ -1,16 +1,15 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.util.HashMap; - import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; +import java.util.HashMap; + /** * インスタンスを管理するクラス * * @author r-isitani - * */ public class Instances { private static Instances theInstance = null; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java index 76b3b06..a5608ec 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java @@ -16,9 +16,7 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; /** * オブジェクトを管理するモデル @@ -33,7 +31,7 @@ private String instanceId; private Map visibleobject = new HashMap<>(); - public MovableObjectModel(RealTime3DFragment fragment, Universe universe,String instanceId) { + public MovableObjectModel(RealTime3DFragment fragment, Universe universe, String instanceId) { this.fragment = fragment; this.universe = universe; this.setInstanceId(instanceId); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java index fadd0f2..150adb0 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java @@ -1,11 +1,8 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import android.telecom.Call; - import net.arnx.jsonic.JSON; import org.ntlab.radishforandroidstudio.cactusClient.connections.BulletCreateConnection; -import org.ntlab.radishforandroidstudio.cactusClient.connections.BulletGetConnection; import org.ntlab.radishforandroidstudio.cactusClient.connections.BulletUpdateConnection; import org.ntlab.radishforandroidstudio.framework.animation.Animation3D; import org.ntlab.radishforandroidstudio.framework.gameMain.Actor; @@ -92,7 +89,7 @@ public void onCollisionExit(Placeable p) { } - + @Override public Force3D getGravity() { return Force3D.ZERO; @@ -105,7 +102,7 @@ // サーバに弾を作成 if (!isCreatedOnServer && !instanceId.equals("") && !playerId.equals("") && !isWaitCreatingOnServer) { JSON json = new JSON(); - Quaternion3D q = ((Solid3D)(getBody())).getQuaternion(); + Quaternion3D q = ((Solid3D) (getBody())).getQuaternion(); BulletCreateConnection con = new BulletCreateConnection(instanceId, playerId); con.setCallBack(this); con.addFormParam("bulletID", getUuid()); @@ -114,13 +111,12 @@ con.doPost(); isWaitCreatingOnServer = true; System.out.println("create shot uuid:" + getUuid()); - } - else if (isCreatedOnServer && !isWaitCreatingOnServer) { + } else if (isCreatedOnServer && !isWaitCreatingOnServer) { // サーバの弾の情報を更新 updateInterval -= interval; if (updateInterval <= 0 && isCreatedOnServer) { JSON json = new JSON(); - Quaternion3D q = ((Solid3D)(getBody())).getQuaternion(); + Quaternion3D q = ((Solid3D) (getBody())).getQuaternion(); updateInterval = INIT_UPDATE_INTERVAL; BulletUpdateConnection con = new BulletUpdateConnection(instanceId, playerId, getUuid()); con.setCallBack(this); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java index 7dfc485..63d2679 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java @@ -1,5 +1,7 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; +import net.arnx.jsonic.JSONHint; + import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; @@ -12,7 +14,6 @@ //import framework.model3D.Position3D; //import framework.physics.AngularVelocity3D; //import framework.physics.Velocity3D; -import net.arnx.jsonic.JSONHint; public class Object extends Entity3D { private Position3D position; @@ -33,7 +34,7 @@ } public Object(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, - Quaternion3D angle, Attribute attribute, int modelID) { + Quaternion3D angle, Attribute attribute, int modelID) { setPrim(new Box()); setObject(new Object3D("", prim)); setPlaceable(object); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java index 1d33074..0f47ad1 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java @@ -17,8 +17,8 @@ // TODO: 2018/10/23 ObjectModelManagerの記述 private ObjectModelManager() { try { - setObject(0, ModelFactory.loadModel(fragment.getResources(),getClass().getResource("cube-binary.stl").getPath())); - setObject(1, ModelFactory.loadModel(fragment.getResources(),getClass().getResource("cube-binary.stl").getPath())); + setObject(0, ModelFactory.loadModel(fragment.getResources(), getClass().getResource("cube-binary.stl").getPath())); + setObject(1, ModelFactory.loadModel(fragment.getResources(), getClass().getResource("cube-binary.stl").getPath())); } catch (IOException | ModelFileFormatException e) { e.printStackTrace(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharacter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharacter.java index a36c44a..391b6d9 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharacter.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharacter.java @@ -1,9 +1,6 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; -import org.ntlab.radishforandroidstudio.framework.model3D.Universe; - -import java.util.ArrayList; public class OtherPlayerCharacter extends Object3D { public OtherPlayerCharacter(Object3D body) { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java index f4fb261..59d8079 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java @@ -49,8 +49,8 @@ /** * キャラクターの状態を更新する * - * @author s.iwatani * @param interval 前回の更新からの時間差 + * @author s.iwatani */ @Override public void update(double interval) { @@ -69,8 +69,9 @@ Map lastVisibleCharacters = new HashMap<>(visibleCharacters); visibleCharacters.clear(); JSON json = new JSON(); - Map m = json.decode(response, new TypeReference>(){}); - for (Map.Entry entry: m.entrySet()) { + Map m = json.decode(response, new TypeReference>() { + }); + for (Map.Entry entry : m.entrySet()) { visibleCharacters.put(entry.getKey(), 1); ArrayList properties = new ArrayList<>(); Player player = entry.getValue(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java index a176ca3..088f68b 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java @@ -8,7 +8,6 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; -import org.ntlab.radishforandroidstudio.framework.subject.BulletShotSubject; import java.util.ArrayList; import java.util.Iterator; @@ -26,7 +25,7 @@ public OwnBulletsModel(Resources resources, Universe universe, String instanceId, String playerId) { this.resources = resources; this.universe = universe; - cactusModels = CactusModels.getInstance(); + cactusModels = new CactusModels(); setInstanceId(instanceId); setPlayerId(playerId); @@ -46,7 +45,7 @@ @Override public void update(double interval) { - for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext();) { + for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext(); ) { MyBullet bullet = bulletIterator.next(); bullet.update(interval); // 弾削除 @@ -58,10 +57,10 @@ } public void deleteBullets(ArrayList deletedBullets) { - for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext();) { + for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext(); ) { MyBullet bullet = bulletIterator.next(); - for(String deleteBullet : deletedBullets) { // 弾削除 + for (String deleteBullet : deletedBullets) { // 弾削除 if (bullet.getUuid().equals(bullets)) { universe.displace(bullet); sendDeleteBulletForServer(bullet); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Player.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Player.java index ce1a31c..173f5b7 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Player.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Player.java @@ -1,13 +1,13 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; +import net.arnx.jsonic.JSONHint; + import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; -import net.arnx.jsonic.JSONHint; - import java.io.Serializable; public class Player extends Entity3D implements Serializable { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/RandomStringGenerator.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/RandomStringGenerator.java index 6796d1d..3f48a41 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/RandomStringGenerator.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/RandomStringGenerator.java @@ -1,9 +1,9 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.util.Set; - import org.apache.commons.lang3.RandomStringUtils; +import java.util.Set; + public class RandomStringGenerator { public static final String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/StageModelManager.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/StageModelManager.java index 5287d4f..9db2c3e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/StageModelManager.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/StageModelManager.java @@ -1,12 +1,9 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import java.io.IOException; -import java.util.HashMap; - import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; -import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; -import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException; + +import java.util.HashMap; public class StageModelManager { private static StageModelManager theInstance = null; @@ -14,13 +11,13 @@ private StageModelManager() { /***************************************************************************************************** - try { - setStage(0, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); - setStage(1, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); - } catch (IOException | ModelFileFormatException e) { - e.printStackTrace(); - } - *******************************************************************************************************/ + try { + setStage(0, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); + setStage(1, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); + } catch (IOException | ModelFileFormatException e) { + e.printStackTrace(); + } + *******************************************************************************************************/ } public static StageModelManager getInstance() { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedAccount.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedAccount.java index 634ccaf..4807175 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedAccount.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedAccount.java @@ -2,7 +2,7 @@ import java.net.URI; -public class URIAddressedAccount{ +public class URIAddressedAccount { private URI uri; private Account account; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index dc07b5c..e1a3683 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java @@ -2,18 +2,17 @@ import android.content.Context; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.support.v4.app.Fragment; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ListView; - import net.arnx.jsonic.JSON; import net.arnx.jsonic.TypeReference; @@ -76,17 +75,20 @@ // con.addQueryParam("accountID", account.getUniqueID()); con.setCallBack(new CallBack() { private Context context; + public CallBack setContext(Context context) { this.context = context; return this; } + @Override public void onResponse(String response) { - Map characters = JSON.decode(response, new TypeReference>(){}); + Map characters = JSON.decode(response, new TypeReference>() { + }); for (String characterId : characters.keySet()) { characterIds.add(characterId); final ArrayAdapter adapter = new ArrayAdapter(context, android.R.layout.simple_list_item_1, characterIds); - ListView listView = (ListView)view.findViewById(R.id.list); + ListView listView = (ListView) view.findViewById(R.id.list); listView.setAdapter(adapter); } } @@ -95,6 +97,7 @@ // セルを選択されたら詳細画面フラグメント呼び出す listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { private Context context; + @Override public void onItemClick(AdapterView parent, View v, int position, long id) { PlayersConnection con = new PlayersConnection(); @@ -103,15 +106,16 @@ con.setCallBack(new CallBack() { @Override public void onResponse(String response) { - Map player = JSON.decode(response, new TypeReference>(){}); + Map player = JSON.decode(response, new TypeReference>() { + }); // TODO: 複数帰ってきた,もしくは帰ってこなかったときの処理 // プレイ画面へ Bundle bundle = new Bundle(); bundle.putSerializable("characterId", characterIds.get(position)); - bundle.putSerializable("player", (Player)player.values().toArray()[0]); - String[] splitedUri = ((String)(player.keySet().toArray()[0])).split("/"); - bundle.putString("playerId", splitedUri[splitedUri.length-1]); + bundle.putSerializable("player", (Player) player.values().toArray()[0]); + String[] splitedUri = ((String) (player.keySet().toArray()[0])).split("/"); + bundle.putString("playerId", splitedUri[splitedUri.length - 1]); bundle.putString("instanceId", instanceId); PlayerFragment fragment = new PlayerFragment(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java index 31c75d8..82b2833 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java @@ -10,31 +10,23 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.Button; import android.widget.ListView; -import android.widget.Toast; - import net.arnx.jsonic.JSON; import net.arnx.jsonic.TypeReference; import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.Cactus; import org.ntlab.radishforandroidstudio.cactusClient.connections.InstancesFragmentConnection; -import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection; -import org.ntlab.radishforandroidstudio.cactusClient.models.Account; import org.ntlab.radishforandroidstudio.cactusClient.models.Instance; -import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedAccount; import org.ntlab.radishforandroidstudio.framework.network.CallBack; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; public class InstancesFragment extends Fragment { private InstancesFragmentConnection connection; - ArrayList> listInstances ; + ArrayList> listInstances; ListView listView; @Override @@ -52,14 +44,15 @@ @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - HashMap mapInstances = JSON.decode(response, new TypeReference>(){}); + HashMap mapInstances = JSON.decode(response, new TypeReference>() { + }); System.out.println(response); // for(Map.Entry entry : mapInstances.entrySet()){ // listInstances.add(entry); // } listInstances = new ArrayList<>(mapInstances.entrySet()); ArrayList listNames = new ArrayList<>(); - for(Map.Entry entry : listInstances) { + for (Map.Entry entry : listInstances) { listNames.add(entry.getValue().getName()); } // ListViewをセット @@ -81,9 +74,9 @@ FragmentTransaction transaction = manager.beginTransaction(); CharactersFragment fragment = new CharactersFragment(); Bundle bundle = new Bundle(); - bundle.putSerializable("instanceId",s[s.length-1]); + bundle.putSerializable("instanceId", s[s.length - 1]); fragment.setArguments(bundle); - transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); + transaction.replace(R.id.fragment_place, fragment, "characters_fragment"); transaction.addToBackStack(null); transaction.commit(); } 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 e74e5b3..2b87c88 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 @@ -37,7 +37,7 @@ public void onStart() { super.onStart(); - Button button = (Button)getActivity().findViewById(R.id.signUP1); + Button button = (Button) getActivity().findViewById(R.id.signUP1); button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -49,15 +49,15 @@ transaction.commit(); } }); - Button loginButton = (Button)getActivity().findViewById(R.id.login); + Button loginButton = (Button) getActivity().findViewById(R.id.login); loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - EditText userName = (EditText)getActivity().findViewById(R.id.inputUserName); - EditText passWord = (EditText)getActivity().findViewById(R.id.checkPassword); + EditText userName = (EditText) getActivity().findViewById(R.id.inputUserName); + EditText passWord = (EditText) getActivity().findViewById(R.id.checkPassword); // /**************************************************************** - if(testFlag) { + if (testFlag) { FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new InstancesFragment()); @@ -70,7 +70,7 @@ if (userName.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); return; - } else if(passWord.getText().toString().isEmpty()){ + } else if (passWord.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show(); return; } @@ -80,11 +80,12 @@ @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - URIAddressedAccount lac = JSON.decode(response, new TypeReference(){}); + URIAddressedAccount lac = JSON.decode(response, new TypeReference() { + }); // System.out.println(response); Account user = lac.getAccount(); - if(user.isLogin()){ - Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); + if (user.isLogin()) { + Toast.makeText(getActivity(), "ログインに成功しました。", Toast.LENGTH_SHORT).show(); Cactus c = (Cactus) getActivity().getApplication(); c.setMyAccount(user); c.setAddressedAccount(lac); @@ -92,14 +93,14 @@ FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new InstancesFragment()); transaction.commit(); - }else { - Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), "ログインに失敗しました。", Toast.LENGTH_SHORT).show(); } } }); connection.addFormParam("userID", userName.getText().toString()); connection.addFormParam("userPass", passWord.getText().toString()); - if(testFlag == false)connection.doPut(); + if (testFlag == false) connection.doPut(); } }); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java index 67b241f..778275a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java @@ -178,6 +178,7 @@ public void logout() { player.logout(); } + @Override public void onDestroy() { System.out.println("destroy"); 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 6893c1a..0631c1c 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 @@ -10,6 +10,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; + import net.arnx.jsonic.JSON; import net.arnx.jsonic.TypeReference; @@ -50,25 +51,25 @@ //サインアップ Button signUpButton = (Button) getActivity().findViewById(R.id.signUp2); - signUpButton.setOnClickListener(new View.OnClickListener(){ + signUpButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - EditText inputPassword = (EditText)getActivity().findViewById(R.id.inputPassword2); - EditText checkPassWord = (EditText)getActivity().findViewById(R.id.checkPassword); - EditText inputUserName = (EditText)getActivity().findViewById(R.id.inputUserName); - EditText inputUserID = (EditText)getActivity().findViewById(R.id.inputUserID); + EditText inputPassword = (EditText) getActivity().findViewById(R.id.inputPassword2); + EditText checkPassWord = (EditText) getActivity().findViewById(R.id.checkPassword); + EditText inputUserName = (EditText) getActivity().findViewById(R.id.inputUserName); + EditText inputUserID = (EditText) getActivity().findViewById(R.id.inputUserID); - if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains(" ")){ + if (inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains(" ")) { Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show(); return; - }else if (inputPassword.getText().toString().isEmpty()) { + } else if (inputPassword.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show(); return; } else if (checkPassWord.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show(); return; - } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) { + } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString())) { Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show(); return; } @@ -80,10 +81,11 @@ //通信した時の処理を書くのだよ // URIAddressedAccount ac = JSON.decode(response,URIAddressedAccount.class); // System.out.println("JSON.decode(response, URIAddressedAccount.class);\viewPoint"+ac.getUri()); - URIAddressedAccount ac2 = JSON.decode(response, new TypeReference(){}); - System.out.println("JSON.decode(response, new TypeReference(){});\n"+ac2.getUri()); + URIAddressedAccount ac2 = JSON.decode(response, new TypeReference() { + }); + System.out.println("JSON.decode(response, new TypeReference(){});\n" + ac2.getUri()); System.out.println(response); - Toast.makeText(getActivity(),"アカウントを作成しました。", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "アカウントを作成しました。", Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java index 5ab28fd..a665386 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java @@ -10,10 +10,7 @@ import android.view.ViewGroup; import android.widget.Button; -import net.arnx.jsonic.JSON; - import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; public class StartFragment extends Fragment {