Fork: 0
nitta-lab-2018 / CactusServer
Browse code
反映されない可能性のある個所を修正
collisionCorrection master
1 parent b8f4cab commit 6ad45ec371eb0af804fa04b54d17e79d6640641e
y-ota authored on 25 Oct 2018
Patch
Unified Split
Showing 3 changed files
View
14
■■■■■
 src/main/java/cactusServer/entities/MovableObject.java
package cactusServer.entities;
 
import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor;
import org.ntlab.radishforandroidstudio.framework.model3D.Model3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Object3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D;
import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D;
import org.ntlab.radishforandroidstudio.framework.physics.Solid3D;
import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D;
import org.ntlab.radishforandroidstudio.java3d.Box;
import org.ntlab.radishforandroidstudio.java3d.Primitive;
 
 
public MovableObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity,
Quaternion3D angle, Attribute attribute, int modelID) {
setPrim(new Box());
setObject(new Object3D("", prim));
setPlaceable(object);
setObject(new Solid3D(new Object3D("", prim)));
setPlaceable(new OvergroundActor((Solid3D) object, null));
setPosition(position);
setVelocity(velocity);
setAngularVelocity(angularVelocity);
setAngle(angle);
}
 
public void setPosition(Position3D position) {
this.position = position;
if(placeable != null)((Object3D)(getPlaceable().getBody())).setPosition(position);
if (placeable != null)
((Object3D) (getPlaceable().getBody())).setPosition(position);
}
 
public void setVelocity(Velocity3D velocity) {
this.velocity = velocity;
}
 
public void setAngle(Quaternion3D angle) {
this.angle = angle;
if(placeable != null)((Object3D) getPlaceable().getBody()).apply(angle, false);
if (placeable != null)
((Object3D) getPlaceable().getBody()).apply(angle, false);
}
 
public void setAttribute(Attribute attribute) {
this.attribute = attribute;
View
1
■■■■■
 src/main/java/cactusServer/models/CollisionManager.java
public void collisionMove(MovableObject object, Player player) {
CollisionResult result;
result = PhysicsUtility.checkCollision(player.getObject(), null, object.getObject(), null);
if (result != null) {
System.out.println("プレイヤーとオブジェクトが衝突");
objMove(result, object, false);
}
}
 
View
src/main/java/cactusServer/utils/App.java