Merge branch 'master' into obj

Fork: 0

nitta-lab-2018 / CactusServer

Browse code Merge branch 'master' into obj collisionCorrection master
commit c8f219a29678179a605ba735824a178de59836a9 2 parents 545a82e + 2a7243e y-ota authored on 16 Oct 2018

Patch

Unified Split

Showing 7 changed files

                Ignore Space
               Show notes
              View
            
          
          30 ■■■■■
          src/main/java/cactusServer/entities/Instance.java
 	public Instance update(Instance.State state) {
		setState(state);
		return this;
	}
	
	public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, int modelID) {
		Character character = characterMap.get(characterId);
		if (character != null) {
			character.update(position, angle, modelID);
		}
		return character;
	}
	
	public Bullet updateBullet(String playerId, String bulletId, Position3D position, Quaternion3D angle) {
		HashMap<String, Bullet> map = bulletMap.get(playerId);
		if (map != null) {
			Bullet bullet = map.get(bulletId);
			if (bullet != null) {
				bullet.update(position, angle);
			}
			return bullet;
		}
		return null;
	}
 
	public Character destroyCharacter(String characterId) {
		return characterMap.remove(characterId);
	}
 
	public Object destroyObject(String objId) {
		return objMap.remove(objId);
	}
	
	public Bullet destroyBullet(String playerId, String bulletId) {
		HashMap<String, Bullet> map = bulletMap.get(playerId);
		if (map != null) {
			Bullet removedBullet = map.remove(bulletId);
			universe.displace(removedBullet.getPlaceable());
			return removedBullet;
		}
		return null;
	}
 
	public static enum State {
		AVAILABLE, MAINTENANCE;
	}
 	public Instance update(Instance.State state) {
 		setState(state);
 		return this;
 	}
+	public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, int modelID) {
+		Character character = characterMap.get(characterId);
+		if (character != null) {
+			character.update(position, angle, modelID);
+		}
+		return character;
+	}
+	public Bullet updateBullet(String playerId, String bulletId, Position3D position, Quaternion3D angle) {
+		HashMap<String, Bullet> map = bulletMap.get(playerId);
+		if (map != null) {
+			Bullet bullet = map.get(bulletId);
+			if (bullet != null) {
+				bullet.update(position, angle);
+			}
+			return bullet;
+		}
+		return null;
+	}
 	public Character destroyCharacter(String characterId) {
 		return characterMap.remove(characterId);
 	}
 	public Object destroyObject(String objId) {
 		return objMap.remove(objId);
 	}
+	public Bullet destroyBullet(String playerId, String bulletId) {
+		HashMap<String, Bullet> map = bulletMap.get(playerId);
+		if (map != null) {
+			Bullet removedBullet = map.remove(bulletId);
+			universe.displace(removedBullet.getPlaceable());
+			return removedBullet;
+		}
+		return null;
+	}
 	public static enum State {
 		AVAILABLE, MAINTENANCE;
 	}

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          src/main/java/cactusServer/entities/Player.java
+		this.lastUpdateTime = lastUpdateTime;
	}
 
	public Player update(String characterID, Position3D position, Quaternion3D angle, CameraState cameraState,
			EmoteState.EmoteType animationClassToStart) {
			EmoteState.EmoteType animationClassToStart, long lastUpdateTime) {
		setPosition(position);
		setAngle(angle);
		if (!this.characterID.equals(characterID)) {
			changeCharacter(characterID);
		}
		setCameraState(cameraState);
		updateEmoteType(animationClassToStart);
		// updateAreaURI();
		setLastUpdateTime(lastUpdateTime);
		return this;
	}
 
	private void updateAreaURI() {
	}
 
	public void destroy() {
		writeCharacterData();
		Instance instance = Instances.getInstance().getInstance(instanceID);
		instance.getUniverse().displace(this.getPlaceable());
	}
 
	private Character getCharacter() {
		return Instances.getInstance().getInstance(instanceID).getCharacter(characterID);
 		this.lastUpdateTime = lastUpdateTime;
 	}
 	public Player update(String characterID, Position3D position, Quaternion3D angle, CameraState cameraState,
+			EmoteState.EmoteType animationClassToStart) {
+			EmoteState.EmoteType animationClassToStart, long lastUpdateTime) {
 		setPosition(position);
 		setAngle(angle);
 		if (!this.characterID.equals(characterID)) {
 			changeCharacter(characterID);
 		}
 		setCameraState(cameraState);
 		updateEmoteType(animationClassToStart);
 		// updateAreaURI();
+		setLastUpdateTime(lastUpdateTime);
 		return this;
 	}
 	private void updateAreaURI() {
 	}
 	public void destroy() {
 		writeCharacterData();
+		Instance instance = Instances.getInstance().getInstance(instanceID);
+		instance.getUniverse().displace(this.getPlaceable());
 	}
 	private Character getCharacter() {
 		return Instances.getInstance().getInstance(instanceID).getCharacter(characterID);

Ignore Space Show notes View src/main/java/cactusServer/models/Instances.java

Ignore Space Show notes View src/main/java/cactusServer/resources/BulletsRest.java

Ignore Space Show notes View src/main/java/cactusServer/resources/CharactersRest.java

Ignore Space Show notes View src/main/java/cactusServer/resources/PlayersRest.java

Ignore Space Show notes View src/main/java/cactusServer/utils/App.java

Show line notes below