diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index a495421..c87b1d3 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -99,9 +99,9 @@ String id = RandomStringGenerator.generateUniqueString(Item.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, itemMap.keySet()); itemMap.put(id, item); - HashMap returnMap = new HashMap<>(); - returnMap.put(id, item); - return returnMap; + HashMap returnedMap = new HashMap<>(); + returnedMap.put(id, item); + return returnedMap; } return null; } diff --git a/src/main/java/cactusServer/entities/EmoteState.java b/src/main/java/cactusServer/entities/EmoteState.java index ab16a90..8b617f5 100644 --- a/src/main/java/cactusServer/entities/EmoteState.java +++ b/src/main/java/cactusServer/entities/EmoteState.java @@ -27,5 +27,6 @@ public static enum EmoteType { // �J�n����G���[�g�̎�ނ̗� + DUMMY; } } diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 77e36a6..3c8a079 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -119,9 +119,9 @@ RandomStringGenerator.ALPHA_NUMERIC, areaMap.keySet()); Area area = new Area(name, region, permissions); areaMap.put(id, area); - HashMap returnMap = new HashMap<>(); - returnMap.put(id, area); - return returnMap; + HashMap returnedMap = new HashMap<>(); + returnedMap.put(id, area); + return returnedMap; } public HashMap createObject(Position3D position, Velocity3D velocity, @@ -131,9 +131,9 @@ Object object = new Object(position, velocity, angularVelocity, angle, attribute, model); objMap.put(id, object); universe.place(object.getPlaceable()); - HashMap returnMap = new HashMap<>(); - returnMap.put(id, object); - return returnMap; + HashMap returnedMap = new HashMap<>(); + returnedMap.put(id, object); + return returnedMap; } public HashMap createCharacter(String instanceId, String accountURI, String name, @@ -142,9 +142,9 @@ RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet()); Character character = new Character(instanceId, accountURI, name, position, angle, modelID); characterMap.put(id, character); - HashMap returnMap = new HashMap<>(); - returnMap.put(id, character); - return returnMap; + HashMap returnedMap = new HashMap<>(); + returnedMap.put(id, character); + return returnedMap; } public Instance update(Instance.State state) { 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(); } } diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 6a96cee..72ba5cf 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -45,9 +45,9 @@ RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet()); Instance instance = new Instance(name, stageID); instanceMap.put(id, instance); - HashMap returnMap = new HashMap<>(); - returnMap.put(id, instance); - return returnMap; + HashMap returnedMap = new HashMap<>(); + returnedMap.put(id, instance); + return returnedMap; } public HashMap createPlayer(String instanceURI, String characterURI, CameraState cameraState, @@ -56,9 +56,9 @@ RandomStringGenerator.ALPHA_NUMERIC, playerMap.keySet()); Player player = new Player(instanceURI, characterURI, cameraState, animationClassToStart); playerMap.put(id, player); - HashMap returnMap = new HashMap<>(); - returnMap.put(id, player); - return returnMap; + HashMap returnedMap = new HashMap<>(); + returnedMap.put(id, player); + return returnedMap; } public HashMap getInstances() {