diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 7fbaa76..f414542 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/OwnPlayer.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java index e581f7c..4cab8bc 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 @@ -1,5 +1,7 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; +import android.app.Activity; +import android.app.Fragment; import android.content.res.Resources; import android.os.Bundle; @@ -16,6 +18,8 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.CharacterConnection; +import org.ntlab.radishforandroidstudio.cactusClient.views.PlayerFragment; +import org.ntlab.radishforandroidstudio.framework.RWT.RWTUIFragment; import org.ntlab.radishforandroidstudio.framework.animation.Animation3D; import org.ntlab.radishforandroidstudio.framework.event.PadEvent; import org.ntlab.radishforandroidstudio.framework.gameMain.GameBaseModel; @@ -34,7 +38,7 @@ import org.ntlab.radishforandroidstudio.java3d.Material; import org.ntlab.radishforandroidstudio.java3d.Vector3d; -public class OwnPlayer implements PadListener, GameBaseModel, CallBack, OnClickListener { +public class OwnPlayer implements PadListener, GameBaseModel, CallBack { private boolean isTouched = false; private float touchX = 0.0f; private float touchY = 0.0f; @@ -90,19 +94,19 @@ .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, -5.0 * charaVector3d.getZ()));//視線 } - - @Override - public void onClick(View v) { - if(actor.isOnGround()) { - Velocity3D vel = actor.getVelocity(); - vel.setY(vel.getY() + 15); - actor.setVelocity(vel); - System.out.print("Jumpしました。"); - }else{ - System.out.print("地に足がついてない。"); - } - System.out.print("onClick押されましたよ----------------------------------------------------"); - } +// +// @Override +// public void onClick(View v) { +// if(actor.isOnGround()) { +// Velocity3D vel = actor.getVelocity(); +// vel.setY(vel.getY() + 15); +// actor.setVelocity(vel); +// System.out.print("Jumpしました。"); +// }else{ +// System.out.print("地に足がついてない。"); +// } +// System.out.print("onClick押されましたよ----------------------------------------------------"); +// } @Override public boolean onEvent(PadEvent event) { @@ -152,8 +156,8 @@ total.add(touchYVec); total.y = vel.getY(); -// -// Button jumpButton = (Button) getActivity().findViewById(R.id.JumpButton); + +// Button jumpButton = (Button) getActivity().findViewById(R.id.Button); // jumpButton.setOnClickListener(new View.OnClickListener() { // public void onClick(View v) { // if(actor.isOnGround()) total.y = vel.getY() + 15; @@ -201,5 +205,17 @@ } + public void jump(){ + if(actor.isOnGround()) { + Velocity3D vel = actor.getVelocity(); + vel.setY(vel.getY() + 5); + actor.setVelocity(vel); + System.out.print("Jumpしました。"); + }else{ + System.out.print("地に足がついてない。"); + } + System.out.print("onClick押されましたよ----------------------------------------------------"); + + } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index a85f43b..dc07b5c 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java @@ -31,7 +31,6 @@ import java.util.Map; public class CharactersFragment extends Fragment { - private CharactersFragmentConnection connection; private String instanceId; private Account account; 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 b7b1af5..b8f7ce3 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 @@ -7,6 +7,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v7.widget.ActivityChooserView; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -40,6 +41,8 @@ RWTPad pad = null; private OwnPlayer player; private OtherPlayerCharactersModel otherPlayerCharactersModel; + RWTUIFragment f = null; + public PlayerFragment() { // Required empty public constructor } @@ -100,12 +103,30 @@ modelManager.addModel(otherPlayerCharactersModel); modelManager.setInstanceId(bundle.getString("instanceId")); initGameWindowView(); + + + +// Button jumpButton = (Button) getActivity().findViewById(R.id.Button); +// jumpButton.setOnClickListener(new View.OnClickListener() { +// public void onClick(View v) { +// player.jump(); +// } +// }); + return parentView; } @Override 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(); + } + }); + + } @@ -126,7 +147,8 @@ pad.addListener(player); // Button button = (Button) f.findViewById(R.id.Button); // button.setOnClickListener(player); -} + + } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java index 3838cc6..5e97251 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java @@ -11,15 +11,19 @@ import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.models.OwnPlayer; import org.ntlab.radishforandroidstudio.cactusClient.views.PlayerFragment; import org.ntlab.radishforandroidstudio.framework.event.PadEvent; import org.ntlab.radishforandroidstudio.framework.listener.PadListener; +import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; import static android.view.View.*; +import static org.ntlab.radishforandroidstudio.framework.subject.PadSubject.own; public class RWTUIFragment extends Fragment implements OnTouchListener,PadListener { PlayerFragment listener = null; View v = null; + public RWTUIFragment() {} @Override @@ -35,6 +39,10 @@ v = inflater.inflate(R.layout.ui_fragment, container, false); RWTPad pad = v.findViewById(R.id.pad); pad.addListener(this); + + + + if (listener != null) { listener.onCreateFragmentEvent(this); } @@ -46,7 +54,11 @@ System.out.println("RWTUIFragment touch"); return false; } - +// +// +// public void onClick(View v) { +// System.out.print("onClick押されましたよ----------------------------------------------------IN RWTUIFragment"); +// } @Override public boolean onEvent(PadEvent event) { diff --git a/app/src/main/res/layout/ui_fragment.xml b/app/src/main/res/layout/ui_fragment.xml index edf17da..b7877bf 100644 --- a/app/src/main/res/layout/ui_fragment.xml +++ b/app/src/main/res/layout/ui_fragment.xml @@ -19,6 +19,7 @@ app:layout_constraintEnd_toStartOf="@+id/Button" app:layout_constraintStart_toStartOf="parent" /> +