diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bbb0931..e28b1ff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,17 +22,6 @@
android:theme="@style/AppTheme">
-
-
-
-
-
-
-
-
-
@@ -43,25 +32,24 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java
index 77f2ca9..f47be9b 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java
@@ -1,20 +1,15 @@
package org.ntlab.radishforandroidstudio.cactusClient;
import android.annotation.SuppressLint;
-import android.app.Fragment;
+
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.os.Bundle;
-import android.text.Layout;
-import android.view.LayoutInflater;
+
import android.view.MotionEvent;
-import android.widget.Button;
-import android.widget.EditText;
+
import android.widget.FrameLayout;
import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import android.R;
import org.ntlab.radishforandroidstudio.framework.RWT.RWTPad;
import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView;
@@ -36,7 +31,7 @@
import org.ntlab.radishforandroidstudio.java3d.Material;
import org.ntlab.radishforandroidstudio.java3d.Vector3d;
import org.ntlab.radishforandroidstudio.java3d.Vector3f;
-import org.ntlab.radishforandroidstudio.java3d.View;
+
public class PlayerActivity extends RealTime3DActivity implements PadListener{
@@ -120,8 +115,9 @@
f.setListener(this);
android.view.View uiLayout = (android.view.View)findViewById(org.ntlab.radishforandroidstudio.R.id.ui_layout);
uiLayout.setOnTouchListener((RWTUIFragment)f);
- transaction.add(org.ntlab.radishforandroidstudio.R.id.ui_layout, f);
- transaction.commit();
+ // TODO: 2018/06/26 下のやつ
+// transaction.add(org.ntlab.radishforandroidstudio.R.id.ui_layout, f);
+// transaction.commit();
@@ -182,7 +178,7 @@
}
public void onCreateFragmentEvent(RWTUIFragment f) {
- pad = (RWTPad) f.findViewById(org.ntlab.radishforandroidstudio.R.id.button3);
+ pad = (RWTPad) f.findViewById(org.ntlab.radishforandroidstudio.R.id.pad);
pad.addListener(this);
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
index 6dec524..5b6d935 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
@@ -17,7 +17,6 @@
FragmentManager manager = getSupportFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
transaction.add(R.id.framelayout_field, new StartFragment());
- transaction.addToBackStack(null);
transaction.commit();
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java
index bc3af77..ad59c16 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java
@@ -124,8 +124,8 @@
public void initGameWindowView() {
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction transaction = fragmentManager.beginTransaction();
- Fragment f = new RWTUIFragment();
+ Fragment f = new RWTUIFragment();
View uiLayout = parentView.findViewById(R.id.ui_layout);
uiLayout.setOnTouchListener((RWTUIFragment) f);
transaction.add(R.id.ui_layout, f);
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 8254501..67e4e74 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
@@ -1,96 +1,18 @@
-//package org.ntlab.radishforandroidstudio.framework.RWT;
-//
-//import android.support.annotation.NonNull;
-//import android.support.v4.app.Fragment;
-//import android.os.Bundle;
-//import android.view.LayoutInflater;
-//import android.view.MotionEvent;
-//import android.view.View;
-//import android.view.ViewGroup;
-//
-//import org.ntlab.radishforandroidstudio.R;
-//import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity;
-//import org.ntlab.radishforandroidstudio.framework.event.PadEvent;
-//import org.ntlab.radishforandroidstudio.framework.listener.PadListener;
-//
-//import static android.view.View.*;
-//
-//public class RWTUIFragment extends Fragment implements OnTouchListener, PadListener {
-// PlayerActivity listener = null;
-// View v = null;
-//
-// public RWTUIFragment() {
-// }
-//
-// @Override
-// public void onCreate(Bundle savedInstanceState) {
-// super.onCreate(savedInstanceState);
-// }
-//
-// @Override
-// public View onCreateView(LayoutInflater inflater, ViewGroup container,
-// Bundle savedInstanceState) {
-// v = inflater.inflate(R.layout.ui_fragment, container, false);
-// RWTPad pad = v.findViewById(org.ntlab.radishforandroidstudio.R.id.button3);
-// pad.addListener(this);
-//
-// if (listener != null) {
-// listener.onCreateFragmentEvent(this);
-// }
-// return inflater.inflate(R.layout.ui_fragment, null);
-// }
-//
-// @Override
-// public boolean onTouch(View v, MotionEvent event) {
-// System.out.println("RWTUIFragment touch");
-// v.performClick();
-// return false;
-// }
-//
-// public void setListener(PlayerActivity activity) {
-// listener = activity;
-// }
-//
-// @Override
-// public boolean onEvent(PadEvent event) {
-// return false;
-// }
-// public View findViewById(int id) {
-// return v.findViewById(id);
-// }
-//}
package org.ntlab.radishforandroidstudio.framework.RWT;
-import android.app.Activity;
-import android.app.Fragment;
+
import android.os.Bundle;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
+
import org.ntlab.radishforandroidstudio.R;
import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity;
import org.ntlab.radishforandroidstudio.framework.event.PadEvent;
import org.ntlab.radishforandroidstudio.framework.listener.PadListener;
-import org.ntlab.radishforandroidstudio.sample.SampleGameActivity;
-
-
-//import android.support.annotation.NonNull;
-//import android.support.v4.app.Fragment;
-//import android.os.Bundle;
-//import android.view.LayoutInflater;
-//import android.view.MotionEvent;
-//import android.view.View;
-//import android.view.ViewGroup;
-//
-//import org.ntlab.radishforandroidstudio.R;
-//import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity;
-//import org.ntlab.radishforandroidstudio.framework.event.PadEvent;
-//import org.ntlab.radishforandroidstudio.framework.listener.PadListener;
-//
-//import static android.view.View.*;
import static android.view.View.*;
@@ -110,7 +32,7 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
v = inflater.inflate(R.layout.ui_fragment, container, false);
- RWTPad pad = v.findViewById(org.ntlab.radishforandroidstudio.R.id.button3);
+ RWTPad pad = v.findViewById(R.id.pad);
pad.addListener(this);
if (listener != null) {