diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateBoundary.java index b73c2ec..f2391dc 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateBoundary.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateBoundary.java @@ -1,6 +1,9 @@ package org.ntlab.radishforandroidstudio.cactusClient.UseCases; +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; + public interface UpdateBoundary { void onUpdate(long interval); + void addModels(GameBaseModel model); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateUseCase.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateUseCase.java index 3463dfb..f570838 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateUseCase.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UpdateUseCase.java @@ -1,15 +1,37 @@ package org.ntlab.radishforandroidstudio.cactusClient.UseCases; import org.ntlab.radishforandroidstudio.cactusClient.models.model.CactusModels; +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; -public class UpdateUseCase implements UpdateBoundary { +public class UpdateUseCase extends CactusModels implements UpdateBoundary { - CactusModels cactusModels = null; + CactusModels cactusModels ; + + @Override + public void update(double interval) { + super.update(interval); + } + + @Override + public void addModel(GameBaseModel model) { + super.addModel(model); + } + + @Override + public void setInstanceId(String id) { + super.setInstanceId(id); + } @Override public void onUpdate(long interval) { cactusModels.update(interval); - } + + @Override + public void addModels(GameBaseModel model) { + cactusModels.addModel(model); + } + + } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusModels.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusModels.java index 2d782cd..dc24397 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusModels.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusModels.java @@ -34,6 +34,11 @@ } @Override + public void addModel(GameBaseModel model) { + super.addModel(model); + } + + @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 f3cbeb8..948d889 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 @@ -44,8 +44,6 @@ private boolean isTouched = false;//画面判定 private float touchX = 0.0f; private float touchY = 0.0f; -// -// CactusModels modelManager=null; public PlayerFragment() { // Required empty public constructor @@ -54,7 +52,6 @@ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // TODO: 2019/01/10 CactusRepositoryを変えたことによるエラー modelManager = new CactusModels(); modelManager.setFragment(this); 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 8dd5a16..f1b6a6b 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 @@ -11,6 +11,7 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.UseCases.UpdateBoundary; +import org.ntlab.radishforandroidstudio.cactusClient.UseCases.UpdateUseCase; import org.ntlab.radishforandroidstudio.cactusClient.models.model.CactusModels; import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; @@ -21,9 +22,9 @@ protected Camera3D camera; protected RWTSurfaceView view; protected View parentView = null; - protected GameBaseModelContainer modelManager = null; +// protected GameBaseModelContainer modelManager = null; protected UpdateBoundary updateBoundary = null; - protected CactusModels cactusModels = null; + protected UpdateUseCase modelManager = null; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -48,16 +49,15 @@ @Override protected void update(long interval) { progress(interval); - if (modelManager != null) { - modelManager.update(interval); +// if (modelManager != null) { +// modelManager.update(interval); +// } + + if (updateBoundary!=null) { + updateBoundary.onUpdate(interval); } -// if (updateBoundary != null) { -// updateBoundary.onUpdate(interval); -// } -// -// if (cactusModels != null){ -// cactusModels.update(interval); -// } + updateBoundary.onUpdate(interval); + universe.update(interval); camera.adjust(interval); view.requestRender();