diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 89eca83..4c5bc7b 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/build.gradle b/app/build.gradle index ceb0ace..85116da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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 4187ac4..cbffdcd 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 @@ -40,6 +40,7 @@ private float touchX = 0.0f; private float touchY = 0.0f; RWTPad pad = null; + double n=0.0; public PlayerFragment() { // Required empty public constructor @@ -127,6 +128,7 @@ float minY = event.getDevice().getMotionRange(MotionEvent.AXIS_Y).getMin(); touchX = (event.getX() - minX) / (maxX - minX); touchY = (event.getY() - minY) / (maxY - minY); + } else if (event.getAction() == MotionEvent.ACTION_UP) { isTouched = false; } @@ -145,6 +147,7 @@ Vector3d up = new Vector3d(0,1,0); Vector3d total = new Vector3d(); Vector3d right = new Vector3d(); + if (isPadTouched) { right.cross(charaVector3d,up); @@ -173,10 +176,9 @@ } }); - } else if (isTouched) { - pocha.rotY(0.1 * (0.5f - touchX) * (double) (interval / 15.0)); - + pocha.rotY(0.1 * (0.5f - touchX)); + n += (0.5f-touchY); } else { curV.setX(0.0); curV.setZ(0.0); @@ -184,8 +186,8 @@ } charaVector3d.normalize();//キャラの向きを単位ベクトルに // 向き設定 - camera.setViewPoint(pocha.getPosition().add(5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.5, 5.0 * charaVector3d.getZ()));//視点 - camera.setViewLine(new Vector3d(-5.0 * charaVector3d.getX(), charaVector3d.getY() - 2.5, -5.0 * charaVector3d.getZ()));//視線 + camera.setViewPoint(pocha.getPosition().add(5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.5 - n, 5.0 * charaVector3d.getZ()));//視点 + camera.setViewLine(new Vector3d(-5.0 * charaVector3d.getX(), charaVector3d.getY() - 2.5 + n, -5.0 * charaVector3d.getZ()));//視線 } //sampleUiFragmentからそのまま持ってきた diff --git a/build.gradle b/build.gradle index d9fe839..e062745 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong