Skip to content

Commit 8f314f7

Browse files
cainhuangcainhuang
committed
Update the version to 3.6.37
1 parent 94d38ca commit 8f314f7

File tree

24 files changed

+307
-97
lines changed

24 files changed

+307
-97
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cmake_minimum_required (VERSION 2.8)
3131
# set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile" CACHE STRING "" FORCE)
3232
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
3333

34-
set (BEHAVIAC_PACKAGE_VERSION 3.6.36)
34+
set (BEHAVIAC_PACKAGE_VERSION 3.6.37)
3535

3636
#option( BUILD_SHARED_LIBS "set to OFF to build static libraries" ON )
3737
SET(BUILD_SHARED_LIBS ON CACHE BOOL "set to OFF to build static libraries")

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/Tencent/behaviac/blob/master/license.txt)
2-
[![Release Version](https://img.shields.io/badge/release-3.6.35-red.svg)](https://github.com/Tencent/behaviac/releases)
2+
[![Release Version](https://img.shields.io/badge/release-3.6.37-red.svg)](https://github.com/Tencent/behaviac/releases)
33
[![Updates](https://img.shields.io/badge/Platform-%20iOS%20%7C%20OS%20X%20%7C%20Android%20%7C%20Windows%20%7C%20Linux%20-brightgreen.svg)](https://github.com/Tencent/behaviac/blob/master/history.txt)
44
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/behaviac/pulls)
55

‎history.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
2017-08-08 3.6.37
2+
Support generating the codes for initializing the member array.
3+
14
2017-08-03 3.6.36
2-
fix a bug of accessing task params when calling a sub tree
5+
Fix a bug of accessing task params when calling a sub tree
36

47
2017-7-11 3.6.35
58
Improve the C++ types generation.

‎inc/behaviac/common/_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#define BEHAVIAC_RELEASE 0
1212
#endif
1313

14-
#define BEHAVIAC_VERSION_STRING "3.6.36"
14+
#define BEHAVIAC_VERSION_STRING "3.6.37"
1515

‎inc/behaviac/common/member.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,11 @@ namespace behaviac {
590590
return NULL;
591591
}
592592

593-
#if !BEHAVIAC_RELEASE
594-
virtual bool IsArrayItem() {
593+
//#if !BEHAVIAC_RELEASE
594+
virtual bool IsArrayItem() const {
595595
return false;
596596
}
597-
#endif
597+
//#endif
598598
};
599599

600600
template<typename T, bool bTypeIsVector>
@@ -815,12 +815,12 @@ namespace behaviac {
815815
return this->_name.c_str();
816816
}
817817

818-
#if !BEHAVIAC_RELEASE
818+
//#if !BEHAVIAC_RELEASE
819819
public:
820-
virtual bool IsArrayItem() {
820+
virtual bool IsArrayItem() const {
821821
return false;
822822
}
823-
#endif
823+
//#endif
824824

825825
public:
826826
CProperty(const char* name) {
@@ -995,12 +995,12 @@ namespace behaviac {
995995
_gfp = gfp;
996996
}
997997

998-
#if !BEHAVIAC_RELEASE
998+
//#if !BEHAVIAC_RELEASE
999999
public:
1000-
virtual bool IsArrayItem() {
1000+
virtual bool IsArrayItem() const {
10011001
return true;
10021002
}
1003-
#endif
1003+
//#endif
10041004

10051005
public:
10061006
virtual const void* GetValueElement(const behaviac::Agent* self, int index) const {
@@ -1096,12 +1096,12 @@ namespace behaviac {
10961096
_gfp = gfp;
10971097
}
10981098

1099-
#if !BEHAVIAC_RELEASE
1099+
//#if !BEHAVIAC_RELEASE
11001100
public:
1101-
virtual bool IsArrayItem() {
1101+
virtual bool IsArrayItem() const {
11021102
return true;
11031103
}
1104-
#endif
1104+
//#endif
11051105

11061106
public:
11071107
virtual const void* GetValueElement(const behaviac::Agent* self, int index) const {
@@ -1476,12 +1476,12 @@ namespace behaviac {
14761476
_parentId = parentId;
14771477
}
14781478

1479-
#if !BEHAVIAC_RELEASE
1479+
//#if !BEHAVIAC_RELEASE
14801480
public:
1481-
virtual bool IsArrayItem() {
1481+
virtual bool IsArrayItem() const {
14821482
return true;
14831483
}
1484-
#endif
1484+
//#endif
14851485

14861486
public:
14871487
virtual bool IsCustomized() const {
@@ -1527,12 +1527,12 @@ namespace behaviac {
15271527
_parentId = parentId;
15281528
}
15291529

1530-
#if !BEHAVIAC_RELEASE
1530+
//#if !BEHAVIAC_RELEASE
15311531
public:
1532-
virtual bool IsArrayItem() {
1532+
virtual bool IsArrayItem() const {
15331533
return true;
15341534
}
1535-
#endif
1535+
//#endif
15361536

15371537
public:
15381538
virtual bool IsCustomized() const {

‎integration/demo_running/behaviac/Base/Meta.cs

+2
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ public ICustomizedProperty CreateCustomizedArrayItemProperty(uint id, string nam
339339
public static string GetTypeName(string typeName)
340340
{
341341
typeName = typeName.Replace("*", "");
342+
//typeName = typeName.Replace("&lt;", "<");
343+
//typeName = typeName.Replace("&gt;", ">");
342344
return typeName;
343345
}
344346

‎integration/demo_running/behaviac/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.36
1+
3.6.37

‎integration/unity/Assets/Scripts/behaviac/runtime/Base/Meta.cs

+2
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ public ICustomizedProperty CreateCustomizedArrayItemProperty(uint id, string nam
339339
public static string GetTypeName(string typeName)
340340
{
341341
typeName = typeName.Replace("*", "");
342+
//typeName = typeName.Replace("&lt;", "<");
343+
//typeName = typeName.Replace("&gt;", ">");
342344
return typeName;
343345
}
344346

‎integration/unity/Assets/Scripts/behaviac/runtime/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.36
1+
3.6.37

‎projects/gmake/Makefile

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# GNU Make solution makefile autogenerated by Premake
2+
# Type "make help" for usage help
3+
4+
ifndef config
5+
config=debugstatic32
6+
endif
7+
export config
8+
9+
PROJECTS := behaviac btunittest btremotetest demo_running usertest tutorial_1 tutorial_1_1 tutorial_1_2 tutorial_2 tutorial_3 tutorial_4 tutorial_5 tutorial_6 tutorial_7 tutorial_8 tutorial_9 tutorial_10 tutorial_11 tutorial_12 tutorial_13
10+
11+
.PHONY: all clean help $(PROJECTS)
12+
13+
all: $(PROJECTS)
14+
15+
behaviac:
16+
@echo "==== Building behaviac ($(config)) ===="
17+
@${MAKE} --no-print-directory -C . -f behaviac.make
18+
19+
btunittest: behaviac
20+
@echo "==== Building btunittest ($(config)) ===="
21+
@${MAKE} --no-print-directory -C . -f btunittest.make
22+
23+
btremotetest: behaviac
24+
@echo "==== Building btremotetest ($(config)) ===="
25+
@${MAKE} --no-print-directory -C . -f btremotetest.make
26+
27+
demo_running: behaviac
28+
@echo "==== Building demo_running ($(config)) ===="
29+
@${MAKE} --no-print-directory -C . -f demo_running.make
30+
31+
usertest: behaviac
32+
@echo "==== Building usertest ($(config)) ===="
33+
@${MAKE} --no-print-directory -C . -f usertest.make
34+
35+
tutorial_1: behaviac
36+
@echo "==== Building tutorial_1 ($(config)) ===="
37+
@${MAKE} --no-print-directory -C . -f tutorial_1.make
38+
39+
tutorial_1_1: behaviac
40+
@echo "==== Building tutorial_1_1 ($(config)) ===="
41+
@${MAKE} --no-print-directory -C . -f tutorial_1_1.make
42+
43+
tutorial_1_2: behaviac
44+
@echo "==== Building tutorial_1_2 ($(config)) ===="
45+
@${MAKE} --no-print-directory -C . -f tutorial_1_2.make
46+
47+
tutorial_2: behaviac
48+
@echo "==== Building tutorial_2 ($(config)) ===="
49+
@${MAKE} --no-print-directory -C . -f tutorial_2.make
50+
51+
tutorial_3: behaviac
52+
@echo "==== Building tutorial_3 ($(config)) ===="
53+
@${MAKE} --no-print-directory -C . -f tutorial_3.make
54+
55+
tutorial_4: behaviac
56+
@echo "==== Building tutorial_4 ($(config)) ===="
57+
@${MAKE} --no-print-directory -C . -f tutorial_4.make
58+
59+
tutorial_5: behaviac
60+
@echo "==== Building tutorial_5 ($(config)) ===="
61+
@${MAKE} --no-print-directory -C . -f tutorial_5.make
62+
63+
tutorial_6: behaviac
64+
@echo "==== Building tutorial_6 ($(config)) ===="
65+
@${MAKE} --no-print-directory -C . -f tutorial_6.make
66+
67+
tutorial_7: behaviac
68+
@echo "==== Building tutorial_7 ($(config)) ===="
69+
@${MAKE} --no-print-directory -C . -f tutorial_7.make
70+
71+
tutorial_8: behaviac
72+
@echo "==== Building tutorial_8 ($(config)) ===="
73+
@${MAKE} --no-print-directory -C . -f tutorial_8.make
74+
75+
tutorial_9: behaviac
76+
@echo "==== Building tutorial_9 ($(config)) ===="
77+
@${MAKE} --no-print-directory -C . -f tutorial_9.make
78+
79+
tutorial_10: behaviac
80+
@echo "==== Building tutorial_10 ($(config)) ===="
81+
@${MAKE} --no-print-directory -C . -f tutorial_10.make
82+
83+
tutorial_11: behaviac
84+
@echo "==== Building tutorial_11 ($(config)) ===="
85+
@${MAKE} --no-print-directory -C . -f tutorial_11.make
86+
87+
tutorial_12: behaviac
88+
@echo "==== Building tutorial_12 ($(config)) ===="
89+
@${MAKE} --no-print-directory -C . -f tutorial_12.make
90+
91+
tutorial_13: behaviac
92+
@echo "==== Building tutorial_13 ($(config)) ===="
93+
@${MAKE} --no-print-directory -C . -f tutorial_13.make
94+
95+
clean:
96+
@${MAKE} --no-print-directory -C . -f behaviac.make clean
97+
@${MAKE} --no-print-directory -C . -f btunittest.make clean
98+
@${MAKE} --no-print-directory -C . -f btremotetest.make clean
99+
@${MAKE} --no-print-directory -C . -f demo_running.make clean
100+
@${MAKE} --no-print-directory -C . -f usertest.make clean
101+
@${MAKE} --no-print-directory -C . -f tutorial_1.make clean
102+
@${MAKE} --no-print-directory -C . -f tutorial_1_1.make clean
103+
@${MAKE} --no-print-directory -C . -f tutorial_1_2.make clean
104+
@${MAKE} --no-print-directory -C . -f tutorial_2.make clean
105+
@${MAKE} --no-print-directory -C . -f tutorial_3.make clean
106+
@${MAKE} --no-print-directory -C . -f tutorial_4.make clean
107+
@${MAKE} --no-print-directory -C . -f tutorial_5.make clean
108+
@${MAKE} --no-print-directory -C . -f tutorial_6.make clean
109+
@${MAKE} --no-print-directory -C . -f tutorial_7.make clean
110+
@${MAKE} --no-print-directory -C . -f tutorial_8.make clean
111+
@${MAKE} --no-print-directory -C . -f tutorial_9.make clean
112+
@${MAKE} --no-print-directory -C . -f tutorial_10.make clean
113+
@${MAKE} --no-print-directory -C . -f tutorial_11.make clean
114+
@${MAKE} --no-print-directory -C . -f tutorial_12.make clean
115+
@${MAKE} --no-print-directory -C . -f tutorial_13.make clean
116+
117+
help:
118+
@echo "Usage: make [config=name] [target]"
119+
@echo ""
120+
@echo "CONFIGURATIONS:"
121+
@echo " debugstatic32"
122+
@echo " releasestatic32"
123+
@echo ""
124+
@echo "TARGETS:"
125+
@echo " all (default)"
126+
@echo " clean"
127+
@echo " behaviac"
128+
@echo " btunittest"
129+
@echo " btremotetest"
130+
@echo " demo_running"
131+
@echo " usertest"
132+
@echo " tutorial_1"
133+
@echo " tutorial_1_1"
134+
@echo " tutorial_1_2"
135+
@echo " tutorial_2"
136+
@echo " tutorial_3"
137+
@echo " tutorial_4"
138+
@echo " tutorial_5"
139+
@echo " tutorial_6"
140+
@echo " tutorial_7"
141+
@echo " tutorial_8"
142+
@echo " tutorial_9"
143+
@echo " tutorial_10"
144+
@echo " tutorial_11"
145+
@echo " tutorial_12"
146+
@echo " tutorial_13"
147+
@echo ""
148+
@echo "For more information, see http://industriousone.com/premake/quick-start"

‎src/common/object/tagobject.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ namespace behaviac {
8989
for (behaviac::map<uint32_t, IProperty*>::const_iterator it = members.begin(); it != members.end(); ++it) {
9090
//uint32_t memberId = it->first;
9191
const IProperty* pProperty = it->second;
92-
93-
behaviac::string valueStr = pProperty->GetValueToString((behaviac::Agent*)pObject);
94-
CIOID attrId(pProperty->Name());
95-
node->setAttr(attrId, valueStr.c_str());
92+
if (!pProperty->IsArrayItem()) {
93+
behaviac::string valueStr = pProperty->GetValueToString((behaviac::Agent*)pObject);
94+
CIOID attrId(pProperty->Name());
95+
node->setAttr(attrId, valueStr.c_str());
96+
}
9697
}
9798
}
9899
}

0 commit comments

Comments
 (0)