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 c4bc8b7..a0f168c 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 @@ -15,6 +15,7 @@ private RealTime3DFragment fragment; private ObjectsConnection objectsConnection; private String instanceId; + private String objectId; public MovableObjectModel(RealTime3DFragment fragment, Universe universe) { this.fragment = fragment; @@ -27,9 +28,17 @@ this.instanceId = id; } + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + /** + * オブジェクトの状態更新 + * + * @param interval 前回の更新からの時間差 + */ @Override public void update(double interval) { - } 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 77b982e..ea61611 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 @@ -12,6 +12,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.Object; import org.ntlab.radishforandroidstudio.cactusClient.models.OtherPlayerCharactersModel; import org.ntlab.radishforandroidstudio.cactusClient.models.OwnPlayer; import org.ntlab.radishforandroidstudio.cactusClient.models.Player; @@ -34,7 +35,9 @@ private OvergroundActor pocha; RWTPad pad = null; private OwnPlayer player; + private Object obj; private OtherPlayerCharactersModel otherPlayerCharactersModel; + private MovableObjectModel movableObjectModel; public PlayerFragment() { @@ -48,16 +51,12 @@ //環境光 AmbientLight amblight = new AmbientLight(new Color3f(1.0f, 1.0f, 1.0f)); - -// amblight.setInfluencingBounds(new BoundingSphere(new Point3d(), 10000.0)); universe.placeLight(amblight); - //平行光源 DirectionalLight dirlight = new DirectionalLight( new Color3f(1.0f, 1.0f, 1.0f), //光の色 new Vector3f(0.0f, -1.0f, -0.5f) //光の方向ベクトル ); -// dirlight.setInfluencingBounds(new BoundingSphere(new Point3d(), 10000.0)); universe.placeLight(dirlight); // 地面の作成 @@ -96,6 +95,11 @@ otherPlayerCharactersModel.setPlayerId(playerId); modelManager.addModel(otherPlayerCharactersModel); modelManager.setInstanceId(bundle.getString("instanceId")); + //オブジェクトの生成 + String objectId =bundle.getString("objectId"); + + + //画面の生成 initGameWindowView(); return parentView; }