diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java index af0c4ab..5aa7662 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/Actor.java @@ -25,7 +25,8 @@ * @author 新田直也 * */ -public abstract class Actor extends Animatable implements Movable { +public abstract class Actor extends BaseActor{ +// public abstract class Actor extends Animatable implements Movable { protected Vector3d direction = new Vector3d(1.0, 0.0, 0.0); protected Mode mode; // 以下省メモリ化のため予めインスタンスを生成 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 new file mode 100644 index 0000000..8fbc379 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java @@ -0,0 +1,23 @@ +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; +import org.ntlab.radishforandroidstudio.framework.physics.Collidable; + +import java.util.ArrayList; + +public abstract class BaseActor extends Animatable implements Collidable { + + private ArrayList collidableList; + + public BaseActor(Object3D body, Animation3D animation) { + super(body, animation); + } + + private void addColidable(Placeable p){ + collidableList.add(p); + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/Collidable.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/Collidable.java new file mode 100644 index 0000000..3795008 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/Collidable.java @@ -0,0 +1,8 @@ +package org.ntlab.radishforandroidstudio.framework.physics; + +import org.ntlab.radishforandroidstudio.framework.model3D.Movable; +import org.ntlab.radishforandroidstudio.framework.model3D.Placeable; + +public interface Collidable extends Movable { + public void addCollidable(Placeable p); +}