diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1a6fed5..e4b29fc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,17 +57,6 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e30fd4c..ad5fa73 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
@@ -22,61 +22,6 @@
//初期Fragmentの設定
Fragment fragment;
fragment = new StartFragment();
- getSupportFragmentManager().beginTransaction().replace(R.id.fragment_field,fragment).commit();
-
-
-// Fragment fragment;
-// if (savedInstanceState == null) {
-//// FragmentManager manager = getSupportFragmentManager();
-//// FragmentTransaction transaction = manager.beginTransaction();
-////
-//// transaction.add(R.id.container, new SampleGameFragment());
-////
-//// transaction.commit();
-//
-//// fragment = new StartFragment();
-// fragment = new StartFragment();
-// getSupportFragmentManager()
-// .beginTransaction()
-// .replace(R.id.fragment_field, fragment)
-// .commit();
-// }
-
-
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment_field, fragment).commit();
}
-}
-
-//touch event用
-// frameLayout01 = (FrameLayout)findViewById(R.id.framelayout_sample);
-// frameLayout01.setOnTouchListener((SampleGameFragment)samplgem);
-//
-////
-//// SampleGameFragment samplegamefragment = new SampleGameFragment();
-////
-//// View view1 =(View)findViewById(R.id.framelayout_sample);
-//// view1.setOnTouchListener((SampleGameFragment)samplegamefragment);
-
-
-
-//
-// public void ClickButton(View view){
-// Fragment fragment;
-//
-//// if(view == findViewById(R.id.button)){
-//// fragment = new StartFragment();
-//// getSupportFragmentManager()
-//// .beginTransaction()
-//// .replace(R.id.fragment_field, fragment)
-//// .commit();
-//// }
-//
-//// if(view == findViewById(R.id.button2)){
-// fragment = new SampleGameFragment();
-// getSupportFragmentManager()
-// .beginTransaction()
-// .replace(R.id.fragment_field, fragment)
-// .commit();
-//// }
-//
-//
-// }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java
index 72d6b27..825217d 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java
@@ -1,10 +1,7 @@
package org.ntlab.radishforandroidstudio.cactusClient.tests;
-import android.content.Context;
-import android.net.Uri;
+
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
@@ -17,12 +14,6 @@
public class StartFragment extends Fragment {
- //FragmentにInterfaceを定義
- public interface OnClickListener{
- void onClick();
- }
-
-
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@@ -34,19 +25,16 @@
public void onStart() {
super.onStart();
- Button button =(Button)getActivity().findViewById(R.id.start_button);
-
- final Fragment fragment1 = new SampleGameFragment();
+ Button button = getActivity().findViewById(R.id.start_button);
button.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
FragmentManager manager = getFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
- transaction.replace(R.id.container,fragment1);
+ transaction.replace(R.id.fragment_field,new SampleGameFragment());
transaction.addToBackStack(null);
transaction.commit();
-
}
});
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java
index 8c133dd..9b4024d 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java
@@ -31,20 +31,12 @@
view.setRenderMode(RWTSurfaceView.RENDERMODE_WHEN_DIRTY);
view.attachCamera(camera);
-// getActivity().setContentView(view);
getActivity().addContentView(view,new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
-
-// Log.d(TAG, "onCreate");
-
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_real_time_3d, container, false);
-
-// return new RWTSurfaceView(getActivity());
-
-
}
@Override
@@ -53,7 +45,6 @@
universe.update(interval);
camera.adjust(interval);
view.requestRender();
-
}
protected void progress(long interval) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8d885f3..e44c0ad 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,24 +6,25 @@
android:layout_height="match_parent"
tools:context=".cactusClient.MainActivity">
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_real_time.xml b/app/src/main/res/layout/fragment_real_time.xml
index a00791e..899bc36 100644
--- a/app/src/main/res/layout/fragment_real_time.xml
+++ b/app/src/main/res/layout/fragment_real_time.xml
@@ -9,6 +9,7 @@
+ android:text="RealTime"
+ android:textSize="24sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_real_time_3d.xml b/app/src/main/res/layout/fragment_real_time_3d.xml
index e83e61c..bb6264a 100644
--- a/app/src/main/res/layout/fragment_real_time_3d.xml
+++ b/app/src/main/res/layout/fragment_real_time_3d.xml
@@ -6,10 +6,11 @@
tools:context=".framework.gameMain.RealTime3DFragment">
-
+
\ No newline at end of file