diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 252850f..6522ee3 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cff7d4c..3e28d89 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,10 +21,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - - - + @@ -35,9 +33,8 @@ - - + @@ -59,7 +56,7 @@ - + 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 000b506..66a0711 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,16 +1,9 @@ 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; -import android.view.View.OnTouchListener; -import android.widget.FrameLayout; import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; public class SampleActivity extends AppCompatActivity { @@ -18,11 +11,5 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sample); - -// //初期Fragmentの設定(初めに出すFragmentにはいらないっぽい) -// Fragment fragment; -// fragment = new StartFragment(); -// 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/SampleGame2Fragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGame2Fragment.java index 26c1301..5c9b210 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGame2Fragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGame2Fragment.java @@ -1,9 +1,6 @@ package org.ntlab.radishforandroidstudio.cactusClient.tests; -import android.content.Context; -import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; 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 d7b2a6d..720a447 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 @@ -4,30 +4,17 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -// -//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.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.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.java3d.Appearance; import org.ntlab.radishforandroidstudio.java3d.Box; import org.ntlab.radishforandroidstudio.java3d.IndexedTriangleArray; @@ -35,14 +22,11 @@ import org.ntlab.radishforandroidstudio.java3d.Point3d; import org.ntlab.radishforandroidstudio.java3d.TextureCubeMap; import org.ntlab.radishforandroidstudio.java3d.TextureLoader; -import org.ntlab.radishforandroidstudio.java3d.Transform3D; import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.java3d.Vector3f; public class SampleGameFragment extends RealTime3DFragment { - - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState);