diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/CactusRepository.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/CactusRepository.java new file mode 100644 index 0000000..9ad876f --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/CactusRepository.java @@ -0,0 +1,5 @@ +package org.ntlab.radishforandroidstudio.cactusClient.UseCases; + +public class CactusRepository { + +} 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 4925fd7..3463dfb 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,15 @@ package org.ntlab.radishforandroidstudio.cactusClient.UseCases; -import org.ntlab.radishforandroidstudio.cactusClient.models.model.CactusRepository; +import org.ntlab.radishforandroidstudio.cactusClient.models.model.CactusModels; public class UpdateUseCase implements UpdateBoundary { - CactusRepository cactusRepository = new CactusRepository(); + CactusModels cactusModels = null; @Override public void onUpdate(long interval) { - cactusRepository.update(interval); + cactusModels.update(interval); } } 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 new file mode 100644 index 0000000..2d782cd --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusModels.java @@ -0,0 +1,40 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models.model; + +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModelContainer; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; + +/** + * モデルを管理する + *

+ * singleton + * + * @author s.iwatani + */ +public class CactusModels extends GameBaseModelContainer implements OnlineModel { + private String instanceId = ""; + + public CactusModels() { + super(); + } + + public void setInstanceId(String id) { + for (GameBaseModel model : models) { + model.setInstanceId(id); + } + for (GameBaseModel model : nextAddModels) { + model.setInstanceId(id); + } + instanceId = id; + } + + @Override + public void update(double interval) { + super.update(interval); + } + + @Override + public void onResponse(String response) { + + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusRepository.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusRepository.java deleted file mode 100644 index af986b2..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/model/CactusRepository.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.models.model; - -import org.ntlab.radishforandroidstudio.cactusClient.UseCases.UpdateUseCase; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; -import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModelContainer; - -/** - * モデルを管理する - * - * singleton - * - * @author s.iwatani - */ -public class CactusRepository extends GameBaseModelContainer implements OnlineModel { - private String instanceId = ""; - UpdateUseCase updateUseCase = new UpdateUseCase(); - - public CactusRepository() { - super(); - } - - public void setInstanceId(String id) { - for(GameBaseModel model : models) { - model.setInstanceId(id); - } - for(GameBaseModel model : nextAddModels) { - model.setInstanceId(id); - } - instanceId = id; - } - - @Override - public void update(double interval) { - super.update(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 8a0c4a8..f3cbeb8 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 @@ -13,7 +13,7 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.controller.bullet.BulletsModel; -import org.ntlab.radishforandroidstudio.cactusClient.models.model.CactusRepository; +import org.ntlab.radishforandroidstudio.cactusClient.models.model.CactusModels; import org.ntlab.radishforandroidstudio.cactusClient.controller.object.MovableObjectModel; import org.ntlab.radishforandroidstudio.cactusClient.controller.player.OtherPlayerCharactersModel; import org.ntlab.radishforandroidstudio.cactusClient.controller.bullet.OwnBulletsModel; @@ -38,13 +38,14 @@ private OwnPlayerModel player; private OwnBulletsModel ownBulletsModel; private MovableObjectModel movableObjectModel; + RWTUIFragment f = null; private boolean isTouched = false;//画面判定 private float touchX = 0.0f; private float touchY = 0.0f; - - CactusRepository modelManager;//とりあえずエラーを消すために配置 +// +// CactusModels modelManager=null; public PlayerFragment() { // Required empty public constructor @@ -55,7 +56,7 @@ super.onCreate(savedInstanceState); // TODO: 2019/01/10 CactusRepositoryを変えたことによるエラー - modelManager = new CactusRepository(); + modelManager = new CactusModels(); modelManager.setFragment(this); modelManager.setUniverse(universe); 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 4c8cbab..8dd5a16 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.models.model.CactusModels; import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; import org.ntlab.radishforandroidstudio.framework.view3D.Camera3D; @@ -20,8 +21,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; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -46,12 +48,16 @@ @Override protected void update(long interval) { progress(interval); -// if (modelManager != null) { -// modelManager.update(interval); -// } - if (updateBoundary != null) { - updateBoundary.onUpdate(interval); + if (modelManager != null) { + modelManager.update(interval); } +// if (updateBoundary != null) { +// updateBoundary.onUpdate(interval); +// } +// +// if (cactusModels != null){ +// cactusModels.update(interval); +// } universe.update(interval); camera.adjust(interval); view.requestRender();