diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/ObjectsConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/ObjectsConnection.java new file mode 100644 index 0000000..e175902 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/ObjectsConnection.java @@ -0,0 +1,9 @@ +package org.ntlab.radishforandroidstudio.cactusClient.connections; + +import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; + +public class ObjectsConnection extends HttpAsyncConnection { + public ObjectsConnection() { + super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/objects"); + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java new file mode 100644 index 0000000..5d7c095 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java @@ -0,0 +1,12 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Universe; + +public class MovableObject extends Object3D { + private Universe universe = null; + + public MovableObject(Object3D obj) { + super(obj); + } +} 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 new file mode 100644 index 0000000..c4bc8b7 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java @@ -0,0 +1,40 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import org.ntlab.radishforandroidstudio.cactusClient.connections.ObjectsConnection; +import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; +import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; +import org.ntlab.radishforandroidstudio.framework.model3D.Universe; +import org.ntlab.radishforandroidstudio.framework.network.CallBack; + +/** + * オブジェクトを管理するモデル + */ + +public class MovableObjectModel implements GameBaseModel, CallBack { + private Universe universe; + private RealTime3DFragment fragment; + private ObjectsConnection objectsConnection; + private String instanceId; + + public MovableObjectModel(RealTime3DFragment fragment, Universe universe) { + this.fragment = fragment; + this.universe = universe; + } + + + @Override + public void setInstanceId(String id) { + this.instanceId = id; + } + + @Override + public void update(double interval) { + + } + + + @Override + public void onResponse(String response) { + + } +} 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 51403d1..d81cfb6 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 @@ -100,7 +100,6 @@ Object3D pochaBody = null; try { pochaBody = ModelFactory.loadModel(fragment.getResources(), "pocha.stl", ap1).createObject(); - pochaBody.scale(5.0); } catch (Exception e) { e.printStackTrace(); } 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 c590b28..d9ef3c0 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 @@ -12,6 +12,7 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.models.BulletsManager; import org.ntlab.radishforandroidstudio.cactusClient.models.CactusModels; +import org.ntlab.radishforandroidstudio.cactusClient.models.MovableObjectModel; import org.ntlab.radishforandroidstudio.cactusClient.models.OtherPlayerCharactersModel; import org.ntlab.radishforandroidstudio.cactusClient.models.OwnPlayer; import org.ntlab.radishforandroidstudio.cactusClient.models.Player; @@ -36,6 +37,7 @@ private OwnPlayer player; private OtherPlayerCharactersModel otherPlayerCharactersModel; private BulletsManager bulletsManager; + private MovableObjectModel movableObjectModel; public PlayerFragment() { // Required empty public constructor @@ -94,6 +96,7 @@ String playerId = bundle.getString("playerId"); String instanceId = bundle.getString("instanceId"); player = new OwnPlayer((Player)bundle.getSerializable("player"), getResources(), universe, camera, playerId, instanceId); + modelManager.addModel(player); otherPlayerCharactersModel = new OtherPlayerCharactersModel(this, universe); otherPlayerCharactersModel.setPlayerId(playerId); bulletsManager = new BulletsManager(this.getResources(), universe); @@ -109,11 +112,8 @@ @Override protected void progress(long interval) { super.progress(interval); - System.out.println("update"); } - - //sampleUiFragmentからそのまま持ってきた public void initGameWindowView() { FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction transaction = fragmentManager.beginTransaction(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java index df08e52..9d42402 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -79,7 +79,7 @@ public void onResponse(String response) { //通信した時の処理を書くのだよ // URIAddressedAccount ac = JSON.decode(response,URIAddressedAccount.class); -// System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri()); +// System.out.println("JSON.decode(response, URIAddressedAccount.class);\viewPoint"+ac.getUri()); URIAddressedAccount ac2 = JSON.decode(response, new TypeReference(){}); System.out.println("JSON.decode(response, new TypeReference(){});\n"+ac2.getUri()); System.out.println(response); diff --git a/app/src/main/res/layout/ui_fragment.xml b/app/src/main/res/layout/ui_fragment.xml index 22f656a..34a7203 100644 --- a/app/src/main/res/layout/ui_fragment.xml +++ b/app/src/main/res/layout/ui_fragment.xml @@ -9,8 +9,14 @@ android:id="@+id/pad" android:layout_width="150dp" android:layout_height="150dp" + android:layout_marginBottom="44dp" + android:layout_marginEnd="302dp" + android:layout_marginLeft="44dp" + android:layout_marginRight="302dp" + android:layout_marginStart="44dp" android:text="Button" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/button" app:layout_constraintStart_toStartOf="parent" /> +