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 735d99a..f619693 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 @@ -139,6 +139,7 @@ OvergroundActor actor = new OvergroundActor(obj1, null); //地面との当たり判定するとき universe.place(actor); + //地面との当たり判定しないとき // universe.place(diceObj); // physicalSystem.add(diceObj); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OvergroundActor.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OvergroundActor.java index c9cbda8..1bf96d7 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OvergroundActor.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/OvergroundActor.java @@ -14,64 +14,67 @@ /** * 地面の上を移動するもの(ジャンプや自由落下させることも可能) - * @author 新田直也 * + * @author 新田直也 */ public class OvergroundActor extends Actor { - public OvergroundActor(Object3D body, Animation3D animation) { - super(body, animation); - } + public OvergroundActor(Object3D body, Animation3D animation) { + super(body, animation); + } - public OvergroundActor(Solid3D body, Animation3D animation) { - super(body, animation); - } + public OvergroundActor(Solid3D body, Animation3D animation) { + super(body, animation); + } // public OvergroundActor(ActorModel model) { // super(model); // } - public void onIntersect(CollisionResult cr, long interval) { - // めり込んだら(めり込んだ面の法線方向に)押し戻す - Vector3d back = (Vector3d) cr.normal.clone(); - back.scale(cr.length * 2.0); - body.apply(new Position3D(body.getPosition3D().add(back)), false); - - // 速度の面の法線方向の成分を 0 にする - Vector3d v = (Vector3d) ((Solid3D)body).getVelocity().getVector3d().clone(); - double d = v.dot(cr.normal); - v.scaleAdd(-d, cr.normal, v); - body.apply(new Velocity3D(v), false); - } + public void onIntersect(CollisionResult cr, long interval) { + // めり込んだら(めり込んだ面の法線方向に)押し戻す + Vector3d back = (Vector3d) cr.normal.clone(); + back.scale(cr.length * 2.0); + body.apply(new Position3D(body.getPosition3D().add(back)), false); - @Override - public void onEndFall() { - } + // 速度の面の法線方向の成分を 0 にする + Vector3d v = (Vector3d) ((Solid3D) body).getVelocity().getVector3d().clone(); + double d = v.dot(cr.normal); + v.scaleAdd(-d, cr.normal, v); + body.apply(new Velocity3D(v), false); + } - @Override - public void onEndAnimation() { - } + @Override + public void onEndFall() { + } - //可動物関係 + @Override + public void onEndAnimation() { + } + + //可動物関係 - @Override - public void addCollidable(ArrayList pList) { + @Override + public void addCollidable(ArrayList pList) { - } + } - @Override - public void onCollisionEnter(Placeable p) { + //ほかの物体と触れたとき + @Override + public void onCollisionEnter(Placeable p) { - } + } - @Override - public void onCollisionStay(Placeable p) { + //触れている間 + @Override + public void onCollisionStay(Placeable p) { - } + } - @Override - public void onCollisionExit(Placeable p) { + //触れるのをやめたとき + @Override + public void onCollisionExit(Placeable p) { - } + } } \ No newline at end of file