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 8fbc379..dff7919 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 @@ -11,13 +11,18 @@ public abstract class BaseActor extends Animatable implements Collidable { - private ArrayList collidableList; +// private ArrayList collidableList; + + private ArrayList> collidableListList; public BaseActor(Object3D body, Animation3D animation) { + super(body, animation); + collidableListList =new ArrayList>(); + } - private void addColidable(Placeable p){ - collidableList.add(p); + public void addCollidableList(ArrayList pList){ + collidableListList.add(pList); } } 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 index ea2e216..f186526 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/Collidable.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/physics/Collidable.java @@ -3,9 +3,11 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Movable; import org.ntlab.radishforandroidstudio.framework.model3D.Placeable; +import java.util.ArrayList; + public interface Collidable extends Movable { - public void addCollidable(Placeable p); - public void CollidableEnter(Placeable p);//触れたとき + public void addCollidable(ArrayList pList); + public void onCollidableEnter(Placeable p);//触れたとき public void onCollidableStay(Placeable p);//触れている間 public void onCollidableExit(Placeable p);//触れるのをやめたとき }