diff --git a/CMakeLists.txt b/CMakeLists.txt index cc41fd2c..dc747dcf 100644 --- 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.24) +set (BEHAVIAC_PACKAGE_VERSION 3.6.25) #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") @@ -409,3 +409,4 @@ 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") add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_5/cpp") +add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_6/cpp") diff --git a/README.md b/README.md index 8036c035..d301933c 100644 --- 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.24-red.svg)](https://github.com/Tencent/behaviac/releases) +[![Release Version](https://img.shields.io/badge/release-3.6.25-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/build/android_vs2015/behaviac_android/behaviac_android.NativeActivity/behaviac_android.NativeActivity.vcxproj b/build/android_vs2015/behaviac_android/behaviac_android.NativeActivity/behaviac_android.NativeActivity.vcxproj index bae8e98a..285171c3 100644 --- a/build/android_vs2015/behaviac_android/behaviac_android.NativeActivity/behaviac_android.NativeActivity.vcxproj +++ b/build/android_vs2015/behaviac_android/behaviac_android.NativeActivity/behaviac_android.NativeActivity.vcxproj @@ -34,113 +34,6 @@ x86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -241,11 +134,8 @@ - - - @@ -271,8 +161,7 @@ - - + @@ -289,16 +178,123 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {f9a73654-619a-41f7-8e56-9e50c8073a90} Android diff --git a/docs/behaviac.chm b/docs/behaviac.chm index 67cdc831..91b2edb6 100644 Binary files a/docs/behaviac.chm and b/docs/behaviac.chm differ diff --git a/history.txt b/history.txt index 41521b52..7e79c64e 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2017-3-16 3.6.25 + Support renaming types. + Add the tutorial_6 projects. + 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. diff --git a/inc/behaviac/common/_config.h b/inc/behaviac/common/_config.h index f2123e76..92bd17b5 100644 --- 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.24" +#define BEHAVIAC_VERSION_STRING "3.6.25" diff --git a/inc/behaviac/common/workspace.h b/inc/behaviac/common/workspace.h index 5d57b232..ec2e4064 100644 --- a/inc/behaviac/common/workspace.h +++ b/inc/behaviac/common/workspace.h @@ -109,6 +109,14 @@ namespace behaviac { class BehaviorTreeTask; class Agent; + /*! \addtogroup Workspace + * @{ + * \addtogroup Workspace + * @{ */ + + /** + Workspace is used to manage the file format, time, load/unload/update bt, debug and so on. + */ class BEHAVIAC_API Workspace { public: BEHAVIAC_DECLARE_MEMORY_OPERATORS(Workspace); diff --git a/integration/demo_running/behaviac/Base/LogManager.cs b/integration/demo_running/behaviac/Base/LogManager.cs index 1ee638ec..ac695378 100644 --- a/integration/demo_running/behaviac/Base/LogManager.cs +++ b/integration/demo_running/behaviac/Base/LogManager.cs @@ -519,6 +519,14 @@ virtual protected System.IO.StreamWriter GetFile(Agent pAgent) { buffer = string.Format("Agent_$_{0:3}.log", agentId); } + +#if !BEHAVIAC_NOT_USE_UNITY + if (UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsEditor && + UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsPlayer) + { + buffer = Path.Combine(UnityEngine.Application.persistentDataPath, buffer); + } +#endif } else { diff --git a/integration/demo_running/behaviac/Base/Utils.cs b/integration/demo_running/behaviac/Base/Utils.cs index e47e7fd4..91d4bb13 100644 --- a/integration/demo_running/behaviac/Base/Utils.cs +++ b/integration/demo_running/behaviac/Base/Utils.cs @@ -1289,8 +1289,8 @@ public static void Break(string msg) LogError(msg); #if !BEHAVIAC_NOT_USE_UNITY - //UnityEngine.Debug.Break(); - System.Diagnostics.Debug.Assert(false); + UnityEngine.Debug.Break(); + //System.Diagnostics.Debug.Assert(false); #else //throw new Exception(); System.Diagnostics.Debug.Assert(false); diff --git a/integration/demo_running/behaviac/FSM/WaitState.cs b/integration/demo_running/behaviac/FSM/WaitState.cs index fdd32a19..b13b3744 100644 --- a/integration/demo_running/behaviac/FSM/WaitState.cs +++ b/integration/demo_running/behaviac/FSM/WaitState.cs @@ -174,11 +174,13 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { Debug.Check(childStatus == EBTStatus.BT_RUNNING); Debug.Check(this.m_node is WaitState, "node is not an WaitState"); + WaitState pStateNode = (WaitState)this.m_node; if (Workspace.Instance.UseIntValue) { if (Workspace.Instance.IntValueSinceStartup - this.m_intStart >= this.m_intTime) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } @@ -186,6 +188,7 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { if (Workspace.Instance.DoubleValueSinceStartup - this.m_start >= this.m_time) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } diff --git a/integration/demo_running/behaviac/license.txt b/integration/demo_running/behaviac/license.txt index 540c4b97..8f260be7 100644 --- a/integration/demo_running/behaviac/license.txt +++ b/integration/demo_running/behaviac/license.txt @@ -1,138 +1,69 @@ -Tencent is pleased to support the open source community by making behaviac available. - -Copyright (C) 2015 THL A29 Limited, a Tencent company. All rights reserved. - -If you have downloaded a copy of the behaviac binary from Tencent, please note that the behaviac -binary is licensed under the BSD 3-Clause License. -If you have downloaded a copy of the behaviac source code from Tencent, please note that behaviac -source code is licensed under the BSD 3-Clause License, except for the third-party components -listed below which are subject to different license terms. Your integration of behaviac into -your own projects may require compliance with the BSD 3-Clause License, as well as the other -licenses applicable to the third-party components included within behaviac. - +Tencent is pleased to support the open source community by making Behaviac available. +Copyright (C) 2015-2017 THL A29 Limited, a Tencent company. All rights reserved. +If you have downloaded a copy of the Behaviac binary from Tencent, please note that the Behaviac binary is licensed under the BSD 3-Clause License. +If you have downloaded a copy of the Behaviac source code from Tencent, please note that Behaviac source code is licensed under the BSD 3-Clause License, except for the third-party components listed below which are subject to different license terms. Your integration of Behaviac into your own projects may require compliance with the BSD 3-Clause License, as well as the other licenses applicable to the third-party components included within Behaviac. A copy of the BSD 3-Clause License is included in this file. Other dependencies and licenses: -Open Source Software Licensed Under the BSD License: The below software in this distribution may -have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are -Copyright (C) 2015 THL A29 Limited. +Open Source Software Licensed Under the University of Illinois/NCSA Open Source License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- +1. LLVM - ConvertUTF.c 3.9.1 +Copyright 2001-2004 Unicode, Inc. -The Brainiac Designer V2.1 -Copyright (c) 2008, Daniel Kollmann -All rights reserved. -Nsubstitute V1.7.1 -Copyright (c) 2009, Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) -All rights reserved. +Terms of the University of Illinois/NCSA Open Source License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +? Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers. +? Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. +? Neither the names of , nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. -Libbehavior V1.0 -Copyright (c) 2009, LeegleechN -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted -provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the copyright holder nor the names of its contributors may be used to endorse - or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Open Source Software Licensed Under the MIT License: The below software in this distribution may have been -modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015 THL -A29 Limited. +Open Source Software Licensed Under the MIT License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- - -RapidXml V1.13 +1. RapidXml V 1.13 Copyright (c) 2006, 2007 Marcin Kalicinski All Rights Reserved. -DockPanel V2.0 +2. DockPanel V 2.0.0 Copyright (c) 2007 Weifen Luo All Rights Reserved. -nunit-framework V3.0 +3. nunit-framework V 3.0.0 Copyright (c) 2014 Charlie Poole All Rights Reserved. - -Terms of the MIT License: ---------------------------------------------------- - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the Software without restriction, including without -limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following -conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions -of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +Terms of the MIT License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -Open Source Software Licensed Under the zlib License: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -SDL V2.0.3 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SDL_image V2.0.0 -Copyright (C) 1997-2013 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. -SDL_ttf V2.0.12 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +Open Source Software Licensed Under the BSD 3-Clause License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. +-------------------------------------------------------------------- +1. Brainiac Designer V 2.1 +Copyright (c) 2008, Daniel Kollmann +All rights reserved. -Terms of the zlib License: ---------------------------------------------------- +2. Nsubstitute V 1.7.1 +Copyright (c) 2009 Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) +All rights reserved. -This software is provided 'as-is', without any express or implied warranty. In no event will the authors -be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, including commercial applications, -and to alter it and redistribute it freely, subject to the following restrictions: +Terms of the BSD 3-Clause License: +-------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original - software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the - original software. -3. This notice may not be removed or altered from any source distribution. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Terms of the BSD 3-Clause License: --------------------------------------------------------------------- +3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that -the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the - following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/integration/demo_running/behaviac/version.txt b/integration/demo_running/behaviac/version.txt index b522e479..927968ce 100644 --- a/integration/demo_running/behaviac/version.txt +++ b/integration/demo_running/behaviac/version.txt @@ -1 +1 @@ -3.6.24 +3.6.25 diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs index 1ee638ec..ac695378 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs @@ -519,6 +519,14 @@ virtual protected System.IO.StreamWriter GetFile(Agent pAgent) { buffer = string.Format("Agent_$_{0:3}.log", agentId); } + +#if !BEHAVIAC_NOT_USE_UNITY + if (UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsEditor && + UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsPlayer) + { + buffer = Path.Combine(UnityEngine.Application.persistentDataPath, buffer); + } +#endif } else { diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs index e47e7fd4..91d4bb13 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs @@ -1289,8 +1289,8 @@ public static void Break(string msg) LogError(msg); #if !BEHAVIAC_NOT_USE_UNITY - //UnityEngine.Debug.Break(); - System.Diagnostics.Debug.Assert(false); + UnityEngine.Debug.Break(); + //System.Diagnostics.Debug.Assert(false); #else //throw new Exception(); System.Diagnostics.Debug.Assert(false); diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs b/integration/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs index fdd32a19..b13b3744 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs @@ -174,11 +174,13 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { Debug.Check(childStatus == EBTStatus.BT_RUNNING); Debug.Check(this.m_node is WaitState, "node is not an WaitState"); + WaitState pStateNode = (WaitState)this.m_node; if (Workspace.Instance.UseIntValue) { if (Workspace.Instance.IntValueSinceStartup - this.m_intStart >= this.m_intTime) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } @@ -186,6 +188,7 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { if (Workspace.Instance.DoubleValueSinceStartup - this.m_start >= this.m_time) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/license.txt b/integration/unity/Assets/Scripts/behaviac/runtime/license.txt index 540c4b97..8f260be7 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/license.txt +++ b/integration/unity/Assets/Scripts/behaviac/runtime/license.txt @@ -1,138 +1,69 @@ -Tencent is pleased to support the open source community by making behaviac available. - -Copyright (C) 2015 THL A29 Limited, a Tencent company. All rights reserved. - -If you have downloaded a copy of the behaviac binary from Tencent, please note that the behaviac -binary is licensed under the BSD 3-Clause License. -If you have downloaded a copy of the behaviac source code from Tencent, please note that behaviac -source code is licensed under the BSD 3-Clause License, except for the third-party components -listed below which are subject to different license terms. Your integration of behaviac into -your own projects may require compliance with the BSD 3-Clause License, as well as the other -licenses applicable to the third-party components included within behaviac. - +Tencent is pleased to support the open source community by making Behaviac available. +Copyright (C) 2015-2017 THL A29 Limited, a Tencent company. All rights reserved. +If you have downloaded a copy of the Behaviac binary from Tencent, please note that the Behaviac binary is licensed under the BSD 3-Clause License. +If you have downloaded a copy of the Behaviac source code from Tencent, please note that Behaviac source code is licensed under the BSD 3-Clause License, except for the third-party components listed below which are subject to different license terms. Your integration of Behaviac into your own projects may require compliance with the BSD 3-Clause License, as well as the other licenses applicable to the third-party components included within Behaviac. A copy of the BSD 3-Clause License is included in this file. Other dependencies and licenses: -Open Source Software Licensed Under the BSD License: The below software in this distribution may -have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are -Copyright (C) 2015 THL A29 Limited. +Open Source Software Licensed Under the University of Illinois/NCSA Open Source License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- +1. LLVM - ConvertUTF.c 3.9.1 +Copyright 2001-2004 Unicode, Inc. -The Brainiac Designer V2.1 -Copyright (c) 2008, Daniel Kollmann -All rights reserved. -Nsubstitute V1.7.1 -Copyright (c) 2009, Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) -All rights reserved. +Terms of the University of Illinois/NCSA Open Source License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +? Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers. +? Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. +? Neither the names of , nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. -Libbehavior V1.0 -Copyright (c) 2009, LeegleechN -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted -provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the copyright holder nor the names of its contributors may be used to endorse - or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Open Source Software Licensed Under the MIT License: The below software in this distribution may have been -modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015 THL -A29 Limited. +Open Source Software Licensed Under the MIT License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- - -RapidXml V1.13 +1. RapidXml V 1.13 Copyright (c) 2006, 2007 Marcin Kalicinski All Rights Reserved. -DockPanel V2.0 +2. DockPanel V 2.0.0 Copyright (c) 2007 Weifen Luo All Rights Reserved. -nunit-framework V3.0 +3. nunit-framework V 3.0.0 Copyright (c) 2014 Charlie Poole All Rights Reserved. - -Terms of the MIT License: ---------------------------------------------------- - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the Software without restriction, including without -limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following -conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions -of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +Terms of the MIT License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -Open Source Software Licensed Under the zlib License: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -SDL V2.0.3 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SDL_image V2.0.0 -Copyright (C) 1997-2013 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. -SDL_ttf V2.0.12 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +Open Source Software Licensed Under the BSD 3-Clause License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. +-------------------------------------------------------------------- +1. Brainiac Designer V 2.1 +Copyright (c) 2008, Daniel Kollmann +All rights reserved. -Terms of the zlib License: ---------------------------------------------------- +2. Nsubstitute V 1.7.1 +Copyright (c) 2009 Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) +All rights reserved. -This software is provided 'as-is', without any express or implied warranty. In no event will the authors -be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, including commercial applications, -and to alter it and redistribute it freely, subject to the following restrictions: +Terms of the BSD 3-Clause License: +-------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original - software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the - original software. -3. This notice may not be removed or altered from any source distribution. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Terms of the BSD 3-Clause License: --------------------------------------------------------------------- +3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that -the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the - following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/version.txt b/integration/unity/Assets/Scripts/behaviac/runtime/version.txt index b522e479..927968ce 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/version.txt +++ b/integration/unity/Assets/Scripts/behaviac/runtime/version.txt @@ -1 +1 @@ -3.6.24 +3.6.25 diff --git a/projects/gmake/tutorial_6.make b/projects/gmake/tutorial_6.make new file mode 100644 index 00000000..42144c3c --- /dev/null +++ b/projects/gmake/tutorial_6.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_6/x32 + TARGETDIR = ../../bin + TARGET = $(TARGETDIR)/tutorial_6_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_6/x32 + TARGETDIR = ../../bin + TARGET = $(TARGETDIR)/tutorial_6_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_6.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_6 + $(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_6 +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_6.o: ../../tutorials/tutorial_6/cpp/tutorial_6.cpp + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<" + +$(OBJDIR)/behaviac_agent_meta.o: ../../tutorials/tutorial_6/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_6/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 diff --git a/projects/vs2010/behaviac.sln b/projects/vs2010/behaviac.sln index d6128f7b..94d758ac 100644 --- a/projects/vs2010/behaviac.sln +++ b/projects/vs2010/behaviac.sln @@ -3,62 +3,67 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "behaviac", "behaviac.vcxproj", "{332CEEDC-7568-D84C-B9C6-B710915836ED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btunittest", "btunittest.vcxproj", "{0576E871-6AA3-034E-A1D2-B13F05EAB8E4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btunittest", "btunittest.vcxproj", "{3142D9DE-E233-8849-BD9C-8E32A2D8A17F}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{AB187D85-C43A-8D4D-93DC-5BE155BA83F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_running", "demo_running.vcxproj", "{7EEABE38-F889-A143-9E23-87E662C1D0BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_running", "demo_running.vcxproj", "{5A567917-7107-0D43-8AF7-092473042257}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{41F757EE-B27F-5E47-A254-DBE973DDB05E}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1", "tutorial_1.vcxproj", "{AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1", "tutorial_1.vcxproj", "{07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_1", "tutorial_1_1.vcxproj", "{081EEE85-63C8-FB4D-BB8A-FAA0565F315C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_1", "tutorial_1_1.vcxproj", "{1132F949-A304-9A45-97E0-37901CFFB513}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_2", "tutorial_1_2.vcxproj", "{5DF9E011-47FC-F24C-A55E-F011A173CF51}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_2", "tutorial_1_2.vcxproj", "{9A35B566-7608-624D-B46E-588E465A5C97}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_2", "tutorial_2.vcxproj", "{03D2EACE-6F32-EE43-B8E1-B98516B1A24A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_2", "tutorial_2.vcxproj", "{B3802D90-A937-B54F-890A-1E394C18FCB9}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_3", "tutorial_3.vcxproj", "{48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_3", "tutorial_3.vcxproj", "{928EF48B-8E5B-A040-9741-5C96705ABEE1}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_4", "tutorial_4.vcxproj", "{04F58A64-83DD-A241-8134-E0EFA75B00D6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_4", "tutorial_4.vcxproj", "{D8C65B00-D6BC-564C-9DA1-161F65EF5408}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_5", "tutorial_5.vcxproj", "{F406167D-2699-E641-B8E8-2B01460D2D06}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_5", "tutorial_5.vcxproj", "{F5D8C526-79F5-E743-ABC1-D7C676E93F0F}" + ProjectSection(ProjectDependencies) = postProject + {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_6", "tutorial_6.vcxproj", "{6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection @@ -79,102 +84,110 @@ Global {332CEEDC-7568-D84C-B9C6-B710915836ED}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {332CEEDC-7568-D84C-B9C6-B710915836ED}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {332CEEDC-7568-D84C-B9C6-B710915836ED}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {7EEABE38-F889-A143-9E23-87E662C1D0BE}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {5DF9E011-47FC-F24C-A55E-F011A173CF51}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {04F58A64-83DD-A241-8134-E0EFA75B00D6}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {F406167D-2699-E641-B8E8-2B01460D2D06}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {5A567917-7107-0D43-8AF7-092473042257}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {41F757EE-B27F-5E47-A254-DBE973DDB05E}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {1132F949-A304-9A45-97E0-37901CFFB513}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {9A35B566-7608-624D-B46E-588E465A5C97}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {B3802D90-A937-B54F-890A-1E394C18FCB9}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {928EF48B-8E5B-A040-9741-5C96705ABEE1}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {D8C65B00-D6BC-564C-9DA1-161F65EF5408}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/vs2010/behaviac.vcxproj.filters b/projects/vs2010/behaviac.vcxproj.filters index e6d99e40..b3ad9aa0 100644 --- a/projects/vs2010/behaviac.vcxproj.filters +++ b/projects/vs2010/behaviac.vcxproj.filters @@ -2,166 +2,166 @@ - {A61E554B-F50C-4041-90C3-B04CEA47D42C} + {4B74C9AE-2982-3745-8282-C526D8F64CE8} - {6D83E72C-9A56-EB44-A5C6-1C858BDDD59F} + {556D341E-F013-C54F-ABED-BCAB84FF4B4C} - {5F78B868-63ED-0D44-89DA-FBDEC3E657FF} + {9EBDC145-9EA0-934D-8001-0E4A0CE2D227} - {723C61AD-E379-5646-A544-804E61A6B7F6} + {04299F82-19AF-AB40-856F-BAB4A1499E3E} - {52B5D628-3DF4-7E4C-A148-5947AC707E8A} + {205633CD-1C95-264F-885A-85B7F2C69FE9} - {FCEC89D4-02DE-3648-B057-083BD435EEFD} + {A0F5FF8A-66D8-5B4E-B9CE-FED18BD50570} - {12665B44-0660-B041-8FBD-7AF7E6770B2B} + {1609703F-ACD1-8A46-B42C-218F33D32BEF} - {EFD89F47-72A0-2C4B-B193-C222256AC9CB} + {A1B0D5FE-7F65-F147-A9B8-DFDE751A5B27} - {EB751EFA-51B2-164B-AAC3-434D48F77F27} + {2EC3FD07-A382-394A-A442-AB9924C73ED7} - {80DD9E8F-12D4-4A4E-8086-49A6679DA74B} + {55ADFEEB-1CD0-D645-A90D-23A33B4E159C} - {77B55811-1249-1443-BEA4-F2F588E68679} + {A315A0F5-89A2-B249-BF80-92F6A5F541A4} - {935B9729-D420-9C43-8484-8F2D607BC62F} + {AFEEE7BC-0894-E647-9B2A-C5329055F48C} - {A4709BFD-28A0-B740-8B79-798FD85A2523} + {6755632D-5181-3C48-96EA-5B3358E0E111} - {F237FFEA-E165-BE4D-8E6E-B874D4E2B5B4} + {335971D1-D7F6-7743-A083-60866BF5FC00} - {BA548B4B-71BD-B841-9FF8-BA3D462816F4} + {F871BC61-77A0-1245-BD2F-8BD41F72640F} - {15CD0962-04F2-4B4D-B7CD-4FB97A95199D} + {D5042ABA-690E-A64C-9846-DDA9910463F8} - {C1A86649-365F-1A49-AA7C-1BD76B3D1EC5} + {1DD54556-ABD8-FA43-AE78-3E886C590EAA} - {8234CD61-585C-9443-9091-1D3B21846952} + {FEDDFF36-CA82-3849-9CCD-18EC4F04B965} - {C75102FC-4FDC-CF4B-B700-91BE29538058} + {20D57225-57D2-7E4F-9044-97C80918C6E0} - {D66B3A27-EED8-7143-872E-4CD2D3998ABE} + {350451A9-C4B6-E540-B531-D13067A8DEEF} - {5BD659F4-F0C5-7347-B063-C4353622F80D} + {8209DC2E-6237-F645-B2FD-3205FA32B7F2} - {BFC19D12-F6E0-B44A-8489-59BA93E58F8F} + {76D299F0-D98C-C24F-8D36-8D45DDC331BF} - {94E9926D-B3E4-EE41-AAB5-98CC74581E15} + {166BFA05-C520-194E-B6BA-DB391BBD7B20} - {403F5F8D-642F-CD44-BA48-2D3FA627B693} + {F15EA89E-95EB-DF44-8615-B066615C6F0F} - {49C10B2F-BA07-724F-9E88-046D66E62D44} + {12FB189D-10B8-834D-9493-C23A1E4966D1} - {9AF551B4-96C1-2E42-AE93-72EE4451A407} + {B40F93C5-7A55-5040-AF16-AA39F34A81F4} - {FBCC912B-DB64-E049-A842-94868BFC209C} + {017B97E2-57D4-6846-A894-7AFA69F71EF9} - {DA4F578B-8305-564A-87F8-76F6003BAB06} + {1F28D56F-0427-FD40-8D78-6ABDDE2E7C6A} - {A7F7519D-892F-5D46-A02F-CD5D538B6C0D} + {6DF176A7-3B29-3346-90B3-49CFA88B14AA} - {FBB09538-AADE-304E-A2DB-F3199CD3B37F} + {3A569644-DDD6-114B-A2A0-078EF5CC4818} - {15EC4782-B25D-BB4B-8E20-B0DB1A63125C} + {083A9076-32E1-3448-ADC5-BD36A4CFD244} - {DF96B5D8-B867-E34E-878B-8DAE7248D54E} + {48D5313E-26D4-B046-9AF4-D6C4C00C98EA} - {8FFD646D-9AA7-5E40-A572-52ADF92732D7} + {2B22AF11-C65F-8942-A34F-82B8D77B335A} - {682ED4C8-7620-0C44-B6BC-CD42E4223A69} + {B4632CB6-050D-0B41-8D15-9558CEE9D755} - {50DCFC53-9BB1-EA41-8F8D-0489C9919431} + {13457559-7716-7F4F-8553-E53E6C2F0BDC} - {726D320E-75E3-8248-A0E9-E09F2AF21A8E} + {A16E3DD7-C542-334E-AA23-4E874CA523A5} - {2EBD3FC8-AE43-1E4C-8A99-9833AB0D268F} + {5F84B05A-162B-4841-9BD6-B6516C2017BB} - {80E78902-D68E-604D-921C-4AE0F4839CE0} + {F7B04BB3-E2E8-2A48-BF3F-D593D5605B95} - {C8AAF316-A301-504D-9CFA-9F2A1221AE61} + {12FA07A7-1171-7C41-AF41-FD8D98186221} - {4CC2DFE8-725A-A24D-BBA0-A58A75045B88} + {3AAF2D46-6D0C-EF4E-82CE-EB4A501E2888} - {689BB38C-7540-CE4F-8920-BEFF607B842B} + {7AFA5F51-B1CA-6E48-B754-194A04885251} - {9D480650-8113-5043-B6AC-21C1F75CF7FE} + {E5FB951A-DC7D-FB40-B97F-C5973BCC9936} - {48BDF634-0D39-1242-942B-5B3FD8473689} + {6E00E524-FA9E-F249-8C19-07A01B22D607} - {F5C1CB31-C466-FD4C-88A6-85DB62315AFF} + {0C53117E-2E22-BC48-831C-2761B595777D} - {7D1EBD7D-5D7E-F745-BEA5-512549CFE11A} + {9AE3AC5E-09AD-6941-88E5-5ACC99C11FE1} - {2B873126-50E1-934C-95BA-988A0F99F982} + {FA84D043-C810-F944-98C0-B2AE5CCB8153} - {FD34FB1B-3E6A-9B43-B516-1C1F31D94ED6} + {19AA691E-E9E0-1440-A125-6E7E8D220898} - {35EC92D2-A836-914E-954D-3AE6EB6B4898} + {C01552A6-44D6-3044-9435-C9888A7B04E4} - {3400B232-9F5D-844B-9EFF-E461636BC9C5} + {92EE5D26-8FBC-5D43-B1EC-4D2548F1B8B4} - {F8FEDFDE-B47E-B044-B613-98A43806D8AC} + {6FE35D05-7222-A645-BB79-BDFBADCB5720} - {C9837783-948A-FE4E-9D8D-281767CA716C} + {BB10892B-1C09-7E4A-8509-BA81E0B3CEFE} - {C69A3D0C-308D-AC43-BF3C-95D5803D4668} + {5B8E5FA6-2956-E340-9883-66A3C60E1A87} - {9F9F60CD-DAFD-DF40-AA4B-0D1F5FA06F9A} + {D0B4E084-AD33-7440-A96C-C5F3615D6CD6} - {DF72A4D4-28A0-204A-9088-F705DA9E2E9A} + {AE8DECD7-B1C4-6E44-9728-84BB061604EF} diff --git a/projects/vs2010/btperformance.vcxproj b/projects/vs2010/btperformance.vcxproj index 8faadf20..ef0c600d 100644 --- a/projects/vs2010/btperformance.vcxproj +++ b/projects/vs2010/btperformance.vcxproj @@ -19,7 +19,7 @@ - {BD1F33DA-FE1D-FC42-BB7B-28FE29020B79} + {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242} btperformance Win32Proj diff --git a/projects/vs2010/btperformance.vcxproj.filters b/projects/vs2010/btperformance.vcxproj.filters index f19d3b23..b9bc6da2 100644 --- a/projects/vs2010/btperformance.vcxproj.filters +++ b/projects/vs2010/btperformance.vcxproj.filters @@ -2,22 +2,22 @@ - {C1D6714B-8AAD-554D-82B8-5D75A79A4C7C} + {0C4B816D-6F94-644A-A018-F0F74F6D41BB} - {AD389C81-4BA0-6A4A-B872-9F5BF659627B} + {52A10F77-1C45-8B43-8F6C-0F4EE5C236F7} - {7714B372-75C3-F946-965A-1C8954C05CCF} + {F562AF9E-5D1B-E64E-9B86-777E930D0ED5} - {C011FE18-2418-2C42-9786-4690D7BA3D3F} + {5EB8935A-F81C-2B48-B47D-7145C33A6447} - {F5A7BF0D-8E56-4543-ACA3-537E0702AAF1} + {9EEA1ACB-56CD-C04E-B6C7-06A1DCF46743} - {F367FB00-97FF-BD49-A78D-1012A79515C2} + {AA7F8B30-1269-7944-A451-77A5DFBFF39B} diff --git a/projects/vs2010/btremotetest.vcxproj b/projects/vs2010/btremotetest.vcxproj index 12360db9..e000e94e 100644 --- a/projects/vs2010/btremotetest.vcxproj +++ b/projects/vs2010/btremotetest.vcxproj @@ -19,7 +19,7 @@ - {AB187D85-C43A-8D4D-93DC-5BE155BA83F6} + {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8} btremotetest Win32Proj diff --git a/projects/vs2010/btremotetest.vcxproj.filters b/projects/vs2010/btremotetest.vcxproj.filters index ead1cf0c..a41a14d8 100644 --- a/projects/vs2010/btremotetest.vcxproj.filters +++ b/projects/vs2010/btremotetest.vcxproj.filters @@ -2,25 +2,25 @@ - {1BF928B9-F8E9-3F41-A6E7-2A1C3BBE6DB6} + {173C9041-3C09-A249-82C1-01EB1BC714BD} - {B6EF308F-8BD6-BE47-9E77-87D3E5E18BE0} + {C424173E-1317-B241-8B65-65AEAEF32DFC} - {315B15B0-3D1E-D443-8DB1-4F75B4A40C00} + {EE3D4D92-CB35-E14F-BB2A-8172AFB00631} - {1836353D-A34D-3B46-9935-28246CBD811D} + {604AE807-9EBB-254E-81EE-4308BF949B25} - {292CFF28-F9BD-F44A-BC9F-02BA835CF1CA} + {6139A3AE-741B-0A4E-A542-7C241693AAA9} - {17F04084-1C1B-6B4E-A029-E7C150ADC8A9} + {40366E99-3275-9D41-AECB-88C49E10BAA2} - {970B4C1C-E927-3D42-A2B1-D00EDEF2B0AF} + {F079EB48-EB66-784B-820B-B2F0A86266A6} diff --git a/projects/vs2010/btunittest.vcxproj b/projects/vs2010/btunittest.vcxproj index 46b50203..c744037d 100644 --- a/projects/vs2010/btunittest.vcxproj +++ b/projects/vs2010/btunittest.vcxproj @@ -19,7 +19,7 @@ - {0576E871-6AA3-034E-A1D2-B13F05EAB8E4} + {3142D9DE-E233-8849-BD9C-8E32A2D8A17F} btunittest Win32Proj diff --git a/projects/vs2010/btunittest.vcxproj.filters b/projects/vs2010/btunittest.vcxproj.filters index 59899244..e0d79297 100644 --- a/projects/vs2010/btunittest.vcxproj.filters +++ b/projects/vs2010/btunittest.vcxproj.filters @@ -2,52 +2,52 @@ - {302A50ED-F0A2-814C-8445-CA10E4C097BB} + {AE8295E7-9DB5-CA46-A233-2A4947CAB45D} - {7F05C6BA-73FE-A244-9BC6-176B0F6A0BDA} + {9044C98F-EF9A-8F4B-A61D-72BDB95B5C52} - {4E9242C0-91F8-6540-AA51-3604FAF80CD4} + {83CE499E-5A72-6A4D-98F5-B1D5D2090D9B} - {1AB103F7-02F1-994C-ADAE-0CC6405741BF} + {5E2D90AD-935F-F841-A0EA-15B77980E778} - {E0CAE784-12E9-E04E-8B29-087109498060} + {14700233-4798-1946-B9BE-B7F39C42DFA6} - {3E005E79-721F-CC46-85BB-CB8B7EA496E0} + {EC797B29-DACC-A648-BE42-4A42F365F2AC} - {D495053A-64B6-8644-8D9B-B3E94E9A3D52} + {0B657C4D-D40D-3B47-8F97-3906C2C14DF0} - {FAA38B8A-0344-4F4E-BB29-0F2D4C23D024} + {63C01020-4EFA-A447-A709-2DDC858076FD} - {A94215B6-F746-8D47-8C34-7B30B719B644} + {A4991B70-C54B-1549-8DC3-3F01BB5AF582} - {6975DE17-9592-604A-ABD9-822C53683A2A} + {30653DF2-706F-1842-9B35-9E091BC64800} - {3C53F938-ADBC-DA43-8F28-F3954A3826EE} + {AD39640D-860D-0E46-88BD-96116096865A} - {5F5408C9-B003-4F44-ABFE-A6C60C851A22} + {FFB38A2F-E444-7748-8C07-56476266E650} - {4B8CDD82-2546-DF42-9644-03C9E3F25A5A} + {C9071FB6-0872-244E-8AAD-A919C01477EE} - {24587E34-E38A-1045-904A-1713A087EED1} + {0FF78D6A-CD49-4649-9F3E-9BF859901832} - {347854DD-D329-8B4D-A612-A82C21200B7A} + {35B03924-B523-8840-99F4-5D83EC7CACCA} - {472E7A8D-B6E6-B840-9277-5ACAF3F295EC} + {FB4BFD2A-63FB-AE4F-9298-BEB7E1AD1D04} diff --git a/projects/vs2010/demo_running.vcxproj b/projects/vs2010/demo_running.vcxproj index 3047ceb7..76376783 100644 --- a/projects/vs2010/demo_running.vcxproj +++ b/projects/vs2010/demo_running.vcxproj @@ -19,7 +19,7 @@ - {7EEABE38-F889-A143-9E23-87E662C1D0BE} + {5A567917-7107-0D43-8AF7-092473042257} demo_running Win32Proj diff --git a/projects/vs2010/demo_running.vcxproj.filters b/projects/vs2010/demo_running.vcxproj.filters index 0605e928..b87b91ef 100644 --- a/projects/vs2010/demo_running.vcxproj.filters +++ b/projects/vs2010/demo_running.vcxproj.filters @@ -2,28 +2,28 @@ - {F55F9133-9176-084B-A3FD-2F105C7FFFC5} + {86FE23A3-0F9C-144B-8750-D405F1AEDA66} - {E7D2E4C3-EFA6-BE43-AF3B-968BDABDC707} + {A098655D-A479-FE42-AD6C-AEFB8AEBEE88} - {6011FA67-15C6-1C49-A530-45E9E27997CB} + {CA002994-40CA-3A4C-94EF-684B4FA5E03A} - {42ADFCCB-B994-754B-A422-E11D3F98CA51} + {1375B7AA-CBBD-544C-B07F-D15241BAAF86} - {A18E0C7E-69CB-294A-B117-9A86F601EE5D} + {FE5996A5-94E3-FC48-992B-1C732DDF7490} - {41C150D6-7CB2-9F42-AA2F-04983437C88E} + {49A64D8F-9600-634B-89BC-9800FBDD3495} - {15258383-9521-CF43-BA3D-D9F03AF6AF37} + {E040CB71-B081-1648-B426-B43CF898BA09} - {21369C56-4DB7-734B-B14D-E1041C328DA0} + {8B759932-EE86-DB4D-AA0C-637C9244A542} diff --git a/projects/vs2010/tutorial_1.vcxproj b/projects/vs2010/tutorial_1.vcxproj index 2dc4fc97..b400440f 100644 --- a/projects/vs2010/tutorial_1.vcxproj +++ b/projects/vs2010/tutorial_1.vcxproj @@ -19,7 +19,7 @@ - {AD6D1B5E-0651-2345-AF2B-A941D8F53B2E} + {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74} tutorial_1 Win32Proj diff --git a/projects/vs2010/tutorial_1.vcxproj.filters b/projects/vs2010/tutorial_1.vcxproj.filters index 593d3886..fd4bf554 100644 --- a/projects/vs2010/tutorial_1.vcxproj.filters +++ b/projects/vs2010/tutorial_1.vcxproj.filters @@ -2,22 +2,22 @@ - {024A6C75-6525-E048-8E94-4089E2A7B340} + {C1FC048F-92F2-BF44-81F1-6D3CE2C0B5DD} - {F2284417-7890-2A42-BFAA-C2D01ACD5586} + {B320AC80-4A6F-254D-91D3-DD02379CED41} - {A9454711-8982-474B-B70B-51786E60AC00} + {AED42B60-86E5-6B42-B8BA-247745B71233} - {B394F8A3-A05E-8443-B979-358BE5F0A5C9} + {34C1A93E-C13A-5B4C-9825-6152FDDD4963} - {433F942A-CA60-2144-A3E9-4EAE5F8A57D9} + {FBA97219-CA32-EF4E-AAE3-0F7808700DE6} - {25C89597-DDD7-0B44-9906-50A632406EB0} + {01607832-6E71-5142-B285-6FD222D46588} diff --git a/projects/vs2010/tutorial_1_1.vcxproj b/projects/vs2010/tutorial_1_1.vcxproj index 43f7c89b..87ec9c98 100644 --- a/projects/vs2010/tutorial_1_1.vcxproj +++ b/projects/vs2010/tutorial_1_1.vcxproj @@ -19,7 +19,7 @@ - {081EEE85-63C8-FB4D-BB8A-FAA0565F315C} + {1132F949-A304-9A45-97E0-37901CFFB513} tutorial_1_1 Win32Proj diff --git a/projects/vs2010/tutorial_1_1.vcxproj.filters b/projects/vs2010/tutorial_1_1.vcxproj.filters index d8880a1d..7e4b8911 100644 --- a/projects/vs2010/tutorial_1_1.vcxproj.filters +++ b/projects/vs2010/tutorial_1_1.vcxproj.filters @@ -2,22 +2,22 @@ - {6E124A45-C7AB-EF47-A952-4C9F1E7D79EA} + {1FAEE9A7-F8FB-1641-8977-3917E6D69B0D} - {153ACD48-91ED-5741-BF6B-B7C2568CA0ED} + {5371104A-6D8E-0E4C-9C86-A8E50E92B84F} - {3A1BE9A0-53EA-774A-B854-9F55D8099B12} + {4F5F11C7-FA68-4B4C-99AB-B69023AD6783} - {A4F7DB6A-6CE0-484E-8734-2D67C31DD1FF} + {4FE381BD-591F-2344-A26E-EEC1D0A670B6} - {DB4FDF9F-5AED-BF44-ABF5-86EBE774DAB0} + {CC96D816-EB64-7C45-BC4F-4C553270ABCE} - {9C3ACE14-51B2-F143-9AC2-F4E2E166339A} + {D3DD3C38-620F-0E4B-A9A9-96600B2867AC} diff --git a/projects/vs2010/tutorial_1_2.vcxproj b/projects/vs2010/tutorial_1_2.vcxproj index 6c27390c..f185d390 100644 --- a/projects/vs2010/tutorial_1_2.vcxproj +++ b/projects/vs2010/tutorial_1_2.vcxproj @@ -19,7 +19,7 @@ - {5DF9E011-47FC-F24C-A55E-F011A173CF51} + {9A35B566-7608-624D-B46E-588E465A5C97} tutorial_1_2 Win32Proj diff --git a/projects/vs2010/tutorial_1_2.vcxproj.filters b/projects/vs2010/tutorial_1_2.vcxproj.filters index 3ba9af86..10b716a4 100644 --- a/projects/vs2010/tutorial_1_2.vcxproj.filters +++ b/projects/vs2010/tutorial_1_2.vcxproj.filters @@ -2,22 +2,22 @@ - {8D3600FC-D5DE-484F-A649-F015AE785F27} + {C5A95FF1-77C9-A747-8CD9-2D1837005122} - {C1F24F68-855D-5749-8D3C-71FF204F4574} + {D9897873-3A7A-1441-9936-B8AE3B2012D3} - {6A9CA18C-3A0E-694C-879B-A15BC93C17F6} + {11859CF1-D11A-C748-8847-630C6A511513} - {FBA99E87-3D04-8F4D-B2E6-5FF1CE9BC0B1} + {5F0A5FEF-EF0A-6740-9536-DCCF5F9EBE06} - {AD71573A-8D0E-BD47-A46A-B276980B2564} + {89513827-EB5E-7849-B7D2-E32577ED3E21} - {8D617627-A957-B540-B7BB-472F4FD77BA5} + {FAEE183B-C895-6149-AD41-71490AF519B5} diff --git a/projects/vs2010/tutorial_2.vcxproj b/projects/vs2010/tutorial_2.vcxproj index e800849d..b23ef385 100644 --- a/projects/vs2010/tutorial_2.vcxproj +++ b/projects/vs2010/tutorial_2.vcxproj @@ -19,7 +19,7 @@ - {03D2EACE-6F32-EE43-B8E1-B98516B1A24A} + {B3802D90-A937-B54F-890A-1E394C18FCB9} tutorial_2 Win32Proj diff --git a/projects/vs2010/tutorial_2.vcxproj.filters b/projects/vs2010/tutorial_2.vcxproj.filters index 7b3a5e38..b4061e3f 100644 --- a/projects/vs2010/tutorial_2.vcxproj.filters +++ b/projects/vs2010/tutorial_2.vcxproj.filters @@ -2,25 +2,25 @@ - {2812BA07-6176-894F-B419-DA36315358F8} + {E31561C2-E8F9-C94D-B96D-B0C380216C85} - {61755521-B379-D74B-96E6-FDA3DF566932} + {D8A60795-F686-944E-887F-835E465A5181} - {EC7FB501-53D9-E446-BC98-C8240BDEDF38} + {383F6D47-96A1-F849-8D77-D9DE3AE2B3D4} - {ACCF72B3-1168-254D-8A0B-793ECCABB763} + {E63603BD-520C-8741-BE75-5B0575556E73} - {3201B7FC-B072-524F-8C05-59AE56EF77C1} + {B2B0BF3E-B8A8-3D48-8AE8-EAE3DCAA940F} - {4BD858DA-5F6B-5A4E-ACC7-C80D426DE4BE} + {CDE4C225-FE36-CF49-A275-A708EDAAB8AC} - {A268664C-8E9E-DB40-95BF-2065225EDD97} + {4F76EBF1-FFDE-8845-8796-CB3E4CB89155} diff --git a/projects/vs2010/tutorial_3.vcxproj b/projects/vs2010/tutorial_3.vcxproj index 4ef1e3ed..7d1abb29 100644 --- a/projects/vs2010/tutorial_3.vcxproj +++ b/projects/vs2010/tutorial_3.vcxproj @@ -19,7 +19,7 @@ - {48BE257E-9D4E-F34D-BC7E-11C4F2F253A6} + {928EF48B-8E5B-A040-9741-5C96705ABEE1} tutorial_3 Win32Proj diff --git a/projects/vs2010/tutorial_3.vcxproj.filters b/projects/vs2010/tutorial_3.vcxproj.filters index f318d09d..0301e599 100644 --- a/projects/vs2010/tutorial_3.vcxproj.filters +++ b/projects/vs2010/tutorial_3.vcxproj.filters @@ -2,22 +2,22 @@ - {D4812164-B283-2D48-A4F0-EE01DC381999} + {7E34349F-3C12-D645-A143-D735E9471B48} - {16186116-C8D7-7849-B911-27648399FEA3} + {FD9C7C56-DC80-2C4A-9605-CCE3E85DDEF9} - {ACEC36AF-E77B-8548-A7B5-54A637A6D28F} + {C3E0A30A-0CF3-8244-AEF1-6C070298ED49} - {614E9729-1405-0045-AB51-84D886E6066B} + {95D50DDF-BBCC-5442-B65E-B2DA12B51CA6} - {945D6763-263E-6B48-80F4-2A49B7C0F92F} + {6370E9D6-42D7-8944-BEF9-EBB311DF29EE} - {C5A9677C-178C-2B43-AF89-8979E7207A0A} + {44DE2B9C-A8D0-1D4D-8AFB-C8BE821DB4EE} diff --git a/projects/vs2010/tutorial_4.vcxproj b/projects/vs2010/tutorial_4.vcxproj index cf747f64..84197f24 100644 --- a/projects/vs2010/tutorial_4.vcxproj +++ b/projects/vs2010/tutorial_4.vcxproj @@ -19,7 +19,7 @@ - {04F58A64-83DD-A241-8134-E0EFA75B00D6} + {D8C65B00-D6BC-564C-9DA1-161F65EF5408} tutorial_4 Win32Proj diff --git a/projects/vs2010/tutorial_4.vcxproj.filters b/projects/vs2010/tutorial_4.vcxproj.filters index 0c002972..12651c3c 100644 --- a/projects/vs2010/tutorial_4.vcxproj.filters +++ b/projects/vs2010/tutorial_4.vcxproj.filters @@ -2,22 +2,22 @@ - {7972C8A8-E398-E740-A833-B9A67D78F68A} + {E51CA290-17A0-FC40-AA8E-18DAE716C3B2} - {A8B5A252-7384-3544-89E0-21F489D4E938} + {98614188-7BC0-0F42-AAF3-470ACE486EDE} - {9B3DA7A4-8164-6541-A965-1E587962AA44} + {6E7304CC-8115-6F4B-9CF5-C9C4E1E74F89} - {9150D5BB-3FBA-2440-B391-86457E1EC83D} + {6F0E499D-7069-C948-8409-83B104F6FA21} - {C83E1C4F-5206-0343-A30C-1F832AC79F31} + {DAD1ABC6-2980-EF4D-8E62-D40FD5849610} - {6D99277F-91AA-564E-ACCA-C47277290AAD} + {9F9F95BB-C612-A34A-84A6-5CD11BEADF41} diff --git a/projects/vs2010/tutorial_5.vcxproj b/projects/vs2010/tutorial_5.vcxproj index 5d05f397..8a508888 100644 --- a/projects/vs2010/tutorial_5.vcxproj +++ b/projects/vs2010/tutorial_5.vcxproj @@ -19,7 +19,7 @@ - {F406167D-2699-E641-B8E8-2B01460D2D06} + {F5D8C526-79F5-E743-ABC1-D7C676E93F0F} tutorial_5 Win32Proj diff --git a/projects/vs2010/tutorial_5.vcxproj.filters b/projects/vs2010/tutorial_5.vcxproj.filters index df7d1df0..f24d64a7 100644 --- a/projects/vs2010/tutorial_5.vcxproj.filters +++ b/projects/vs2010/tutorial_5.vcxproj.filters @@ -2,22 +2,22 @@ - {720156AC-3A35-1942-A011-3AC6F4C7FF1B} + {70E99CDD-C2EE-E947-B492-F40637F29051} - {82BD7283-CE2B-FC42-AD4A-D510F366A48D} + {9D4D5D87-E885-D141-B790-39D7701E4930} - {E602DCC8-587C-5E42-8725-BA6BE756A7BF} + {DC19C80F-57C1-AF48-A7F2-2961F3A187DE} - {B7DFF469-1FE9-864B-A838-CAE42EAEA406} + {B63A31EB-E2BF-414F-8D75-71B2EAFA4A60} - {84F271F4-C098-1749-AD06-0D14C9FE8093} + {873F0E30-1BA7-D34D-B6A1-AC842EECD2B8} - {4EE7F70A-CC0C-1C4B-8255-51AF30595DF5} + {910BAD1C-B0B9-6F43-A652-3ED66AB510DB} diff --git a/projects/vs2010/tutorial_6.vcxproj b/projects/vs2010/tutorial_6.vcxproj new file mode 100644 index 00000000..7e570d69 --- /dev/null +++ b/projects/vs2010/tutorial_6.vcxproj @@ -0,0 +1,239 @@ + + + + + DebugStatic + Win32 + + + ReleaseStatic + Win32 + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + + {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3} + tutorial_6 + Win32Proj + + + + Application + true + MultiByte + + + Application + false + MultiByte + + + Application + true + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + ..\..\bin\ + ..\..\intermediate\debugstatic\vs2010\tutorial_6\x32\ + tutorial_6_debugstatic_win32_vs2010 + .exe + true + + + ..\..\bin\ + ..\..\intermediate\releasestatic\vs2010\tutorial_6\x32\ + tutorial_6_releasestatic_win32_vs2010 + .exe + false + + + ..\..\bin\ + ..\..\intermediate\debugdll\vs2010\tutorial_6\x32\ + tutorial_6_debugdll_win32_vs2010 + .exe + true + + + ..\..\bin\ + ..\..\intermediate\releasedll\vs2010\tutorial_6\x32\ + tutorial_6_releasedll_win32_vs2010 + .exe + false + + + + /MP /bigobj %(AdditionalOptions) + Disabled + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + true + MultiThreadedDebugDLL + true + + Level4 + false + Fast + EditAndContinue + $(OutDir)tutorial_6_debugstatic_win32_vs2010.pdb + + + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)tutorial_6_debugstatic_win32_vs2010.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + /MP /bigobj /Ox /Oi /Ob1 /Ot %(AdditionalOptions) + Full + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + Level4 + false + Fast + + + + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + false + true + true + $(OutDir)tutorial_6_releasestatic_win32_vs2010.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + /MP /bigobj %(AdditionalOptions) + Disabled + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + true + MultiThreadedDebugDLL + true + + Level4 + false + Fast + EditAndContinue + $(OutDir)tutorial_6_debugdll_win32_vs2010.pdb + + + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)tutorial_6_debugdll_win32_vs2010.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + /MP /bigobj /Ox /Oi /Ob1 /Ot %(AdditionalOptions) + Full + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + Level4 + false + Fast + + + + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + false + true + true + $(OutDir)tutorial_6_releasedll_win32_vs2010.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + + + + + + + + + + + + + + + + + {332CEEDC-7568-D84C-B9C6-B710915836ED} + + + + + + diff --git a/projects/vs2010/tutorial_6.vcxproj.filters b/projects/vs2010/tutorial_6.vcxproj.filters new file mode 100644 index 00000000..0016cffb --- /dev/null +++ b/projects/vs2010/tutorial_6.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {2D32C092-FBD5-CE45-B6A1-3A48310DD31B} + + + {BE2D8807-3690-5C4D-92B0-AC9E5317D6C8} + + + {809F5B67-B956-C641-A61B-1E6BB52DD46C} + + + {06B0E2C4-B083-3043-AECA-2CAB5CCA789C} + + + {026AE998-9713-254D-B0FC-2F65CC30B0D4} + + + {F4CB92C7-ED9C-144D-8440-38EE4F207A89} + + + + + tutorials\tutorial_6\cpp\behaviac_generated\types + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + + + tutorials\tutorial_6\cpp + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + diff --git a/projects/vs2010/usertest.vcxproj b/projects/vs2010/usertest.vcxproj index 9e2be070..4f64a107 100644 --- a/projects/vs2010/usertest.vcxproj +++ b/projects/vs2010/usertest.vcxproj @@ -19,7 +19,7 @@ - {E29F6B3D-D6EA-9A44-B868-4014DB71FEBF} + {41F757EE-B27F-5E47-A254-DBE973DDB05E} usertest Win32Proj diff --git a/projects/vs2010/usertest.vcxproj.filters b/projects/vs2010/usertest.vcxproj.filters index 0ea54b7f..619facd5 100644 --- a/projects/vs2010/usertest.vcxproj.filters +++ b/projects/vs2010/usertest.vcxproj.filters @@ -2,28 +2,28 @@ - {EBD19423-9278-5746-A256-A483152AE9BC} + {FC25A8B6-CF09-5B48-93A6-1CA6EBACAB58} - {207E3AE2-65B7-4E41-A9DF-7809D522F60F} + {F99CE654-F89D-F344-9C5B-6D489354D19F} - {DCE208B6-A4FF-8540-9B49-ACFCA262D03C} + {FFC39FB3-52DA-7E4F-92CD-8469C1012084} - {561E0833-E5DA-6041-B0B6-E17E79CC5E71} + {BEC00164-A4F2-DB4F-B890-C94C36B23BA2} - {45589955-009E-8640-B54B-90E94A13FC79} + {A12581E9-234A-2F42-937B-AAF35B10997A} - {6919C25A-6151-0343-B284-D5F237EB376D} + {19DC5891-A711-4440-8F1E-C7B9B6BC5025} - {1753B0C8-0260-A14F-9D9B-6BBC30B6C8F5} + {3A49A471-884F-0147-A657-68235996C6E5} - {2C894691-0DE5-D54E-BF24-BD0595FF7610} + {16583F8B-4B3D-2940-A23D-6FFB3A6240B5} diff --git a/projects/vs2013/behaviac.sln b/projects/vs2013/behaviac.sln index 362ab29f..dabfbc19 100644 --- a/projects/vs2013/behaviac.sln +++ b/projects/vs2013/behaviac.sln @@ -3,62 +3,67 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "behaviac", "behaviac.vcxproj", "{332CEEDC-7568-D84C-B9C6-B710915836ED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btunittest", "btunittest.vcxproj", "{1AADF83F-8903-8A48-A5BA-9EA1F5344A95}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btunittest", "btunittest.vcxproj", "{1719AEB2-B56A-464A-A63A-5F7C2E54D337}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{4F05EE3A-F16B-E949-8CF7-108566AA95A8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{6BC7C54C-AD97-1944-8E25-20E4EE8BF796}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{3AE50056-01F6-4A4F-9E27-A9DB312F634A}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_running", "demo_running.vcxproj", "{20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_running", "demo_running.vcxproj", "{803B3D92-0B30-4041-9492-B1B58F0D63BC}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{60E97E8F-FD9D-3347-843C-44D5B14EFB9F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{E3B1BA89-2650-4E4F-8018-7109702702A9}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1", "tutorial_1.vcxproj", "{77E8143A-F10E-7247-B3A0-9B8E635C81A1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1", "tutorial_1.vcxproj", "{C6BD24CC-FB22-0E4E-9A24-4480F03192FD}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_1", "tutorial_1_1.vcxproj", "{6D5814F4-C655-D148-BCBA-1E091BD10C6A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_1", "tutorial_1_1.vcxproj", "{9860146C-FA39-9346-9B79-193320168E43}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_2", "tutorial_1_2.vcxproj", "{85A7D310-7EE6-D241-8846-28887BE720F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_2", "tutorial_1_2.vcxproj", "{F326205A-472F-9844-AF75-8D2B3E0BE934}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_2", "tutorial_2.vcxproj", "{6517CF7B-694B-E749-A8BE-99432EA3F419}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_2", "tutorial_2.vcxproj", "{E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_3", "tutorial_3.vcxproj", "{0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_3", "tutorial_3.vcxproj", "{F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_4", "tutorial_4.vcxproj", "{05DA6C78-4039-E643-B34D-254D840B87F7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_4", "tutorial_4.vcxproj", "{CABFE60C-BCCC-C84B-AA53-F805FACA0D98}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_5", "tutorial_5.vcxproj", "{9090A68A-8DCF-1842-85B3-059B0F3AA825}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_5", "tutorial_5.vcxproj", "{26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}" + ProjectSection(ProjectDependencies) = postProject + {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_6", "tutorial_6.vcxproj", "{1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection @@ -79,102 +84,110 @@ Global {332CEEDC-7568-D84C-B9C6-B710915836ED}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {332CEEDC-7568-D84C-B9C6-B710915836ED}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {332CEEDC-7568-D84C-B9C6-B710915836ED}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {4F05EE3A-F16B-E949-8CF7-108566AA95A8}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {77E8143A-F10E-7247-B3A0-9B8E635C81A1}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {6D5814F4-C655-D148-BCBA-1E091BD10C6A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {85A7D310-7EE6-D241-8846-28887BE720F8}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {6517CF7B-694B-E749-A8BE-99432EA3F419}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {05DA6C78-4039-E643-B34D-254D840B87F7}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {9090A68A-8DCF-1842-85B3-059B0F3AA825}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {1719AEB2-B56A-464A-A63A-5F7C2E54D337}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {3AE50056-01F6-4A4F-9E27-A9DB312F634A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {803B3D92-0B30-4041-9492-B1B58F0D63BC}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {E3B1BA89-2650-4E4F-8018-7109702702A9}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {9860146C-FA39-9346-9B79-193320168E43}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {F326205A-472F-9844-AF75-8D2B3E0BE934}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/vs2013/behaviac.vcxproj.filters b/projects/vs2013/behaviac.vcxproj.filters index d930dea4..66e335f7 100644 --- a/projects/vs2013/behaviac.vcxproj.filters +++ b/projects/vs2013/behaviac.vcxproj.filters @@ -2,166 +2,166 @@ - {9EA2D5BD-CE3E-A44A-A89D-68FA4B1D17CB} + {EC51B8BA-F853-5D43-B91C-79FC357B8878} - {C64A49BA-3141-6447-9A46-A1B49C8991F8} + {B15B28D4-5333-D449-BF72-D2A9FF38211D} - {16CB01F5-549D-1246-B79E-7645F3B4A810} + {65082F0B-F691-B14A-97A3-78E254BAF0C9} - {2F6C85E9-1D3C-814A-8ED9-75DE37ACB5E1} + {15FFD6C1-8AF6-9D4B-A34B-FF5EAB479842} - {3DD5C48A-295B-584E-9AA0-29473095419E} + {9A2DEB5D-EDE0-EA47-BB13-8628DCDED12A} - {9B8C1D5D-3F0D-7945-BB48-8025B0820E67} + {94104223-7F28-9E4B-9F3F-FA4378178D6F} - {5F178803-CC04-6848-A49F-E04BC742399F} + {516B6C51-790A-254D-8423-C390929363E9} - {A0092F33-ECDB-9E47-B43D-900698D012F7} + {8FC0C5B8-77E0-FD4D-A32F-959EE844F8FD} - {F0EF8E96-16EB-2C45-8E82-783DC5894F42} + {587F5B04-7932-7F4B-B66C-23B3DE0E616E} - {080B5B32-0A81-564F-AD2D-87DCDB72239C} + {EA09EF5F-4135-6341-B603-4D646215AC5C} - {44BBBABC-E900-224A-A2D3-556E38A6EB1F} + {9998667C-14F8-BF40-8BB4-63C5F80482AA} - {B58B7CFB-7F37-8743-AF49-3335C8D8244D} + {E87E39E3-FC46-3E45-880D-C96DF7EDCD52} - {3CC7B27C-9E38-D74D-8AA2-8AB662022C49} + {A4532293-8391-6D46-B06E-A9C18C3023EC} - {918632DF-AD39-8E48-BED1-378653BB4E64} + {D09C9F77-2371-8648-AB51-EB9B0071C012} - {9ABD9288-3B97-1F43-B008-C3ED65643BCB} + {21D5149A-797A-B648-8955-44ABC432AB5F} - {ADA98C34-0B7E-9945-B88B-0660409335A9} + {17339F09-C807-6743-BCD6-7CC74ED700C3} - {383FCA87-9B44-BC4D-9469-19217CDFEDF3} + {EC7DB71B-44B3-0C40-B444-FC394C214AD3} - {0AC62858-96C3-B54B-B10C-A3A4660BAE69} + {E569FB3D-42DC-C345-B562-F5D4035F037F} - {3D799274-7068-EC4E-A17B-5678F70D7507} + {C83B18F3-25AE-DC49-9357-9DD9A938570E} - {C304E021-55C8-7844-89CE-48EB10CB775A} + {BFA54451-5F5D-324C-B0D5-CDE8A2BBF67D} - {D58DF0E1-2A07-214B-A2DD-AB6042A1A74E} + {7A411471-4F4E-294D-AE60-6B660A8AA092} - {D8CBF605-E07C-8B47-AE3F-7D123323158F} + {9D8F1A12-37E5-2B44-8602-7752846942BF} - {1213FC4C-A119-3443-897A-E2C2EB51BBA3} + {44C418E6-6EE9-CC46-951B-EF9407F01849} - {08ABB227-8B2B-CB4E-86D7-92A6D38664B5} + {9DABFA18-6C79-4B45-8894-05BA03D82D81} - {BE84C82A-1A03-E649-9007-C5867BA95093} + {54F61301-4796-E848-A755-4584AE86D6B1} - {5BD60C3C-3B3A-384C-BF24-67B72B0A0BB8} + {D90478CB-59F7-034B-A4AF-5438009EF29E} - {722FE820-1A41-6641-9329-DC8DBA172C2C} + {F8B7DE39-5728-6C4A-BB59-1D35AE35320E} - {323B140B-42FE-2A43-A582-8967B8140040} + {1FD0AD76-D5AC-FB48-BD3D-6E79CB4DEC3F} - {54F0A589-F706-E24B-A2D3-D5D10863DE44} + {105D7979-99A3-4446-A17B-FEF8FD2B060F} - {7EF05F4B-E35F-9B47-90A6-6ADBF85FD6D7} + {B9C687B4-076B-F541-8A2E-0DA714389FBE} - {E04FA491-09C2-4A4D-9DA0-59BDC642075D} + {F3F57CEC-2953-094C-8CFA-D3D9F89AE82A} - {4FC42556-5F7A-734A-B005-C77AE714BDC2} + {37586960-7805-4349-B706-2D389256A131} - {F1D7AC50-B52B-A140-AF68-A4BFBDB30AB9} + {23831B54-93D2-3347-A071-DDCEC52C3321} - {9487276E-BD4E-AA49-BF43-5D841AA77382} + {488B054F-4668-264F-ADC2-B7FE53E9E5F6} - {F39C772A-A430-5D43-A765-A929D5BA530C} + {AB309314-B647-E344-80B8-2E5921930546} - {54FBD8A7-E725-6F43-B45B-BA12B792D960} + {83981213-437C-E141-819A-8962C5DA87E6} - {6FF70C7A-EE5E-F746-8443-8CF39099AD5C} + {14B917FB-9AF5-E242-8177-97E954577204} - {4C266490-5A54-C449-81E3-6F9384836CB0} + {DAB7313F-CD84-8A45-9778-0A8C1483464A} - {A05F51F0-473C-1946-825B-5AF6553AB8F2} + {46572491-D5A6-854A-894F-49654AA3851C} - {B9900836-7DC8-F143-AE29-34CD202C1D67} + {4A75D153-2972-C542-8CA3-25E3571FCD8F} - {088061D9-ADCB-6449-A6D2-075ACB6EAEE5} + {082C656F-8BFE-E64C-B4E4-BD46DEF92250} - {77C28411-6FC0-734C-B25C-AC9BB2D3184D} + {254B14C7-9107-754D-ADAF-392B7EF16409} - {19E83E7F-61C4-7D4C-94E7-0CE4F05C7E93} + {8FA3B089-AEA2-C14E-BD42-A9BA22702C2C} - {9A83122C-57EB-134A-8B6E-7D338C1A408F} + {78494070-FFB0-B941-95F9-C4EF4BF2D311} - {CA6EDB05-7C57-1148-B779-2F4D3BCA6411} + {BFB2DDB8-2EB7-734D-BA4D-986288DD2A48} - {24E38039-86B1-8842-B54C-7AA84E240451} + {174A1119-4527-DB4E-9031-07AE7F92B55C} - {5D335160-60A9-C742-B47F-6A7F3AF5704D} + {1D174C18-0CBD-D44E-BE2A-8D5B5EF66110} - {E40819E3-A3E9-BE43-841A-D1420B808312} + {B171C193-0949-DB40-8ABA-047F7956CAD8} - {88C86293-F9A8-114A-932C-EEA217629521} + {41EA910A-D1E0-8C40-A20B-BD612615D3C3} - {C790D420-A2F0-A940-B1F7-7581CB65F985} + {1F07181F-53C9-264B-BD64-898957380E08} - {96222B39-285E-7645-96C0-CBC69DD12363} + {9DC2F0F9-7D58-394C-AC89-1F40BE13C607} - {C2A83726-EA73-8748-A33D-6662C0D5F74A} + {10DD542F-B2A3-5849-AB88-FB69D5899845} - {2C3633E6-53EE-D04D-A188-CC2261DEDA48} + {8E4DBDD9-F4B7-9E43-8236-DD3F7CBE9D12} - {476CAE64-EC6D-514A-88A1-AA1A0ECD4969} + {C6844F4E-6818-5544-AE93-98AF62ACBE5B} diff --git a/projects/vs2013/btperformance.vcxproj b/projects/vs2013/btperformance.vcxproj index e153429c..ae653332 100644 --- a/projects/vs2013/btperformance.vcxproj +++ b/projects/vs2013/btperformance.vcxproj @@ -19,7 +19,7 @@ - {6BC7C54C-AD97-1944-8E25-20E4EE8BF796} + {3AE50056-01F6-4A4F-9E27-A9DB312F634A} btperformance Win32Proj diff --git a/projects/vs2013/btperformance.vcxproj.filters b/projects/vs2013/btperformance.vcxproj.filters index 232504c1..095fc4ce 100644 --- a/projects/vs2013/btperformance.vcxproj.filters +++ b/projects/vs2013/btperformance.vcxproj.filters @@ -2,22 +2,22 @@ - {D3120AFB-4BB5-9347-BB8B-FC015C872189} + {8098246A-0982-4447-A270-EAC7AC01324A} - {D9EDABCD-293C-044E-BD89-8BAB020E41F3} + {5403A889-8A77-B34B-ADCF-DC33ADDD79DA} - {DE779F12-CDC5-5549-85B6-AF481B721B0D} + {C5AC5524-75E9-3C47-B808-54E9BCB19E21} - {46401249-0BA4-024E-821E-341D90D201D8} + {FE3A117B-6115-424D-B0AE-263758D63272} - {548C8A28-CD0B-3848-B055-35D4D9C35560} + {01CC47DA-F67B-0348-8004-8AF99E390625} - {D7A0F4D2-A441-DB40-99A4-864D6B3F8570} + {5FD04EC3-CC15-AC4C-B053-B60B5C57A266} diff --git a/projects/vs2013/btremotetest.vcxproj b/projects/vs2013/btremotetest.vcxproj index 91f129bb..715badee 100644 --- a/projects/vs2013/btremotetest.vcxproj +++ b/projects/vs2013/btremotetest.vcxproj @@ -19,7 +19,7 @@ - {4F05EE3A-F16B-E949-8CF7-108566AA95A8} + {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464} btremotetest Win32Proj diff --git a/projects/vs2013/btremotetest.vcxproj.filters b/projects/vs2013/btremotetest.vcxproj.filters index 65d95de1..8bc2da9e 100644 --- a/projects/vs2013/btremotetest.vcxproj.filters +++ b/projects/vs2013/btremotetest.vcxproj.filters @@ -2,25 +2,25 @@ - {4D756ECB-2479-3C4F-A8EE-580276EC0C50} + {05C6A6F3-6E1E-274A-9BE7-010B14ECE838} - {1D722C4C-9595-5E45-A39C-111317546FAF} + {B4E957E9-D8F3-3A4F-B00B-C18CEFA069DB} - {84136798-05E8-FE46-BF1B-DEC4902BA460} + {2C5ABC4F-E853-5D4F-AA45-197867AA262B} - {6EBA93D6-D5BF-3D45-AA9D-173130ABF2A1} + {CFDC593B-45EF-DE40-8DB8-D6FD150A4062} - {A085381E-B3BD-CC4E-86AA-F53E3DDA772B} + {62949365-6D93-E34D-AC92-C4CFD8EB1FE8} - {886EB5AC-D073-B640-B180-E2887EA83959} + {EF381090-ACF6-4F4B-837F-4F2F43C4AE1F} - {E641FA7A-4396-2E45-9C34-619D605BD15B} + {65E8CAC6-ACA9-8E45-8E08-B82FC95C6919} diff --git a/projects/vs2013/btunittest.vcxproj b/projects/vs2013/btunittest.vcxproj index cd72ce5f..a5d05b6f 100644 --- a/projects/vs2013/btunittest.vcxproj +++ b/projects/vs2013/btunittest.vcxproj @@ -19,7 +19,7 @@ - {1AADF83F-8903-8A48-A5BA-9EA1F5344A95} + {1719AEB2-B56A-464A-A63A-5F7C2E54D337} btunittest Win32Proj diff --git a/projects/vs2013/btunittest.vcxproj.filters b/projects/vs2013/btunittest.vcxproj.filters index d53cd7af..2fcea939 100644 --- a/projects/vs2013/btunittest.vcxproj.filters +++ b/projects/vs2013/btunittest.vcxproj.filters @@ -2,52 +2,52 @@ - {F6056035-255A-F441-92A4-E2368CC36F34} + {DA191687-F7EE-9F4A-AA54-DC161CFF71F6} - {45C8E90B-F9A5-8E44-B66B-6CBF64C91F75} + {525ECEB9-086E-294A-B302-465917A7CA99} - {28763C0B-8B48-6B4A-A563-9806AE505FF9} + {7197B3FD-6712-8A43-917E-61428D5BFE67} - {DA226754-169D-1944-A0DA-0ACAED7A895F} + {6628C7E6-7522-6F4A-B5EF-34E328DFEA8A} - {6B0514CD-FFA1-3C46-AE22-183B8872057F} + {E1A6D0C6-BFEB-2445-BE86-332CC18454B1} - {8B5E3A1C-F62A-FA45-9835-F7A12DA8AB15} + {6CE7CE0E-3B1F-FD4E-8C3B-44F6FDE4E04B} - {5F8D7637-1830-3E49-8819-4CCA02F0467D} + {4BD72402-63B3-9446-919A-6702CBE87E85} - {420FC38E-4C66-7E41-BF44-820A94F4E2BE} + {210C13D3-87D0-A542-B8B2-45B83BA6FB0E} - {5A985F18-15A9-AA47-AC62-7A117B996715} + {643ADA10-5F79-974E-882E-C112A5A02894} - {9C1DE6CA-98C7-FC42-A225-A09304824E03} + {DD412140-E188-9442-AF57-202E5502463A} - {371DB7C3-B412-D743-998D-546803B69CF8} + {437BAA35-D42A-E241-8F38-1E65B568A523} - {A5886C83-47C4-5949-A99E-EBCA744BE445} + {C3AFBBB6-1C55-7F40-9F74-DB7A39196620} - {6A45582F-0179-7141-BC7D-B9305F73AD6E} + {0A93DF45-CAAE-4E4B-B83A-D967B1C03E8C} - {F927A7B7-F7DD-6E43-A8AB-0219E6EDC44F} + {CE0971B9-DA80-F240-AB0D-9D6F8C5DA8FB} - {97EC879A-985F-1148-A96B-EB108E0A86A5} + {1739E302-D9DE-594C-8C5A-6C666BECC61C} - {37788C68-63DC-4641-8BB8-7C18137F343C} + {3CD7FD3A-22DC-AE4B-8895-054B53BE4DBE} diff --git a/projects/vs2013/demo_running.vcxproj b/projects/vs2013/demo_running.vcxproj index 582940c5..7b27ac09 100644 --- a/projects/vs2013/demo_running.vcxproj +++ b/projects/vs2013/demo_running.vcxproj @@ -19,7 +19,7 @@ - {20E7F6E4-3FB8-2C43-A22B-E4A935EFC2A3} + {803B3D92-0B30-4041-9492-B1B58F0D63BC} demo_running Win32Proj diff --git a/projects/vs2013/demo_running.vcxproj.filters b/projects/vs2013/demo_running.vcxproj.filters index 7e06b261..a3c83dac 100644 --- a/projects/vs2013/demo_running.vcxproj.filters +++ b/projects/vs2013/demo_running.vcxproj.filters @@ -2,28 +2,28 @@ - {A8256D24-09F7-364B-B4CA-5924F2BEF609} + {F57B648B-E258-234A-9F13-976482CF515E} - {9AC35987-2548-6844-A470-F8CF8A2F7982} + {38696485-6A02-CC49-9FD8-CC8B8950C684} - {D991ABB1-E6CC-A546-BD9A-296069475E01} + {C75CF597-25D8-CD49-830A-FC6908F4834B} - {A1CFC7B6-20E1-A442-AE7D-8F327B7954C0} + {9E076078-E357-314A-8D95-E5D0F302C80F} - {FE9F0196-13C7-2E4C-818E-8596073D7C2D} + {F8F87647-5F0A-9A46-B334-6316C49F3E57} - {F7536FBA-FA9A-7341-A02C-C5D8B0BB953A} + {C045368E-0391-974C-B70C-0DAE1AB56252} - {51FD570C-A77A-C04A-B83B-D2558DB92A36} + {BE409C23-58C6-794F-8105-48395C30AF91} - {F0D3F2C2-E742-9B4B-8EA6-94622A9B8F41} + {89823AE3-6339-AA46-8C09-7DCD939E7592} diff --git a/projects/vs2013/tutorial_1.vcxproj b/projects/vs2013/tutorial_1.vcxproj index 2d191f33..db25f00f 100644 --- a/projects/vs2013/tutorial_1.vcxproj +++ b/projects/vs2013/tutorial_1.vcxproj @@ -19,7 +19,7 @@ - {77E8143A-F10E-7247-B3A0-9B8E635C81A1} + {C6BD24CC-FB22-0E4E-9A24-4480F03192FD} tutorial_1 Win32Proj diff --git a/projects/vs2013/tutorial_1.vcxproj.filters b/projects/vs2013/tutorial_1.vcxproj.filters index 51c6f57d..70dc14e2 100644 --- a/projects/vs2013/tutorial_1.vcxproj.filters +++ b/projects/vs2013/tutorial_1.vcxproj.filters @@ -2,22 +2,22 @@ - {E4C1F906-2A95-4442-81F4-7A5B23AC81D9} + {5F023A70-7B63-E34D-976E-7B93F34A00F6} - {3458BB9C-AD32-D248-B502-BCAC8EFAA87F} + {6B6AFABD-E799-1240-844D-3BACB7CD149C} - {3CBE3654-192A-C14D-B987-6A54D09B3919} + {0F7B9850-169D-B948-8D59-94712BB2999B} - {45D2E918-805A-3A45-BD45-5134095991BA} + {7805E903-1CF9-3645-A9BA-92D37B09A8FF} - {9D64C6B5-EACB-B94A-88AF-15FD2BB21761} + {4C806332-B9BC-AA4D-B5E1-48EC64CD5AA6} - {17624858-5A01-E744-AB72-A26BE011DC7A} + {DB61FB15-CEA6-714C-BF8B-146AEBF9DAAE} diff --git a/projects/vs2013/tutorial_1_1.vcxproj b/projects/vs2013/tutorial_1_1.vcxproj index d9286f0c..99b9f326 100644 --- a/projects/vs2013/tutorial_1_1.vcxproj +++ b/projects/vs2013/tutorial_1_1.vcxproj @@ -19,7 +19,7 @@ - {6D5814F4-C655-D148-BCBA-1E091BD10C6A} + {9860146C-FA39-9346-9B79-193320168E43} tutorial_1_1 Win32Proj diff --git a/projects/vs2013/tutorial_1_1.vcxproj.filters b/projects/vs2013/tutorial_1_1.vcxproj.filters index 33b8b03b..e9054845 100644 --- a/projects/vs2013/tutorial_1_1.vcxproj.filters +++ b/projects/vs2013/tutorial_1_1.vcxproj.filters @@ -2,22 +2,22 @@ - {6C076EDF-E888-3B48-B2A0-1BE68AC77DE2} + {C473980B-A740-B644-86A5-E4C1F2032F63} - {49C61B23-3351-2344-96D2-6E321EF355A1} + {F9FEA073-E5F4-C64A-99EC-4D4DBF3BCBBF} - {F32723DF-99D2-E24E-AFE5-84CB4F20F57C} + {11CA29C1-7683-BE42-BC51-CB0353D16CD8} - {507F92CC-7204-DB41-8F7A-4E7B8C992B7E} + {91174C5D-1E34-0E47-BF86-CD83682B4478} - {D29A8368-60B0-8449-B87C-742370FA11B1} + {6014E75A-ACF9-6D4D-A9DF-0A1305F87BE4} - {584B943E-727F-CD4F-999C-6AC9A8324C05} + {207D601D-A04F-E54B-8FBB-15BCB5E6F44D} diff --git a/projects/vs2013/tutorial_1_2.vcxproj b/projects/vs2013/tutorial_1_2.vcxproj index 3281e067..bd918c18 100644 --- a/projects/vs2013/tutorial_1_2.vcxproj +++ b/projects/vs2013/tutorial_1_2.vcxproj @@ -19,7 +19,7 @@ - {85A7D310-7EE6-D241-8846-28887BE720F8} + {F326205A-472F-9844-AF75-8D2B3E0BE934} tutorial_1_2 Win32Proj diff --git a/projects/vs2013/tutorial_1_2.vcxproj.filters b/projects/vs2013/tutorial_1_2.vcxproj.filters index 8eb8e639..0edc6267 100644 --- a/projects/vs2013/tutorial_1_2.vcxproj.filters +++ b/projects/vs2013/tutorial_1_2.vcxproj.filters @@ -2,22 +2,22 @@ - {026199DC-9F6D-F34D-A9A7-BF60A023140C} + {99496AED-0D24-AC4A-8321-F64D355C03BA} - {1D3506ED-E8A1-CB43-9BE3-FB7D7D8A713E} + {2136FA28-C920-8E44-9931-AA12AB3641A6} - {D9AA11B3-C3B3-1A48-9398-83F833D87E3A} + {A1E6D4F3-3E7D-1C43-86FE-87AE40450DDD} - {8BC6FB9B-5BC6-154F-B0E0-BB8A1B5DF99E} + {39B0B464-C204-2A4A-A0CE-852020AF2704} - {978A1711-ED06-F846-B820-F78C099F99A0} + {DE132B93-50C9-1B4B-9FF7-705BC919C66C} - {D1939102-23B4-D14C-9C2C-A58C9F11DA12} + {3530B039-5B03-3E41-8975-6AD8F81D7D23} diff --git a/projects/vs2013/tutorial_2.vcxproj b/projects/vs2013/tutorial_2.vcxproj index eecc7ebf..8d7580c7 100644 --- a/projects/vs2013/tutorial_2.vcxproj +++ b/projects/vs2013/tutorial_2.vcxproj @@ -19,7 +19,7 @@ - {6517CF7B-694B-E749-A8BE-99432EA3F419} + {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757} tutorial_2 Win32Proj diff --git a/projects/vs2013/tutorial_2.vcxproj.filters b/projects/vs2013/tutorial_2.vcxproj.filters index dc1dcbb9..89091fc4 100644 --- a/projects/vs2013/tutorial_2.vcxproj.filters +++ b/projects/vs2013/tutorial_2.vcxproj.filters @@ -2,25 +2,25 @@ - {9408E9D4-88A6-B94B-B44F-4A23F47A9114} + {341681C3-2235-5B47-A01A-5C74EE340064} - {9D5F3DBF-CFCB-8C4D-B3B2-755220D8614B} + {219DDF1B-5377-9F40-AA5C-B10D8964B8D2} - {0473E207-C69A-9A4C-A667-3BAD2D60191F} + {C5EF23CB-7032-8F4A-BA42-6B8200AEE80F} - {FDDC3FE1-A6CF-CB48-9051-031083E47A0B} + {06AB6A0B-FB58-D947-8A28-D6126B15D4D2} - {B2357999-CE51-3540-ACBC-E3928F83BD2C} + {D7506DDE-B882-9948-90F8-D2975D11DBB3} - {C2D55F95-34C0-3642-B20C-534ABD58A35A} + {167A9D1F-4DD0-FA49-994B-BCC43E8D8742} - {7AC5F9D1-6EE3-8C46-8D78-139A3B54AB63} + {D25D07FB-E0AB-204C-B24A-ACC92771AB44} diff --git a/projects/vs2013/tutorial_3.vcxproj b/projects/vs2013/tutorial_3.vcxproj index e4e97ffe..5f18fa93 100644 --- a/projects/vs2013/tutorial_3.vcxproj +++ b/projects/vs2013/tutorial_3.vcxproj @@ -19,7 +19,7 @@ - {0869CE5A-2A6F-BD4F-ADAB-B84E4A06D24F} + {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8} tutorial_3 Win32Proj diff --git a/projects/vs2013/tutorial_3.vcxproj.filters b/projects/vs2013/tutorial_3.vcxproj.filters index 33b12ee8..802f4331 100644 --- a/projects/vs2013/tutorial_3.vcxproj.filters +++ b/projects/vs2013/tutorial_3.vcxproj.filters @@ -2,22 +2,22 @@ - {F73B376B-A8C8-1C47-A20D-F69BB4D68496} + {75D9E1B7-46EB-6D48-BD2F-4D2559E20E33} - {DC52CFE9-5380-D743-9F49-C259B3E93F3E} + {429899C5-C728-7E48-9316-8A511CA52055} - {BE6766CB-765B-A941-AFCF-91F078963200} + {FDB26833-26EE-B94C-B15F-BD107405EDBD} - {4E81D11B-DF12-A747-8799-94D070DA7E7D} + {785BC0C5-9A6E-F74D-A8E8-86960686CFA2} - {C1C84D88-0F4A-0B4D-880B-A0AEAC315995} + {4FAEAF7A-C6F1-8F4E-BF74-23B59F35EF25} - {09E6420D-99D3-C544-A4C1-B4640CFBAC78} + {60BE49CB-6B2E-B64B-ACA1-2868873503CC} diff --git a/projects/vs2013/tutorial_4.vcxproj b/projects/vs2013/tutorial_4.vcxproj index 26799d6c..fd8c8a97 100644 --- a/projects/vs2013/tutorial_4.vcxproj +++ b/projects/vs2013/tutorial_4.vcxproj @@ -19,7 +19,7 @@ - {05DA6C78-4039-E643-B34D-254D840B87F7} + {CABFE60C-BCCC-C84B-AA53-F805FACA0D98} tutorial_4 Win32Proj diff --git a/projects/vs2013/tutorial_4.vcxproj.filters b/projects/vs2013/tutorial_4.vcxproj.filters index 2c355433..b96e21db 100644 --- a/projects/vs2013/tutorial_4.vcxproj.filters +++ b/projects/vs2013/tutorial_4.vcxproj.filters @@ -2,22 +2,22 @@ - {8E3621BD-F529-8346-99CF-57EFD31B547F} + {631F1C33-9C12-B043-973F-21ECBD57760E} - {6643BD47-DC35-874B-ABBB-7C8240A41DF0} + {3CA2EE4B-6A7C-624E-8D7F-F7CCE9765962} - {56809A1B-DC23-8D4A-A886-398CB68CD117} + {CAFD04E2-28C7-B44D-AE9D-A5774647DB35} - {6072B9E1-111B-DF40-BB91-BF8D920B6D0B} + {129619A8-D846-A74D-B353-B696D1CE5D38} - {1018DD52-A2AB-9349-96E2-705F69442EB3} + {EB55A70E-162D-294C-9F95-606E1AB24FD8} - {57809AD2-BBDD-AC49-86DC-9A25ECB0FB93} + {FD1893D6-7DE3-BC47-8AC1-E69226332F25} diff --git a/projects/vs2013/tutorial_5.vcxproj b/projects/vs2013/tutorial_5.vcxproj index aa9e9a7f..5d97aa5a 100644 --- a/projects/vs2013/tutorial_5.vcxproj +++ b/projects/vs2013/tutorial_5.vcxproj @@ -19,7 +19,7 @@ - {9090A68A-8DCF-1842-85B3-059B0F3AA825} + {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0} tutorial_5 Win32Proj diff --git a/projects/vs2013/tutorial_5.vcxproj.filters b/projects/vs2013/tutorial_5.vcxproj.filters index e36a941e..7700d468 100644 --- a/projects/vs2013/tutorial_5.vcxproj.filters +++ b/projects/vs2013/tutorial_5.vcxproj.filters @@ -2,22 +2,22 @@ - {94D2DD9F-5ADF-B145-8BC1-CB2169F9A359} + {D9BF6017-B87E-9642-B566-8382E9B55554} - {798747D1-3F03-554F-A945-4F297D4873FD} + {5189F646-2BB3-2549-A809-5E7E071B7ED0} - {3B55E16E-CF68-6041-B0D5-FFDA324E283D} + {D6EA0254-9B07-7A48-BD3F-A3559C0723C0} - {ED73ACBC-4884-694D-B005-DD8EDE37778B} + {3F92101C-B5EF-054F-B9C2-6F0256772BFB} - {07FAEAE5-FAFA-8347-A1E1-21837A58E54D} + {23AB1803-3F2C-E941-AD76-B978B5791171} - {0F5B9E94-1D04-F346-9B8E-C61E33BA7818} + {3D94E524-4271-2540-99B5-5D27C932D518} diff --git a/projects/vs2013/tutorial_6.vcxproj b/projects/vs2013/tutorial_6.vcxproj new file mode 100644 index 00000000..9da1b023 --- /dev/null +++ b/projects/vs2013/tutorial_6.vcxproj @@ -0,0 +1,243 @@ + + + + + DebugStatic + Win32 + + + ReleaseStatic + Win32 + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + + {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A} + tutorial_6 + Win32Proj + + + + Application + true + MultiByte + v120 + + + Application + false + MultiByte + v120 + + + Application + true + MultiByte + v120 + + + Application + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + ..\..\bin\ + ..\..\intermediate\debugstatic\vs2013\tutorial_6\x32\ + tutorial_6_debugstatic_win32_vs2013 + .exe + true + + + ..\..\bin\ + ..\..\intermediate\releasestatic\vs2013\tutorial_6\x32\ + tutorial_6_releasestatic_win32_vs2013 + .exe + false + + + ..\..\bin\ + ..\..\intermediate\debugdll\vs2013\tutorial_6\x32\ + tutorial_6_debugdll_win32_vs2013 + .exe + true + + + ..\..\bin\ + ..\..\intermediate\releasedll\vs2013\tutorial_6\x32\ + tutorial_6_releasedll_win32_vs2013 + .exe + false + + + + /MP /bigobj %(AdditionalOptions) + Disabled + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + true + MultiThreadedDebugDLL + true + + Level4 + false + Fast + EditAndContinue + $(OutDir)tutorial_6_debugstatic_win32_vs2013.pdb + + + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)tutorial_6_debugstatic_win32_vs2013.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + /MP /bigobj /Ox /Oi /Ob1 /Ot %(AdditionalOptions) + Full + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + Level4 + false + Fast + + + + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + false + true + true + $(OutDir)tutorial_6_releasestatic_win32_vs2013.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + /MP /bigobj %(AdditionalOptions) + Disabled + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + false + EnableFastChecks + true + MultiThreadedDebugDLL + true + + Level4 + false + Fast + EditAndContinue + $(OutDir)tutorial_6_debugdll_win32_vs2013.pdb + + + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)tutorial_6_debugdll_win32_vs2013.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + /MP /bigobj /Ox /Oi /Ob1 /Ot %(AdditionalOptions) + Full + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions) + false + true + MultiThreadedDLL + true + + Level4 + false + Fast + + + + WIN32;NDEBUG;_HAS_EXCEPTIONS=0;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + false + true + true + $(OutDir)tutorial_6_releasedll_win32_vs2013.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + + + + + + + + + + + + + + + + + {332CEEDC-7568-D84C-B9C6-B710915836ED} + + + + + + diff --git a/projects/vs2013/tutorial_6.vcxproj.filters b/projects/vs2013/tutorial_6.vcxproj.filters new file mode 100644 index 00000000..86ae4d4a --- /dev/null +++ b/projects/vs2013/tutorial_6.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {BA838636-C58F-7747-B773-02E45A5AE815} + + + {D1B3399B-1CDC-794C-BDAF-996F148F6606} + + + {A4539B6E-29B8-C24A-9671-623047568F30} + + + {695BCD86-26CB-334E-BBCC-E2BFA00B0EAE} + + + {B36EC091-4514-BC4B-901D-BE044ABA18D2} + + + {2C1D1D33-A8BE-F04F-A0A9-FF871EAEAB0C} + + + + + tutorials\tutorial_6\cpp\behaviac_generated\types + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + + + tutorials\tutorial_6\cpp + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_6\cpp\behaviac_generated\types\internal + + + diff --git a/projects/vs2013/usertest.vcxproj b/projects/vs2013/usertest.vcxproj index 69d3111f..5fdfa009 100644 --- a/projects/vs2013/usertest.vcxproj +++ b/projects/vs2013/usertest.vcxproj @@ -19,7 +19,7 @@ - {60E97E8F-FD9D-3347-843C-44D5B14EFB9F} + {E3B1BA89-2650-4E4F-8018-7109702702A9} usertest Win32Proj diff --git a/projects/vs2013/usertest.vcxproj.filters b/projects/vs2013/usertest.vcxproj.filters index 6bb6deda..018bfab9 100644 --- a/projects/vs2013/usertest.vcxproj.filters +++ b/projects/vs2013/usertest.vcxproj.filters @@ -2,28 +2,28 @@ - {5C3B3681-06DF-E444-9E13-2229C3633D97} + {04D617BE-0DAF-744C-9DC7-C75AAEF584E5} - {8571E418-59C8-E044-9248-B876341BEA6A} + {0BF86E2F-376C-DB40-8077-B7B3AD0DC2C3} - {7C3351B6-2F24-A640-9077-BDEB7CDF5246} + {98D51115-3F47-9C48-A939-ED37FE0A94EA} - {C7ED713B-43E9-FD44-842E-6F2BCF01264F} + {FAED5850-5FE6-B549-AC23-F9AE8CE3D695} - {A79D1808-468A-9940-B506-F4D0C76224AB} + {0339CB2C-FA67-204A-8634-6523E4980949} - {8C22C432-DCC5-D143-BC44-3BB2C3C32407} + {323BD9F9-BD02-F444-9F1A-0C7AB3C1C276} - {485F8073-E857-8E49-9006-3A33EB969911} + {1397214B-5545-6C40-8D52-33A277414010} - {BD45F297-D270-2F40-AB46-916738BE196E} + {80C0F130-927A-B948-BFAC-9F65313EE61A} diff --git a/src/fsm/waitstate.cpp b/src/fsm/waitstate.cpp index 98c02a9c..e55f6577 100644 --- a/src/fsm/waitstate.cpp +++ b/src/fsm/waitstate.cpp @@ -197,23 +197,25 @@ namespace behaviac { BEHAVIAC_ASSERT(WaitState::DynamicCast(this->GetNode()) != 0, "node is not an WaitState"); WaitState* pStateNode = (WaitState*)(this->GetNode()); - BEHAVIAC_UNUSED_VAR(pStateNode); - bool bUseIntValue = Workspace::GetInstance()->GetUseIntValue(); + bool bUseIntValue = Workspace::GetInstance()->GetUseIntValue(); - if (bUseIntValue) { - long long time = Workspace::GetInstance()->GetIntValueSinceStartup(); + if (bUseIntValue) { + long long time = Workspace::GetInstance()->GetIntValueSinceStartup(); - if (time - this->m_intStart >= this->m_intTime) { - return BT_SUCCESS; - } - } else { - double time = Workspace::GetInstance()->GetDoubleValueSinceStartup(); + if (time - this->m_intStart >= this->m_intTime) { + pStateNode->Update(pAgent, this->m_nextStateId); + return BT_SUCCESS; + } + } + else { + double time = Workspace::GetInstance()->GetDoubleValueSinceStartup(); - if (time - this->m_start >= this->m_time) { - return BT_SUCCESS; - } - } + if (time - this->m_start >= this->m_time) { + pStateNode->Update(pAgent, this->m_nextStateId); + return BT_SUCCESS; + } + } return BT_RUNNING; } diff --git a/tools/designer/BehaviacDesigner/ControlsDialog.cs b/tools/designer/BehaviacDesigner/ControlsDialog.cs index dc8063aa..a25ff621 100644 --- a/tools/designer/BehaviacDesigner/ControlsDialog.cs +++ b/tools/designer/BehaviacDesigner/ControlsDialog.cs @@ -64,6 +64,8 @@ private void initWorkspaces() _workspaces.Add("C++ Tutorial_3", "../../../tutorials/tutorial_3/workspace/tutorial_3_cpp.workspace.xml"); _workspaces.Add("C++ Tutorial_4", "../../../tutorials/tutorial_4/workspace/tutorial_4_cpp.workspace.xml"); _workspaces.Add("C++ Tutorial_5", "../../../tutorials/tutorial_5/workspace/tutorial_5_cpp.workspace.xml"); + _workspaces.Add("C++ Tutorial_6", "../../../tutorials/tutorial_6/workspace/tutorial_6_cpp.workspace.xml"); + _workspaces.Add("C# Tutorial_1", "../../../tutorials/tutorial_1/workspace/tutorial_1_cs.workspace.xml"); _workspaces.Add("C# Tutorial_1_1", "../../../tutorials/tutorial_1_1/workspace/tutorial_1_1_cs.workspace.xml"); _workspaces.Add("C# Tutorial_1_2", "../../../tutorials/tutorial_1_2/workspace/tutorial_1_2_cs.workspace.xml"); @@ -71,6 +73,8 @@ private void initWorkspaces() _workspaces.Add("C# Tutorial_3", "../../../tutorials/tutorial_3/workspace/tutorial_3_cs.workspace.xml"); _workspaces.Add("C# Tutorial_4", "../../../tutorials/tutorial_4/workspace/tutorial_4_cs.workspace.xml"); _workspaces.Add("C# Tutorial_5", "../../../tutorials/tutorial_5/workspace/tutorial_5_cs.workspace.xml"); + _workspaces.Add("C# Tutorial_6", "../../../tutorials/tutorial_6/workspace/tutorial_6_cs.workspace.xml"); + #if DEBUG _workspaces.Add("Unity Unit Test", "../../../integration/unity/Assets/behaviac/workspace/behaviacunittest.workspace.xml"); _workspaces.Add("Unity Tank Demo", "../../../integration/BattleCityDemo/Assets/behaviac/workspace/BattleCity.workspace.xml"); diff --git a/tools/designer/BehaviacDesigner/MainWindow.cs b/tools/designer/BehaviacDesigner/MainWindow.cs index f98cb932..facbe64f 100644 --- a/tools/designer/BehaviacDesigner/MainWindow.cs +++ b/tools/designer/BehaviacDesigner/MainWindow.cs @@ -290,9 +290,30 @@ private void loadConfig() XmlNode configNode = configFile.ChildNodes[1]; + Plugin.TypeRenames.Clear(); + foreach (XmlNode xmlNode in configNode.ChildNodes) { - if (xmlNode.Name == "FilterNodes") + if (xmlNode.Name == "TypeRenames") + { + XmlAttribute langAttr = xmlNode.Attributes["Language"]; + if (Workspace.Current == null || langAttr != null && langAttr.Value == Workspace.Current.Language) + { + foreach (XmlNode node in xmlNode.ChildNodes) + { + XmlAttribute oldNameAttr = node.Attributes != null ? node.Attributes["OldName"] : null; + XmlAttribute newNameAttr = node.Attributes != null ? node.Attributes["NewName"] : null; + + if (oldNameAttr != null && newNameAttr != null) + { + string oldName = oldNameAttr.Value; + string newName = newNameAttr.Value; + Plugin.TypeRenames[oldName] = newName; + } + } + } + } + else if (xmlNode.Name == "FilterNodes") { Plugin.FilterNodes.Clear(); @@ -306,7 +327,6 @@ private void loadConfig() Plugin.FilterNodes.Add(nodeName); } } - } else if (xmlNode.Name == "Themes") { @@ -335,7 +355,6 @@ private void loadConfig() } } } - } catch (Exception e) { diff --git a/tools/designer/BehaviacDesigner/ParametersDock.cs b/tools/designer/BehaviacDesigner/ParametersDock.cs index 354d5c92..388a14fd 100644 --- a/tools/designer/BehaviacDesigner/ParametersDock.cs +++ b/tools/designer/BehaviacDesigner/ParametersDock.cs @@ -179,22 +179,27 @@ private void InspectObject(AgentType agentType, string agentName, string agentFu AgentType agentType1 = Plugin.GetAgentType(at); ParametersDock dock = findParametersDock(agentType1, an); - dock.InspectObject(agentType1, agentFullName1); + if (dock != null) + { + dock.InspectObject(agentType1, agentFullName1); - dock.setProperty(nodeState, agentFullName1); + dock.setProperty(nodeState, agentFullName1); + } } - } else if (AgentDataPool.CurrentFrame > -1 && !string.IsNullOrEmpty(agentName)) { ParametersDock dock = findParametersDock(agentType, agentName); - dock.InspectObject(agentType, agentFullName); + if (dock != null) + { + dock.InspectObject(agentType, agentFullName); - List valueSet = AgentDataPool.GetValidValues(agentType, agentFullName, AgentDataPool.CurrentFrame); + List valueSet = AgentDataPool.GetValidValues(agentType, agentFullName, AgentDataPool.CurrentFrame); - foreach (AgentDataPool.ValueMark value in valueSet) - { - dock.setProperty(null, value.Name, value.Value); + foreach (AgentDataPool.ValueMark value in valueSet) + { + dock.setProperty(null, value.Name, value.Value); + } } } diff --git a/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs b/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs index 2bac22d2..fc3db91b 100644 --- a/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs +++ b/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.6.24")] -[assembly: AssemblyFileVersion("3.6.24")] +[assembly: AssemblyVersion("3.6.25")] +[assembly: AssemblyFileVersion("3.6.25")] diff --git a/tools/designer/BehaviacDesignerBase/Importers/ImporterXML.cs b/tools/designer/BehaviacDesignerBase/Importers/ImporterXML.cs index 8082e039..16dff1f1 100644 --- a/tools/designer/BehaviacDesignerBase/Importers/ImporterXML.cs +++ b/tools/designer/BehaviacDesignerBase/Importers/ImporterXML.cs @@ -385,7 +385,7 @@ private static bool generateCsFile(string csFilename, string metaFile) if (i == 0 && classfullname != "behaviac::Agent") { - wrtr.WriteLine("\t[Behaviac.Design.ClassDesc(\"behaviac::Agent\", \"Agent\", false, true, false, \"\", \"\", false, true, \"\")]"); + wrtr.WriteLine("\t[Behaviac.Design.ClassDesc(\"behaviac::Agent\", \"\", \"Agent\", false, true, false, \"\", \"\", false, true, \"\")]"); wrtr.WriteLine("\tpublic class behaviac_Agent : Behaviac.Design.Agent"); wrtr.WriteLine("\t{"); wrtr.WriteLine("\t}\n"); diff --git a/tools/designer/BehaviacDesignerBase/Plugin.cs b/tools/designer/BehaviacDesignerBase/Plugin.cs index e9a5e871..c539acdf 100644 --- a/tools/designer/BehaviacDesignerBase/Plugin.cs +++ b/tools/designer/BehaviacDesignerBase/Plugin.cs @@ -1769,6 +1769,15 @@ public static bool IsClassDerived(Type type, Type baseType) return (type != null) && (baseType != null) && (type == baseType || type.IsSubclassOf(baseType)); } + private static Dictionary _typeRenames = new Dictionary(); + public static Dictionary TypeRenames + { + get + { + return _typeRenames; + } + } + private static List _filterNodes = new List(); public static List FilterNodes { @@ -2464,7 +2473,9 @@ public static bool IsExportArray(object v) public static bool IsCustomClassType(Type type) { - return type != null && !type.IsByRef && (type.IsClass || type.IsValueType) && type != typeof(void) && !type.IsEnum && !type.IsPrimitive && !IsStringType(type) && !IsArrayType(type); + return type != null && !type.IsByRef && (type.IsClass || type.IsValueType) && + type != typeof(void) && type != typeof(llong) && type != typeof(ullong) && + !type.IsEnum && !type.IsPrimitive && !IsStringType(type) && !IsArrayType(type); } public static bool IsCompatibleType(ValueTypes valueType, Type filterType, Type typeToFilter, bool bArrayType) diff --git a/tools/designer/BehaviacDesignerBase/Properties/Resources.Designer.cs b/tools/designer/BehaviacDesignerBase/Properties/Resources.Designer.cs index 419ebf26..6a076ecf 100644 --- a/tools/designer/BehaviacDesignerBase/Properties/Resources.Designer.cs +++ b/tools/designer/BehaviacDesignerBase/Properties/Resources.Designer.cs @@ -1883,6 +1883,15 @@ internal static string ReferencedBehaviorError { } } + /// + /// Looks up a localized string similar to Behavior Filename. + /// + internal static string ReferencedBehaviorFilename { + get { + return ResourceManager.GetString("ReferencedBehaviorFilename", resourceCulture); + } + } + /// /// Looks up a localized string similar to ReferencedBehaviorPath. /// diff --git a/tools/designer/BehaviacDesignerBase/Properties/Resources.resx b/tools/designer/BehaviacDesignerBase/Properties/Resources.resx index 23d0aa75..5f3fc6df 100644 --- a/tools/designer/BehaviacDesignerBase/Properties/Resources.resx +++ b/tools/designer/BehaviacDesignerBase/Properties/Resources.resx @@ -870,4 +870,7 @@ Please reexport the meta with the latest runtime! All meta files will be merged, and the previous mete files will be removed. Are you sure? + + Behavior Filename + \ No newline at end of file diff --git a/tools/designer/BehaviacDesignerBase/Properties/Resources.zh-CN.resx b/tools/designer/BehaviacDesignerBase/Properties/Resources.zh-CN.resx index b4980af8..1b59d762 100644 --- a/tools/designer/BehaviacDesignerBase/Properties/Resources.zh-CN.resx +++ b/tools/designer/BehaviacDesignerBase/Properties/Resources.zh-CN.resx @@ -868,4 +868,7 @@ 多个类型信息文件将被自动合并，并删除掉旧的类型信息文件，确定吗？ + + 引用文件名 + \ No newline at end of file diff --git a/tools/designer/Plugins/PluginBehaviac/DataExporters/Cpp/DataCppExporter.cs b/tools/designer/Plugins/PluginBehaviac/DataExporters/Cpp/DataCppExporter.cs index 0defcf3f..db2ede82 100644 --- a/tools/designer/Plugins/PluginBehaviac/DataExporters/Cpp/DataCppExporter.cs +++ b/tools/designer/Plugins/PluginBehaviac/DataExporters/Cpp/DataCppExporter.cs @@ -69,12 +69,15 @@ public static string GetGeneratedNativeType(string typeName) typeName = typeName.Replace("const ", ""); //repalce "std::string" and "string" with "beahviac::string" - //if (typeName.Contains("std::string")) - //{ - // typeName = typeName.Replace("std::string", "behaviac::string"); - //} - - if (!typeName.Contains("behaviac::string") && !typeName.Contains("behaviac::wstring")) + if (typeName.Contains("std::string")) + { + typeName = typeName.Replace("std::string", "behaviac::string"); + } + else if (typeName.Contains("std::wstring")) + { + typeName = typeName.Replace("std::wstring", "behaviac::wstring"); + } + else if (!typeName.Contains("behaviac::string") && !typeName.Contains("behaviac::wstring")) { if (typeName.Contains("wstring")) { @@ -86,6 +89,14 @@ public static string GetGeneratedNativeType(string typeName) } } + if (Plugin.TypeRenames.Count > 0) + { + foreach (KeyValuePair typePair in Plugin.TypeRenames) + { + typeName = typeName.Replace(typePair.Key, typePair.Value); + } + } + return typeName; } diff --git a/tutorials/CsTutorials/CsTutorials.sln b/tutorials/CsTutorials/CsTutorials.sln index 08b61814..972df331 100644 --- a/tutorials/CsTutorials/CsTutorials.sln +++ b/tutorials/CsTutorials/CsTutorials.sln @@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tutorial_4", "..\tutorial_4 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tutorial_1_2", "..\tutorial_1_2\cs\tutorial_1_2.csproj", "{5989203F-A9DE-48C4-B7F5-A4D8DB252C44}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tutorial_6", "..\tutorial_6\cs\tutorial_6.csproj", "{65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -109,6 +111,16 @@ Global {5989203F-A9DE-48C4-B7F5-A4D8DB252C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {5989203F-A9DE-48C4-B7F5-A4D8DB252C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU {5989203F-A9DE-48C4-B7F5-A4D8DB252C44}.Release|Win32.ActiveCfg = Release|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Debug|Win32.ActiveCfg = Debug|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Release|Any CPU.Build.0 = Release|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs b/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs index 1ee638ec..ac695378 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs @@ -519,6 +519,14 @@ virtual protected System.IO.StreamWriter GetFile(Agent pAgent) { buffer = string.Format("Agent_$_{0:3}.log", agentId); } + +#if !BEHAVIAC_NOT_USE_UNITY + if (UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsEditor && + UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsPlayer) + { + buffer = Path.Combine(UnityEngine.Application.persistentDataPath, buffer); + } +#endif } else { diff --git a/tutorials/CsTutorials/behaviac/runtime/Base/Utils.cs b/tutorials/CsTutorials/behaviac/runtime/Base/Utils.cs index e47e7fd4..91d4bb13 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Base/Utils.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Base/Utils.cs @@ -1289,8 +1289,8 @@ public static void Break(string msg) LogError(msg); #if !BEHAVIAC_NOT_USE_UNITY - //UnityEngine.Debug.Break(); - System.Diagnostics.Debug.Assert(false); + UnityEngine.Debug.Break(); + //System.Diagnostics.Debug.Assert(false); #else //throw new Exception(); System.Diagnostics.Debug.Assert(false); diff --git a/tutorials/CsTutorials/behaviac/runtime/FSM/WaitState.cs b/tutorials/CsTutorials/behaviac/runtime/FSM/WaitState.cs index fdd32a19..b13b3744 100644 --- a/tutorials/CsTutorials/behaviac/runtime/FSM/WaitState.cs +++ b/tutorials/CsTutorials/behaviac/runtime/FSM/WaitState.cs @@ -174,11 +174,13 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { Debug.Check(childStatus == EBTStatus.BT_RUNNING); Debug.Check(this.m_node is WaitState, "node is not an WaitState"); + WaitState pStateNode = (WaitState)this.m_node; if (Workspace.Instance.UseIntValue) { if (Workspace.Instance.IntValueSinceStartup - this.m_intStart >= this.m_intTime) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } @@ -186,6 +188,7 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { if (Workspace.Instance.DoubleValueSinceStartup - this.m_start >= this.m_time) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } diff --git a/tutorials/CsTutorials/behaviac/runtime/license.txt b/tutorials/CsTutorials/behaviac/runtime/license.txt index 540c4b97..8f260be7 100644 --- a/tutorials/CsTutorials/behaviac/runtime/license.txt +++ b/tutorials/CsTutorials/behaviac/runtime/license.txt @@ -1,138 +1,69 @@ -Tencent is pleased to support the open source community by making behaviac available. - -Copyright (C) 2015 THL A29 Limited, a Tencent company. All rights reserved. - -If you have downloaded a copy of the behaviac binary from Tencent, please note that the behaviac -binary is licensed under the BSD 3-Clause License. -If you have downloaded a copy of the behaviac source code from Tencent, please note that behaviac -source code is licensed under the BSD 3-Clause License, except for the third-party components -listed below which are subject to different license terms. Your integration of behaviac into -your own projects may require compliance with the BSD 3-Clause License, as well as the other -licenses applicable to the third-party components included within behaviac. - +Tencent is pleased to support the open source community by making Behaviac available. +Copyright (C) 2015-2017 THL A29 Limited, a Tencent company. All rights reserved. +If you have downloaded a copy of the Behaviac binary from Tencent, please note that the Behaviac binary is licensed under the BSD 3-Clause License. +If you have downloaded a copy of the Behaviac source code from Tencent, please note that Behaviac source code is licensed under the BSD 3-Clause License, except for the third-party components listed below which are subject to different license terms. Your integration of Behaviac into your own projects may require compliance with the BSD 3-Clause License, as well as the other licenses applicable to the third-party components included within Behaviac. A copy of the BSD 3-Clause License is included in this file. Other dependencies and licenses: -Open Source Software Licensed Under the BSD License: The below software in this distribution may -have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are -Copyright (C) 2015 THL A29 Limited. +Open Source Software Licensed Under the University of Illinois/NCSA Open Source License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- +1. LLVM - ConvertUTF.c 3.9.1 +Copyright 2001-2004 Unicode, Inc. -The Brainiac Designer V2.1 -Copyright (c) 2008, Daniel Kollmann -All rights reserved. -Nsubstitute V1.7.1 -Copyright (c) 2009, Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) -All rights reserved. +Terms of the University of Illinois/NCSA Open Source License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +? Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers. +? Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. +? Neither the names of , nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. -Libbehavior V1.0 -Copyright (c) 2009, LeegleechN -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted -provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the copyright holder nor the names of its contributors may be used to endorse - or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Open Source Software Licensed Under the MIT License: The below software in this distribution may have been -modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015 THL -A29 Limited. +Open Source Software Licensed Under the MIT License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- - -RapidXml V1.13 +1. RapidXml V 1.13 Copyright (c) 2006, 2007 Marcin Kalicinski All Rights Reserved. -DockPanel V2.0 +2. DockPanel V 2.0.0 Copyright (c) 2007 Weifen Luo All Rights Reserved. -nunit-framework V3.0 +3. nunit-framework V 3.0.0 Copyright (c) 2014 Charlie Poole All Rights Reserved. - -Terms of the MIT License: ---------------------------------------------------- - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the Software without restriction, including without -limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following -conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions -of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +Terms of the MIT License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -Open Source Software Licensed Under the zlib License: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -SDL V2.0.3 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SDL_image V2.0.0 -Copyright (C) 1997-2013 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. -SDL_ttf V2.0.12 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +Open Source Software Licensed Under the BSD 3-Clause License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. +-------------------------------------------------------------------- +1. Brainiac Designer V 2.1 +Copyright (c) 2008, Daniel Kollmann +All rights reserved. -Terms of the zlib License: ---------------------------------------------------- +2. Nsubstitute V 1.7.1 +Copyright (c) 2009 Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) +All rights reserved. -This software is provided 'as-is', without any express or implied warranty. In no event will the authors -be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, including commercial applications, -and to alter it and redistribute it freely, subject to the following restrictions: +Terms of the BSD 3-Clause License: +-------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original - software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the - original software. -3. This notice may not be removed or altered from any source distribution. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Terms of the BSD 3-Clause License: --------------------------------------------------------------------- +3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that -the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the - following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/tutorials/CsTutorials/behaviac/runtime/version.txt b/tutorials/CsTutorials/behaviac/runtime/version.txt index b522e479..927968ce 100644 --- a/tutorials/CsTutorials/behaviac/runtime/version.txt +++ b/tutorials/CsTutorials/behaviac/runtime/version.txt @@ -1 +1 @@ -3.6.24 +3.6.25 diff --git a/tutorials/tutorial_1/cpp/tutorial_1.cpp b/tutorials/tutorial_1/cpp/tutorial_1.cpp index 4822197f..6326af47 100644 --- a/tutorials/tutorial_1/cpp/tutorial_1.cpp +++ b/tutorials/tutorial_1/cpp/tutorial_1.cpp @@ -24,7 +24,6 @@ #endif using namespace std; -using namespace behaviac; FirstAgent* g_FirstAgent = NULL; diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs index 1ee638ec..ac695378 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs @@ -519,6 +519,14 @@ virtual protected System.IO.StreamWriter GetFile(Agent pAgent) { buffer = string.Format("Agent_$_{0:3}.log", agentId); } + +#if !BEHAVIAC_NOT_USE_UNITY + if (UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsEditor && + UnityEngine.Application.platform != UnityEngine.RuntimePlatform.WindowsPlayer) + { + buffer = Path.Combine(UnityEngine.Application.persistentDataPath, buffer); + } +#endif } else { diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs index e47e7fd4..91d4bb13 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/Utils.cs @@ -1289,8 +1289,8 @@ public static void Break(string msg) LogError(msg); #if !BEHAVIAC_NOT_USE_UNITY - //UnityEngine.Debug.Break(); - System.Diagnostics.Debug.Assert(false); + UnityEngine.Debug.Break(); + //System.Diagnostics.Debug.Assert(false); #else //throw new Exception(); System.Diagnostics.Debug.Assert(false); diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs index fdd32a19..b13b3744 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/FSM/WaitState.cs @@ -174,11 +174,13 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { Debug.Check(childStatus == EBTStatus.BT_RUNNING); Debug.Check(this.m_node is WaitState, "node is not an WaitState"); + WaitState pStateNode = (WaitState)this.m_node; if (Workspace.Instance.UseIntValue) { if (Workspace.Instance.IntValueSinceStartup - this.m_intStart >= this.m_intTime) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } @@ -186,6 +188,7 @@ protected override EBTStatus update(Agent pAgent, EBTStatus childStatus) { if (Workspace.Instance.DoubleValueSinceStartup - this.m_start >= this.m_time) { + pStateNode.Update(pAgent, out this.m_nextStateId); return EBTStatus.BT_SUCCESS; } } diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/license.txt b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/license.txt index 540c4b97..8f260be7 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/license.txt +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/license.txt @@ -1,138 +1,69 @@ -Tencent is pleased to support the open source community by making behaviac available. - -Copyright (C) 2015 THL A29 Limited, a Tencent company. All rights reserved. - -If you have downloaded a copy of the behaviac binary from Tencent, please note that the behaviac -binary is licensed under the BSD 3-Clause License. -If you have downloaded a copy of the behaviac source code from Tencent, please note that behaviac -source code is licensed under the BSD 3-Clause License, except for the third-party components -listed below which are subject to different license terms. Your integration of behaviac into -your own projects may require compliance with the BSD 3-Clause License, as well as the other -licenses applicable to the third-party components included within behaviac. - +Tencent is pleased to support the open source community by making Behaviac available. +Copyright (C) 2015-2017 THL A29 Limited, a Tencent company. All rights reserved. +If you have downloaded a copy of the Behaviac binary from Tencent, please note that the Behaviac binary is licensed under the BSD 3-Clause License. +If you have downloaded a copy of the Behaviac source code from Tencent, please note that Behaviac source code is licensed under the BSD 3-Clause License, except for the third-party components listed below which are subject to different license terms. Your integration of Behaviac into your own projects may require compliance with the BSD 3-Clause License, as well as the other licenses applicable to the third-party components included within Behaviac. A copy of the BSD 3-Clause License is included in this file. Other dependencies and licenses: -Open Source Software Licensed Under the BSD License: The below software in this distribution may -have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are -Copyright (C) 2015 THL A29 Limited. +Open Source Software Licensed Under the University of Illinois/NCSA Open Source License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- +1. LLVM - ConvertUTF.c 3.9.1 +Copyright 2001-2004 Unicode, Inc. -The Brainiac Designer V2.1 -Copyright (c) 2008, Daniel Kollmann -All rights reserved. -Nsubstitute V1.7.1 -Copyright (c) 2009, Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) -All rights reserved. +Terms of the University of Illinois/NCSA Open Source License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +? Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers. +? Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. +? Neither the names of , nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. -Libbehavior V1.0 -Copyright (c) 2009, LeegleechN -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted -provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the copyright holder nor the names of its contributors may be used to endorse - or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Open Source Software Licensed Under the MIT License: The below software in this distribution may have been -modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015 THL -A29 Limited. +Open Source Software Licensed Under the MIT License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. -------------------------------------------------------------------- - -RapidXml V1.13 +1. RapidXml V 1.13 Copyright (c) 2006, 2007 Marcin Kalicinski All Rights Reserved. -DockPanel V2.0 +2. DockPanel V 2.0.0 Copyright (c) 2007 Weifen Luo All Rights Reserved. -nunit-framework V3.0 +3. nunit-framework V 3.0.0 Copyright (c) 2014 Charlie Poole All Rights Reserved. - -Terms of the MIT License: ---------------------------------------------------- - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the Software without restriction, including without -limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following -conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions -of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +Terms of the MIT License: +--------------------------------------------------- +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -Open Source Software Licensed Under the zlib License: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -SDL V2.0.3 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SDL_image V2.0.0 -Copyright (C) 1997-2013 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. -SDL_ttf V2.0.12 -Copyright (C) 1997-2014 Sam Lantinga (slouken@libsdl.org) -All Rights Reserved. +Open Source Software Licensed Under the BSD 3-Clause License: The below software in this distribution may have been modified by THL A29 Limited (Tencent Modifications). All Tencent Modifications are Copyright (C) 2015-2017 THL A29 Limited. +-------------------------------------------------------------------- +1. Brainiac Designer V 2.1 +Copyright (c) 2008, Daniel Kollmann +All rights reserved. -Terms of the zlib License: ---------------------------------------------------- +2. Nsubstitute V 1.7.1 +Copyright (c) 2009 Anthony Egerton (nsubstitute@delfish.com) and David Tchepak (dave@davesquared.net) +All rights reserved. -This software is provided 'as-is', without any express or implied warranty. In no event will the authors -be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, including commercial applications, -and to alter it and redistribute it freely, subject to the following restrictions: +Terms of the BSD 3-Clause License: +-------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original - software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the - original software. -3. This notice may not be removed or altered from any source distribution. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Terms of the BSD 3-Clause License: --------------------------------------------------------------------- +3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that -the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the - following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of THL A29 Limited nor the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/version.txt b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/version.txt index b522e479..927968ce 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/version.txt +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/version.txt @@ -1 +1 @@ -3.6.24 +3.6.25 diff --git a/tutorials/tutorial_1_2/cpp/tutorial_1_2.cpp b/tutorials/tutorial_1_2/cpp/tutorial_1_2.cpp index 42ae7ff2..9ed1e9ea 100644 --- a/tutorials/tutorial_1_2/cpp/tutorial_1_2.cpp +++ b/tutorials/tutorial_1_2/cpp/tutorial_1_2.cpp @@ -24,7 +24,6 @@ #endif using namespace std; -using namespace behaviac; SecondAgent* g_SecondAgent = NULL; diff --git a/tutorials/tutorial_2/cpp/tutorial_2.cpp b/tutorials/tutorial_2/cpp/tutorial_2.cpp index dd350cd5..c5fe1848 100644 --- a/tutorials/tutorial_2/cpp/tutorial_2.cpp +++ b/tutorials/tutorial_2/cpp/tutorial_2.cpp @@ -24,7 +24,6 @@ #endif using namespace std; -using namespace behaviac; FirstAgent* g_FirstAgent = NULL; diff --git a/tutorials/tutorial_3/cpp/tutorial_3.cpp b/tutorials/tutorial_3/cpp/tutorial_3.cpp index 99877d63..f8542f63 100644 --- a/tutorials/tutorial_3/cpp/tutorial_3.cpp +++ b/tutorials/tutorial_3/cpp/tutorial_3.cpp @@ -24,7 +24,6 @@ #endif using namespace std; -using namespace behaviac; FirstAgent* g_FirstAgent = NULL; SecondAgent* g_SecondAgent = NULL; diff --git a/tutorials/tutorial_4/cpp/tutorial_4.cpp b/tutorials/tutorial_4/cpp/tutorial_4.cpp index 2cbba137..a004b79f 100644 --- a/tutorials/tutorial_4/cpp/tutorial_4.cpp +++ b/tutorials/tutorial_4/cpp/tutorial_4.cpp @@ -24,7 +24,6 @@ #endif using namespace std; -using namespace behaviac; FirstAgent* g_FirstAgent = NULL; diff --git a/tutorials/tutorial_5/cpp/tutorial_5.cpp b/tutorials/tutorial_5/cpp/tutorial_5.cpp index 48a54b0b..1b96fc1a 100644 --- a/tutorials/tutorial_5/cpp/tutorial_5.cpp +++ b/tutorials/tutorial_5/cpp/tutorial_5.cpp @@ -24,7 +24,6 @@ #endif using namespace std; -using namespace behaviac; FirstAgent* g_FirstAgent = NULL; diff --git a/tutorials/tutorial_5/cs/Properties/AssemblyInfo.cs b/tutorials/tutorial_5/cs/Properties/AssemblyInfo.cs index 428571c6..ebfb4a26 100644 --- a/tutorials/tutorial_5/cs/Properties/AssemblyInfo.cs +++ b/tutorials/tutorial_5/cs/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("tutorial_1")] +[assembly: AssemblyTitle("tutorial_5")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("tutorial_1")] +[assembly: AssemblyProduct("tutorial_5")] [assembly: AssemblyCopyright("Copyright © Microsoft 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/tutorials/tutorial_6/cpp/CMakeLists.txt b/tutorials/tutorial_6/cpp/CMakeLists.txt new file mode 100644 index 00000000..09a83ed8 --- /dev/null +++ b/tutorials/tutorial_6/cpp/CMakeLists.txt @@ -0,0 +1,22 @@ +message(STATUS "tutorials: ${CMAKE_CURRENT_SOURCE_DIR}") + +file(GLOB_RECURSE BTUNITTEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") +file(GLOB_RECURSE BTUNITTEST_INC "${CMAKE_CURRENT_SOURCE_DIR}/*.h") + +# add the binary tree to the search path for include files +# so that we will find TutorialConfig.h +include_directories("${PROJECT_SOURCE_DIR}/inc") +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +# set(BTUNITTEST_SRC_INC ${BTUNITTEST_SRC} ${BTUNITTEST_INC}) + +# add the executable +add_executable(tutorial_6 ${BTUNITTEST_INC} ${BTUNITTEST_SRC}) + +target_link_libraries (tutorial_6 libbehaviac ${CMAKE_THREAD_LIBS_INIT}) + +set_target_properties(tutorial_6 PROPERTIES PREFIX "") +# set_target_properties(tutorial_6 PROPERTIES OUTPUT_NAME_DEBUG libbehaviac${${CMAKE_DEBUG_POSTFIX}} +# set_target_properties(tutorial_6 PROPERTIES OUTPUT_NAME_RELEASE libbehaviac${${CMAKE_RELEASE_POSTFIX}} +set_target_properties(tutorial_6 PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) +set_target_properties(tutorial_6 PROPERTIES RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX}) diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/behaviac_types.h b/tutorials/tutorial_6/cpp/behaviac_generated/types/behaviac_types.h new file mode 100644 index 00000000..e5c90fa2 --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/behaviac_types.h @@ -0,0 +1,70 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +#ifndef _BEHAVIAC_TYPES_H_ +#define _BEHAVIAC_TYPES_H_ + +#include "behaviac/behaviac.h" +#include "behaviac/behaviortree/behaviortree.h" +#include "behaviac/agent/agent.h" +#include "behaviac/common/meta.h" + +#include "behaviac/behaviortree/nodes/actions/action.h" +#include "behaviac/behaviortree/nodes/actions/assignment.h" +#include "behaviac/behaviortree/nodes/actions/compute.h" +#include "behaviac/behaviortree/nodes/actions/noop.h" +#include "behaviac/behaviortree/nodes/actions/wait.h" +#include "behaviac/behaviortree/nodes/actions/waitforsignal.h" +#include "behaviac/behaviortree/nodes/actions/waitframes.h" +#include "behaviac/behaviortree/nodes/composites/compositestochastic.h" +#include "behaviac/behaviortree/nodes/composites/ifelse.h" +#include "behaviac/behaviortree/nodes/composites/parallel.h" +#include "behaviac/behaviortree/nodes/composites/referencebehavior.h" +#include "behaviac/behaviortree/nodes/composites/selector.h" +#include "behaviac/behaviortree/nodes/composites/selectorloop.h" +#include "behaviac/behaviortree/nodes/composites/selectorprobability.h" +#include "behaviac/behaviortree/nodes/composites/selectorstochastic.h" +#include "behaviac/behaviortree/nodes/composites/sequence.h" +#include "behaviac/behaviortree/nodes/composites/sequencestochastic.h" +#include "behaviac/behaviortree/nodes/composites/withprecondition.h" +#include "behaviac/behaviortree/nodes/conditions/and.h" +#include "behaviac/behaviortree/nodes/conditions/conditionbase.h" +#include "behaviac/behaviortree/nodes/conditions/condition.h" +#include "behaviac/behaviortree/nodes/conditions/false.h" +#include "behaviac/behaviortree/nodes/conditions/or.h" +#include "behaviac/behaviortree/nodes/conditions/true.h" +#include "behaviac/behaviortree/nodes/decorators/decoratoralwaysfailure.h" +#include "behaviac/behaviortree/nodes/decorators/decoratoralwaysrunning.h" +#include "behaviac/behaviortree/nodes/decorators/decoratoralwayssuccess.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorcount.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorcountlimit.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorfailureuntil.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorframes.h" +#include "behaviac/behaviortree/nodes/decorators/decoratoriterator.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorlog.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorloop.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorloopuntil.h" +#include "behaviac/behaviortree/nodes/decorators/decoratornot.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorrepeat.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorsuccessuntil.h" +#include "behaviac/behaviortree/nodes/decorators/decoratortime.h" +#include "behaviac/behaviortree/nodes/decorators/decoratorweight.h" +#include "behaviac/behaviortree/attachments/event.h" +#include "behaviac/behaviortree/attachments/attachaction.h" +#include "behaviac/behaviortree/attachments/precondition.h" +#include "behaviac/behaviortree/attachments/effector.h" +#include "behaviac/htn/task.h" +#include "behaviac/fsm/fsm.h" +#include "behaviac/fsm/state.h" +#include "behaviac/fsm/startcondition.h" +#include "behaviac/fsm/transitioncondition.h" +#include "behaviac/fsm/waitstate.h" +#include "behaviac/fsm/waitframesstate.h" +#include "behaviac/fsm/alwaystransition.h" +#include "behaviac/fsm/waittransition.h" + +#include "internal/behaviac_agent_headers.h" +#include "internal/behaviac_agent_member_visitor.h" + +#endif // _BEHAVIAC_TYPES_H_ diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/FirstAgent.cpp b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/FirstAgent.cpp new file mode 100644 index 00000000..e4cdf40c --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/FirstAgent.cpp @@ -0,0 +1,38 @@ +// ------------------------------------------------------------------------------- +// THIS FILE IS ORIGINALLY GENERATED BY THE DESIGNER. +// YOU ARE ONLY ALLOWED TO MODIFY CODE BETWEEN '///<<< BEGIN' AND '///<<< END'. +// PLEASE MODIFY AND REGENERETE IT IN THE DESIGNER FOR CLASS/MEMBERS/METHODS, ETC. +// ------------------------------------------------------------------------------- + +#include "FirstAgent.h" + +///<<< BEGIN WRITING YOUR CODE FILE_INIT + +///<<< END WRITING YOUR CODE + +FirstAgent::FirstAgent() +{ + p1 = 0; +///<<< BEGIN WRITING YOUR CODE CONSTRUCTOR + +///<<< END WRITING YOUR CODE +} + +FirstAgent::~FirstAgent() +{ +///<<< BEGIN WRITING YOUR CODE DESTRUCTOR + +///<<< END WRITING YOUR CODE +} + +void FirstAgent::Say(behaviac::string& param0) +{ +///<<< BEGIN WRITING YOUR CODE Say + printf("\n%s\n\n", param0.c_str()); +///<<< END WRITING YOUR CODE +} + + +///<<< BEGIN WRITING YOUR CODE FILE_UNINIT + +///<<< END WRITING YOUR CODE diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/FirstAgent.h b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/FirstAgent.h new file mode 100644 index 00000000..56470856 --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/FirstAgent.h @@ -0,0 +1,39 @@ +// ------------------------------------------------------------------------------- +// THIS FILE IS ORIGINALLY GENERATED BY THE DESIGNER. +// YOU ARE ONLY ALLOWED TO MODIFY CODE BETWEEN '///<<< BEGIN' AND '///<<< END'. +// PLEASE MODIFY AND REGENERETE IT IN THE DESIGNER FOR CLASS/MEMBERS/METHODS, ETC. +// ------------------------------------------------------------------------------- + +#ifndef _BEHAVIAC_FIRSTAGENT_H_ +#define _BEHAVIAC_FIRSTAGENT_H_ + +#include "behaviac_headers.h" + +///<<< BEGIN WRITING YOUR CODE FILE_INIT + +///<<< END WRITING YOUR CODE + +class FirstAgent : public behaviac::Agent +///<<< BEGIN WRITING YOUR CODE FirstAgent +///<<< END WRITING YOUR CODE +{ +public: + FirstAgent(); + virtual ~FirstAgent(); + + BEHAVIAC_DECLARE_AGENTTYPE(FirstAgent, behaviac::Agent) + + private: int p1; + + private: void Say(behaviac::string& param0); + +///<<< BEGIN WRITING YOUR CODE CLASS_PART + +///<<< END WRITING YOUR CODE +}; + +///<<< BEGIN WRITING YOUR CODE FILE_UNINIT + +///<<< END WRITING YOUR CODE + +#endif diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_headers.h b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_headers.h new file mode 100644 index 00000000..d81173cc --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_headers.h @@ -0,0 +1,13 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +#ifndef _BEHAVIAC_AGENT_HEADERS_H_ +#define _BEHAVIAC_AGENT_HEADERS_H_ + +#include "behaviac_headers.h" + +// THE FOLLOWING AGENT HEADER FILES IS GENERATED AUTOMATICALLY: +#include "FirstAgent.h" + +#endif // _BEHAVIAC_AGENT_HEADERS_H_ diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h new file mode 100644 index 00000000..8fc32121 --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -0,0 +1,29 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +#ifndef _BEHAVIAC_MEMBER_VISITOR_H_ +#define _BEHAVIAC_MEMBER_VISITOR_H_ + +#include "behaviac_agent_headers.h" + +// Agent property and method handlers + +namespace behaviac +{ +} + +struct PROPERTY_TYPE_FirstAgent_p1 { }; +template<> inline int& FirstAgent::_Get_Property_() +{ + return this->p1; +} + +struct METHOD_TYPE_FirstAgent_Say { }; +template<> inline void FirstAgent::_Execute_Method_(behaviac::string& p0) +{ + this->FirstAgent::Say(p0); +} + + +#endif // _BEHAVIAC_MEMBER_VISITOR_H_ diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp new file mode 100644 index 00000000..92319137 --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp @@ -0,0 +1,342 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +#include "behaviac/common/meta.h" +#include "behaviac/common/member.h" +#include "behaviac_agent_meta.h" + +namespace behaviac +{ + class BehaviorLoaderImplement : BehaviorLoader + { + public: + BehaviorLoaderImplement() + { + AgentMeta::SetBehaviorLoader(this); + } + + virtual ~BehaviorLoaderImplement() + { + } + + virtual bool load() + { + class CMethod_behaviac_Agent_VectorAdd : public CAgentMethodVoidBase + { + IInstanceMember* _param0; + IInstanceMember* _param1; + + public: + CMethod_behaviac_Agent_VectorAdd() : _param0(0) , _param1(0) + { + } + + CMethod_behaviac_Agent_VectorAdd(CMethod_behaviac_Agent_VectorAdd &rhs) : CAgentMethodVoidBase(rhs) , _param0(0) , _param1(0) + { + } + + ~CMethod_behaviac_Agent_VectorAdd() + { + BEHAVIAC_DELETE _param0; + BEHAVIAC_DELETE _param1; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 2); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + _param0 = AgentMeta::TParseProperty(paramStrs[0].c_str()); + _param1 = AgentMeta::TParseProperty(paramStrs[1].c_str()); + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_param0 != NULL); + BEHAVIAC_ASSERT(_param1 != NULL); + + IList& pValue_param0 = *(IList*)_param0->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + System::Object& pValue_param1 = *(System::Object*)_param1->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + behaviac::Agent::VectorAdd(pValue_param0, pValue_param1); + } + }; + + class CMethod_behaviac_Agent_VectorClear : public CAgentMethodVoidBase + { + IInstanceMember* _param0; + + public: + CMethod_behaviac_Agent_VectorClear() : _param0(0) + { + } + + CMethod_behaviac_Agent_VectorClear(CMethod_behaviac_Agent_VectorClear &rhs) : CAgentMethodVoidBase(rhs) , _param0(0) + { + } + + ~CMethod_behaviac_Agent_VectorClear() + { + BEHAVIAC_DELETE _param0; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 1); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + _param0 = AgentMeta::TParseProperty(paramStrs[0].c_str()); + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_param0 != NULL); + + IList& pValue_param0 = *(IList*)_param0->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + behaviac::Agent::VectorClear(pValue_param0); + } + }; + + class CMethod_behaviac_Agent_VectorContains : public CAgentMethodBase + { + IInstanceMember* _param0; + IInstanceMember* _param1; + + public: + CMethod_behaviac_Agent_VectorContains() : _param0(0) , _param1(0) + { + } + + CMethod_behaviac_Agent_VectorContains(CMethod_behaviac_Agent_VectorContains &rhs) : CAgentMethodBase(rhs) , _param0(0) , _param1(0) + { + } + + ~CMethod_behaviac_Agent_VectorContains() + { + BEHAVIAC_DELETE _param0; + BEHAVIAC_DELETE _param1; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 2); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + _param0 = AgentMeta::TParseProperty(paramStrs[0].c_str()); + _param1 = AgentMeta::TParseProperty(paramStrs[1].c_str()); + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_param0 != NULL); + BEHAVIAC_ASSERT(_param1 != NULL); + + IList& pValue_param0 = *(IList*)_param0->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + System::Object& pValue_param1 = *(System::Object*)_param1->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + _returnValue->value = behaviac::Agent::VectorContains(pValue_param0, pValue_param1); + } + }; + + class CMethod_behaviac_Agent_VectorLength : public CAgentMethodBase + { + IInstanceMember* _param0; + + public: + CMethod_behaviac_Agent_VectorLength() : _param0(0) + { + } + + CMethod_behaviac_Agent_VectorLength(CMethod_behaviac_Agent_VectorLength &rhs) : CAgentMethodBase(rhs) , _param0(0) + { + } + + ~CMethod_behaviac_Agent_VectorLength() + { + BEHAVIAC_DELETE _param0; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_behaviac_Agent_VectorLength(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 1); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + _param0 = AgentMeta::TParseProperty(paramStrs[0].c_str()); + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_param0 != NULL); + + IList& pValue_param0 = *(IList*)_param0->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + _returnValue->value = behaviac::Agent::VectorLength(pValue_param0); + } + }; + + class CMethod_behaviac_Agent_VectorRemove : public CAgentMethodVoidBase + { + IInstanceMember* _param0; + IInstanceMember* _param1; + + public: + CMethod_behaviac_Agent_VectorRemove() : _param0(0) , _param1(0) + { + } + + CMethod_behaviac_Agent_VectorRemove(CMethod_behaviac_Agent_VectorRemove &rhs) : CAgentMethodVoidBase(rhs) , _param0(0) , _param1(0) + { + } + + ~CMethod_behaviac_Agent_VectorRemove() + { + BEHAVIAC_DELETE _param0; + BEHAVIAC_DELETE _param1; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 2); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + _param0 = AgentMeta::TParseProperty(paramStrs[0].c_str()); + _param1 = AgentMeta::TParseProperty(paramStrs[1].c_str()); + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_param0 != NULL); + BEHAVIAC_ASSERT(_param1 != NULL); + + IList& pValue_param0 = *(IList*)_param0->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + System::Object& pValue_param1 = *(System::Object*)_param1->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + behaviac::Agent::VectorRemove(pValue_param0, pValue_param1); + } + }; + + class CMethod_FirstAgent_Say : public CAgentMethodVoidBase + { + IInstanceMember* _param0; + + public: + CMethod_FirstAgent_Say() : _param0(0) + { + } + + CMethod_FirstAgent_Say(CMethod_FirstAgent_Say &rhs) : CAgentMethodVoidBase(rhs) , _param0(0) + { + } + + ~CMethod_FirstAgent_Say() + { + BEHAVIAC_DELETE _param0; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_FirstAgent_Say(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 1); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + _param0 = AgentMeta::TParseProperty(paramStrs[0].c_str()); + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_param0 != NULL); + + behaviac::string& pValue_param0 = *(behaviac::string*)_param0->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + self = Agent::GetParentAgent(self, _instance); + + ((FirstAgent*)self)->_Execute_Method_(pValue_param0); + } + }; + + AgentMeta::SetTotalSignature(2778993514u); + + AgentMeta* meta = NULL; + BEHAVIAC_UNUSED_VAR(meta); + + // behaviac::Agent + meta = BEHAVIAC_NEW AgentMeta(24743406u); + AgentMeta::GetAgentMetas()[1770892321u] = meta; + meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_behaviac_Agent_LogMessage)); + meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); + meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); + meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); + meta->RegisterMethod(505785840u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorLength()); + meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); + + // FirstAgent + meta = BEHAVIAC_NEW AgentMeta(1472749534u); + AgentMeta::GetAgentMetas()[1778122110u] = meta; + meta->RegisterMemberProperty(2082220067u, BEHAVIAC_NEW CMemberProperty< int >("p1", Set_FirstAgent_p1, Get_FirstAgent_p1)); + meta->RegisterMethod(3345343196u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_FirstAgent_event_task) /* event_task */); + meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_FirstAgent_LogMessage)); + meta->RegisterMethod(702722749u, BEHAVIAC_NEW CMethod_FirstAgent_Say()); + meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); + meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); + meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); + meta->RegisterMethod(505785840u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorLength()); + meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); + + AgentMeta::Register("behaviac::Agent"); + AgentMeta::Register("FirstAgent"); + + return true; + } + + virtual bool unLoad() + { + AgentMeta::UnRegister("behaviac::Agent"); + AgentMeta::UnRegister("FirstAgent"); + + return true; + } + }; + + static BehaviorLoaderImplement _behaviorLoaderImplement_; + + static BehaviorLoaderImplement* _pBehaviorLoader_ = NULL; + + void InitBehaviorLoader() + { + _pBehaviorLoader_ = BEHAVIAC_NEW BehaviorLoaderImplement(); + } + + void DestroyBehaviorLoader() + { + if (_pBehaviorLoader_) + { + BEHAVIAC_DELETE _pBehaviorLoader_; + _pBehaviorLoader_ = NULL; + } + } +} diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_meta.h b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_meta.h new file mode 100644 index 00000000..1f8511d3 --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_agent_meta.h @@ -0,0 +1,25 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +#ifndef _BEHAVIAC_AGENT_PROPERTIES_H_ +#define _BEHAVIAC_AGENT_PROPERTIES_H_ + +#include "behaviac_agent_headers.h" +#include "behaviac_agent_member_visitor.h" + +namespace behaviac +{ + // --------------------------------------------------------------------- + // Delegate methods + // --------------------------------------------------------------------- + + inline void FunctionPointer_behaviac_Agent_LogMessage(char* param0) { behaviac::Agent::LogMessage(param0); } + + inline void Set_FirstAgent_p1(Agent* self, int value) { ((FirstAgent*)self)->_Get_Property_() = value; }; + inline const void* Get_FirstAgent_p1(Agent* self) { return &((FirstAgent*)self)->_Get_Property_(); }; + + inline void FunctionPointer_FirstAgent_event_task(Agent* self, int param0) { } /* event_task */ + inline void FunctionPointer_FirstAgent_LogMessage(char* param0) { FirstAgent::LogMessage(param0); } +} +#endif // _BEHAVIAC_AGENT_PROPERTIES_H_ diff --git a/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_headers.h b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_headers.h new file mode 100644 index 00000000..dc16254f --- /dev/null +++ b/tutorials/tutorial_6/cpp/behaviac_generated/types/internal/behaviac_headers.h @@ -0,0 +1,13 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +#ifndef _BEHAVIAC_HEADERS_H_ +#define _BEHAVIAC_HEADERS_H_ + +#include "behaviac/behaviac.h" + +// YOU SHOULD SET THE HEADER FILES OF YOUR GAME WHEN EXPORTING CPP FILES ON THE BEHAVIAC EDITOR: + + +#endif // _BEHAVIAC_HEADERS_H_ diff --git a/tutorials/tutorial_6/cpp/exported/maintree_task.xml b/tutorials/tutorial_6/cpp/exported/maintree_task.xml new file mode 100644 index 00000000..1c1a71bd --- /dev/null +++ b/tutorials/tutorial_6/cpp/exported/maintree_task.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/cpp/exported/meta/tutorial_6_cpp.meta.xml b/tutorials/tutorial_6/cpp/exported/meta/tutorial_6_cpp.meta.xml new file mode 100644 index 00000000..50ed46e9 --- /dev/null +++ b/tutorials/tutorial_6/cpp/exported/meta/tutorial_6_cpp.meta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/cpp/exported/subtree_task.xml b/tutorials/tutorial_6/cpp/exported/subtree_task.xml new file mode 100644 index 00000000..93b4616f --- /dev/null +++ b/tutorials/tutorial_6/cpp/exported/subtree_task.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/cpp/tutorial_6.cpp b/tutorials/tutorial_6/cpp/tutorial_6.cpp new file mode 100644 index 00000000..ebd0d976 --- /dev/null +++ b/tutorials/tutorial_6/cpp/tutorial_6.cpp @@ -0,0 +1,130 @@ +///////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Tencent is pleased to support the open source community by making behaviac available. +// +// Copyright (C) 2015-2017 THL A29 Limited, a Tencent company. All rights reserved. +// +// Licensed under the BSD 3-Clause License (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at http://opensource.org/licenses/BSD-3-Clause +// +// 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. +///////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +#include "behaviac_generated/types/behaviac_types.h" + +#if BEHAVIAC_CCDEFINE_MSVC +#include +#endif + +#if BEHAVIAC_CCDEFINE_ANDROID + #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "tutorial_6", __VA_ARGS__)) +#else + #define LOGI printf +#endif + +using namespace std; + +FirstAgent* g_FirstAgent = NULL; + +#if !BEHAVIAC_CCDEFINE_ANDROID +static void SetExePath() +{ +#if BEHAVIAC_CCDEFINE_MSVC + TCHAR szCurPath[_MAX_PATH]; + + GetModuleFileName(NULL, szCurPath, _MAX_PATH); + + char* p = szCurPath; + + while (strchr(p, '\\')) + { + p = strchr(p, '\\'); + p++; + } + + *p = '\0'; + + SetCurrentDirectory(szCurPath); +#endif +} +#endif + +bool InitBehavic() +{ + LOGI("InitBehavic\n"); + + behaviac::Workspace::GetInstance()->SetFilePath("../tutorials/tutorial_6/cpp/exported"); + + behaviac::Workspace::GetInstance()->SetFileFormat(behaviac::Workspace::EFF_xml); + + return true; +} + +bool InitPlayer(const char* btName) +{ + LOGI("InitPlayer : %s\n", btName); + + g_FirstAgent = behaviac::Agent::Create(); + + bool bRet = g_FirstAgent->btload(btName); + + g_FirstAgent->btsetcurrent(btName); + + return bRet; +} + +void UpdateLoop() +{ + LOGI("UpdateLoop\n"); + + behaviac::EBTStatus status = g_FirstAgent->btexec(); + BEHAVIAC_ASSERT(status == behaviac::BT_RUNNING); + + g_FirstAgent->FireEvent("event_task", 2); +} + +void CleanupPlayer() +{ + LOGI("CleanupPlayer\n"); + + behaviac::Agent::Destroy(g_FirstAgent); +} + +void CleanupBehaviac() +{ + LOGI("CleanupBehaviac\n"); + + behaviac::Workspace::GetInstance()->Cleanup(); +} + +#if !BEHAVIAC_CCDEFINE_ANDROID +int main(int argc, char** argv) +{ + BEHAVIAC_UNUSED_VAR(argc); + BEHAVIAC_UNUSED_VAR(argv); + + SetExePath(); + + LOGI("BEHAVIAC_CCDEFINE_NAME=%s\n", BEHAVIAC_CCDEFINE_NAME); + + InitBehavic(); + + bool bInit = InitPlayer("maintree_task"); + + if (bInit) + { + UpdateLoop(); + + CleanupPlayer(); + } + + CleanupBehaviac(); + + int ret = system("pause"); + BEHAVIAC_UNUSED_VAR(ret); + + return 0; +} + +#endif diff --git a/tutorials/tutorial_6/cs/Properties/AssemblyInfo.cs b/tutorials/tutorial_6/cs/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..2fd3e0ea --- /dev/null +++ b/tutorials/tutorial_6/cs/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("tutorial_6")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("tutorial_6")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("02c55697-4943-4575-882e-92112e0a52aa")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs b/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs new file mode 100644 index 00000000..740ef325 --- /dev/null +++ b/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs @@ -0,0 +1,230 @@ +// --------------------------------------------------------------------- +// THIS FILE IS AUTO-GENERATED BY BEHAVIAC DESIGNER, SO PLEASE DON'T MODIFY IT BY YOURSELF! +// --------------------------------------------------------------------- + +using System; +using System.Collections; +using System.Collections.Generic; + +namespace behaviac +{ + + public class BehaviorLoaderImplement : BehaviorLoader + { + private class CMethod_behaviac_Agent_VectorAdd : CAgentMethodVoidBase + { + IInstanceMember _param0; + IInstanceMember _param1; + + public CMethod_behaviac_Agent_VectorAdd() + { + } + + public CMethod_behaviac_Agent_VectorAdd(CMethod_behaviac_Agent_VectorAdd rhs) : base(rhs) + { + } + + public override IMethod Clone() + { + return new CMethod_behaviac_Agent_VectorAdd(this); + } + + public override void Load(string instance, string[] paramStrs) + { + Debug.Check(paramStrs.Length == 2); + + _instance = instance; + _param0 = AgentMeta.ParseProperty(paramStrs[0]); + _param1 = AgentMeta.ParseProperty(paramStrs[1]); + } + + public override void Run(Agent self) + { + Debug.Check(_param0 != null); + Debug.Check(_param1 != null); + + behaviac.Agent.VectorAdd((IList)_param0.GetValueObject(self), (System.Object)_param1.GetValueObject(self)); + } + } + + private class CMethod_behaviac_Agent_VectorClear : CAgentMethodVoidBase + { + IInstanceMember _param0; + + public CMethod_behaviac_Agent_VectorClear() + { + } + + public CMethod_behaviac_Agent_VectorClear(CMethod_behaviac_Agent_VectorClear rhs) : base(rhs) + { + } + + public override IMethod Clone() + { + return new CMethod_behaviac_Agent_VectorClear(this); + } + + public override void Load(string instance, string[] paramStrs) + { + Debug.Check(paramStrs.Length == 1); + + _instance = instance; + _param0 = AgentMeta.ParseProperty(paramStrs[0]); + } + + public override void Run(Agent self) + { + Debug.Check(_param0 != null); + + behaviac.Agent.VectorClear((IList)_param0.GetValueObject(self)); + } + } + + private class CMethod_behaviac_Agent_VectorContains : CAgentMethodBase + { + IInstanceMember _param0; + IInstanceMember _param1; + + public CMethod_behaviac_Agent_VectorContains() + { + } + + public CMethod_behaviac_Agent_VectorContains(CMethod_behaviac_Agent_VectorContains rhs) : base(rhs) + { + } + + public override IMethod Clone() + { + return new CMethod_behaviac_Agent_VectorContains(this); + } + + public override void Load(string instance, string[] paramStrs) + { + Debug.Check(paramStrs.Length == 2); + + _instance = instance; + _param0 = AgentMeta.ParseProperty(paramStrs[0]); + _param1 = AgentMeta.ParseProperty(paramStrs[1]); + } + + public override void Run(Agent self) + { + Debug.Check(_param0 != null); + Debug.Check(_param1 != null); + + _returnValue.value = behaviac.Agent.VectorContains((IList)_param0.GetValueObject(self), (System.Object)_param1.GetValueObject(self)); + } + } + + private class CMethod_behaviac_Agent_VectorLength : CAgentMethodBase + { + IInstanceMember _param0; + + public CMethod_behaviac_Agent_VectorLength() + { + } + + public CMethod_behaviac_Agent_VectorLength(CMethod_behaviac_Agent_VectorLength rhs) : base(rhs) + { + } + + public override IMethod Clone() + { + return new CMethod_behaviac_Agent_VectorLength(this); + } + + public override void Load(string instance, string[] paramStrs) + { + Debug.Check(paramStrs.Length == 1); + + _instance = instance; + _param0 = AgentMeta.ParseProperty(paramStrs[0]); + } + + public override void Run(Agent self) + { + Debug.Check(_param0 != null); + + _returnValue.value = behaviac.Agent.VectorLength((IList)_param0.GetValueObject(self)); + } + } + + private class CMethod_behaviac_Agent_VectorRemove : CAgentMethodVoidBase + { + IInstanceMember _param0; + IInstanceMember _param1; + + public CMethod_behaviac_Agent_VectorRemove() + { + } + + public CMethod_behaviac_Agent_VectorRemove(CMethod_behaviac_Agent_VectorRemove rhs) : base(rhs) + { + } + + public override IMethod Clone() + { + return new CMethod_behaviac_Agent_VectorRemove(this); + } + + public override void Load(string instance, string[] paramStrs) + { + Debug.Check(paramStrs.Length == 2); + + _instance = instance; + _param0 = AgentMeta.ParseProperty(paramStrs[0]); + _param1 = AgentMeta.ParseProperty(paramStrs[1]); + } + + public override void Run(Agent self) + { + Debug.Check(_param0 != null); + Debug.Check(_param1 != null); + + behaviac.Agent.VectorRemove((IList)_param0.GetValueObject(self), (System.Object)_param1.GetValueObject(self)); + } + } + + + public override bool Load() + { + AgentMeta.TotalSignature = 1527488372; + + AgentMeta meta; + + // behaviac.Agent + meta = new AgentMeta(24743406); + AgentMeta._AgentMetas_[2436498804] = meta; + meta.RegisterMethod(1045109914, new CAgentStaticMethodVoid(delegate(string param0) { behaviac.Agent.LogMessage(param0); })); + meta.RegisterMethod(2521019022, new CMethod_behaviac_Agent_VectorAdd()); + meta.RegisterMethod(2306090221, new CMethod_behaviac_Agent_VectorClear()); + meta.RegisterMethod(3483755530, new CMethod_behaviac_Agent_VectorContains()); + meta.RegisterMethod(505785840, new CMethod_behaviac_Agent_VectorLength()); + meta.RegisterMethod(502968959, new CMethod_behaviac_Agent_VectorRemove()); + + // FirstAgent + meta = new AgentMeta(278411645); + AgentMeta._AgentMetas_[1778122110] = meta; + meta.RegisterMemberProperty(2082220067, new CMemberProperty("p1", delegate(Agent self, int value) { ((FirstAgent)self)._set_p1(value); }, delegate(Agent self) { return ((FirstAgent)self)._get_p1(); })); + meta.RegisterMethod(3345343196, new CAgentMethodVoid(delegate(Agent self, int param0) { }) /* event_task */); + meta.RegisterMethod(1045109914, new CAgentStaticMethodVoid(delegate(string param0) { FirstAgent.LogMessage(param0); })); + meta.RegisterMethod(702722749, new CAgentMethodVoid(delegate(Agent self, string param0) { AgentMetaVisitor.ExecuteMethod(self, "Say", new object[]{ param0 }); })); + meta.RegisterMethod(2521019022, new CMethod_behaviac_Agent_VectorAdd()); + meta.RegisterMethod(2306090221, new CMethod_behaviac_Agent_VectorClear()); + meta.RegisterMethod(3483755530, new CMethod_behaviac_Agent_VectorContains()); + meta.RegisterMethod(505785840, new CMethod_behaviac_Agent_VectorLength()); + meta.RegisterMethod(502968959, new CMethod_behaviac_Agent_VectorRemove()); + + AgentMeta.Register("behaviac.Agent"); + AgentMeta.Register("FirstAgent"); + return true; + } + + public override bool UnLoad() + { + AgentMeta.UnRegister("behaviac.Agent"); + AgentMeta.UnRegister("FirstAgent"); + return true; + } + } +} diff --git a/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs b/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs new file mode 100644 index 00000000..66844894 --- /dev/null +++ b/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs @@ -0,0 +1,47 @@ +// ------------------------------------------------------------------------------- +// THIS FILE IS ORIGINALLY GENERATED BY THE DESIGNER. +// YOU ARE ONLY ALLOWED TO MODIFY CODE BETWEEN '///<<< BEGIN' AND '///<<< END'. +// PLEASE MODIFY AND REGENERETE IT IN THE DESIGNER FOR CLASS/MEMBERS/METHODS, ETC. +// ------------------------------------------------------------------------------- + +using System; +using System.Collections; +using System.Collections.Generic; + +///<<< BEGIN WRITING YOUR CODE FILE_INIT + +///<<< END WRITING YOUR CODE + +public class FirstAgent : behaviac.Agent +///<<< BEGIN WRITING YOUR CODE FirstAgent +///<<< END WRITING YOUR CODE +{ + private int p1 = 0; + public void _set_p1(int value) + { + p1 = value; + } + public int _get_p1() + { + return p1; + } + + private void Say(string param0) + { +///<<< BEGIN WRITING YOUR CODE Say + Console.WriteLine(); + Console.WriteLine(param0); + Console.WriteLine(); +///<<< END WRITING YOUR CODE + } + +///<<< BEGIN WRITING YOUR CODE CLASS_PART + +///<<< END WRITING YOUR CODE + +} + +///<<< BEGIN WRITING YOUR CODE FILE_UNINIT + +///<<< END WRITING YOUR CODE + diff --git a/tutorials/tutorial_6/cs/exported/maintree_task.xml b/tutorials/tutorial_6/cs/exported/maintree_task.xml new file mode 100644 index 00000000..1c1a71bd --- /dev/null +++ b/tutorials/tutorial_6/cs/exported/maintree_task.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/cs/exported/meta/tutorial_6_cs.meta.xml b/tutorials/tutorial_6/cs/exported/meta/tutorial_6_cs.meta.xml new file mode 100644 index 00000000..1e2a238c --- /dev/null +++ b/tutorials/tutorial_6/cs/exported/meta/tutorial_6_cs.meta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/cs/exported/subtree_task.xml b/tutorials/tutorial_6/cs/exported/subtree_task.xml new file mode 100644 index 00000000..93b4616f --- /dev/null +++ b/tutorials/tutorial_6/cs/exported/subtree_task.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/cs/tutorial_6.cs b/tutorials/tutorial_6/cs/tutorial_6.cs new file mode 100644 index 00000000..bded2387 --- /dev/null +++ b/tutorials/tutorial_6/cs/tutorial_6.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.IO; +using System.Diagnostics; + +namespace tutorial_6 +{ + class Program + { + static FirstAgent g_FirstAgent; + + static bool InitBehavic() + { + Console.WriteLine("InitBehavic"); + + behaviac.Workspace.Instance.FilePath = "../../exported"; + behaviac.Workspace.Instance.FileFormat = behaviac.Workspace.EFileFormat.EFF_xml; + + return true; + } + + static bool InitPlayer(string btName) + { + Console.WriteLine("InitPlayer : {0}", btName); + + g_FirstAgent = new FirstAgent(); + + bool bRet = g_FirstAgent.btload(btName); + Debug.Assert(bRet); + + g_FirstAgent.btsetcurrent(btName); + + return bRet; + } + + static void UpdateLoop() + { + Console.WriteLine("UpdateLoop"); + + behaviac.EBTStatus status = g_FirstAgent.btexec(); + Debug.Assert(status == behaviac.EBTStatus.BT_RUNNING); + + g_FirstAgent.FireEvent("event_task", 2); + } + + static void CleanupPlayer() + { + Console.WriteLine("CleanupPlayer"); + + g_FirstAgent = null; + } + + static void CleanupBehaviac() + { + Console.WriteLine("CleanupBehaviac"); + + behaviac.Workspace.Instance.Cleanup(); + } + + static void Main(string[] args) + { + InitBehavic(); + + bool bInit = InitPlayer("maintree_task"); + + if (bInit) + { + UpdateLoop(); + + CleanupPlayer(); + } + + CleanupBehaviac(); + + Console.Read(); + } + } +} diff --git a/tutorials/tutorial_6/cs/tutorial_6.csproj b/tutorials/tutorial_6/cs/tutorial_6.csproj new file mode 100644 index 00000000..4c5245ad --- /dev/null +++ b/tutorials/tutorial_6/cs/tutorial_6.csproj @@ -0,0 +1,59 @@ + + + + + Debug + AnyCPU + {65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED} + Exe + Properties + tutorial_6 + tutorial_6 + v2.0 + 512 + + + AnyCPU + true + full + false + bin\Debug\ + TRACE;DEBUG;BEHAVIAC_NOT_USE_UNITY + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + {5beb8aff-ba10-48c0-8104-17be6706d97b} + behaviac + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml new file mode 100644 index 00000000..25ed83c4 --- /dev/null +++ b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml new file mode 100644 index 00000000..2d3d0273 --- /dev/null +++ b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/behaviors/maintree_task.xml b/tutorials/tutorial_6/workspace/behaviors/maintree_task.xml new file mode 100644 index 00000000..4a17a31f --- /dev/null +++ b/tutorials/tutorial_6/workspace/behaviors/maintree_task.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/behaviors/subtree_task.xml b/tutorials/tutorial_6/workspace/behaviors/subtree_task.xml new file mode 100644 index 00000000..c4e0d4e4 --- /dev/null +++ b/tutorials/tutorial_6/workspace/behaviors/subtree_task.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/tutorial_6_cpp.workspace.xml b/tutorials/tutorial_6/workspace/tutorial_6_cpp.workspace.xml new file mode 100644 index 00000000..846ce279 --- /dev/null +++ b/tutorials/tutorial_6/workspace/tutorial_6_cpp.workspace.xml @@ -0,0 +1,10 @@ + + + + + False + 1 + ../../cpp + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/tutorial_6_cs.workspace.xml b/tutorials/tutorial_6/workspace/tutorial_6_cs.workspace.xml new file mode 100644 index 00000000..8b344817 --- /dev/null +++ b/tutorials/tutorial_6/workspace/tutorial_6_cs.workspace.xml @@ -0,0 +1,10 @@ + + + + + False + 1 + ../../cs + + + \ No newline at end of file diff --git a/version.txt b/version.txt index b522e479..927968ce 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.6.24 +3.6.25