diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java index 7236445..a4780cc 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java @@ -28,13 +28,11 @@ import java.util.ArrayList; public class OwnPlayer implements PadListener, GameBaseModel, CallBack { - private boolean isPadTouched = false; - private boolean isTouched = false; + private boolean isPadTouched = false; //Padのタッチ判定 private float touchPadX = 0.0f; private float touchPadY = 0.0f; double n = 1.0; - private OvergroundActor actor; private Camera3D camera; private Player player; @@ -79,7 +77,6 @@ updateCamera(n); } - public void setPlayerId(String id) { playerId = id; } @@ -87,13 +84,8 @@ public void updateCamera(double n) { Vector3d charaVector3d = actor.getDirection(); charaVector3d.normalize();//キャラの向きを単位ベクトルに -// camera.setViewPoint(actor.getPosition().add(5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.0, 5.0 * charaVector3d.getZ()));//視点 -// camera.setViewLine(new Vector3d(-5.0 * charaVector3d.getX(), charaVector3d.getY() - 2.5 + n, -5.0 * charaVector3d.getZ()));//視線 - camera.setViewPoint(actor.getPosition().add(5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.5 - n, 5.0 * charaVector3d.getZ()));//視点 camera.setViewLine(new Vector3d(-5.0 * charaVector3d.getX(), charaVector3d.getY() - 2.5 + n, -5.0 * charaVector3d.getZ()));//視線 - - } /** @@ -108,13 +100,10 @@ charaVector3d.normalize();//キャラの向きを単位ベクトルに MotionEvent motionEvent = event.getMotionEvent(); - if (motionEvent.getAction() == MotionEvent.ACTION_DOWN || motionEvent.getAction() == MotionEvent.ACTION_MOVE) { isPadTouched = true; touchPadX = (float) (Math.cos(event.getAngle()) * event.getLength()); touchPadY = (float) (Math.sin(event.getAngle()) * event.getLength()); - - } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) { Velocity3D vel = actor.getVelocity(); vel.setX(0); @@ -122,7 +111,6 @@ actor.setVelocity(vel); isPadTouched = false; } - return false; } @@ -135,7 +123,6 @@ bullets.setAngle(((Solid3D) (actor.getBody())).getQuaternion()); if (isPadTouched) { - Vector3d up = new Vector3d(0, 1, 0); Vector3d total = new Vector3d(); Vector3d right = new Vector3d(); @@ -155,16 +142,9 @@ vel.setVector3d(total); actor.setVelocity(vel); - - } else if (isTouched) { -// -// actor.rotY(0.1 * (0.5f - touchX)); -// n += (0.5f-touchY); - } else { vel.setX(0.0); vel.setZ(0.0); - actor.setVelocity(vel); } @@ -202,7 +182,6 @@ } - //jump public void jump() { if (actor.isOnGround()) { Velocity3D vel = actor.getVelocity(); @@ -212,8 +191,7 @@ } else { System.out.print("地に足がついてない。"); } - System.out.print("onClick押されましたよ----------------------------------------------------"); - + System.out.print("onClick押されましたよ。"); } public void changeViewpoint(float eyeX, float eyeY) { @@ -232,7 +210,6 @@ return false; } - public void logout() { con = new CharacterConnection(playerId); con.setCallBack(this); 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 0b97f93..9f3baca 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 @@ -36,18 +36,14 @@ import org.ntlab.radishforandroidstudio.java3d.Vector3f; public class PlayerFragment extends RealTime3DFragment { - private OvergroundActor pocha; RWTPad pad = null; private OwnPlayer player; - private Object object; private OtherPlayerCharactersModel otherPlayerCharactersModel; private BulletsManager bulletsManager; private MovableObjectModel movableObjectModel; - private ObjectsConnection con; RWTUIFragment f = null; - private boolean isTouched = false; - private boolean isPadTouched = false; + private boolean isTouched = false;//画面判定 private float touchX = 0.0f; private float touchY = 0.0f; @@ -73,8 +69,7 @@ universe.placeLight(dirlight); // 地面の作成 - IndexedTriangleArray groundGeometry = new IndexedTriangleArray(4, - IndexedTriangleArray.COORDINATES | IndexedTriangleArray.NORMALS, 6); + IndexedTriangleArray groundGeometry = new IndexedTriangleArray(4, IndexedTriangleArray.COORDINATES | IndexedTriangleArray.NORMALS, 6); groundGeometry.setCoordinate(0, new Point3d(-20.0, -1.0, -20.0)); groundGeometry.setCoordinate(1, new Point3d(20.0, -1.0, -20.0)); groundGeometry.setCoordinate(2, new Point3d(20.0, -1.0, 20.0)); @@ -114,13 +109,12 @@ bulletsManager.setPlayerId(playerId); modelManager.addModel(bulletsManager); - //objectの通信 + //object movableObjectModel = new MovableObjectModel(this, universe, instanceId); modelManager.addModel(movableObjectModel); - //画面の生成 modelManager.setInstanceId(instanceId); - + //画面の生成 initGameWindowView(); @@ -137,7 +131,7 @@ touchX = (event.getX() - minX) / (maxX - minX); touchY = (event.getY() - minY) / (maxY - minY); } else if (event.getAction() == MotionEvent.ACTION_UP) { - isPadTouched = false; + isTouched = false; } return true; } @@ -149,24 +143,19 @@ protected void progress(long interval) { super.progress(interval); - Button jumpButton = (Button) getActivity().findViewById(R.id.Button); jumpButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { player.jump(); } }); - if (isPadTouched) { - } else if (isTouched) { + if (isTouched) { player.changeViewpoint(touchX, touchY); isTouched = false; - } else { - } - } - //sampleUiFragmentからそのまま持ってきた + //画面生成 public void initGameWindowView() { FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction transaction = fragmentManager.beginTransaction(); @@ -186,7 +175,6 @@ public void logout() { player.logout(); } - @Override public void onDestroy() { System.out.println("destroy");