diff --git a/src/main/java/cactusServer/entities/Bullet.java b/src/main/java/cactusServer/entities/Bullet.java index 2ec4b09..611f2c7 100644 --- a/src/main/java/cactusServer/entities/Bullet.java +++ b/src/main/java/cactusServer/entities/Bullet.java @@ -6,6 +6,9 @@ import org.ntlab.radishforandroidstudio.java3d.Box; import org.ntlab.radishforandroidstudio.java3d.Primitive; +import cactusServer.models.BulletModelManager; +import cactusServer.models.CharacterModelManager; + public class Bullet extends Entity3D { private String playerID; private Position3D position; @@ -19,10 +22,8 @@ this.playerID = playerID; this.position = position; this.angle = angle; -// setPrim(new Box()); -// setObject(new Object3D("", prim)); -// setPlaceable(object); -// setPlaceable(new Object3D("", new Box())); // ??? + Object3D body = BulletModelManager.getInstance().getBulletModel(0).createObject(); // ���f��ID�͉���0���w�� + setPlaceable(body); } public String getPlayerID() { diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 43f6f0a..3688f12 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -173,7 +173,9 @@ bulletMap.put(playerID, new HashMap()); } HashMap map = bulletMap.get(playerID); - map.put(bulletID, new Bullet(playerID, position, angle)); + Bullet bullet = new Bullet(playerID, position, angle); + map.put(bulletID, bullet); + universe.place(bullet.getPlaceable()); return map; } diff --git a/src/main/java/cactusServer/models/BulletModelManager.java b/src/main/java/cactusServer/models/BulletModelManager.java index b56abba..dfc3f33 100644 --- a/src/main/java/cactusServer/models/BulletModelManager.java +++ b/src/main/java/cactusServer/models/BulletModelManager.java @@ -22,7 +22,7 @@ } private void initBulletModels() { - String[] initCharacterModelFileNames = { "pocha.stl" }; + String[] initCharacterModelFileNames = { "bullet.obj" }; for (String fileName : initCharacterModelFileNames) { addBulletModel(fileName); } diff --git a/src/main/java/cactusServer/resources/BulletsRest.java b/src/main/java/cactusServer/resources/BulletsRest.java index 74c9da3..7528625 100644 --- a/src/main/java/cactusServer/resources/BulletsRest.java +++ b/src/main/java/cactusServer/resources/BulletsRest.java @@ -71,6 +71,7 @@ HashMap map = instance.getBullets().get(playerId); if (map != null) { Bullet removedBullet = map.remove(bulletId); + instance.getUniverse().displace(removedBullet.getPlaceable()); return JSON.encode(removedBullet); } throw new WebApplicationException(400);