diff --git a/src/main/java/cactusServer/entities/AddressedEntity.java b/src/main/java/cactusServer/entities/AddressedEntity.java index 52c55fc..d66bee5 100644 --- a/src/main/java/cactusServer/entities/AddressedEntity.java +++ b/src/main/java/cactusServer/entities/AddressedEntity.java @@ -13,7 +13,7 @@ } public AddressedEntity(Entity body) { - this.body = body; + setBody(body); } public Entity getBody() { diff --git a/src/main/java/cactusServer/entities/Angle.java b/src/main/java/cactusServer/entities/Angle.java index 8976c0d..3edb57f 100644 --- a/src/main/java/cactusServer/entities/Angle.java +++ b/src/main/java/cactusServer/entities/Angle.java @@ -11,10 +11,10 @@ } public Angle(double vx, double vy, double vz, double a) { - this.vx = vx; - this.vy = vy; - this.vz = vz; - this.a = a; + setVx(vx); + setVy(vy); + setVz(vz); + setA(a); } public double getVx() { diff --git a/src/main/java/cactusServer/entities/Area.java b/src/main/java/cactusServer/entities/Area.java index ce7b7e8..3dc0ee4 100644 --- a/src/main/java/cactusServer/entities/Area.java +++ b/src/main/java/cactusServer/entities/Area.java @@ -12,28 +12,44 @@ } public Area(String name, Plain[] region, HashSet permissions) { - this.name = name; - this.region = region; - this.permissions = permissions; + setName(name); + setRegion(region); + setPermissions(permissions); } public String getName() { return name; } - public Plain[] getRegions() { + public Plain[] getRegion() { return region; } - + public Plain getRegion(int index) { return region[index]; } + public HashSet getPermissions() { + return permissions; + } + public boolean isPermission(Allowed allowed) { return permissions.contains(allowed); } + + public void setName(String name) { + this.name = name; + } - public void setPermission(Allowed allowed) { + public void setRegion(Plain[] region) { + this.region = region; + } + + public void setPermissions(HashSet permissions) { + this.permissions = permissions; + } + + public void addPermission(Allowed allowed) { permissions.add(allowed); } diff --git a/src/main/java/cactusServer/entities/CameraState.java b/src/main/java/cactusServer/entities/CameraState.java index 0750a0f..e4704db 100644 --- a/src/main/java/cactusServer/entities/CameraState.java +++ b/src/main/java/cactusServer/entities/CameraState.java @@ -11,10 +11,10 @@ } public CameraState(double distance, Angle angle, double tilt, double fov) { - this.distance = distance; - this.angle = angle; - this.tilt = tilt; - this.fov = fov; + setDistance(distance); + setAngle(angle); + setTilt(tilt); + setFov(fov); } public double getDistance() { diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 36084d1..f435a04 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -26,11 +26,11 @@ } public Character(String accountURI, String name, Position3D position, Angle angle, CharacterModel model) { - this.accountURI = accountURI; - this.name = name; - this.position = position; - this.angle = angle; - this.model = model; + setAccountURI(accountURI); + setName(name); + setPosition(position); + setAngle(angle); + setModel(model); updateAreaURI(); } @@ -70,6 +70,10 @@ return itemList; } + public void setAccountURI(String accountURI) { + this.accountURI = accountURI; + } + public void setName(String name) { this.name = name; } @@ -118,7 +122,7 @@ } private void updateAreaURI() { - + // �L�����N�^�[�̃|�W�V������p���Ăǂ̃G���A���ɂ��邩�𔻒肵�ē��Y�G���A��URI�ɍX�V���� } public Item destroyItem(String itemId) { diff --git a/src/main/java/cactusServer/entities/EmoteState.java b/src/main/java/cactusServer/entities/EmoteState.java index 21a3750..ab16a90 100644 --- a/src/main/java/cactusServer/entities/EmoteState.java +++ b/src/main/java/cactusServer/entities/EmoteState.java @@ -14,7 +14,7 @@ } public EmoteState(EmoteType emoteType) { - this.emoteType = emoteType; + setEmoteType(emoteType); } public EmoteType getEmoteType() { @@ -22,10 +22,7 @@ } public void setEmoteType(EmoteType emoteType) { - if (!this.emoteType.equals(emoteType)) { - this.emoteType = emoteType; - // ���̉��ŃG���[�g�̎�ނ�ύX�������Ƃɂ��K�v�������Ăяo�� - } + this.emoteType = emoteType; } public static enum EmoteType { diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 9e79a1b..7a5ff6c 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -29,7 +29,7 @@ private String name; private State state; private StageModel stage; - + private HashMap areaMap = new HashMap<>(); private HashMap objMap = new HashMap<>(); private HashMap characterMap = new HashMap<>(); @@ -44,9 +44,9 @@ * @param name �C���X�^���X�� */ public Instance(String name, State state, StageModel stageModel) { - this.name = name; - this.state = state; - this.stage = stageModel; + setName(name); + setState(state); + setStage(stageModel); } /** @@ -134,6 +134,10 @@ public void setState(State state) { this.state = state; } + + public void setStage(StageModel stage) { + this.stage = stage; + } public AddressedEntity createArea(String name, Plain[] region, HashSet permissions) { String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, areaMap.keySet()); diff --git a/src/main/java/cactusServer/entities/Item.java b/src/main/java/cactusServer/entities/Item.java index 5655ddd..88533bb 100644 --- a/src/main/java/cactusServer/entities/Item.java +++ b/src/main/java/cactusServer/entities/Item.java @@ -9,8 +9,8 @@ } public Item(String name, int amount) { - this.name = name; - this.amount = amount; + setName(name); + setAmount(amount); } public String getName() { @@ -25,6 +25,14 @@ return (amount == 0); } + public void setName(String name) { + this.name = name; + } + + public void setAmount(int amount) { + this.amount = amount; + } + public Item changeAmount(int amountOfChange) { amount = Math.max(amount + amountOfChange, 0); return this; diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index e91d73a..19f55f1 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -22,9 +22,9 @@ setPosition(position); setVelocity(velocity); setAngularVelocity(angularVelocity); - this.angle = angle; - this.attribute = attribute; - this.model = model; + setAngle(angle); + setAttribute(attribute); + setModel(model); } public Position3D getPosition() { @@ -76,12 +76,12 @@ } public static class Attribute { - private boolean moveable; - private double cof; + private boolean moveable; // �“� + private double cof; // ���C�W�� public Attribute(boolean moveable, double cof) { - this.moveable = moveable; - this.cof = cof; + setMoveable(moveable); + setCof(cof); } public boolean isMoveable() { @@ -91,5 +91,13 @@ public double getCof() { return cof; } + + public void setMoveable(boolean moveable) { + this.moveable = moveable; + } + + public void setCof(double cof) { + this.cof = cof; + } } } diff --git a/src/main/java/cactusServer/entities/Plain.java b/src/main/java/cactusServer/entities/Plain.java index de5f57d..fbe7603 100644 --- a/src/main/java/cactusServer/entities/Plain.java +++ b/src/main/java/cactusServer/entities/Plain.java @@ -13,10 +13,10 @@ } public Plain(double a, double b, double c, double d) { - this.a = a; - this.b = b; - this.c = c; - this.d = d; + setA(a); + setB(b); + setC(c); + setD(d); } public double getA() { @@ -34,4 +34,20 @@ public double getD() { return d; } + + public void setA(double a) { + this.a = a; + } + + public void setB(double b) { + this.b = b; + } + + public void setC(double c) { + this.c = c; + } + + public void setD(double d) { + this.d = d; + } } diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 48af2e2..f2c59d4 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -17,12 +17,12 @@ } public Player(String instanceURI, String characterURI, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { - this.instanceURI = instanceURI; - this.characterURI = characterURI; - this.cameraState = cameraState; - this.emoteState = new EmoteState(animationClassToStart); + setInstanceURI(instanceURI); + setCharacterURI(characterURI); + setCameraState(cameraState); + setEmoteState(new EmoteState(animationClassToStart)); } - + public String getInstanceURI() { return instanceURI; } @@ -71,6 +71,14 @@ this.cameraState = cameraState; } + public void setEmoteState(EmoteState emoteState) { + this.emoteState = emoteState; + } + + public void setanimationClassToStart(EmoteState.EmoteType animationClassToStart) { + setEmoteState(new EmoteState(animationClassToStart)); + } + public void updateEmoteType(EmoteState.EmoteType animationClassToStart) { this.emoteState.setEmoteType(animationClassToStart); }