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 232a2a5..5f0e14d 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 @@ -32,19 +32,20 @@ private String objectId; private Map visibleobject = new HashMap<>(); - public MovableObjectModel(RealTime3DFragment fragment, Universe universe) { + public MovableObjectModel(RealTime3DFragment fragment, Universe universe,String instanceId) { this.fragment = fragment; this.universe = universe; + this.setInstanceId(instanceId); } @Override - public void setInstanceId(String id) { - this.instanceId = id; + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; } - public void setObjectId(String id) { - objectId = id; + public void setObjectId(String objectId) { + this.objectId = objectId; } /** 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 7b57017..a7549f6 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 @@ -10,6 +10,7 @@ import android.view.ViewGroup; import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.connections.ObjectsConnection; import org.ntlab.radishforandroidstudio.cactusClient.models.CactusModels; import org.ntlab.radishforandroidstudio.cactusClient.models.MovableObjectModel; import org.ntlab.radishforandroidstudio.cactusClient.models.Object; @@ -38,6 +39,7 @@ private Object object; private OtherPlayerCharactersModel otherPlayerCharactersModel; private MovableObjectModel movableObjectModel; + private ObjectsConnection con; public PlayerFragment() { // Required empty public constructor @@ -88,6 +90,7 @@ Bundle bundle = getArguments(); // プレイヤーの作成とインスタンスIDのセット String playerId = bundle.getString("playerId"); + player = new OwnPlayer((Player) bundle.getSerializable("player"), getResources(), universe, camera, playerId); modelManager.addModel(player); @@ -95,9 +98,13 @@ otherPlayerCharactersModel.setPlayerId(playerId); modelManager.addModel(otherPlayerCharactersModel); modelManager.setInstanceId(bundle.getString("instanceId")); - //オブジェクトの生成 + + //objectの通信 + String instanceId = bundle.getString("instanceId"); + con = new ObjectsConnection(instanceId); + // TODO: 2018/11/01 ここからObjectの表示を記述する String objectId = bundle.getString("objectId"); - movableObjectModel = new MovableObjectModel(this, universe); + movableObjectModel = new MovableObjectModel(this, universe, instanceId); movableObjectModel.setObjectId(objectId); modelManager.addModel(movableObjectModel);