diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e28b1ff..e9f8039 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,15 +41,15 @@ - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java index f47be9b..e4d7c78 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java @@ -2,15 +2,17 @@ import android.annotation.SuppressLint; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.os.Bundle; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.view.MotionEvent; +import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; +import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.framework.RWT.RWTPad; import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView; import org.ntlab.radishforandroidstudio.framework.RWT.RWTUIFragment; @@ -100,26 +102,20 @@ //pad 追加部分 - - setContentView(org.ntlab.radishforandroidstudio.R.layout.activity_main); - - FrameLayout l = findViewById(org.ntlab.radishforandroidstudio.R.id.game_layout); + setContentView(R.layout.fragment_real_time_3d); + FrameLayout l = findViewById(R.id.game_layout); view = new RWTSurfaceView(this); view.attachCamera(camera); - l.addView(view, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)); + l.addView(view,new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT)); - - FragmentManager fragmentManager = getFragmentManager(); - FragmentTransaction transaction = fragmentManager.beginTransaction(); + FragmentManager fragmentManager = getSupportFragmentManager(); + FragmentTransaction transaction =fragmentManager.beginTransaction(); RWTUIFragment f = new RWTUIFragment(); f.setListener(this); - android.view.View uiLayout = (android.view.View)findViewById(org.ntlab.radishforandroidstudio.R.id.ui_layout); + View uiLayout =(View)findViewById(R.id.ui_layout); uiLayout.setOnTouchListener((RWTUIFragment)f); - // TODO: 2018/06/26 下のやつ -// transaction.add(org.ntlab.radishforandroidstudio.R.id.ui_layout, f); -// transaction.commit(); - - + transaction.add(R.id.ui_layout,f); + transaction.commit(); /*camera.setViewPoint(pocha.getPosition().add(0.0, 1.5, 0.0)); camera.setViewLine(pocha.getDirection()); 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 0a85e18..b3841a0 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 @@ -2,11 +2,12 @@ import android.app.Activity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; -public abstract class RealTimeActivity extends Activity implements Runnable { +public abstract class RealTimeActivity extends AppCompatActivity implements Runnable { //インターバル確認用変数 private long interval = 15L; private long prevTime = 0L;