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 6c0c69d..babc0a2 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 @@ -1,6 +1,8 @@ package org.ntlab.radishforandroidstudio.cactusClient.tests; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; @@ -16,6 +18,29 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sample); + + + 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(); + } + + + } +} + //touch event用 // frameLayout01 = (FrameLayout)findViewById(R.id.framelayout_sample); // frameLayout01.setOnTouchListener((SampleGameFragment)samplgem); @@ -26,30 +51,27 @@ //// 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(); - } - - - } - - -} +// +// 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(); +//// } +// +// +// } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java index 10ceb8b..5867044 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java @@ -12,22 +12,22 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; - -import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView; +// +//import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView; import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; -import org.ntlab.radishforandroidstudio.framework.gameMain.RealTimeActivity; +//import org.ntlab.radishforandroidstudio.framework.gameMain.RealTimeActivity; import org.ntlab.radishforandroidstudio.framework.model3D.BaseObject3D; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -import org.ntlab.radishforandroidstudio.framework.model3D.Universe; -import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; -import org.ntlab.radishforandroidstudio.framework.physics.Force3D; +//import org.ntlab.radishforandroidstudio.framework.model3D.Universe; +//import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; +//import org.ntlab.radishforandroidstudio.framework.physics.Force3D; import org.ntlab.radishforandroidstudio.framework.physics.Ground; -import org.ntlab.radishforandroidstudio.framework.physics.PhysicalSystem; -import org.ntlab.radishforandroidstudio.framework.physics.Solid3D; -import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; -import org.ntlab.radishforandroidstudio.framework.view3D.Camera3D; +//import org.ntlab.radishforandroidstudio.framework.physics.PhysicalSystem; +//import org.ntlab.radishforandroidstudio.framework.physics.Solid3D; +//import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; +//import org.ntlab.radishforandroidstudio.framework.view3D.Camera3D; import org.ntlab.radishforandroidstudio.java3d.Appearance; import org.ntlab.radishforandroidstudio.java3d.Box; import org.ntlab.radishforandroidstudio.java3d.IndexedTriangleArray; @@ -125,12 +125,12 @@ super.onDestroy(); } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.main,menu); - super.onCreateOptionsMenu(menu, inflater); - } +// +// @Override +// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { +// inflater.inflate(R.menu.main,menu); +// super.onCreateOptionsMenu(menu, inflater); +// } public boolean onOptionsItemSelected(MenuItem item){ int id = item.getItemId(); 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 549bdf2..c5c4d02 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 @@ -14,6 +14,12 @@ public class StartFragment extends Fragment { + //FragmentにInterfaceを定義 + public interface OnClickListener{ + void onClick(); + } + + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DActivity.java index 2bb5dd7..c20ee4d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DActivity.java @@ -10,14 +10,14 @@ protected Universe universe; protected Camera3D camera; protected RWTSurfaceView view; - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); universe = new Universe(); - + camera = new Camera3D(universe); - + view = new RWTSurfaceView(this); view.setRenderMode(RWTSurfaceView.RENDERMODE_WHEN_DIRTY); view.attachCamera(camera); @@ -30,6 +30,6 @@ camera.adjust(interval); view.requestRender(); } - + abstract protected void progress(long interval); } 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 41477be..2386b97 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 @@ -1,11 +1,8 @@ package org.ntlab.radishforandroidstudio.framework.gameMain; -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.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,6 +12,8 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Universe; import org.ntlab.radishforandroidstudio.framework.view3D.Camera3D; +import static android.content.ContentValues.TAG; + public class RealTime3DFragment extends RealTimeFragment{ protected Universe universe; protected Camera3D camera; @@ -32,7 +31,7 @@ view.attachCamera(camera); getActivity().setContentView(view); - +// Log.d(TAG, "onCreate"); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java index 417cb4f..0a85e18 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java @@ -25,23 +25,23 @@ this.fixedInterval = false; schedule.scheduleWithFixedDelay(this, interval, interval, TimeUnit.MILLISECONDS); } - + protected void start(long delay, long interval){ this.interval = interval; this.fixedInterval = false; schedule.scheduleWithFixedDelay(this, delay, interval, TimeUnit.MILLISECONDS); } - + protected void start(long delay, long interval, boolean fixedInterval){ this.interval = interval; this.fixedInterval = fixedInterval; schedule.scheduleWithFixedDelay(this, delay, interval, TimeUnit.MILLISECONDS); } - + protected void stop() { schedule.shutdown(); } - + //繰り返し実行される部分 public void run(){ long interval; @@ -55,7 +55,7 @@ } update(interval); } - + //intervalミリ秒のインターバルをおいて定期実行 protected abstract void update(long interval); } diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml index 0a9ec10..35b5505 100644 --- a/app/src/main/res/layout/activity_sample.xml +++ b/app/src/main/res/layout/activity_sample.xml @@ -7,27 +7,11 @@ android:layout_height="match_parent" tools:context=".cactusClient.tests.SampleActivity"> -