diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index fb2aa1d..d55ed87 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -21,6 +21,7 @@ import cactusServer.entities.Object; import cactusServer.entities.Area.Allowed; import cactusServer.entities.Object.Attribute; +import cactusServer.models.StageModelManager; import cactusServer.utils.RandomStringGenerator; import cactusServer.entities.Character; import net.arnx.jsonic.JSONHint; @@ -48,28 +49,19 @@ // JSONDecode���̌Ăяo���p } - public Instance(String name, State state, int stageID) { + public Instance(String name, int stageID) { setName(name); - setState(state); + setState(Instance.State.AVAILABLE); setStageID(stageID); //initUniverse(); } private void initUniverse() { universe = new Universe(); - - // stageURI�����ɂ��ēǂݍ��ރX�e�[�W�̃t�@�C����(���΃p�X)�����\�� - String stageFileName = ""; - // �X�e�[�W��3D�f�[�^��ǂݍ��ݔz�u���� - Object3D stageObj; - try { - stageObj = ModelFactory.loadModel(stageFileName, null, false, true).createObject(); - stage = new Ground(stageObj); - universe.place(stage); - } catch (IOException | ModelFileFormatException e) { - e.printStackTrace(); - } + Object3D stageObj = StageModelManager.getInstance().getStage(stageID).createObject(); + stage = new Ground(stageObj); + universe.place(stage); } public String getName() { diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 8eec861..8dc18ce 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -28,8 +28,10 @@ private Instances() { //�_�~�[�R�[�h - instanceMap.put("test1", new Instance("test1", State.AVAILABLE, 0)); - instanceMap.put("test2", new Instance("test2", State.AVAILABLE, 1)); +// instanceMap.put("test1", new Instance("test1", State.AVAILABLE, 0)); +// instanceMap.put("test2", new Instance("test2", State.AVAILABLE, 1)); + instanceMap.put("test1", new Instance("test1", 0)); + instanceMap.put("test2", new Instance("test2", 1)); } /** @@ -47,7 +49,8 @@ public IDAddressedEntity createInstance(String name, int stageID) { String id = RandomStringGenerator.generateUniqueString(Instance.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet()); - Instance instance = new Instance(name, Instance.State.AVAILABLE, stageID); + //Instance instance = new Instance(name, Instance.State.AVAILABLE, stageID); + Instance instance = new Instance(name, stageID); instanceMap.put(id, instance); return new IDAddressedEntity(id, instance); } @@ -58,7 +61,8 @@ public IDAddressedEntity createInstance(String name, Instance.State state, String stageID) { String id = RandomStringGenerator.generateUniqueString(Instance.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet()); - Instance instance = new Instance(name, state, Integer.parseInt(stageID)); + //Instance instance = new Instance(name, state, Integer.parseInt(stageID)); + Instance instance = new Instance(name, Integer.parseInt(stageID)); instanceMap.put(id, instance); return new IDAddressedEntity(id, instance); }