diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 795735f..762146b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,27 @@ android:label="@string/app_name" android:screenOrientation="landscape" android:theme="@style/SplashTheme"> + + + + + + + + + + + + + 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 fac885d..4756cd5 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 @@ -6,8 +6,13 @@ import android.os.Bundle; import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.views.PlayerFragment; import org.ntlab.radishforandroidstudio.cactusClient.views.StartFragment; +/** + * プレイ画面のテスト用(PlayerFragment) + */ + public class SampleActivity extends AppCompatActivity { @Override @@ -17,7 +22,7 @@ FragmentManager manager = getSupportFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.add(R.id.framelayout_field, new StartFragment()); + transaction.add(R.id.framelayout_field, new PlayerFragment()); transaction.commit(); } 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 becbb3a..6d95a41 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 @@ -130,7 +130,7 @@ physicalSystem = new PhysicalSystem(); Box b1 = new Box(1.0f, 1.0f, 1.0f, ap3); Object3D obj1 = new Object3D("box", b1); - obj1.apply(new Position3D(0.0 , -100.0, 350.0), false); + obj1.apply(new Position3D(0.0 , -50.0, 250.0), false); diceObj = new Solid3D(obj1); diceObj.scale(100.0, 100.0, 100.0); diceObj.apply(new AngularVelocity3D(-0.4, 0.0, -0.6), false); @@ -142,7 +142,7 @@ //カメラの設定(視点) camera.setViewPoint(pocha.getPosition().add(0.0, 1.5, 0.0)); camera.setViewLine(pocha.getDirection()); - camera.addTarget(diceObj); +// camera.addTarget(diceObj); camera.setFieldOfView(1.5); camera.setBackClipDistance(10000.0); start(1000L, 50L, true);