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 80f6f6b..c486b4c 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 @@ -3,8 +3,6 @@ import net.arnx.jsonic.JSON; import org.ntlab.radishforandroidstudio.cactusClient.connections.CharactersConnection; -import org.ntlab.radishforandroidstudio.cactusClient.types.pojo.PlayerPojo; -import org.ntlab.radishforandroidstudio.cactusClient.types.pojo.PlayersPojo; import org.ntlab.radishforandroidstudio.framework.animation.Animation3D; import org.ntlab.radishforandroidstudio.framework.gameMain.Actor; import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; @@ -31,10 +29,10 @@ * @author s.iwatani */ public class OtherPlayerCharactersModel implements CactusModel, CallBack { - private Universe universe = null; - private RealTime3DFragment fragment = null; + private Universe universe; + private RealTime3DFragment fragment; private ArrayList otherCharacters = new ArrayList<>(); - private CharactersConnection con = null; + private CharactersConnection con; private int nextConnectRenaimdTime = 0; private int connectInterval = 300; private Map visibleCharacters = new HashMap<>(); @@ -57,9 +55,8 @@ nextConnectRenaimdTime -= interval; if (nextConnectRenaimdTime <= 0) { nextConnectRenaimdTime = connectInterval; -// con.doAnything(); -// con.doGet(); - con.test(); + con.doAnything(); + con.doGet(); } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/AnglePojo.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/AnglePojo.java deleted file mode 100644 index be11bde..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/AnglePojo.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.types.pojo; - -public class AnglePojo { - public double getVx() { - return vx; - } - - public void setVx(double vx) { - this.vx = vx; - } - - public double getVy() { - return vy; - } - - public void setVy(double vy) { - this.vy = vy; - } - - public double getVz() { - return vz; - } - - public void setVz(double vz) { - this.vz = vz; - } - - public double getA() { - return a; - } - - public void setA(double a) { - this.a = a; - } - - double vx, vy, vz, a; -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PlayerPojo.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PlayerPojo.java deleted file mode 100644 index 2686ccd..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PlayerPojo.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.types.pojo; - -public class PlayerPojo { - private String accountURI; - private String areaURI; - private String name; - private PositionPojo position; - private AnglePojo angle; - private int modelId; - - public String getAccountURI() { - return accountURI; - } - - public void setAccountURI(String accountURI) { - this.accountURI = accountURI; - } - - public String getAreaURI() { - return areaURI; - } - - public void setAreaURI(String areaURI) { - this.areaURI = areaURI; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public PositionPojo getPosition() { - return position; - } - - public void setPosition(PositionPojo position) { - this.position = position; - } - - public AnglePojo getAngle() { - return angle; - } - - public void setAngle(AnglePojo angle) { - this.angle = angle; - } - - public int getModelId() { - return modelId; - } - - public void setModelId(int modelId) { - this.modelId = modelId; - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PlayersPojo.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PlayersPojo.java deleted file mode 100644 index cc7279d..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PlayersPojo.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.types.pojo; - -import java.util.ArrayList; - -public class PlayersPojo { - private ArrayList players; - - public void setPlayers(ArrayList players) { - this.players = players; - } - - public ArrayList getPlayers() { - return players; - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PositionPojo.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PositionPojo.java deleted file mode 100644 index de6689a..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/pojo/PositionPojo.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.types.pojo; - -public class PositionPojo { - public double getX() { - return x; - } - - public void setX(double x) { - this.x = x; - } - - public double getY() { - return y; - } - - public void setY(double y) { - this.y = y; - } - - public double getZ() { - return z; - } - - public void setZ(double z) { - this.z = z; - } - - double x, y, z; -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index be5fc8f..1b17405 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -160,41 +160,4 @@ public void addPathParam(String param){ pathParams += "/" + param; } -int cnt=0; - public void test() { - cnt++; - if (cnt < 10) { - callBack.onResponse("{\n" + - " \"id1\" : {\n" + - " \"accountURI\": \"http://hogehoge.com\",\n" + - " \"areaURI\": \"http://areahogehoge.com\",\n" + - " \"name\": \"Totori Tori\",\n" + - "\t\"position\": {\"x\": 0.5, \"y\": 2, \"z\": 0.2},\n" + - "\t\"angle\": {\"vx\": 0, \"vy\": 0, \"vz\": 0, \"a\": 0},\n" + - "\t\"modelID\": \"5\"\n" + - " },\n" + - " \"id2\" : {\n" + - " \"accountURI\": \"http://hogehoge.com\",\n" + - " \"areaURI\": \"http://areahogehoge.com\",\n" + - " \"name\": \"Tataru Taru\",\n" + - "\t\"position\": {\"x\": 4.5, \"y\": 2, \"z\": 4.5},\n" + - "\t\"angle\": {\"vx\": 0, \"vy\": 0, \"vz\": 0, \"a\": 0},\n" + - "\t\"modelID\": \"5\"\n" + - " }\n" + - "}"); - } - else { - callBack.onResponse("{\n" + - " \"id1\" : {\n" + - " \"accountURI\": \"http://hogehoge.com\",\n" + - " \"areaURI\": \"http://areahogehoge.com\",\n" + - " \"name\": \"Totori Tori\",\n" + - "\t\"position\": {\"x\": 0.5, \"y\": 2, \"z\": 0.2},\n" + - "\t\"angle\": {\"vx\": 0, \"vy\": 0, \"vz\": 0, \"a\": 0},\n" + - "\t\"modelID\": \"5\"\n" + - " }\n" + - "}"); - } - return; - } }