diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java new file mode 100644 index 0000000..5d7c095 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java @@ -0,0 +1,12 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Universe; + +public class MovableObject extends Object3D { + private Universe universe = null; + + public MovableObject(Object3D obj) { + super(obj); + } +} 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 new file mode 100644 index 0000000..c4bc8b7 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java @@ -0,0 +1,40 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import org.ntlab.radishforandroidstudio.cactusClient.connections.ObjectsConnection; +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; +import org.ntlab.radishforandroidstudio.framework.model3D.Universe; +import org.ntlab.radishforandroidstudio.framework.network.CallBack; + +/** + * オブジェクトを管理するモデル + */ + +public class MovableObjectModel implements GameBaseModel, CallBack { + private Universe universe; + private RealTime3DFragment fragment; + private ObjectsConnection objectsConnection; + private String instanceId; + + public MovableObjectModel(RealTime3DFragment fragment, Universe universe) { + this.fragment = fragment; + this.universe = universe; + } + + + @Override + public void setInstanceId(String id) { + this.instanceId = id; + } + + @Override + public void update(double interval) { + + } + + + @Override + public void onResponse(String response) { + + } +} 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 57a8743..77b982e 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 @@ -11,6 +11,7 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.models.CactusModels; +import org.ntlab.radishforandroidstudio.cactusClient.models.MovableObjectModel; import org.ntlab.radishforandroidstudio.cactusClient.models.OtherPlayerCharactersModel; import org.ntlab.radishforandroidstudio.cactusClient.models.OwnPlayer; import org.ntlab.radishforandroidstudio.cactusClient.models.Player; @@ -34,6 +35,7 @@ RWTPad pad = null; private OwnPlayer player; private OtherPlayerCharactersModel otherPlayerCharactersModel; + private MovableObjectModel movableObjectModel; public PlayerFragment() { // Required empty public constructor @@ -88,7 +90,7 @@ Bundle bundle = getArguments(); // プレイヤーの作成とインスタンスIDのセット String playerId = bundle.getString("playerId"); - player = new OwnPlayer((Player)bundle.getSerializable("player"), getResources(), universe, camera, playerId); + player = new OwnPlayer((Player) bundle.getSerializable("player"), getResources(), universe, camera, playerId); modelManager.addModel(player); otherPlayerCharactersModel = new OtherPlayerCharactersModel(this, universe); otherPlayerCharactersModel.setPlayerId(playerId); @@ -103,8 +105,6 @@ super.progress(interval); } - - //sampleUiFragmentからそのまま持ってきた public void initGameWindowView() { FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction transaction = fragmentManager.beginTransaction();