diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index d1e9a92..380c7a3 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -2,11 +2,8 @@ import java.util.HashMap; -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.java3d.Box; -import org.ntlab.radishforandroidstudio.java3d.Primitive; import cactusServer.models.Instances; import cactusServer.utils.RandomStringGenerator; @@ -19,8 +16,6 @@ private Position3D position; private Quaternion3D angle; private int modelID; - private Primitive prim; - private Object3D object; private HashMap itemMap = new HashMap<>(); @JSONHint(ignore = true) @@ -38,8 +33,6 @@ setAngle(angle); setModelID(modelID); initAreaURI(instanceId); - setPrim(new Box()); - setObject(new Object3D("", prim)); } public String getAccountURI() { @@ -178,21 +171,4 @@ return itemMap.remove(itemId); } - @JSONHint(ignore = true) - public Primitive getPrim() { - return prim; - } - - public void setPrim(Primitive prim) { - this.prim = prim; - } - - @JSONHint(ignore = true) - public Object3D getObject() { - return object; - } - - public void setObject(Object3D object) { - this.object = object; - } } diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index f3b7e88..c860950 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -125,6 +125,7 @@ } } + @JSONHint(ignore = true) public Primitive getPrim() { return prim; } @@ -133,6 +134,7 @@ this.prim = prim; } + @JSONHint(ignore = true) public Object3D getObject() { return object; } diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 4878612..22c0568 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -4,6 +4,8 @@ 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.java3d.Box; +import org.ntlab.radishforandroidstudio.java3d.Primitive; import cactusServer.models.CharacterModelManager; import cactusServer.models.Instances; @@ -17,11 +19,12 @@ private Quaternion3D angle; private CameraState cameraState; private EmoteState emoteState; + private Primitive prim; private long lastUpdateTime = System.nanoTime(); @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @JSONHint(ignore = true) - public static final long STOP_TIME_LIMIT = (long)(30 * 1e+9); + public static final long STOP_TIME_LIMIT = (long) (30 * 1e+9); private Player() { // JSONDecode���̌Ăяo���p @@ -83,7 +86,7 @@ public EmoteState getEmoteState() { return emoteState; } - + @JSONHint(ignore = true) public long getLastUpdateTime() { return lastUpdateTime; @@ -120,7 +123,7 @@ public void setAnimationClassToStart(EmoteState.EmoteType animationClassToStart) { setEmoteState(new EmoteState(animationClassToStart)); } - + @JSONHint(ignore = true) public void setLastUpdateTime(long lastUpdateTime) { this.lastUpdateTime = lastUpdateTime; @@ -135,7 +138,7 @@ } setCameraState(cameraState); updateEmoteType(animationClassToStart); -// updateAreaURI(); + // updateAreaURI(); return this; } @@ -190,14 +193,14 @@ setAreaURI(character.getAreaURI()); } -// private void readCharacterData() { -// Character character = getCharacter(); -// readCharacterData(character); -// } + // private void readCharacterData() { + // Character character = getCharacter(); + // readCharacterData(character); + // } private void writeCharacterData() { Character character = getCharacter(); -// if (character == null) return; + // if (character == null) return; character.update(position, angle, areaURI); } } diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index 4bc378a..16f3c41 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -11,6 +11,7 @@ import cactusServer.entities.Character; import cactusServer.entities.Instance; import cactusServer.entities.Object; +import cactusServer.entities.Player; public class CollisionManager { private static CollisionManager theInstance; @@ -38,9 +39,10 @@ instance.getUniverse().update(interval); result.clear(); for (Object object : instance.getObjects().values()) { - for (Character character : instance.getCharacters().values()) { - result.add(PhysicsUtility.checkCollision(character.getObject(), "", object.getObject(), "")); - System.out.println(result.get(result.size()-1).length); + for (Player player : Instances.getInstance().getPlayers().values()) { + // result.add(PhysicsUtility.checkCollision(character.getObject(), "", + // object.getObject(), "")); + // System.out.println(result.get(result.size()-1).length); // objectmove(instance, object, character); } }