Skip to content

Commit

Permalink
Update the version to 3.6.37
Browse files Browse the repository at this point in the history
  • Loading branch information
cainhuang committed Aug 8, 2017
1 parent 94d38ca commit 8f314f7
Show file tree
Hide file tree
Showing 24 changed files with 307 additions and 97 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.36)
set (BEHAVIAC_PACKAGE_VERSION 3.6.37)

#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")
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.35-red.svg)](https://github.com/Tencent/behaviac/releases)
[![Release Version](https://img.shields.io/badge/release-3.6.37-red.svg)](https://github.com/Tencent/behaviac/releases)
[![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)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/behaviac/pulls)

Expand Down
5 changes: 4 additions & 1 deletion history.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2017-08-08 3.6.37
Support generating the codes for initializing the member array.

2017-08-03 3.6.36
fix a bug of accessing task params when calling a sub tree
Fix a bug of accessing task params when calling a sub tree

2017-7-11 3.6.35
Improve the C++ types generation.
Expand Down
2 changes: 1 addition & 1 deletion inc/behaviac/common/_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#define BEHAVIAC_RELEASE 0
#endif

#define BEHAVIAC_VERSION_STRING "3.6.36"
#define BEHAVIAC_VERSION_STRING "3.6.37"

36 changes: 18 additions & 18 deletions inc/behaviac/common/member.h
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,11 @@ namespace behaviac {
return NULL;
}

#if !BEHAVIAC_RELEASE
virtual bool IsArrayItem() {
//#if !BEHAVIAC_RELEASE
virtual bool IsArrayItem() const {
return false;
}
#endif
//#endif
};

template<typename T, bool bTypeIsVector>
Expand Down Expand Up @@ -815,12 +815,12 @@ namespace behaviac {
return this->_name.c_str();
}

#if !BEHAVIAC_RELEASE
//#if !BEHAVIAC_RELEASE
public:
virtual bool IsArrayItem() {
virtual bool IsArrayItem() const {
return false;
}
#endif
//#endif

public:
CProperty(const char* name) {
Expand Down Expand Up @@ -995,12 +995,12 @@ namespace behaviac {
_gfp = gfp;
}

#if !BEHAVIAC_RELEASE
//#if !BEHAVIAC_RELEASE
public:
virtual bool IsArrayItem() {
virtual bool IsArrayItem() const {
return true;
}
#endif
//#endif

public:
virtual const void* GetValueElement(const behaviac::Agent* self, int index) const {
Expand Down Expand Up @@ -1096,12 +1096,12 @@ namespace behaviac {
_gfp = gfp;
}

#if !BEHAVIAC_RELEASE
//#if !BEHAVIAC_RELEASE
public:
virtual bool IsArrayItem() {
virtual bool IsArrayItem() const {
return true;
}
#endif
//#endif

public:
virtual const void* GetValueElement(const behaviac::Agent* self, int index) const {
Expand Down Expand Up @@ -1476,12 +1476,12 @@ namespace behaviac {
_parentId = parentId;
}

#if !BEHAVIAC_RELEASE
//#if !BEHAVIAC_RELEASE
public:
virtual bool IsArrayItem() {
virtual bool IsArrayItem() const {
return true;
}
#endif
//#endif

public:
virtual bool IsCustomized() const {
Expand Down Expand Up @@ -1527,12 +1527,12 @@ namespace behaviac {
_parentId = parentId;
}

#if !BEHAVIAC_RELEASE
//#if !BEHAVIAC_RELEASE
public:
virtual bool IsArrayItem() {
virtual bool IsArrayItem() const {
return true;
}
#endif
//#endif

public:
virtual bool IsCustomized() const {
Expand Down
2 changes: 2 additions & 0 deletions integration/demo_running/behaviac/Base/Meta.cs
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ public ICustomizedProperty CreateCustomizedArrayItemProperty(uint id, string nam
public static string GetTypeName(string typeName)
{
typeName = typeName.Replace("*", "");
//typeName = typeName.Replace("&lt;", "<");
//typeName = typeName.Replace("&gt;", ">");
return typeName;
}

Expand Down
2 changes: 1 addition & 1 deletion integration/demo_running/behaviac/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.6.36
3.6.37
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ public ICustomizedProperty CreateCustomizedArrayItemProperty(uint id, string nam
public static string GetTypeName(string typeName)
{
typeName = typeName.Replace("*", "");
//typeName = typeName.Replace("&lt;", "<");
//typeName = typeName.Replace("&gt;", ">");
return typeName;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.6.36
3.6.37
148 changes: 148 additions & 0 deletions projects/gmake/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
# GNU Make solution makefile autogenerated by Premake
# Type "make help" for usage help

ifndef config
config=debugstatic32
endif
export config

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

.PHONY: all clean help $(PROJECTS)

all: $(PROJECTS)

behaviac:
@echo "==== Building behaviac ($(config)) ===="
@${MAKE} --no-print-directory -C . -f behaviac.make

btunittest: behaviac
@echo "==== Building btunittest ($(config)) ===="
@${MAKE} --no-print-directory -C . -f btunittest.make

btremotetest: behaviac
@echo "==== Building btremotetest ($(config)) ===="
@${MAKE} --no-print-directory -C . -f btremotetest.make

demo_running: behaviac
@echo "==== Building demo_running ($(config)) ===="
@${MAKE} --no-print-directory -C . -f demo_running.make

usertest: behaviac
@echo "==== Building usertest ($(config)) ===="
@${MAKE} --no-print-directory -C . -f usertest.make

tutorial_1: behaviac
@echo "==== Building tutorial_1 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_1.make

tutorial_1_1: behaviac
@echo "==== Building tutorial_1_1 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_1_1.make

tutorial_1_2: behaviac
@echo "==== Building tutorial_1_2 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_1_2.make

tutorial_2: behaviac
@echo "==== Building tutorial_2 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_2.make

tutorial_3: behaviac
@echo "==== Building tutorial_3 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_3.make

tutorial_4: behaviac
@echo "==== Building tutorial_4 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_4.make

tutorial_5: behaviac
@echo "==== Building tutorial_5 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_5.make

tutorial_6: behaviac
@echo "==== Building tutorial_6 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_6.make

tutorial_7: behaviac
@echo "==== Building tutorial_7 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_7.make

tutorial_8: behaviac
@echo "==== Building tutorial_8 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_8.make

tutorial_9: behaviac
@echo "==== Building tutorial_9 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_9.make

tutorial_10: behaviac
@echo "==== Building tutorial_10 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_10.make

tutorial_11: behaviac
@echo "==== Building tutorial_11 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_11.make

tutorial_12: behaviac
@echo "==== Building tutorial_12 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_12.make

tutorial_13: behaviac
@echo "==== Building tutorial_13 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f tutorial_13.make

clean:
@${MAKE} --no-print-directory -C . -f behaviac.make clean
@${MAKE} --no-print-directory -C . -f btunittest.make clean
@${MAKE} --no-print-directory -C . -f btremotetest.make clean
@${MAKE} --no-print-directory -C . -f demo_running.make clean
@${MAKE} --no-print-directory -C . -f usertest.make clean
@${MAKE} --no-print-directory -C . -f tutorial_1.make clean
@${MAKE} --no-print-directory -C . -f tutorial_1_1.make clean
@${MAKE} --no-print-directory -C . -f tutorial_1_2.make clean
@${MAKE} --no-print-directory -C . -f tutorial_2.make clean
@${MAKE} --no-print-directory -C . -f tutorial_3.make clean
@${MAKE} --no-print-directory -C . -f tutorial_4.make clean
@${MAKE} --no-print-directory -C . -f tutorial_5.make clean
@${MAKE} --no-print-directory -C . -f tutorial_6.make clean
@${MAKE} --no-print-directory -C . -f tutorial_7.make clean
@${MAKE} --no-print-directory -C . -f tutorial_8.make clean
@${MAKE} --no-print-directory -C . -f tutorial_9.make clean
@${MAKE} --no-print-directory -C . -f tutorial_10.make clean
@${MAKE} --no-print-directory -C . -f tutorial_11.make clean
@${MAKE} --no-print-directory -C . -f tutorial_12.make clean
@${MAKE} --no-print-directory -C . -f tutorial_13.make clean

help:
@echo "Usage: make [config=name] [target]"
@echo ""
@echo "CONFIGURATIONS:"
@echo " debugstatic32"
@echo " releasestatic32"
@echo ""
@echo "TARGETS:"
@echo " all (default)"
@echo " clean"
@echo " behaviac"
@echo " btunittest"
@echo " btremotetest"
@echo " demo_running"
@echo " usertest"
@echo " tutorial_1"
@echo " tutorial_1_1"
@echo " tutorial_1_2"
@echo " tutorial_2"
@echo " tutorial_3"
@echo " tutorial_4"
@echo " tutorial_5"
@echo " tutorial_6"
@echo " tutorial_7"
@echo " tutorial_8"
@echo " tutorial_9"
@echo " tutorial_10"
@echo " tutorial_11"
@echo " tutorial_12"
@echo " tutorial_13"
@echo ""
@echo "For more information, see http://industriousone.com/premake/quick-start"
9 changes: 5 additions & 4 deletions src/common/object/tagobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ namespace behaviac {
for (behaviac::map<uint32_t, IProperty*>::const_iterator it = members.begin(); it != members.end(); ++it) {
//uint32_t memberId = it->first;
const IProperty* pProperty = it->second;

behaviac::string valueStr = pProperty->GetValueToString((behaviac::Agent*)pObject);
CIOID attrId(pProperty->Name());
node->setAttr(attrId, valueStr.c_str());
if (!pProperty->IsArrayItem()) {
behaviac::string valueStr = pProperty->GetValueToString((behaviac::Agent*)pObject);
CIOID attrId(pProperty->Name());
node->setAttr(attrId, valueStr.c_str());
}
}
}
}
Expand Down
Loading

0 comments on commit 8f314f7

Please sign in to comment.