diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 7a1566a..f2fb7d2 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -1,6 +1,6 @@ package cactusServer.entities; -import org.ntlab.radishforandroidstudio.framework.gameMain.Actor; +import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; @@ -32,11 +32,13 @@ setAnimationClassToStart(animationClassToStart); Character character = getCharacter(characterURI); readCharacterData(character); - // ����Ȋ����œ��Y�R���X�g���N�^�̍Ō��placeable�̒������s��(��ۃN���X�̎��������܂��c�����Ă��Ȃ�) - // int modelID = character.getModelID(); - // Object3D body = - // CharacterModelManager.getInstance().getCharacterModel(modelID).createObject(); - // setPlaceable(new Actor(body, )); + initPlaceable(character.getModelID()); + } + + private void initPlaceable(int modelID) { + // ����Ȋ����œ��Y�R���X�g���N�^�̍Ō��placeable�̒������s�� + Object3D body = CharacterModelManager.getInstance().getCharacterModel(modelID).createObject(); + setPlaceable(new OvergroundActor(body, null)); // ��������Instance������Universe��placeable��z�u���� String[] instanceURISplit = instanceURI.split("/"); // �c�c/instances/{instanceId} String instanceId = instanceURISplit[instanceURISplit.length - 1]; diff --git a/src/main/java/cactusServer/models/CharacterModelManager.java b/src/main/java/cactusServer/models/CharacterModelManager.java index 44482ae..f9c04e0 100644 --- a/src/main/java/cactusServer/models/CharacterModelManager.java +++ b/src/main/java/cactusServer/models/CharacterModelManager.java @@ -23,15 +23,28 @@ private void initCharacterModels() { String[] initCharacterModelFileNames = { "pocha.stl", "Head4.obj" }; for (String fileName : initCharacterModelFileNames) { - String path = createModelFilePath(MODEL_PATH + fileName); - System.out.println((path == null) ? "null����!" : path); // �m�F�p - characterModels.put(nextKey++, loadModel(path)); + addCharacterModel(fileName); } - // �m�F�p - System.out.println(getCharacterModelCount() + "�‚̃}�b�s���O�����݂����!"); - for (Map.Entry entry : characterModels.entrySet()) { - System.out.println(entry.getKey() + ": " + entry.getValue()); + } + + public static CharacterModelManager getInstance() { + if (theInstance == null) { + theInstance = new CharacterModelManager(); } + return theInstance; + } + + public Model3D getCharacterModel(int id) { + return characterModels.get(id); + } + + public int getCharacterModelCount() { + return characterModels.size(); + } + + public void addCharacterModel(String fileName) { + String path = createModelFilePath(MODEL_PATH + fileName); + characterModels.put(nextKey++, loadModel(path)); } private String createModelFilePath(String fileName) { @@ -53,18 +66,14 @@ return null; } - public static CharacterModelManager getInstance() { - if (theInstance == null) { - theInstance = new CharacterModelManager(); + /** + * ���݂�CharacterModelMap�̒��g�̊m�F�p + */ + private void confirmModelMap() { + // �m�F�p + System.out.println(getCharacterModelCount() + "�‚̃}�b�s���O�����݂����!"); + for (Map.Entry entry : characterModels.entrySet()) { + System.out.println(entry.getKey() + ": " + entry.getValue()); } - return theInstance; - } - - public Model3D getCharacterModel(int id) { - return characterModels.get(id); - } - - public int getCharacterModelCount() { - return characterModels.size(); } }