3.6.24

Tencent · Mar 10, 2017 · 12ef9d8 · 12ef9d8
1 parent 017234d
commit 12ef9d8
Show file tree

Hide file tree

Showing 144 changed files with 3,649 additions and 1,716 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ cmake_minimum_required (VERSION 2.8)
 # set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile" CACHE STRING "" FORCE) 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) 
 
-set (BEHAVIAC_PACKAGE_VERSION 3.6.23)
+set (BEHAVIAC_PACKAGE_VERSION 3.6.24)
 
 #option( BUILD_SHARED_LIBS "set to OFF to build static libraries" ON )
 SET(BUILD_SHARED_LIBS ON CACHE BOOL "set to OFF to build static libraries")
@@ -404,6 +404,7 @@ endif()
 
 add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_1/cpp")
 add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_1_1/cpp")
+add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_1_2/cpp")
 add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_2/cpp")
 add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_3/cpp")
 add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_4/cpp")

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/Tencent/behaviac/blob/master/license.txt)
-[![Release Version](https://img.shields.io/badge/release-3.6.23-red.svg)](https://github.com/Tencent/behaviac/releases)
+[![Release Version](https://img.shields.io/badge/release-3.6.24-red.svg)](https://github.com/Tencent/behaviac/releases)
 [![Updates](https://img.shields.io/badge/Platform-iOS | Android | Windows | Linux | Unity -brightgreen.svg)](https://github.com/Tencent/behaviac/blob/master/history.txt)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/behaviac/pulls)
 

diff --git a/docs/behaviac.chm b/docs/behaviac.chm
diff --git a/history.txt b/history.txt
@@ -1,3 +1,9 @@
+2017-3-10  3.6.24
+    Add the tutorial_1_1 and tutorial_1_2.
+    Add the Const setting for the parameters of the method.
+    Improve the generated _Get_Property_ method.
+    Fix a bug for the uint as the return type of the method.
+
 2017-3-7  3.6.23
     Fix a bug for adding the struct of UnityEngine.Vector3.
     Fix a bug for the size_t value.

diff --git a/inc/behaviac/behaviortree/behaviortree.h b/inc/behaviac/behaviortree/behaviortree.h
@@ -178,7 +178,7 @@ namespace behaviac {
             BEHAVIAC_ASSERT(false, "Can't step into this line");
             return false;
         }
-        static BehaviorNode* load(const char* agentType, rapidxml::xml_node<>* node, int version);
+        static BehaviorNode* load(const char* agentType, behaviac::rapidxml::xml_node<>* node, int version);
 
         static void Cleanup();
 
@@ -226,13 +226,13 @@ namespace behaviac {
 
         virtual void load(int version, const char* agentType, const properties_t& properties);
 
-        virtual void load_local(int version, const char* agentType, rapidxml::xml_node<>* node);
-        void load_properties(int version, const char* agentType, rapidxml::xml_node<>* node);
-        void load_properties_pars(int version, const char* agentType, rapidxml::xml_node<>* node);
-        bool load_property_pars(properties_t& properties, rapidxml::xml_node<>* c, int version, const char* agentType);
-        bool load_attachment(int version, const char* agentType, bool bHasEvents, rapidxml::xml_node<>*  c);
-        void load_properties_pars_attachments_children(bool bNode, int version, const char* agentType, rapidxml::xml_node<>* node);
-        void load_attachment_transition_effectors(int version, const char* agentType, rapidxml::xml_node<>* c);
+        virtual void load_local(int version, const char* agentType, behaviac::rapidxml::xml_node<>* node);
+        void load_properties(int version, const char* agentType, behaviac::rapidxml::xml_node<>* node);
+        void load_properties_pars(int version, const char* agentType, behaviac::rapidxml::xml_node<>* node);
+        bool load_property_pars(properties_t& properties, behaviac::rapidxml::xml_node<>* c, int version, const char* agentType);
+        bool load_attachment(int version, const char* agentType, bool bHasEvents, behaviac::rapidxml::xml_node<>*  c);
+        void load_properties_pars_attachments_children(bool bNode, int version, const char* agentType, behaviac::rapidxml::xml_node<>* node);
+        void load_attachment_transition_effectors(int version, const char* agentType, behaviac::rapidxml::xml_node<>* c);
 
         virtual void load_local(int version, const char* agentType, BsonDeserizer& d);
         void load_pars(int version, const char* agentType, BsonDeserizer& d);
@@ -357,7 +357,7 @@ namespace behaviac {
 
         bool IsFSM();
         void SetIsFSM(bool isFsm);
-        void load_local(int version, const char* agentType, rapidxml::xml_node<>* node);
+        void load_local(int version, const char* agentType, behaviac::rapidxml::xml_node<>* node);
         void load_local(int version, const char* agentType, BsonDeserizer& d);
 
         void AddLocal(const char* agentType, const char* typeName, const char* name, const char* valueStr);

diff --git a/inc/behaviac/common/_config.h b/inc/behaviac/common/_config.h
@@ -11,5 +11,5 @@
 	#define BEHAVIAC_RELEASE 		0
 #endif
 
-#define BEHAVIAC_VERSION_STRING 	"3.6.23"
+#define BEHAVIAC_VERSION_STRING 	"3.6.24"
 
diff --git a/inc/behaviac/common/rapidxml/rapidxml.hpp b/inc/behaviac/common/rapidxml/rapidxml.hpp
@@ -1,5 +1,5 @@
-#ifndef RAPIDXML_HPP_INCLUDED
-#define RAPIDXML_HPP_INCLUDED
+#ifndef BEHAVIAC_RAPIDXML_HPP_INCLUDED
+#define BEHAVIAC_RAPIDXML_HPP_INCLUDED
 
 // Copyright (C) 2006, 2009 Marcin Kalicinski
 // Version 1.13

diff --git a/inc/behaviac/property/properties.h b/inc/behaviac/property/properties.h
@@ -31,7 +31,7 @@ namespace behaviac {
     class BEHAVIAC_API Variables {
     public:
         Variables();
-        Variables(behaviac::map<uint32_t, IInstantiatedVariable*>vars);
+        Variables(const behaviac::map<uint32_t, IInstantiatedVariable*>& vars);
         virtual ~Variables();
 
         virtual void Clear(bool bFull);

diff --git a/integration/demo_running/behaviac/version.txt b/integration/demo_running/behaviac/version.txt
@@ -1 +1 @@
-3.6.23 
+3.6.24