diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 9867642..c1bde53 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java index 3f810b6..a5b6ac7 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsModel.java @@ -6,12 +6,11 @@ import net.arnx.jsonic.TypeReference; import org.ntlab.radishforandroidstudio.cactusClient.connections.BulletGetConnection; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Property3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; -import org.ntlab.radishforandroidstudio.framework.network.CallBack; import org.ntlab.radishforandroidstudio.java3d.Appearance; import org.ntlab.radishforandroidstudio.java3d.Material; @@ -20,8 +19,7 @@ import java.util.Map; import java.util.Set; -public class -BulletsModel implements GameBaseModel, CallBack { +public class BulletsModel implements OnlineModel { private Universe universe; private Resources resources; private BulletGetConnection con; 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 d4e6125..fdc7ae6 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,16 +1,17 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModelManager; /** * モデルを管理する - *

+ * * singleton * * @author s.iwatani */ -public class CactusModels extends GameBaseModelManager implements GameBaseModel { +public class CactusModels extends GameBaseModelManager implements OnlineModel { private String instanceId = ""; public CactusModels() { @@ -18,12 +19,17 @@ } public void setInstanceId(String id) { - for (GameBaseModel model : models) { + for(GameBaseModel model : models) { model.setInstanceId(id); } - for (GameBaseModel model : nextAddModels) { + for(GameBaseModel model : nextAddModels) { model.setInstanceId(id); } instanceId = id; } + + @Override + public void onResponse(String response) { + + } } 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 a5608ec..c5551d6 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 @@ -4,13 +4,12 @@ import net.arnx.jsonic.TypeReference; import org.ntlab.radishforandroidstudio.cactusClient.connections.ObjectsConnection; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Property3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; -import org.ntlab.radishforandroidstudio.framework.network.CallBack; import org.ntlab.radishforandroidstudio.java3d.Appearance; import org.ntlab.radishforandroidstudio.java3d.Material; @@ -22,7 +21,7 @@ * オブジェクトを管理するモデル */ -public class MovableObjectModel implements GameBaseModel, CallBack { +public class MovableObjectModel implements OnlineModel { private Universe universe; private RealTime3DFragment fragment; private ObjectsConnection con; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java index 150adb0..ca87b78 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java @@ -6,13 +6,12 @@ import org.ntlab.radishforandroidstudio.cactusClient.connections.BulletUpdateConnection; import org.ntlab.radishforandroidstudio.framework.animation.Animation3D; import org.ntlab.radishforandroidstudio.framework.gameMain.Actor; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.model3D.CollisionResult; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Placeable; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; -import org.ntlab.radishforandroidstudio.framework.network.CallBack; import org.ntlab.radishforandroidstudio.framework.physics.Force3D; import org.ntlab.radishforandroidstudio.framework.physics.Solid3D; import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; @@ -21,7 +20,7 @@ import java.util.ArrayList; import java.util.UUID; -public class MyBullet extends Actor implements GameBaseModel, CallBack { +public class MyBullet extends Actor implements OnlineModel { private String instanceId; private String playerId; private String uuid; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java index 59d8079..b844a71 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java @@ -4,13 +4,12 @@ import net.arnx.jsonic.TypeReference; import org.ntlab.radishforandroidstudio.cactusClient.connections.PlayersConnection; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Property3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; -import org.ntlab.radishforandroidstudio.framework.network.CallBack; import org.ntlab.radishforandroidstudio.java3d.Appearance; import org.ntlab.radishforandroidstudio.java3d.Material; @@ -23,7 +22,7 @@ * * @author s.iwatani */ -public class OtherPlayerCharactersModel implements GameBaseModel, CallBack { +public class OtherPlayerCharactersModel implements OnlineModel { private Universe universe; private RealTime3DFragment fragment; private PlayersConnection con; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java index 088f68b..04f3cac 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnBulletsModel.java @@ -3,7 +3,7 @@ import android.content.res.Resources; import org.ntlab.radishforandroidstudio.framework.event.BulletShotEvent; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.listener.BulletShotListener; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; @@ -12,20 +12,18 @@ import java.util.ArrayList; import java.util.Iterator; -public class OwnBulletsModel implements GameBaseModel, BulletShotListener { +public class OwnBulletsModel implements OnlineModel, BulletShotListener { private ArrayList bullets = new ArrayList<>(); private String playerId; private String instanceId; private Resources resources; private Universe universe; - private CactusModels cactusModels; private Position3D playerPos; private Quaternion3D playerAngle; public OwnBulletsModel(Resources resources, Universe universe, String instanceId, String playerId) { this.resources = resources; this.universe = universe; - cactusModels = new CactusModels(); setInstanceId(instanceId); setPlayerId(playerId); @@ -45,7 +43,7 @@ @Override public void update(double interval) { - for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext(); ) { + for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext();) { MyBullet bullet = bulletIterator.next(); bullet.update(interval); // 弾削除 @@ -57,10 +55,10 @@ } public void deleteBullets(ArrayList deletedBullets) { - for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext(); ) { + for (Iterator bulletIterator = bullets.iterator(); bulletIterator.hasNext();) { MyBullet bullet = bulletIterator.next(); - for (String deleteBullet : deletedBullets) { // 弾削除 + for(String deleteBullet : deletedBullets) { // 弾削除 if (bullet.getUuid().equals(bullets)) { universe.displace(bullet); sendDeleteBulletForServer(bullet); @@ -99,4 +97,9 @@ universe.place(b); return true; } + + @Override + public void onResponse(String response) { + + } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayerModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayerModel.java index bac3a11..9041acf 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayerModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayerModel.java @@ -9,7 +9,7 @@ import org.ntlab.radishforandroidstudio.cactusClient.connections.CharacterConnection; import org.ntlab.radishforandroidstudio.framework.animation.Animation3D; import org.ntlab.radishforandroidstudio.framework.event.PadEvent; -import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.OnlineModel; import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; import org.ntlab.radishforandroidstudio.framework.listener.PadListener; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; @@ -17,7 +17,6 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; -import org.ntlab.radishforandroidstudio.framework.network.CallBack; import org.ntlab.radishforandroidstudio.framework.physics.Solid3D; import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; import org.ntlab.radishforandroidstudio.framework.view3D.Camera3D; @@ -27,7 +26,7 @@ import java.util.ArrayList; -public class OwnPlayerModel implements PadListener, GameBaseModel, CallBack { +public class OwnPlayerModel implements PadListener, OnlineModel { private boolean isPadTouched = false; //Padのタッチ判定 private float touchPadX = 0.0f; private float touchPadY = 0.0f; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OnlineModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OnlineModel.java new file mode 100644 index 0000000..a5f48c1 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OnlineModel.java @@ -0,0 +1,6 @@ +package org.ntlab.radishforandroidstudio.framework.gameMain; + +import org.ntlab.radishforandroidstudio.framework.network.CallBack; + +public interface OnlineModel extends GameBaseModel, CallBack { +}