3.6.31

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.30)
+set (BEHAVIAC_PACKAGE_VERSION 3.6.31)
 
 #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")
@@ -442,6 +442,7 @@ if (NOT BEHAVIAC_ANDROID_STUDIO)
 	add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_9/cpp")
 	add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_10/cpp")
 	add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_11/cpp")
+	add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_12/cpp")
 else()
 	add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_11/cpp")
 endif()

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.30-red.svg)](https://github.com/Tencent/behaviac/releases)
+[![Release Version](https://img.shields.io/badge/release-3.6.31-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)
 

history.txt

@@ -1,8 +1,14 @@
+2017-4-24  3.6.31
+    Fix a bug for generating the codes of the Task and Event.
+    Fix a bug for the hotreload of the meta file.
+    Add the tutorial_12.
+
 2017-4-20  3.6.30
     Supporot the hot reload of the meta file.
     Ignore the System_Object as the type of the property.
     Fix a bug for the IfElse node.
     Fix a bug for generating the namespace of the enum.
+    Add the tutorial_10 and tutorial_11.
 
 2017-4-11  3.6.29
     Fix a bug of compiling error for GCC.

inc/behaviac/common/_config.h

@@ -11,5 +11,5 @@
 	#define BEHAVIAC_RELEASE 		0
 #endif
 
-#define BEHAVIAC_VERSION_STRING 	"3.6.30"
+#define BEHAVIAC_VERSION_STRING 	"3.6.31"
 

integration/demo_running/behaviac/version.txt

@@ -1 +1 @@
-3.6.30 
+3.6.31 

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

@@ -1 +1 @@
-3.6.30 
+3.6.31 

projects/gmake/tutorial_12.make

@@ -0,0 +1,145 @@
+# GNU Make project makefile autogenerated by Premake
+ifndef config
+  config=debugstatic32
+endif
+
+ifndef verbose
+  SILENT = @
+endif
+
+CC = gcc
+CXX = g++
+AR = ar
+
+ifndef RESCOMP
+  ifdef WINDRES
+    RESCOMP = $(WINDRES)
+  else
+    RESCOMP = windres
+  endif
+endif
+
+ifeq ($(config),debugstatic32)
+  OBJDIR     = ../../intermediate/debugstatic/gmake/tutorial_12/x32
+  TARGETDIR  = ../../bin
+  TARGET     = $(TARGETDIR)/tutorial_12_debugstatic_win32_gmake.exe
+  DEFINES   += -DWIN32 -D_DEBUG -DDEBUG
+  INCLUDES  += -I../../inc -I../../inc -ID:/include
+  ALL_CPPFLAGS  += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
+  ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -g -Wall -Wextra -ffast-math -m32 -Wno-invalid-offsetof -Wno-array-bounds -Wno-unused-local-typedefs -Wno-maybe-uninitialized -finput-charset=UTF-8
+  ALL_CXXFLAGS  += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions
+  ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS   += $(LDFLAGS) -L../../lib -m32 -L/usr/lib32
+  LDDEPS    += ../../lib/libbehaviac_debugstatic_win32_gmake.a
+  LIBS      += $(LDDEPS)
+  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),releasestatic32)
+  OBJDIR     = ../../intermediate/releasestatic/gmake/tutorial_12/x32
+  TARGETDIR  = ../../bin
+  TARGET     = $(TARGETDIR)/tutorial_12_releasestatic_win32_gmake.exe
+  DEFINES   += -DWIN32 -DNDEBUG -D_CONSOLE
+  INCLUDES  += -I../../inc -I../../inc -ID:/include
+  ALL_CPPFLAGS  += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
+  ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -O2 -Wall -Wextra -ffast-math -m32 /Ox /Oi /Ob1 /Ot -Wno-invalid-offsetof -Wno-array-bounds -Wno-unused-local-typedefs -Wno-maybe-uninitialized -finput-charset=UTF-8
+  ALL_CXXFLAGS  += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions
+  ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS   += $(LDFLAGS) -L../../lib -s -m32 -L/usr/lib32
+  LDDEPS    += ../../lib/libbehaviac_releasestatic_win32_gmake.a
+  LIBS      += $(LDDEPS)
+  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+OBJECTS := \
+	$(OBJDIR)/tutorial_12.o \
+	$(OBJDIR)/behaviac_agent_meta.o \
+	$(OBJDIR)/FirstAgent.o \
+
+RESOURCES := \
+
+SHELLTYPE := msdos
+ifeq (,$(ComSpec)$(COMSPEC))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(SHELL)))
+  SHELLTYPE := posix
+endif
+
+.PHONY: clean prebuild prelink
+
+all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
+	@:
+
+$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
+	@echo Linking tutorial_12
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(TARGETDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
+endif
+
+$(OBJDIR):
+	@echo Creating $(OBJDIR)
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) mkdir -p $(OBJDIR)
+else
+	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
+endif
+
+clean:
+	@echo Cleaning tutorial_12
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+	$(SILENT) rm -rf $(OBJDIR)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
+endif
+
+prebuild:
+	$(PREBUILDCMDS)
+
+prelink:
+	$(PRELINKCMDS)
+
+ifneq (,$(PCH))
+.NOTPARALLEL: $(GCH) $(PCH)
+$(GCH): $(PCH)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
+endif
+
+$(OBJDIR)/tutorial_12.o: ../../tutorials/tutorial_12/cpp/tutorial_12.cpp
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
+
+$(OBJDIR)/behaviac_agent_meta.o: ../../tutorials/tutorial_12/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
+
+$(OBJDIR)/FirstAgent.o: ../../tutorials/tutorial_12/cpp/behaviac_generated/types/internal/FirstAgent.cpp
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
+
+-include $(OBJECTS:%.o=%.d)
+ifneq (,$(PCH))
+  -include $(OBJDIR)/$(notdir $(PCH)).d
+endif

projects/vs2010/behaviac.sln

@@ -93,6 +93,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_11", "tutorial_11.
 		{332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_12", "tutorial_12.vcxproj", "{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		DebugStatic|Win32 = DebugStatic|Win32
@@ -253,6 +258,14 @@ Global
 		{F887BDB1-EFE5-5448-8B0E-A7B341746F68}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
 		{F887BDB1-EFE5-5448-8B0E-A7B341746F68}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
 		{F887BDB1-EFE5-5448-8B0E-A7B341746F68}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugStatic|Win32.Build.0 = DebugStatic|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
+		{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE