diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersConnection.java new file mode 100644 index 0000000..3732526 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersConnection.java @@ -0,0 +1,9 @@ +package org.ntlab.radishforandroidstudio.cactusClient.connections; + +import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; + +public class CharactersConnection extends HttpAsyncConnection { + public CharactersConnection(String instanceId) { + super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/characters"); + } +} 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 b54b050..2d6dbaf 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,5 +1,7 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; +import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; + import java.util.ArrayList; /** @@ -9,10 +11,15 @@ */ public class CactusModels implements CactusModel { private ArrayList models = new ArrayList<>(); + private RealTime3DFragment fragment = null; public CactusModels() { models.add(new OtherPlayerCharactersModel()); } + public CactusModels(RealTime3DFragment fragment) { + models.add(new OtherPlayerCharactersModel()); + this.fragment = fragment; + } /** * モデルの状態を更新する diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java index e65c90f..ebe9c20 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java @@ -1,5 +1,6 @@ package org.ntlab.radishforandroidstudio.framework.gameMain; +import android.content.res.Resources; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -10,6 +11,8 @@ import android.widget.LinearLayout; import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.models.CactusModel; +import org.ntlab.radishforandroidstudio.cactusClient.models.CactusModels; import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; import org.ntlab.radishforandroidstudio.framework.view3D.Camera3D; @@ -19,12 +22,15 @@ protected Camera3D camera; protected RWTSurfaceView view; protected View parentView = null; + private CactusModels models = null; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); universe = new Universe(); camera = new Camera3D(universe); + + models = new CactusModels(this); } @Nullable @@ -43,6 +49,7 @@ @Override protected void update(long interval) { progress(interval); + models.update(interval); universe.update(interval); camera.adjust(interval); view.requestRender(); @@ -51,5 +58,9 @@ protected void progress(long interval) { } + + public Universe getUniverse() { + return universe; + } }