diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 38b75d5..7d8e794 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 8d40625..8d58ebc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.1'
implementation 'com.android.support:support-v4:27.1.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
@@ -38,5 +38,4 @@
implementation group: 'net.arnx', name: 'jsonic', version: '1.3.10'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.google.android.gms:play-services-maps:15.0.1'
-// implementation files('/Users/matsumotoayaju/AndroidStudioProjects/Cactus２/lib/jsonic-1.3.9/jsonic-1.3.9.jar')
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bb4b7c..e9f8039 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
package="org.ntlab.radishforandroidstudio">
+
-
-
-
-
+
+
@@ -32,19 +32,17 @@
-
-
-
-
-
-
+
+
+
+
+
-
@@ -52,7 +50,6 @@
-
\ 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 ca7edc3..1216892 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java
@@ -1,21 +1,18 @@
package org.ntlab.radishforandroidstudio.cactusClient;
import android.annotation.SuppressLint;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
+
import android.os.Bundle;
-import android.text.Layout;
-import android.view.LayoutInflater;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.view.MotionEvent;
-import android.widget.Button;
-import android.widget.EditText;
+
+import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
-import android.widget.Toast;
-import android.R;
-
+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;
@@ -36,10 +33,9 @@
import org.ntlab.radishforandroidstudio.java3d.Material;
import org.ntlab.radishforandroidstudio.java3d.Vector3d;
import org.ntlab.radishforandroidstudio.java3d.Vector3f;
-import org.ntlab.radishforandroidstudio.java3d.View;
-public class PlayerActivity extends RealTime3DActivity implements PadListener{
+public class PlayerActivity extends RealTime3DActivity implements PadListener {
private OvergroundActor pocha;
private Ground stage;
private boolean isTouched = false;
@@ -77,7 +73,7 @@
Object3D pochaBody = null;
try {
pochaBody = ModelFactory.loadModel(getResources(), "pocha.stl", ap1).createObject();
- Animation3D pochaAnimation = null; //AnimationFactory.loadAnimation("data\\pocha\\walk.wrl");
+ Animation3D pochaAnimation = null; //AnimationFactory.loadAnimation("data\\pocha\\walk.wrl");
pocha = new OvergroundActor(pochaBody, pochaAnimation);
pocha.setPosition(new Position3D(0.0, -100.0, 250.0));
universe.place(pocha);
@@ -105,26 +101,23 @@
//pad 追加部分
+ setContentView(R.layout.fragment_real_time_3d);
- setContentView(org.ntlab.radishforandroidstudio.R.layout.activity_main);
-
- FrameLayout l = findViewById(org.ntlab.radishforandroidstudio.R.id.game_layout);
+ 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));
-
- FragmentManager fragmentManager = getFragmentManager();
+ 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);
- uiLayout.setOnTouchListener((RWTUIFragment)f);
- // transaction.add(org.ntlab.radishforandroidstudio.R.id.ui_layout, f);
+ View uiLayout = (View) findViewById(R.id.ui_layout);
+ uiLayout.setOnTouchListener((RWTUIFragment) f);
+ transaction.add(R.id.ui_layout, f);
transaction.commit();
-
/*camera.setViewPoint(pocha.getPosition().add(0.0, 1.5, 0.0));
camera.setViewLine(pocha.getDirection());
camera.setFieldOfView(1.5);
@@ -135,25 +128,24 @@
@Override
public void progress(long interval) {
Velocity3D curV = pocha.getVelocity();
- if (isTouched) {
- pocha.rotY(0.001 * (0.5f - touchX) * (double)(interval / 15.0));
- curV.setX(pocha.getDirection().getX() * 200.0 * (0.5f - touchY));
- curV.setZ(pocha.getDirection().getZ() * 200.0 * (0.5f - touchX));
- pocha.setVelocity(curV);
+ if (isTouched) {
+ pocha.rotY(0.001 * (0.5f - touchX) * (double) (interval / 15.0));
+ curV.setX(pocha.getDirection().getX() * 200.0 * (0.5f - touchY));
+ curV.setZ(pocha.getDirection().getZ() * 200.0 * (0.5f - touchX));
+ pocha.setVelocity(curV);
- } else {
- curV.setX(0.0);
- curV.setZ(0.0);
- pocha.setVelocity(curV);
- }
-
+ } else {
+ curV.setX(0.0);
+ curV.setZ(0.0);
+ pocha.setVelocity(curV);
+ }
Vector3d charaVector3d = pocha.getDirection();
charaVector3d.normalize();//キャラの向きを単位ベクトルに
camera.setViewPoint(pocha.getPosition()
- .add( -5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.0, -5.0 * charaVector3d.getZ()));//視点
- camera.setViewLine(new Vector3d(5.0 *charaVector3d.getX() , charaVector3d.getY() - 2.5, 5.0 *charaVector3d.getZ()+touchX));//視線
+ .add(-5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.0, -5.0 * charaVector3d.getZ()));//視点
+ camera.setViewLine(new Vector3d(5.0 * charaVector3d.getX(), charaVector3d.getY() - 2.5, 5.0 * charaVector3d.getZ() + touchX));//視線
}
@@ -177,7 +169,7 @@
}*/
public void onCreateFragmentEvent(RWTUIFragment f) {
- pad = (RWTPad) f.findViewById(org.ntlab.radishforandroidstudio.R.id.button3);
+ pad = (RWTPad) f.findViewById(org.ntlab.radishforandroidstudio.R.id.pad);
pad.addListener(this);
}
@@ -194,14 +186,14 @@
float minX = motionEvent.getDevice().getMotionRange(MotionEvent.AXIS_X).getMin();
float maxY = motionEvent.getDevice().getMotionRange(MotionEvent.AXIS_Y).getMax();
float minY = motionEvent.getDevice().getMotionRange(MotionEvent.AXIS_Y).getMin();
- touchX = (float) (Math.cos(event.getAngle())*event.getLength());
- touchY = (float) (Math.sin(event.getAngle())*event.getLength());
+ touchX = (float) (Math.cos(event.getAngle()) * event.getLength());
+ touchY = (float) (Math.sin(event.getAngle()) * event.getLength());
//motion.eventをevent.getLengthみたいに変えればいい?
//touchYのもとは(motionEvent.getY() - minY) / (maxY - minY),X (motionEvent.getX() - minX) / (maxX - minX)
camera.setViewPoint(pocha.getPosition()
- .add( -5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.0, -5.0 * charaVector3d.getZ()));//視点
- camera.setViewLine(new Vector3d(5.0 *charaVector3d.getX() , charaVector3d.getY() - 2.5, 5.0 *charaVector3d.getZ()+touchX));//視線
+ .add(-5.0 * charaVector3d.getX(), charaVector3d.getY() + 5.0, -5.0 * charaVector3d.getZ()));//視点
+ camera.setViewLine(new Vector3d(5.0 * charaVector3d.getX(), charaVector3d.getY() - 2.5, 5.0 * charaVector3d.getZ() + touchX));//視線
} else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
isTouched = false;
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java
index 791dfda..15154d7 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java
@@ -1,15 +1,16 @@
package org.ntlab.radishforandroidstudio.cactusClient.models;
/**
- * �e���\�[�X��POST�ō쐬�����ۂ�, ���Y���\�[�X�̎��̂�URI���Ăяo�����ɕԂ��Ƃ��ɗp����N���X
+ * 各リソースをPOSTで作成した際に, 当該リソースの実体とURIを呼び出し元に返すときに用いるクラス
* @author r-isitani
*
*/
+
public abstract class AddressedEntity {
private Entity body;
protected AddressedEntity() {
- // JSONDecode���̌Ăяo���p
+ // JSONDecode時の呼び出し用
}
public AddressedEntity(Entity body) {
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java
index 59e4eb0..f0997b9 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java
@@ -1,10 +1,11 @@
package org.ntlab.radishforandroidstudio.cactusClient.models;
/**
- * AddressedEntity�N���X�ɂĈ������̂�\�����ۃN���X
+ * AddressedEntityクラスにて扱う実体を表す抽象クラス
* @author r-isitani
*
*/
+
public abstract class Entity {
}
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 24d5bad..5b6d935 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
@@ -16,8 +16,7 @@
FragmentManager manager = getSupportFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
- transaction.add(R.id.fragment_field, new StartFragment());
- transaction.addToBackStack(null);
+ transaction.add(R.id.framelayout_field, new StartFragment());
transaction.commit();
}
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 b36586c..3d358c6 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
@@ -2,12 +2,19 @@
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
import org.ntlab.radishforandroidstudio.R;
+import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView;
+import org.ntlab.radishforandroidstudio.framework.RWT.RWTUIFragment;
import org.ntlab.radishforandroidstudio.framework.animation.Animation3D;
import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor;
import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment;
@@ -97,30 +104,16 @@
start(1000L, 50L, true);
}
- @Override
- protected void progress(long interval) {
- Velocity3D curV = pocha.getVelocity();
- if (isTouched) {
- pocha.rotY(0.1 * (0.5f - touchX) * (double)(interval / 15.0));
- curV.setX(pocha.getDirection().getX() * 200.0 * (0.5f - touchY));
- curV.setZ(pocha.getDirection().getZ() * 200.0 * (0.5f - touchY));
- pocha.setVelocity(curV);
- } else {
- curV.setX(0.0);
- curV.setZ(0.0);
- pocha.setVelocity(curV);
- }
- camera.setViewPoint(pocha.getPosition().add(0.0, 15.0, 0.0));
- camera.setViewLine(pocha.getDirection());
- }
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- // Inflate the layout for this fragment
- View view = inflater.inflate(R.layout.fragment_sample_game2, container, false);
- view.setOnTouchListener(new View.OnTouchListener() {
+ super.onCreateView(inflater, container, savedInstanceState);
+ initGameWindowView();
+
+
+ parentView.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
@@ -138,6 +131,36 @@
return true;
}
});
- return view;
+ return parentView;
}
+
+ @Override
+ protected void progress(long interval) {
+ Velocity3D curV = pocha.getVelocity();
+ if (isTouched) {
+ pocha.rotY(0.1 * (0.5f - touchX) * (double) (interval / 15.0));
+ curV.setX(pocha.getDirection().getX() * 200.0 * (0.5f - touchY));
+ curV.setZ(pocha.getDirection().getZ() * 200.0 * (0.5f - touchY));
+ pocha.setVelocity(curV);
+ } else {
+ curV.setX(0.0);
+ curV.setZ(0.0);
+ pocha.setVelocity(curV);
+ }
+ camera.setViewPoint(pocha.getPosition().add(0.0, 15.0, 0.0));
+ camera.setViewLine(pocha.getDirection());
+ }
+
+ //sampleUiFragmentからそのまま持ってきた
+ public void initGameWindowView() {
+ FragmentManager fragmentManager = getFragmentManager();
+ FragmentTransaction transaction = fragmentManager.beginTransaction();
+
+ Fragment f = new RWTUIFragment();
+ View uiLayout = parentView.findViewById(R.id.ui_layout);
+ uiLayout.setOnTouchListener((RWTUIFragment) f);
+ transaction.add(R.id.ui_layout, f);
+ transaction.commit();
+ }
+
}
\ No newline at end of file
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 720a447..8e8ac2b 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,11 +4,18 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import org.ntlab.radishforandroidstudio.framework.RWT.RWTSurfaceView;
+import org.ntlab.radishforandroidstudio.framework.RWT.RWTUIFragment;
import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor;
import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment;
import org.ntlab.radishforandroidstudio.framework.model3D.BaseObject3D;
@@ -55,7 +62,7 @@
Box b1 = new Box(1.0f, 1.0f, 1.0f, ap1);
final Object3D obj1 = new Object3D("box", b1);
obj1.scale(2.0, 2.0, 2.0);
- obj1.apply(new Position3D(0.0 , 30.0, 0.0), false);
+ obj1.apply(new Position3D(0.0, 30.0, 0.0), false);
OvergroundActor actor = new OvergroundActor(obj1, null);
universe.place(actor);
@@ -101,7 +108,9 @@
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- return inflater.inflate(R.layout.fragment_sample_game, container, false);
+ super.onCreateView(inflater, container, savedInstanceState);
+ initGameWindowView();
+ return parentView;
}
@Override
@@ -110,13 +119,25 @@
super.onDestroy();
}
- public boolean onOptionsItemSelected(MenuItem item){
+ public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
- if(id == R.id.action_settings){
+ if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
+
+ //sampleUiFragmentからそのまま持ってきた
+ public void initGameWindowView() {
+ FragmentManager fragmentManager = getFragmentManager();
+ FragmentTransaction transaction = fragmentManager.beginTransaction();
+
+ Fragment f = new RWTUIFragment();
+ View uiLayout = parentView.findViewById(R.id.ui_layout);
+ uiLayout.setOnTouchListener((RWTUIFragment) f);
+ transaction.add(R.id.ui_layout, f);
+ transaction.commit();
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java
index 5d084ef..ad59c16 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java
@@ -62,7 +62,7 @@
Box b1 = new Box(1.0f, 1.0f, 1.0f, ap1);
final Object3D obj1 = new Object3D("box", b1);
obj1.scale(2.0, 2.0, 2.0);
- obj1.apply(new Position3D(0.0 , 30.0, 0.0), false);
+ obj1.apply(new Position3D(0.0, 30.0, 0.0), false);
OvergroundActor actor = new OvergroundActor(obj1, null);
universe.place(actor);
@@ -111,10 +111,10 @@
super.onDestroy();
}
- public boolean onOptionsItemSelected(MenuItem item){
+ public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
- if(id == R.id.action_settings){
+ if (id == R.id.action_settings) {
return true;
}
@@ -124,10 +124,10 @@
public void initGameWindowView() {
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction transaction = fragmentManager.beginTransaction();
- Fragment f = new RWTUIFragment();
+ Fragment f = new RWTUIFragment();
View uiLayout = parentView.findViewById(R.id.ui_layout);
- uiLayout.setOnTouchListener((RWTUIFragment)f);
+ uiLayout.setOnTouchListener((RWTUIFragment) f);
transaction.add(R.id.ui_layout, f);
transaction.commit();
}
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 a5ffa6c..b56b11f 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
@@ -31,7 +31,9 @@
public void onClick(View view) {
FragmentManager manager = getFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
- transaction.replace(R.id.fragment_field, new SampleUiFragment());
+// transaction.replace(R.id.framelayout_field, new SampleUiFragment());
+// transaction.replace(R.id.framelayout_field, new SampleGameFragment());
+ transaction.replace(R.id.framelayout_field,new SampleGame2Fragment());
transaction.addToBackStack(null);
transaction.commit();
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
index 0cc5ec7..67e4e74 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
@@ -1,6 +1,5 @@
package org.ntlab.radishforandroidstudio.framework.RWT;
-import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -8,13 +7,12 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
+
import org.ntlab.radishforandroidstudio.R;
import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity;
import org.ntlab.radishforandroidstudio.framework.event.PadEvent;
import org.ntlab.radishforandroidstudio.framework.listener.PadListener;
-import org.ntlab.radishforandroidstudio.sample.SampleGameActivity;
import static android.view.View.*;
@@ -34,7 +32,7 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
v = inflater.inflate(R.layout.ui_fragment, container, false);
- RWTPad pad = v.findViewById(org.ntlab.radishforandroidstudio.R.id.button3);
+ RWTPad pad = v.findViewById(R.id.pad);
pad.addListener(this);
if (listener != null) {
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java
index a6190ed..b7817f2 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java
@@ -1,7 +1,5 @@
package org.ntlab.radishforandroidstudio.framework.gameMain;
-import android.view.animation.Animation;
-
import org.ntlab.radishforandroidstudio.framework.animation.Animation3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Object3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Placeable;
@@ -21,7 +19,7 @@
}
- public void addCollidableList(ArrayList pList){
+ public void addCollidableList(ArrayList pList) {
collidableListList.add(pList);
}
}
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;
diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml
index ac0f24f..fe0e4b9 100644
--- a/app/src/main/res/layout/activity_sample.xml
+++ b/app/src/main/res/layout/activity_sample.xml
@@ -8,7 +8,7 @@
tools:context=".cactusClient.tests.SampleActivity">