v3.2.0

Author: Evan Hu

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>info.xiaomo</groupId>
     <artifactId>g-engine</artifactId>
-    <version>3.1.4</version>
+    <version>3.2.0</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/info/xiaomo/gengine/ai/btree/BehaviorTreeManager.java

@@ -11,12 +11,12 @@
 import info.xiaomo.gengine.ai.btree.branch.*;
 import info.xiaomo.gengine.ai.btree.decorator.Random;
 import info.xiaomo.gengine.ai.btree.decorator.*;
-import info.xiaomo.gengine.common.math.Vector3;
-import info.xiaomo.gengine.common.utils.Args;
-import info.xiaomo.gengine.common.utils.FileUtil;
-import info.xiaomo.gengine.common.utils.ReflectUtil;
-import info.xiaomo.gengine.common.utils.StringUtil;
-import info.xiaomo.gengine.struct.Person;
+import info.xiaomo.gengine.math.Vector3;
+import info.xiaomo.gengine.utils.Args;
+import info.xiaomo.gengine.utils.FileUtil;
+import info.xiaomo.gengine.utils.ReflectUtil;
+import info.xiaomo.gengine.utils.StringUtil;
+import info.xiaomo.gengine.entity.AbsPerson;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
@@ -37,7 +37,7 @@ public class BehaviorTreeManager {
 	/**
 	 * 行为树对象缓存
 	 */
-	private final Map<String, BehaviorTree<? extends Person>> behaviorTrees = new HashMap<>();
+	private final Map<String, BehaviorTree<? extends AbsPerson>> behaviorTrees = new HashMap<>();
 
 	private BehaviorTreeManager() {
 
@@ -71,7 +71,7 @@ public void parseBehaviorTree(String path) {
 				for (File file : files) {
 					if (file.exists()) {
 						// 加载行为树
-						Args.Two<String, BehaviorTree<? extends Person>> tree = createBehaviorTree(file);
+						Args.Two<String, BehaviorTree<? extends AbsPerson>> tree = createBehaviorTree(file);
 						behaviorTrees.put(tree.a(), tree.b());
 						// LOGGER.debug("行为树{} 加入容器", tree.a());
 					}
@@ -89,7 +89,7 @@ public void parseBehaviorTree(String path) {
 	 * @param file
 	 * @return
 	 */
-	private Args.Two<String, BehaviorTree<? extends Person>> createBehaviorTree(File file) throws Exception {
+	private Args.Two<String, BehaviorTree<? extends AbsPerson>> createBehaviorTree(File file) throws Exception {
 		String xmlStr = FileUtil.readTxtFile(file.getPath());
 		Document document = DocumentHelper.parseText(Objects.requireNonNull(xmlStr));
 		Element rootElement = document.getRootElement(); // 根节点
@@ -111,11 +111,11 @@ private Args.Two<String, BehaviorTree<? extends Person>> createBehaviorTree(File
 		// 行为树xml根节点
 		Element rootTaskElement = (Element) treeRootElements.get(0);
 		// 行为树根任务
-		Task<Person> rootTask = createTask(rootTaskElement);
+		Task<AbsPerson> rootTask = createTask(rootTaskElement);
 		// 递归设置分支节点和叶子节点
 		addTask(rootTaskElement, rootTask);
 
-		BehaviorTree<? extends Person> behaviorTree = new BehaviorTree<>(rootTask);
+		BehaviorTree<? extends AbsPerson> behaviorTree = new BehaviorTree<>(rootTask);
 		return Args.of(id, behaviorTree);
 	}
 
@@ -125,11 +125,11 @@ private Args.Two<String, BehaviorTree<? extends Person>> createBehaviorTree(File
 	 * @param element xml配置节点
 	 * @param task    父任务
 	 */
-	private void addTask(Element element, Task<Person> task) {
+	private void addTask(Element element, Task<AbsPerson> task) {
 		Iterator<Element> iterator = element.elementIterator();
 		while (iterator.hasNext()) {
 			Element secondElement = iterator.next();
-			Task<Person> secondTask = createTask(secondElement);
+			Task<AbsPerson> secondTask = createTask(secondElement);
 			if (secondElement.getName().equalsIgnoreCase(XML_GUARD)) {
 				task.setGuard(secondTask);
 			} else {
@@ -147,11 +147,11 @@ private void addTask(Element element, Task<Person> task) {
 	 * @param element
 	 * @return
 	 */
-	private Task<Person> createTask(Element element) {
+	private Task<AbsPerson> createTask(Element element) {
 		if (element == null) {
 			throw new RuntimeException("传入行为数节点为空");
 		}
-		Task<Person> task;
+		Task<AbsPerson> task;
 
 		switch (element.getName()) {
 			case XML_SELECTOR:
@@ -250,18 +250,18 @@ private Task<Person> createTask(Element element) {
 	 * @return
 	 */
 	@SuppressWarnings({"unchecked",})
-	private LeafTask<Person> createLeafTask(Element element) {
+	private LeafTask<AbsPerson> createLeafTask(Element element) {
 		Attribute leafAttr = element.attribute(XML_ATTRIBUTE_CLASS);
 		if (leafAttr == null) {
 			throw new IllegalStateException(
 					String.format("xml %s %s节点 未配置class属性", element.getUniquePath(), element.getName()));
 		}
 		String classStr = leafAttr.getValue();
-		LeafTask<Person> leafTask = null;
+		LeafTask<AbsPerson> leafTask = null;
 		Class<?> leafTaskClass;
 		try {
 			leafTaskClass = Class.forName(classStr);
-			leafTask = (LeafTask<Person>) leafTaskClass.newInstance();
+			leafTask = (LeafTask<AbsPerson>) leafTaskClass.newInstance();
 
 			// 设置属性
 			if (element.attributeCount() < 2) { // 没有设置属性参数
@@ -326,13 +326,13 @@ private LeafTask<Person> createLeafTask(Element element) {
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	public BehaviorTree<? extends Person> cloneBehaviorTree(String id) {
-		BehaviorTree<? extends Person> behaviorTree = behaviorTrees.get(id);
+	public BehaviorTree<? extends AbsPerson> cloneBehaviorTree(String id) {
+		BehaviorTree<? extends AbsPerson> behaviorTree = behaviorTrees.get(id);
 		if (behaviorTree == null) {
 			return null;
 		}
 		try {
-			return (BehaviorTree<Person>) ReflectUtil.deepCopy(behaviorTree);
+			return (BehaviorTree<AbsPerson>) ReflectUtil.deepCopy(behaviorTree);
 		} catch (Exception e) {
 			LOGGER.error("克隆行为树", e);
 		}

src/main/java/info/xiaomo/gengine/ai/btree/IBehaviorTreeScript.java

@@ -1,7 +1,7 @@
 package info.xiaomo.gengine.ai.btree;
 
 import info.xiaomo.gengine.script.IScript;
-import info.xiaomo.gengine.struct.Person;
+import info.xiaomo.gengine.entity.AbsPerson;
 
 /**
  * 行为树脚本
@@ -18,7 +18,7 @@ public interface IBehaviorTreeScript extends IScript {
 	 * @param person
 	 *
 	 */
-	default void addBehaviorTree(Person person) {
+	default void addBehaviorTree(AbsPerson person) {
 
 	}
 }

src/main/java/info/xiaomo/gengine/ai/btree/SingleRunningChildBranch.java

@@ -17,7 +17,7 @@
 package info.xiaomo.gengine.ai.btree;
 
 import java.util.List;
-import info.xiaomo.gengine.common.math.MathUtil;
+import info.xiaomo.gengine.math.MathUtil;
 
 /**
  * 只能运行一个子任务的分支任务<br>

src/main/java/info/xiaomo/gengine/ai/btree/Task.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 import info.xiaomo.gengine.ai.btree.annotation.TaskConstraint;
-import info.xiaomo.gengine.common.cache.IMemoryObject;
+import info.xiaomo.gengine.persist.cache.IMemoryObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/info/xiaomo/gengine/ai/btree/decorator/Random.java

@@ -20,7 +20,7 @@
 import info.xiaomo.gengine.ai.btree.Task;
 import info.xiaomo.gengine.ai.btree.annotation.TaskAttribute;
 import info.xiaomo.gengine.ai.btree.annotation.TaskConstraint;
-import info.xiaomo.gengine.common.math.MathUtil;
+import info.xiaomo.gengine.math.MathUtil;
 
 /**
  * 结果随机<br>

src/main/java/info/xiaomo/gengine/ai/btree/leaf/Wait.java

@@ -18,7 +18,7 @@
 
 import info.xiaomo.gengine.ai.btree.LeafTask;
 import info.xiaomo.gengine.ai.btree.annotation.TaskAttribute;
-import info.xiaomo.gengine.common.utils.TimeUtil;
+import info.xiaomo.gengine.utils.TimeUtil;
 
 /**
  * 等待执行指定次数<br>

src/main/java/info/xiaomo/gengine/ai/fsm/DefaultStateMachine.java

@@ -1,6 +1,6 @@
 package info.xiaomo.gengine.ai.fsm;
 
-import info.xiaomo.gengine.ai.msg.Telegram;
+import info.xiaomo.gengine.ai.telegram.Telegram;
 
 /**
  * 默认状态机调度 <br>

src/main/java/info/xiaomo/gengine/ai/fsm/State.java

@@ -17,7 +17,7 @@
 package info.xiaomo.gengine.ai.fsm;
 
 
-import info.xiaomo.gengine.ai.msg.Telegram;
+import info.xiaomo.gengine.ai.telegram.Telegram;
 
 /**
  * 状态接口<br>

src/main/java/info/xiaomo/gengine/ai/fsm/StateMachine.java

@@ -1,24 +1,8 @@
-/*******************************************************************************
- * Copyright 2014 See AUTHORS file.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package info.xiaomo.gengine.ai.fsm;
 
 
-import info.xiaomo.gengine.ai.msg.Telegram;
-import info.xiaomo.gengine.ai.msg.Telegraph;
+import info.xiaomo.gengine.ai.telegram.Telegram;
+import info.xiaomo.gengine.ai.telegram.Telegraph;
 
 /**
  * 状态机接口<br>
@@ -38,14 +22,14 @@ public interface StateMachine<E, S extends State<E>> extends Telegraph {
 	 * global state (if any) then the {@code update} method of the current state.
 	 * </p>
 	 */
-	public void update();
+	void update();
 
 	/**
 	 * Performs a transition to the specified state.
 	 *
 	 * @param newState the state to transition to
 	 */
-	public void changeState(S newState);
+	void changeState(S newState);
 
 	/**
 	 * Changes the state back to the previous state.
@@ -54,19 +38,19 @@ public interface StateMachine<E, S extends State<E>> extends Telegraph {
 	 * revert to. In case there is no previous state, no state change occurs
 	 * and {@code false} will be returned.
 	 */
-	public boolean revertToPreviousState();
+	boolean revertToPreviousState();
 
 	/**
 	 * Sets the initial state of this state machine.
 	 *
 	 * @param state the initial state.
 	 */
-	public void setInitialState(S state);
+	void setInitialState(S state);
 
 	/**
 	 * Returns the current state of this state machine.
 	 */
-	public S getCurrentState();
+	S getCurrentState();
 
 	/**
 	 * Returns the global state of this state machine.
@@ -76,19 +60,19 @@ public interface StateMachine<E, S extends State<E>> extends Telegraph {
 	 * {@code enter} and {@code exit} method.
 	 * </p>
 	 */
-	public S getGlobalState();
+	S getGlobalState();
 
 	/**
 	 * Sets the global state of this state machine.
 	 *
 	 * @param state the global state.
 	 */
-	public void setGlobalState(S state);
+	void setGlobalState(S state);
 
 	/**
 	 * Returns the last state of this state machine.
 	 */
-	public S getPreviousState();
+	S getPreviousState();
 
 	/**
 	 * Indicates whether the state machine is in the given state.
@@ -97,7 +81,7 @@ public interface StateMachine<E, S extends State<E>> extends Telegraph {
 	 * @return true if the current state's type is equal to the type of the class
 	 * passed as a parameter.
 	 */
-	public boolean isInState(S state);
+	boolean isInState(S state);
 
 	/**
 	 * Handles received telegrams.
@@ -110,5 +94,5 @@ public interface StateMachine<E, S extends State<E>> extends Telegraph {
 	 * @param telegram the received telegram
 	 * @return true if telegram has been successfully handled; false otherwise.
 	 */
-	public boolean handleMessage(Telegram telegram);
+	boolean handleMessage(Telegram telegram);
 }