diff --git a/CMakeLists.txt b/CMakeLists.txt index dc747dcf..7cc0fcf3 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.25) +set (BEHAVIAC_PACKAGE_VERSION 3.6.26) #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") @@ -410,3 +410,4 @@ 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") +add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_7/cpp") diff --git a/README.md b/README.md index d301933c..c48b8412 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.25-red.svg)](https://github.com/Tencent/behaviac/releases) +[![Release Version](https://img.shields.io/badge/release-3.6.26-red.svg)](https://github.com/Tencent/behaviac/releases) [![Updates](https://img.shields.io/badge/Platform-iOS | Android | Windows | Linux | Unity -brightgreen.svg)](https://github.com/Tencent/behaviac/blob/master/history.txt) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/behaviac/pulls) diff --git a/docs/behaviac.chm b/docs/behaviac.chm index 91b2edb6..a742366d 100644 Binary files a/docs/behaviac.chm and b/docs/behaviac.chm differ diff --git a/history.txt b/history.txt index 7e79c64e..64d2acff 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2017-3-23 3.6.26 + Support renaming the types. + Do not send the update message when debugging. + Fix a bug for setting the var when debugging for C#. + Fix a bug for generating codes for Agent* as the return type of the method. + Fix a bug for renaming the method. + 2017-3-16 3.6.25 Support renaming types. Add the tutorial_6 projects. diff --git a/inc/behaviac/agent/agent.h b/inc/behaviac/agent/agent.h index f8c6fbbc..e24ccb08 100644 --- a/inc/behaviac/agent/agent.h +++ b/inc/behaviac/agent/agent.h @@ -305,6 +305,8 @@ namespace behaviac { */ void LogVariables(bool bForce); + void LogRunningNodes(); + //static bool Invoke(Agent* pAgent, const char* methodName); //template diff --git a/inc/behaviac/common/_config.h b/inc/behaviac/common/_config.h index 92bd17b5..e4e7b71c 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.25" +#define BEHAVIAC_VERSION_STRING "3.6.26" diff --git a/inc/behaviac/common/member.h b/inc/behaviac/common/member.h index 07d05062..45fde5a0 100644 --- a/inc/behaviac/common/member.h +++ b/inc/behaviac/common/member.h @@ -320,7 +320,7 @@ namespace behaviac { const RealBaseType& currentValue = pAgent->GetVariable(name); if (bForce || OperationUtils::Compare(currentValue, this->value, E_NOTEQUAL)) { - behaviac::string valueStr = StringUtils::ToString(this->value); + behaviac::string valueStr = StringUtils::ToString(currentValue); behaviac::string typeName = GetClassTypeName((RealBaseType*)0); LogManager::GetInstance()->Log(pAgent, typeName.c_str(), name, valueStr.c_str()); diff --git a/integration/demo_running/behaviac/Agent/Agent.cs b/integration/demo_running/behaviac/Agent/Agent.cs index 9d49d4ca..8e21c5c0 100644 --- a/integration/demo_running/behaviac/Agent/Agent.cs +++ b/integration/demo_running/behaviac/Agent/Agent.cs @@ -141,7 +141,7 @@ void Awake() Init_(this.m_contextId, this, this.m_priority); #if !BEHAVIAC_RELEASE - this.SetName(this.name); + //this.SetName(this.name); this._members.Clear(); #endif } @@ -1366,6 +1366,27 @@ public void LogVariables(bool bForce) } } +#endif + } + + public void LogRunningNodes() + { +#if !BEHAVIAC_RELEASE + if (Config.IsLoggingOrSocketing && this.m_currentBT != null) + { + List runningNodes = this.m_currentBT.GetRunningNodes(false); + + foreach (BehaviorTask behaviorTask in runningNodes) + { + string btStr = BehaviorTask.GetTickInfo(this, behaviorTask, "enter"); + + //empty btStr is for internal BehaviorTreeTask + if (!string.IsNullOrEmpty(btStr)) + { + LogManager.Instance.Log(this, btStr, EActionResult.EAR_success, LogMode.ELM_tick); + } + } + } #endif } @@ -1382,6 +1403,7 @@ protected static void Init_(int contextId, Agent pAgent, int priority) pAgent.m_contextId = contextId; pAgent.m_id = ms_agent_index++; pAgent.m_priority = priority; + pAgent.SetName(pAgent.name); Context.AddAgent(pAgent); diff --git a/integration/demo_running/behaviac/Agent/Context.cs b/integration/demo_running/behaviac/Agent/Context.cs index 99b406b1..69c81bb7 100644 --- a/integration/demo_running/behaviac/Agent/Context.cs +++ b/integration/demo_running/behaviac/Agent/Context.cs @@ -310,6 +310,8 @@ private void LogCurrentState() if (e.Current.IsMasked()) { e.Current.LogVariables(true); + + e.Current.LogRunningNodes(); } } } diff --git a/integration/demo_running/behaviac/Base/LogManager.cs b/integration/demo_running/behaviac/Base/LogManager.cs index ac695378..9d794989 100644 --- a/integration/demo_running/behaviac/Base/LogManager.cs +++ b/integration/demo_running/behaviac/Base/LogManager.cs @@ -163,9 +163,12 @@ public void Log(Agent pAgent, string btMsg, EActionResult actionResult, LogMode //[tick]Ship.Ship_1 ships\suicide.xml.Selector[1]:update [1] int count = Workspace.Instance.UpdateActionCount(btMsg); - string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); + if (actionResultStr != "running") + { + string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); - Output(pAgent, buffer); + Output(pAgent, buffer); + } } else if (mode == LogMode.ELM_jump) { diff --git a/integration/demo_running/behaviac/Base/socketconnect_base.cs b/integration/demo_running/behaviac/Base/socketconnect_base.cs index ea0daafe..67709144 100644 --- a/integration/demo_running/behaviac/Base/socketconnect_base.cs +++ b/integration/demo_running/behaviac/Base/socketconnect_base.cs @@ -564,7 +564,10 @@ public void AddPacket(Packet packet) } } - m_packetQueue.Enqueue(packet); + lock (m_packetQueue) + { + m_packetQueue.Enqueue(packet); + } } } @@ -577,23 +580,11 @@ public bool CollectPackets(PacketCollection coll) return true; } - Packet packet = m_packetQueue.Peek(); - - while (packet == null) + lock (m_packetQueue) { - m_packetQueue.Dequeue(); - - if (m_packetQueue.Count == 0) - { - break; - } - - packet = m_packetQueue.Peek(); - } + Packet packet = m_packetQueue.Peek(); - while (packet != null) - { - if (coll.Add(packet)) + while (packet == null) { m_packetQueue.Dequeue(); @@ -604,9 +595,24 @@ public bool CollectPackets(PacketCollection coll) packet = m_packetQueue.Peek(); } - else + + while (packet != null) { - return false; + if (coll.Add(packet)) + { + m_packetQueue.Dequeue(); + + if (m_packetQueue.Count == 0) + { + break; + } + + packet = m_packetQueue.Peek(); + } + else + { + return false; + } } } @@ -617,24 +623,27 @@ public bool CollectPackets(PacketCollection coll) private void SendPackets(Socket h) { - Packet packet = m_packetQueue.Peek(); - - while (packet != null) + lock (m_packetQueue) { - int bytesWritten = (0); - bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + Packet packet = m_packetQueue.Peek(); - // Failed to send data. Most probably sending too much, break and - // hope for the best next time - if (!success) + while (packet != null) { - Debug.Check(false); - behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); - break; - } + int bytesWritten = (0); + bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + + // Failed to send data. Most probably sending too much, break and + // hope for the best next time + if (!success) + { + Debug.Check(false); + behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); + break; + } - m_packetQueue.Dequeue(); // 'Commit' pop if data sent. - packet = m_packetQueue.Peek(); + m_packetQueue.Dequeue(); // 'Commit' pop if data sent. + packet = m_packetQueue.Peek(); + } } } diff --git a/integration/demo_running/behaviac/BehaviorTree/BehaviorTree_task.cs b/integration/demo_running/behaviac/BehaviorTree/BehaviorTree_task.cs index 54fe16ca..b86ee798 100644 --- a/integration/demo_running/behaviac/BehaviorTree/BehaviorTree_task.cs +++ b/integration/demo_running/behaviac/BehaviorTree/BehaviorTree_task.cs @@ -515,7 +515,7 @@ public static string GetTickInfo(Agent pAgent, BehaviorNode n, string action) if (Config.IsLoggingOrSocketing) { - if (pAgent != null && pAgent.IsMasked()) + if (!System.Object.ReferenceEquals(pAgent, null) && pAgent.IsMasked()) { //BEHAVIAC_PROFILE("GetTickInfo", true); diff --git a/integration/demo_running/behaviac/Workspace.cs b/integration/demo_running/behaviac/Workspace.cs index 26220b80..b3459ead 100644 --- a/integration/demo_running/behaviac/Workspace.cs +++ b/integration/demo_running/behaviac/Workspace.cs @@ -1217,13 +1217,15 @@ private void ParseProperty(string[] tokens) #endif } + private int m_frame = 0; + protected void LogFrames() { #if !BEHAVIAC_RELEASE if (Config.IsLoggingOrSocketing) { - LogManager.Instance.Log("[frame]{0}\n", this.FrameSinceStartup); + LogManager.Instance.Log("[frame]{0}\n", (this.FrameSinceStartup >= 0) ? this.FrameSinceStartup : (this.m_frame++)); } #endif diff --git a/integration/demo_running/behaviac/version.txt b/integration/demo_running/behaviac/version.txt index 927968ce..d2f69272 100644 --- a/integration/demo_running/behaviac/version.txt +++ b/integration/demo_running/behaviac/version.txt @@ -1 +1 @@ -3.6.25 +3.6.26 diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs index 9d49d4ca..8e21c5c0 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs @@ -141,7 +141,7 @@ void Awake() Init_(this.m_contextId, this, this.m_priority); #if !BEHAVIAC_RELEASE - this.SetName(this.name); + //this.SetName(this.name); this._members.Clear(); #endif } @@ -1366,6 +1366,27 @@ public void LogVariables(bool bForce) } } +#endif + } + + public void LogRunningNodes() + { +#if !BEHAVIAC_RELEASE + if (Config.IsLoggingOrSocketing && this.m_currentBT != null) + { + List runningNodes = this.m_currentBT.GetRunningNodes(false); + + foreach (BehaviorTask behaviorTask in runningNodes) + { + string btStr = BehaviorTask.GetTickInfo(this, behaviorTask, "enter"); + + //empty btStr is for internal BehaviorTreeTask + if (!string.IsNullOrEmpty(btStr)) + { + LogManager.Instance.Log(this, btStr, EActionResult.EAR_success, LogMode.ELM_tick); + } + } + } #endif } @@ -1382,6 +1403,7 @@ protected static void Init_(int contextId, Agent pAgent, int priority) pAgent.m_contextId = contextId; pAgent.m_id = ms_agent_index++; pAgent.m_priority = priority; + pAgent.SetName(pAgent.name); Context.AddAgent(pAgent); diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs index 99b406b1..69c81bb7 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs @@ -310,6 +310,8 @@ private void LogCurrentState() if (e.Current.IsMasked()) { e.Current.LogVariables(true); + + e.Current.LogRunningNodes(); } } } diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs index ac695378..9d794989 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Base/LogManager.cs @@ -163,9 +163,12 @@ public void Log(Agent pAgent, string btMsg, EActionResult actionResult, LogMode //[tick]Ship.Ship_1 ships\suicide.xml.Selector[1]:update [1] int count = Workspace.Instance.UpdateActionCount(btMsg); - string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); + if (actionResultStr != "running") + { + string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); - Output(pAgent, buffer); + Output(pAgent, buffer); + } } else if (mode == LogMode.ELM_jump) { diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs index ea0daafe..67709144 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs @@ -564,7 +564,10 @@ public void AddPacket(Packet packet) } } - m_packetQueue.Enqueue(packet); + lock (m_packetQueue) + { + m_packetQueue.Enqueue(packet); + } } } @@ -577,23 +580,11 @@ public bool CollectPackets(PacketCollection coll) return true; } - Packet packet = m_packetQueue.Peek(); - - while (packet == null) + lock (m_packetQueue) { - m_packetQueue.Dequeue(); - - if (m_packetQueue.Count == 0) - { - break; - } - - packet = m_packetQueue.Peek(); - } + Packet packet = m_packetQueue.Peek(); - while (packet != null) - { - if (coll.Add(packet)) + while (packet == null) { m_packetQueue.Dequeue(); @@ -604,9 +595,24 @@ public bool CollectPackets(PacketCollection coll) packet = m_packetQueue.Peek(); } - else + + while (packet != null) { - return false; + if (coll.Add(packet)) + { + m_packetQueue.Dequeue(); + + if (m_packetQueue.Count == 0) + { + break; + } + + packet = m_packetQueue.Peek(); + } + else + { + return false; + } } } @@ -617,24 +623,27 @@ public bool CollectPackets(PacketCollection coll) private void SendPackets(Socket h) { - Packet packet = m_packetQueue.Peek(); - - while (packet != null) + lock (m_packetQueue) { - int bytesWritten = (0); - bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + Packet packet = m_packetQueue.Peek(); - // Failed to send data. Most probably sending too much, break and - // hope for the best next time - if (!success) + while (packet != null) { - Debug.Check(false); - behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); - break; - } + int bytesWritten = (0); + bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + + // Failed to send data. Most probably sending too much, break and + // hope for the best next time + if (!success) + { + Debug.Check(false); + behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); + break; + } - m_packetQueue.Dequeue(); // 'Commit' pop if data sent. - packet = m_packetQueue.Peek(); + m_packetQueue.Dequeue(); // 'Commit' pop if data sent. + packet = m_packetQueue.Peek(); + } } } diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs b/integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs index 54fe16ca..b86ee798 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs @@ -515,7 +515,7 @@ public static string GetTickInfo(Agent pAgent, BehaviorNode n, string action) if (Config.IsLoggingOrSocketing) { - if (pAgent != null && pAgent.IsMasked()) + if (!System.Object.ReferenceEquals(pAgent, null) && pAgent.IsMasked()) { //BEHAVIAC_PROFILE("GetTickInfo", true); diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/Workspace.cs b/integration/unity/Assets/Scripts/behaviac/runtime/Workspace.cs index 26220b80..b3459ead 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/Workspace.cs +++ b/integration/unity/Assets/Scripts/behaviac/runtime/Workspace.cs @@ -1217,13 +1217,15 @@ private void ParseProperty(string[] tokens) #endif } + private int m_frame = 0; + protected void LogFrames() { #if !BEHAVIAC_RELEASE if (Config.IsLoggingOrSocketing) { - LogManager.Instance.Log("[frame]{0}\n", this.FrameSinceStartup); + LogManager.Instance.Log("[frame]{0}\n", (this.FrameSinceStartup >= 0) ? this.FrameSinceStartup : (this.m_frame++)); } #endif diff --git a/integration/unity/Assets/Scripts/behaviac/runtime/version.txt b/integration/unity/Assets/Scripts/behaviac/runtime/version.txt index 927968ce..d2f69272 100644 --- a/integration/unity/Assets/Scripts/behaviac/runtime/version.txt +++ b/integration/unity/Assets/Scripts/behaviac/runtime/version.txt @@ -1 +1 @@ -3.6.25 +3.6.26 diff --git a/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/BehaviacUnitTestCpp.meta.xml b/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/BehaviacUnitTestCpp.meta.xml index 4ba674d9..92f3db3b 100644 --- a/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/BehaviacUnitTestCpp.meta.xml +++ b/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/BehaviacUnitTestCpp.meta.xml @@ -116,27 +116,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -231,27 +210,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -267,23 +225,6 @@ - - - - - - - - - - - - - - - - - @@ -332,102 +273,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -572,410 +417,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -999,36 +474,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1065,212 +510,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - - + + - - - + + - - + + - - + + + + + @@ -1285,27 +586,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1315,7 +595,6 @@ - @@ -1330,28 +609,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1393,27 +650,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1450,27 +686,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1479,27 +694,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1516,52 +710,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1572,27 +724,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/behaviacunittest.meta.xml b/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/behaviacunittest.meta.xml index 7ff02d5e..47313bf2 100644 --- a/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/behaviacunittest.meta.xml +++ b/integration/unity/Assets/behaviac/workspace/behaviors/behaviac_meta/behaviacunittest.meta.xml @@ -253,365 +253,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -620,241 +269,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + @@ -930,48 +382,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -985,116 +397,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1143,101 +445,119 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - - + + - - - + + - - + + - - + + + + + @@ -1252,52 +572,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1307,7 +585,6 @@ - @@ -1322,28 +599,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1385,27 +640,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1442,27 +676,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1471,27 +684,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1507,27 +699,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1542,27 +713,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/projects/gmake/tutorial_7.make b/projects/gmake/tutorial_7.make new file mode 100644 index 00000000..9c5ac9cf --- /dev/null +++ b/projects/gmake/tutorial_7.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_7/x32 + TARGETDIR = ../../bin + TARGET = $(TARGETDIR)/tutorial_7_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_7/x32 + TARGETDIR = ../../bin + TARGET = $(TARGETDIR)/tutorial_7_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_7.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_7 + $(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_7 +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_7.o: ../../tutorials/tutorial_7/cpp/tutorial_7.cpp + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<" + +$(OBJDIR)/behaviac_agent_meta.o: ../../tutorials/tutorial_7/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_7/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 94d758ac..d68e8502 100644 --- a/projects/vs2010/behaviac.sln +++ b/projects/vs2010/behaviac.sln @@ -3,67 +3,72 @@ 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", "{3142D9DE-E233-8849-BD9C-8E32A2D8A17F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btunittest", "btunittest.vcxproj", "{7A59366D-BAA2-BB44-8F53-4AF9A16826EE}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{8A044C1E-436D-AD4B-A9EA-16DB0790C1B8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{60BC45C8-125A-1045-8C62-E556418032A7}" 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", "{5A567917-7107-0D43-8AF7-092473042257}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_running", "demo_running.vcxproj", "{A395F726-39CF-1243-A3FD-2E4A2C28052C}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{41F757EE-B27F-5E47-A254-DBE973DDB05E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}" 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", "{07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1", "tutorial_1.vcxproj", "{392B915F-37F8-D04C-AC37-1AC3F8F71347}" 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", "{1132F949-A304-9A45-97E0-37901CFFB513}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_1", "tutorial_1_1.vcxproj", "{B6995F32-4579-BC41-A170-5D2F22742841}" 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", "{9A35B566-7608-624D-B46E-588E465A5C97}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_2", "tutorial_1_2.vcxproj", "{63325692-4A43-2F4C-9ABB-66D11B4A3313}" 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", "{B3802D90-A937-B54F-890A-1E394C18FCB9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_2", "tutorial_2.vcxproj", "{5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}" 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", "{928EF48B-8E5B-A040-9741-5C96705ABEE1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_3", "tutorial_3.vcxproj", "{2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}" 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", "{D8C65B00-D6BC-564C-9DA1-161F65EF5408}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_4", "tutorial_4.vcxproj", "{8EB72F80-A348-3840-A83C-328334219659}" 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", "{F5D8C526-79F5-E743-ABC1-D7C676E93F0F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_5", "tutorial_5.vcxproj", "{7339497F-C8EB-114D-B510-C5306C30BE32}" 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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_6", "tutorial_6.vcxproj", "{80188EBF-E5C8-714D-96CC-65EDAA12609D}" + ProjectSection(ProjectDependencies) = postProject + {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_7", "tutorial_7.vcxproj", "{25F5C81D-65CC-F041-9A80-FB56B35CB29B}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection @@ -84,110 +89,118 @@ 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 - {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 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.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 b3ad9aa0..d7b44376 100644 --- a/projects/vs2010/behaviac.vcxproj.filters +++ b/projects/vs2010/behaviac.vcxproj.filters @@ -2,166 +2,166 @@ - {4B74C9AE-2982-3745-8282-C526D8F64CE8} + {54C0A880-181D-2040-A491-A68E6DC34763} - {556D341E-F013-C54F-ABED-BCAB84FF4B4C} + {EE558818-4EE2-5E4F-B95C-FEC668E17077} - {9EBDC145-9EA0-934D-8001-0E4A0CE2D227} + {D7D07F39-4625-A941-8E5E-58D23B4A384C} - {04299F82-19AF-AB40-856F-BAB4A1499E3E} + {0A877ECA-99C8-3F48-B2C2-C5C733A4848A} - {205633CD-1C95-264F-885A-85B7F2C69FE9} + {801A2938-4FF3-6446-A1A0-DB3A56CAAEFB} - {A0F5FF8A-66D8-5B4E-B9CE-FED18BD50570} + {F8BC9085-4620-5F43-9001-05056DF6C65A} - {1609703F-ACD1-8A46-B42C-218F33D32BEF} + {F38104BF-CF92-DA49-9F2C-5CDC49EB6DB5} - {A1B0D5FE-7F65-F147-A9B8-DFDE751A5B27} + {73BE7A06-00D4-C148-93E3-375C0C219E7E} - {2EC3FD07-A382-394A-A442-AB9924C73ED7} + {C3F116B8-21C1-0646-97EB-428CD67ABF04} - {55ADFEEB-1CD0-D645-A90D-23A33B4E159C} + {2F27C48A-949B-9249-BB19-520CE562DDC3} - {A315A0F5-89A2-B249-BF80-92F6A5F541A4} + {A4969C21-09EE-AC45-984D-60B89D346A22} - {AFEEE7BC-0894-E647-9B2A-C5329055F48C} + {EC560D68-B078-4048-B2B7-258214EEE280} - {6755632D-5181-3C48-96EA-5B3358E0E111} + {634AB72C-EF0A-AF47-A6E4-FCB2D4B98EFC} - {335971D1-D7F6-7743-A083-60866BF5FC00} + {6B57D48C-3901-A347-ACA9-F3D9528691BD} - {F871BC61-77A0-1245-BD2F-8BD41F72640F} + {7FB7A9A1-B15D-ED4D-BBA4-0647D289738B} - {D5042ABA-690E-A64C-9846-DDA9910463F8} + {C75F3E9A-6A14-774D-B86F-7AFD193BD202} - {1DD54556-ABD8-FA43-AE78-3E886C590EAA} + {D308515B-ADC6-984F-BCC8-3DDE9AC9A5FD} - {FEDDFF36-CA82-3849-9CCD-18EC4F04B965} + {8F6BC2D2-54B7-CD4E-BA34-0DA384811D54} - {20D57225-57D2-7E4F-9044-97C80918C6E0} + {9B9303A1-7A04-0447-AF5E-AC0B962207FE} - {350451A9-C4B6-E540-B531-D13067A8DEEF} + {C75258A3-7EB2-A849-851D-9CB971114778} - {8209DC2E-6237-F645-B2FD-3205FA32B7F2} + {F824D22B-5501-9E4A-BC42-9FF878E0DE08} - {76D299F0-D98C-C24F-8D36-8D45DDC331BF} + {094E8CA4-FD37-2945-A227-7A56E6F47CE2} - {166BFA05-C520-194E-B6BA-DB391BBD7B20} + {7D978ACF-D7D6-FA47-A817-E86E1C3218A8} - {F15EA89E-95EB-DF44-8615-B066615C6F0F} + {404B028F-3B23-8F41-924C-603BE9AB5E80} - {12FB189D-10B8-834D-9493-C23A1E4966D1} + {8BB54FE8-3E3C-3B41-8B31-F132BBA6254D} - {B40F93C5-7A55-5040-AF16-AA39F34A81F4} + {BDB763FB-F922-6946-BF8F-8899EEE54BB1} - {017B97E2-57D4-6846-A894-7AFA69F71EF9} + {2B38882B-4A74-E549-A1BC-9A827A111602} - {1F28D56F-0427-FD40-8D78-6ABDDE2E7C6A} + {0F580B5A-090E-084E-9F88-AFD5E08638DD} - {6DF176A7-3B29-3346-90B3-49CFA88B14AA} + {109FFCF8-0070-D140-BFC5-EFA232EE1C52} - {3A569644-DDD6-114B-A2A0-078EF5CC4818} + {D1290610-4919-564B-9F70-61FA6D18689D} - {083A9076-32E1-3448-ADC5-BD36A4CFD244} + {CE8A839C-B743-5A41-BB4E-CE7385B60F71} - {48D5313E-26D4-B046-9AF4-D6C4C00C98EA} + {7AC8B981-1206-8442-B6E7-1718371622A5} - {2B22AF11-C65F-8942-A34F-82B8D77B335A} + {0A1E5F68-7D9E-0A41-88D6-EE995F30F70A} - {B4632CB6-050D-0B41-8D15-9558CEE9D755} + {4060FA01-BCC4-6147-8DF6-EF8A245670E9} - {13457559-7716-7F4F-8553-E53E6C2F0BDC} + {79FE85D8-30E4-4C41-8B25-F76D43D50CBB} - {A16E3DD7-C542-334E-AA23-4E874CA523A5} + {01780D0F-0B28-5A4F-8113-899F72815DB2} - {5F84B05A-162B-4841-9BD6-B6516C2017BB} + {610008E8-B4E4-3646-83FE-E5980D4C237A} - {F7B04BB3-E2E8-2A48-BF3F-D593D5605B95} + {2EDE7ACB-C4A0-814A-9EE0-06D970638085} - {12FA07A7-1171-7C41-AF41-FD8D98186221} + {203830CE-F874-5949-B6BE-1B326E3DCA25} - {3AAF2D46-6D0C-EF4E-82CE-EB4A501E2888} + {E7896C7F-D7C9-764D-9A27-39BB55CF08EF} - {7AFA5F51-B1CA-6E48-B754-194A04885251} + {4C5841B0-26AA-374F-934D-38C7D73CB079} - {E5FB951A-DC7D-FB40-B97F-C5973BCC9936} + {DBD3BD59-B505-9B4B-9893-0BDF59C55532} - {6E00E524-FA9E-F249-8C19-07A01B22D607} + {133516AF-4405-F946-9EAA-6BCC65BF959E} - {0C53117E-2E22-BC48-831C-2761B595777D} + {7EC58E07-6DF4-F046-BCB3-916A182C19E0} - {9AE3AC5E-09AD-6941-88E5-5ACC99C11FE1} + {419DDE76-B5DE-0147-8CB5-8EC8E1A882CE} - {FA84D043-C810-F944-98C0-B2AE5CCB8153} + {F0DBDA35-6852-694B-9520-3EB4AE581D1C} - {19AA691E-E9E0-1440-A125-6E7E8D220898} + {405D299A-F264-2643-B1EB-2E1E6C67802B} - {C01552A6-44D6-3044-9435-C9888A7B04E4} + {EF13F280-719E-B347-8574-9A595B83339E} - {92EE5D26-8FBC-5D43-B1EC-4D2548F1B8B4} + {F4CA3897-664D-CB4C-B6C4-0BC585C6F6A0} - {6FE35D05-7222-A645-BB79-BDFBADCB5720} + {47F00A1B-4C4F-EF44-8DD3-C3624E4217C0} - {BB10892B-1C09-7E4A-8509-BA81E0B3CEFE} + {E50517BC-8299-4646-90C9-2C5ADD87E45C} - {5B8E5FA6-2956-E340-9883-66A3C60E1A87} + {1B753D96-0001-5B4D-B249-96D1A3179FFB} - {D0B4E084-AD33-7440-A96C-C5F3615D6CD6} + {C8B98CC8-BCE4-8647-9AF3-5A08E3641655} - {AE8DECD7-B1C4-6E44-9728-84BB061604EF} + {405F2B04-9081-794F-88E9-0DC62ABF90D8} diff --git a/projects/vs2010/btperformance.vcxproj b/projects/vs2010/btperformance.vcxproj index ef0c600d..903ceca8 100644 --- a/projects/vs2010/btperformance.vcxproj +++ b/projects/vs2010/btperformance.vcxproj @@ -19,7 +19,7 @@ - {6650A56E-0B23-DC4A-8FD9-0ACB0D5B6242} + {60BC45C8-125A-1045-8C62-E556418032A7} btperformance Win32Proj diff --git a/projects/vs2010/btperformance.vcxproj.filters b/projects/vs2010/btperformance.vcxproj.filters index b9bc6da2..f4404e81 100644 --- a/projects/vs2010/btperformance.vcxproj.filters +++ b/projects/vs2010/btperformance.vcxproj.filters @@ -2,22 +2,22 @@ - {0C4B816D-6F94-644A-A018-F0F74F6D41BB} + {BBC6E6DE-D898-9F4B-8582-0CFC4A70DCAD} - {52A10F77-1C45-8B43-8F6C-0F4EE5C236F7} + {8F245EC9-E726-414B-B231-2F7F2A87A96C} - {F562AF9E-5D1B-E64E-9B86-777E930D0ED5} + {5EFE5DCA-15B8-F940-93B5-DDD672F5704A} - {5EB8935A-F81C-2B48-B47D-7145C33A6447} + {ABF1F8B5-E00C-5545-913A-534F74CD5ED9} - {9EEA1ACB-56CD-C04E-B6C7-06A1DCF46743} + {FC5B9E27-2FB2-C24A-B266-AB372306CD49} - {AA7F8B30-1269-7944-A451-77A5DFBFF39B} + {9636737A-DD86-EC4F-99F6-9A0FA0339575} diff --git a/projects/vs2010/btremotetest.vcxproj b/projects/vs2010/btremotetest.vcxproj index e000e94e..6f8d7c14 100644 --- a/projects/vs2010/btremotetest.vcxproj +++ b/projects/vs2010/btremotetest.vcxproj @@ -19,7 +19,7 @@ - {8A044C1E-436D-AD4B-A9EA-16DB0790C1B8} + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4} btremotetest Win32Proj diff --git a/projects/vs2010/btremotetest.vcxproj.filters b/projects/vs2010/btremotetest.vcxproj.filters index a41a14d8..e4f6781c 100644 --- a/projects/vs2010/btremotetest.vcxproj.filters +++ b/projects/vs2010/btremotetest.vcxproj.filters @@ -2,25 +2,25 @@ - {173C9041-3C09-A249-82C1-01EB1BC714BD} + {2FF33881-625D-2647-AC06-52C51959F9D2} - {C424173E-1317-B241-8B65-65AEAEF32DFC} + {86F44B5E-2D35-5149-B4D2-E8378B96640E} - {EE3D4D92-CB35-E14F-BB2A-8172AFB00631} + {0066A902-BC61-A948-8716-C8B7CDFF2B97} - {604AE807-9EBB-254E-81EE-4308BF949B25} + {C816FD73-5CFF-894C-B5CC-216FBA1E3C94} - {6139A3AE-741B-0A4E-A542-7C241693AAA9} + {62E9960F-D81F-D541-8D24-54FCD5F1CB33} - {40366E99-3275-9D41-AECB-88C49E10BAA2} + {8E63EDB5-BE41-054A-8E30-0DC06936DD05} - {F079EB48-EB66-784B-820B-B2F0A86266A6} + {34A8C04F-EFDD-E148-BC6E-6F4523A56C76} diff --git a/projects/vs2010/btunittest.vcxproj b/projects/vs2010/btunittest.vcxproj index c744037d..30f86183 100644 --- a/projects/vs2010/btunittest.vcxproj +++ b/projects/vs2010/btunittest.vcxproj @@ -19,7 +19,7 @@ - {3142D9DE-E233-8849-BD9C-8E32A2D8A17F} + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE} btunittest Win32Proj diff --git a/projects/vs2010/btunittest.vcxproj.filters b/projects/vs2010/btunittest.vcxproj.filters index e0d79297..78443dd5 100644 --- a/projects/vs2010/btunittest.vcxproj.filters +++ b/projects/vs2010/btunittest.vcxproj.filters @@ -2,52 +2,52 @@ - {AE8295E7-9DB5-CA46-A233-2A4947CAB45D} + {5A9EB123-6230-9045-A9EA-3911773F65A7} - {9044C98F-EF9A-8F4B-A61D-72BDB95B5C52} + {9E3D1C43-4DD9-D54A-AA5E-B2A5D7AB1B0A} - {83CE499E-5A72-6A4D-98F5-B1D5D2090D9B} + {5D362D33-4F67-A14D-A1B4-88B807D180B2} - {5E2D90AD-935F-F841-A0EA-15B77980E778} + {6E72DA27-1C16-9D4D-8F8B-74A2DCC7444B} - {14700233-4798-1946-B9BE-B7F39C42DFA6} + {36D8D586-6618-EA4D-AF34-830ED67E4F92} - {EC797B29-DACC-A648-BE42-4A42F365F2AC} + {CC4C0074-C982-F64A-B37A-FABAA9CCD559} - {0B657C4D-D40D-3B47-8F97-3906C2C14DF0} + {95031EE4-F832-7645-AE54-8708D794E155} - {63C01020-4EFA-A447-A709-2DDC858076FD} + {6020E36E-AB45-D344-8304-11F09BA65EDB} - {A4991B70-C54B-1549-8DC3-3F01BB5AF582} + {F06A2A21-218B-5F4E-B64D-469761189134} - {30653DF2-706F-1842-9B35-9E091BC64800} + {7C0C8AF3-35D4-294E-80C8-0AE1AF55F53E} - {AD39640D-860D-0E46-88BD-96116096865A} + {42BFD027-4D61-B74B-AB3E-2C9C638C7195} - {FFB38A2F-E444-7748-8C07-56476266E650} + {3B0E41FA-42DC-B74A-8508-8003E5E0E3DF} - {C9071FB6-0872-244E-8AAD-A919C01477EE} + {9BFE84B4-4CB2-5245-8DD1-E1E6D7A30498} - {0FF78D6A-CD49-4649-9F3E-9BF859901832} + {A5D8C5AE-DB8F-634F-BB3B-B1E95780F62C} - {35B03924-B523-8840-99F4-5D83EC7CACCA} + {A565AE62-7CB8-954C-B9F3-57DEB9428F1C} - {FB4BFD2A-63FB-AE4F-9298-BEB7E1AD1D04} + {0E9CAB71-2842-D64C-A677-90EE756E1D97} diff --git a/projects/vs2010/demo_running.vcxproj b/projects/vs2010/demo_running.vcxproj index 76376783..28f79ff8 100644 --- a/projects/vs2010/demo_running.vcxproj +++ b/projects/vs2010/demo_running.vcxproj @@ -19,7 +19,7 @@ - {5A567917-7107-0D43-8AF7-092473042257} + {A395F726-39CF-1243-A3FD-2E4A2C28052C} demo_running Win32Proj diff --git a/projects/vs2010/demo_running.vcxproj.filters b/projects/vs2010/demo_running.vcxproj.filters index b87b91ef..789b47d1 100644 --- a/projects/vs2010/demo_running.vcxproj.filters +++ b/projects/vs2010/demo_running.vcxproj.filters @@ -2,28 +2,28 @@ - {86FE23A3-0F9C-144B-8750-D405F1AEDA66} + {89CE00CD-9DA7-684F-AA87-034E5B247B5E} - {A098655D-A479-FE42-AD6C-AEFB8AEBEE88} + {9FDE2B27-6533-AF45-9049-6DFC9AB7AA4D} - {CA002994-40CA-3A4C-94EF-684B4FA5E03A} + {E7BD6CE1-46A5-9046-B549-7154442DC280} - {1375B7AA-CBBD-544C-B07F-D15241BAAF86} + {8EEB6369-7768-1A44-A45D-78319481C11A} - {FE5996A5-94E3-FC48-992B-1C732DDF7490} + {0592BC02-A57C-884E-B22B-91D79EAEA6BD} - {49A64D8F-9600-634B-89BC-9800FBDD3495} + {7EBF4527-4684-5345-88B1-127B71341202} - {E040CB71-B081-1648-B426-B43CF898BA09} + {5B17274B-B5F7-6B4B-B78B-1F2B4994FDB9} - {8B759932-EE86-DB4D-AA0C-637C9244A542} + {F8050755-884A-7B4A-A6AD-CADE0C498A3D} diff --git a/projects/vs2010/tutorial_1.vcxproj b/projects/vs2010/tutorial_1.vcxproj index b400440f..22fce454 100644 --- a/projects/vs2010/tutorial_1.vcxproj +++ b/projects/vs2010/tutorial_1.vcxproj @@ -19,7 +19,7 @@ - {07166A2D-6B32-8A4E-87B6-F3A5CF8E6F74} + {392B915F-37F8-D04C-AC37-1AC3F8F71347} tutorial_1 Win32Proj diff --git a/projects/vs2010/tutorial_1.vcxproj.filters b/projects/vs2010/tutorial_1.vcxproj.filters index fd4bf554..ea6d8322 100644 --- a/projects/vs2010/tutorial_1.vcxproj.filters +++ b/projects/vs2010/tutorial_1.vcxproj.filters @@ -2,22 +2,22 @@ - {C1FC048F-92F2-BF44-81F1-6D3CE2C0B5DD} + {BF2B1606-6D01-2F40-9C6E-760D98B41596} - {B320AC80-4A6F-254D-91D3-DD02379CED41} + {9E034747-8F46-B84D-8A39-9D4E34B60CB9} - {AED42B60-86E5-6B42-B8BA-247745B71233} + {21027B77-793A-0841-9632-E19688B12396} - {34C1A93E-C13A-5B4C-9825-6152FDDD4963} + {28C1C8DB-C85A-6942-BA18-7EC4603F5E53} - {FBA97219-CA32-EF4E-AAE3-0F7808700DE6} + {77C2C99B-D66A-8447-9725-C4D2A0456B00} - {01607832-6E71-5142-B285-6FD222D46588} + {D12026C8-CD5D-3E4E-AD02-C719C78C11AC} diff --git a/projects/vs2010/tutorial_1_1.vcxproj b/projects/vs2010/tutorial_1_1.vcxproj index 87ec9c98..5aa71dbf 100644 --- a/projects/vs2010/tutorial_1_1.vcxproj +++ b/projects/vs2010/tutorial_1_1.vcxproj @@ -19,7 +19,7 @@ - {1132F949-A304-9A45-97E0-37901CFFB513} + {B6995F32-4579-BC41-A170-5D2F22742841} tutorial_1_1 Win32Proj diff --git a/projects/vs2010/tutorial_1_1.vcxproj.filters b/projects/vs2010/tutorial_1_1.vcxproj.filters index 7e4b8911..513a269d 100644 --- a/projects/vs2010/tutorial_1_1.vcxproj.filters +++ b/projects/vs2010/tutorial_1_1.vcxproj.filters @@ -2,22 +2,22 @@ - {1FAEE9A7-F8FB-1641-8977-3917E6D69B0D} + {F3B2BE01-3613-6F40-AB22-FB4DAD01A697} - {5371104A-6D8E-0E4C-9C86-A8E50E92B84F} + {D4BA2669-6BF6-3C45-ABDD-1CB14F4F0DC7} - {4F5F11C7-FA68-4B4C-99AB-B69023AD6783} + {55EF3690-68F6-8B49-9E70-165F42E5D7B6} - {4FE381BD-591F-2344-A26E-EEC1D0A670B6} + {BDB03FED-696E-6C4F-8C61-4BFC0BAAEE72} - {CC96D816-EB64-7C45-BC4F-4C553270ABCE} + {C2C030ED-9145-C24C-84D1-8083EE868F66} - {D3DD3C38-620F-0E4B-A9A9-96600B2867AC} + {C20BB4F5-F9B5-2B43-A46D-390145D85684} diff --git a/projects/vs2010/tutorial_1_2.vcxproj b/projects/vs2010/tutorial_1_2.vcxproj index f185d390..96318f4a 100644 --- a/projects/vs2010/tutorial_1_2.vcxproj +++ b/projects/vs2010/tutorial_1_2.vcxproj @@ -19,7 +19,7 @@ - {9A35B566-7608-624D-B46E-588E465A5C97} + {63325692-4A43-2F4C-9ABB-66D11B4A3313} tutorial_1_2 Win32Proj diff --git a/projects/vs2010/tutorial_1_2.vcxproj.filters b/projects/vs2010/tutorial_1_2.vcxproj.filters index 10b716a4..4ad7dc9c 100644 --- a/projects/vs2010/tutorial_1_2.vcxproj.filters +++ b/projects/vs2010/tutorial_1_2.vcxproj.filters @@ -2,22 +2,22 @@ - {C5A95FF1-77C9-A747-8CD9-2D1837005122} + {F9368FAA-B795-C54E-84F9-EFF213B0584A} - {D9897873-3A7A-1441-9936-B8AE3B2012D3} + {3D166B89-8C1F-9A4C-B8D3-67D4AAC9787D} - {11859CF1-D11A-C748-8847-630C6A511513} + {15BB9E94-7CA5-294F-8DDA-781368927E3E} - {5F0A5FEF-EF0A-6740-9536-DCCF5F9EBE06} + {8C1D0C3C-9902-9642-BCDF-302D00E9C0E2} - {89513827-EB5E-7849-B7D2-E32577ED3E21} + {9D2C7365-4934-A544-BBDA-D007651922F9} - {FAEE183B-C895-6149-AD41-71490AF519B5} + {451D113E-7AF0-FC4A-8DB1-448B1E9E1686} diff --git a/projects/vs2010/tutorial_2.vcxproj b/projects/vs2010/tutorial_2.vcxproj index b23ef385..b896d723 100644 --- a/projects/vs2010/tutorial_2.vcxproj +++ b/projects/vs2010/tutorial_2.vcxproj @@ -19,7 +19,7 @@ - {B3802D90-A937-B54F-890A-1E394C18FCB9} + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA} tutorial_2 Win32Proj diff --git a/projects/vs2010/tutorial_2.vcxproj.filters b/projects/vs2010/tutorial_2.vcxproj.filters index b4061e3f..a8824689 100644 --- a/projects/vs2010/tutorial_2.vcxproj.filters +++ b/projects/vs2010/tutorial_2.vcxproj.filters @@ -2,25 +2,25 @@ - {E31561C2-E8F9-C94D-B96D-B0C380216C85} + {E1E8F9A9-D8CE-8E4E-88A9-A44D5F72FCE4} - {D8A60795-F686-944E-887F-835E465A5181} + {D3BBF285-2F4D-4B45-8C0A-5A6C894B871C} - {383F6D47-96A1-F849-8D77-D9DE3AE2B3D4} + {C8CE949E-2E0E-A94E-969E-D0A1E4068824} - {E63603BD-520C-8741-BE75-5B0575556E73} + {8EA9BF32-6A57-8841-9F05-5567C2D0662F} - {B2B0BF3E-B8A8-3D48-8AE8-EAE3DCAA940F} + {BC67A02D-8AAB-9546-B961-3B60BF1905BE} - {CDE4C225-FE36-CF49-A275-A708EDAAB8AC} + {516CCF4C-AF5F-8F46-AC3A-9029E94CABCA} - {4F76EBF1-FFDE-8845-8796-CB3E4CB89155} + {C29DDD0D-BD5C-5F4F-A3BB-8E06C50A4E30} diff --git a/projects/vs2010/tutorial_3.vcxproj b/projects/vs2010/tutorial_3.vcxproj index 7d1abb29..084cc47d 100644 --- a/projects/vs2010/tutorial_3.vcxproj +++ b/projects/vs2010/tutorial_3.vcxproj @@ -19,7 +19,7 @@ - {928EF48B-8E5B-A040-9741-5C96705ABEE1} + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329} tutorial_3 Win32Proj diff --git a/projects/vs2010/tutorial_3.vcxproj.filters b/projects/vs2010/tutorial_3.vcxproj.filters index 0301e599..7b16d6dc 100644 --- a/projects/vs2010/tutorial_3.vcxproj.filters +++ b/projects/vs2010/tutorial_3.vcxproj.filters @@ -2,22 +2,22 @@ - {7E34349F-3C12-D645-A143-D735E9471B48} + {771DADFC-A902-334F-89B0-085669D89301} - {FD9C7C56-DC80-2C4A-9605-CCE3E85DDEF9} + {D2BD76DC-E961-8444-948B-9E24CBF1E963} - {C3E0A30A-0CF3-8244-AEF1-6C070298ED49} + {4001CE54-379C-3846-BCA4-C490B35BF4D5} - {95D50DDF-BBCC-5442-B65E-B2DA12B51CA6} + {AE83C133-7C62-5D48-A64D-BFACC757CB47} - {6370E9D6-42D7-8944-BEF9-EBB311DF29EE} + {0E408BF4-573A-CD43-9880-EA0083F67170} - {44DE2B9C-A8D0-1D4D-8AFB-C8BE821DB4EE} + {19924C39-0A06-5843-949F-0DD29E7FF0C7} diff --git a/projects/vs2010/tutorial_4.vcxproj b/projects/vs2010/tutorial_4.vcxproj index 84197f24..c9889850 100644 --- a/projects/vs2010/tutorial_4.vcxproj +++ b/projects/vs2010/tutorial_4.vcxproj @@ -19,7 +19,7 @@ - {D8C65B00-D6BC-564C-9DA1-161F65EF5408} + {8EB72F80-A348-3840-A83C-328334219659} tutorial_4 Win32Proj diff --git a/projects/vs2010/tutorial_4.vcxproj.filters b/projects/vs2010/tutorial_4.vcxproj.filters index 12651c3c..c682839e 100644 --- a/projects/vs2010/tutorial_4.vcxproj.filters +++ b/projects/vs2010/tutorial_4.vcxproj.filters @@ -2,22 +2,22 @@ - {E51CA290-17A0-FC40-AA8E-18DAE716C3B2} + {C9A2E2B6-7242-CB45-A65A-D9DA2725F060} - {98614188-7BC0-0F42-AAF3-470ACE486EDE} + {34E4E3E7-3D93-D242-AEC3-37F8C3C25C1A} - {6E7304CC-8115-6F4B-9CF5-C9C4E1E74F89} + {83503390-159F-754F-A4B0-3C7CF711DDAC} - {6F0E499D-7069-C948-8409-83B104F6FA21} + {45E10DF4-14AA-7548-8B68-3DA75B8EF9BE} - {DAD1ABC6-2980-EF4D-8E62-D40FD5849610} + {48971497-37A2-5547-A6D7-024DC6CEADD8} - {9F9F95BB-C612-A34A-84A6-5CD11BEADF41} + {E506FE57-6267-F445-A9EB-5F3785DE98E8} diff --git a/projects/vs2010/tutorial_5.vcxproj b/projects/vs2010/tutorial_5.vcxproj index 8a508888..ceacbaf7 100644 --- a/projects/vs2010/tutorial_5.vcxproj +++ b/projects/vs2010/tutorial_5.vcxproj @@ -19,7 +19,7 @@ - {F5D8C526-79F5-E743-ABC1-D7C676E93F0F} + {7339497F-C8EB-114D-B510-C5306C30BE32} tutorial_5 Win32Proj diff --git a/projects/vs2010/tutorial_5.vcxproj.filters b/projects/vs2010/tutorial_5.vcxproj.filters index f24d64a7..774a3aca 100644 --- a/projects/vs2010/tutorial_5.vcxproj.filters +++ b/projects/vs2010/tutorial_5.vcxproj.filters @@ -2,22 +2,22 @@ - {70E99CDD-C2EE-E947-B492-F40637F29051} + {83DADB54-A537-464D-A3F0-374CF14B4FF8} - {9D4D5D87-E885-D141-B790-39D7701E4930} + {8DE2513F-5DF5-344A-8959-6102FE8EF939} - {DC19C80F-57C1-AF48-A7F2-2961F3A187DE} + {31D135AD-5622-2043-899F-F4E074B1319A} - {B63A31EB-E2BF-414F-8D75-71B2EAFA4A60} + {434F5D24-D952-4743-BEA2-8503E9F8C839} - {873F0E30-1BA7-D34D-B6A1-AC842EECD2B8} + {3896E7F8-2AE4-7D43-8D53-9F6955645167} - {910BAD1C-B0B9-6F43-A652-3ED66AB510DB} + {788D2F68-1A25-3447-A854-AD2DE752E055} diff --git a/projects/vs2010/tutorial_6.vcxproj b/projects/vs2010/tutorial_6.vcxproj index 7e570d69..8d469a92 100644 --- a/projects/vs2010/tutorial_6.vcxproj +++ b/projects/vs2010/tutorial_6.vcxproj @@ -19,7 +19,7 @@ - {6F5CF956-9DE0-CA48-B8C0-9D8D145D0FA3} + {80188EBF-E5C8-714D-96CC-65EDAA12609D} tutorial_6 Win32Proj diff --git a/projects/vs2010/tutorial_6.vcxproj.filters b/projects/vs2010/tutorial_6.vcxproj.filters index 0016cffb..ea166828 100644 --- a/projects/vs2010/tutorial_6.vcxproj.filters +++ b/projects/vs2010/tutorial_6.vcxproj.filters @@ -2,22 +2,22 @@ - {2D32C092-FBD5-CE45-B6A1-3A48310DD31B} + {CF334E9C-F4DB-804D-9746-2BDDE4CFF055} - {BE2D8807-3690-5C4D-92B0-AC9E5317D6C8} + {1F9D1CC5-A868-AF4C-8E91-788B075D33E1} - {809F5B67-B956-C641-A61B-1E6BB52DD46C} + {DFCC6FB2-F584-5742-BF0A-24D3AB8EF470} - {06B0E2C4-B083-3043-AECA-2CAB5CCA789C} + {22D1CC5E-017F-EF4F-A09F-5A985B424474} - {026AE998-9713-254D-B0FC-2F65CC30B0D4} + {B26EDC93-1CE8-AD4A-AD13-F739B2AE37DB} - {F4CB92C7-ED9C-144D-8440-38EE4F207A89} + {164D75D0-E975-714C-A7B7-237402D643DF} diff --git a/projects/vs2010/tutorial_7.vcxproj b/projects/vs2010/tutorial_7.vcxproj new file mode 100644 index 00000000..577dac66 --- /dev/null +++ b/projects/vs2010/tutorial_7.vcxproj @@ -0,0 +1,239 @@ + + + + + DebugStatic + Win32 + + + ReleaseStatic + Win32 + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + + {25F5C81D-65CC-F041-9A80-FB56B35CB29B} + tutorial_7 + Win32Proj + + + + Application + true + MultiByte + + + Application + false + MultiByte + + + Application + true + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + ..\..\bin\ + ..\..\intermediate\debugstatic\vs2010\tutorial_7\x32\ + tutorial_7_debugstatic_win32_vs2010 + .exe + true + + + ..\..\bin\ + ..\..\intermediate\releasestatic\vs2010\tutorial_7\x32\ + tutorial_7_releasestatic_win32_vs2010 + .exe + false + + + ..\..\bin\ + ..\..\intermediate\debugdll\vs2010\tutorial_7\x32\ + tutorial_7_debugdll_win32_vs2010 + .exe + true + + + ..\..\bin\ + ..\..\intermediate\releasedll\vs2010\tutorial_7\x32\ + tutorial_7_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_7_debugstatic_win32_vs2010.pdb + + + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)tutorial_7_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_7_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_7_debugdll_win32_vs2010.pdb + + + WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) + ..\..\inc;..\..\inc;D:\include;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)tutorial_7_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_7_releasedll_win32_vs2010.exe + ..\..\lib;%(AdditionalLibraryDirectories) + mainCRTStartup + MachineX86 + + + + + + + + + + + + + + + + + + + + + {332CEEDC-7568-D84C-B9C6-B710915836ED} + + + + + + diff --git a/projects/vs2010/tutorial_7.vcxproj.filters b/projects/vs2010/tutorial_7.vcxproj.filters new file mode 100644 index 00000000..fb53a817 --- /dev/null +++ b/projects/vs2010/tutorial_7.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {67302F35-50FD-9847-895F-AEAA5C684352} + + + {F7BD9A9E-15A0-8D4B-A64D-F9074D3F6AAB} + + + {2BBEE04E-567E-C740-8221-8DB97759AB5C} + + + {14E5D5BC-2E08-8140-ABAD-BDDBE1B6C2C7} + + + {ED0FB38B-CF91-304D-96C3-D5E2067B7C2E} + + + {B2918FAF-E131-CD40-B00C-CA1199C12B81} + + + + + tutorials\tutorial_7\cpp\behaviac_generated\types + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + + + tutorials\tutorial_7\cpp + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + diff --git a/projects/vs2010/usertest.vcxproj b/projects/vs2010/usertest.vcxproj index 4f64a107..ae33f3a2 100644 --- a/projects/vs2010/usertest.vcxproj +++ b/projects/vs2010/usertest.vcxproj @@ -19,7 +19,7 @@ - {41F757EE-B27F-5E47-A254-DBE973DDB05E} + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E} usertest Win32Proj diff --git a/projects/vs2010/usertest.vcxproj.filters b/projects/vs2010/usertest.vcxproj.filters index 619facd5..e456e2da 100644 --- a/projects/vs2010/usertest.vcxproj.filters +++ b/projects/vs2010/usertest.vcxproj.filters @@ -2,28 +2,28 @@ - {FC25A8B6-CF09-5B48-93A6-1CA6EBACAB58} + {7B336777-007D-6942-AAD6-BFCB61D1ACAB} - {F99CE654-F89D-F344-9C5B-6D489354D19F} + {3A7315E7-0274-C44B-ABE9-F6515BE2E3B3} - {FFC39FB3-52DA-7E4F-92CD-8469C1012084} + {45701C2D-AACD-DE4B-8A53-2D0D36204D16} - {BEC00164-A4F2-DB4F-B890-C94C36B23BA2} + {80F1B924-D372-D848-A709-226F4EEA59C1} - {A12581E9-234A-2F42-937B-AAF35B10997A} + {437160F5-CB7E-B440-84F5-2A26E34FDF32} - {19DC5891-A711-4440-8F1E-C7B9B6BC5025} + {EE98784A-D1DE-954A-BDA3-7E44E77CD787} - {3A49A471-884F-0147-A657-68235996C6E5} + {E5F2653F-0BAD-9348-A89F-943259F84B98} - {16583F8B-4B3D-2940-A23D-6FFB3A6240B5} + {61CFE9E9-768E-0E49-9B00-50214DCCCB4D} diff --git a/projects/vs2013/behaviac.sln b/projects/vs2013/behaviac.sln index dabfbc19..c6f6cf28 100644 --- a/projects/vs2013/behaviac.sln +++ b/projects/vs2013/behaviac.sln @@ -3,67 +3,72 @@ 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", "{1719AEB2-B56A-464A-A63A-5F7C2E54D337}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btunittest", "btunittest.vcxproj", "{7A59366D-BAA2-BB44-8F53-4AF9A16826EE}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{1F212A0E-E79E-1441-9DBF-EEA7DBBC2464}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btremotetest", "btremotetest.vcxproj", "{FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{3AE50056-01F6-4A4F-9E27-A9DB312F634A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btperformance", "btperformance.vcxproj", "{60BC45C8-125A-1045-8C62-E556418032A7}" 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", "{803B3D92-0B30-4041-9492-B1B58F0D63BC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_running", "demo_running.vcxproj", "{A395F726-39CF-1243-A3FD-2E4A2C28052C}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{E3B1BA89-2650-4E4F-8018-7109702702A9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usertest", "usertest.vcxproj", "{E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}" 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", "{C6BD24CC-FB22-0E4E-9A24-4480F03192FD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1", "tutorial_1.vcxproj", "{392B915F-37F8-D04C-AC37-1AC3F8F71347}" 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", "{9860146C-FA39-9346-9B79-193320168E43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_1", "tutorial_1_1.vcxproj", "{B6995F32-4579-BC41-A170-5D2F22742841}" 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", "{F326205A-472F-9844-AF75-8D2B3E0BE934}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_1_2", "tutorial_1_2.vcxproj", "{63325692-4A43-2F4C-9ABB-66D11B4A3313}" 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", "{E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_2", "tutorial_2.vcxproj", "{5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}" 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", "{F5C2EA87-ECF4-AC47-9802-C0E32BD963D8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_3", "tutorial_3.vcxproj", "{2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}" 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", "{CABFE60C-BCCC-C84B-AA53-F805FACA0D98}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_4", "tutorial_4.vcxproj", "{8EB72F80-A348-3840-A83C-328334219659}" 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", "{26B3F0C3-B7FF-D247-89C8-04131AB5F0F0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_5", "tutorial_5.vcxproj", "{7339497F-C8EB-114D-B510-C5306C30BE32}" 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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_6", "tutorial_6.vcxproj", "{80188EBF-E5C8-714D-96CC-65EDAA12609D}" + ProjectSection(ProjectDependencies) = postProject + {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_7", "tutorial_7.vcxproj", "{25F5C81D-65CC-F041-9A80-FB56B35CB29B}" ProjectSection(ProjectDependencies) = postProject {332CEEDC-7568-D84C-B9C6-B710915836ED} = {332CEEDC-7568-D84C-B9C6-B710915836ED} EndProjectSection @@ -84,110 +89,118 @@ 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 - {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 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {60BC45C8-125A-1045-8C62-E556418032A7}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {A395F726-39CF-1243-A3FD-2E4A2C28052C}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {392B915F-37F8-D04C-AC37-1AC3F8F71347}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {B6995F32-4579-BC41-A170-5D2F22742841}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {63325692-4A43-2F4C-9ABB-66D11B4A3313}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {8EB72F80-A348-3840-A83C-328334219659}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {7339497F-C8EB-114D-B510-C5306C30BE32}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {80188EBF-E5C8-714D-96CC-65EDAA12609D}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B}.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 66e335f7..90200ff5 100644 --- a/projects/vs2013/behaviac.vcxproj.filters +++ b/projects/vs2013/behaviac.vcxproj.filters @@ -2,166 +2,166 @@ - {EC51B8BA-F853-5D43-B91C-79FC357B8878} + {E71BE100-86D3-594E-A56C-8F35B8C5DF0F} - {B15B28D4-5333-D449-BF72-D2A9FF38211D} + {A8E4572C-743F-6643-8363-29F679197D59} - {65082F0B-F691-B14A-97A3-78E254BAF0C9} + {02EF598E-2830-C049-9883-9B9E0A250D8D} - {15FFD6C1-8AF6-9D4B-A34B-FF5EAB479842} + {B8EC9113-7D56-224D-BCAE-E2E7F732A002} - {9A2DEB5D-EDE0-EA47-BB13-8628DCDED12A} + {BAE132DB-1401-DB48-B95F-EC872ACADB69} - {94104223-7F28-9E4B-9F3F-FA4378178D6F} + {9C398A79-9093-0042-A7DD-67EBFB09CE4B} - {516B6C51-790A-254D-8423-C390929363E9} + {8481FE89-C0F7-E248-9869-9AA55E1C3AAA} - {8FC0C5B8-77E0-FD4D-A32F-959EE844F8FD} + {73018F99-B43E-6F47-81AD-3C2975DED610} - {587F5B04-7932-7F4B-B66C-23B3DE0E616E} + {15D5681A-A041-B54E-B442-5DD4859CFD4A} - {EA09EF5F-4135-6341-B603-4D646215AC5C} + {17CFC3A4-3741-ED43-B7AC-527AC86E14EB} - {9998667C-14F8-BF40-8BB4-63C5F80482AA} + {75CCC7F9-2478-F840-AC05-A17C094D94C2} - {E87E39E3-FC46-3E45-880D-C96DF7EDCD52} + {330C84CE-32D9-2947-9E01-5BA096BB9378} - {A4532293-8391-6D46-B06E-A9C18C3023EC} + {5A9055AC-CD4F-1243-A5D4-E8B2C39ACF2A} - {D09C9F77-2371-8648-AB51-EB9B0071C012} + {CF6AF868-0273-264B-B0C8-CA7BB2DD37CC} - {21D5149A-797A-B648-8955-44ABC432AB5F} + {6F528FAD-B29E-4D40-A7B1-E8054C0ECDB5} - {17339F09-C807-6743-BCD6-7CC74ED700C3} + {A7261971-1465-724E-8AC4-17545F146D50} - {EC7DB71B-44B3-0C40-B444-FC394C214AD3} + {D9558F8D-0DBD-184C-A131-4AB28859C324} - {E569FB3D-42DC-C345-B562-F5D4035F037F} + {2E5A16BC-535C-764B-9FAA-BEB71C92B318} - {C83B18F3-25AE-DC49-9357-9DD9A938570E} + {34A9B1B9-3057-A640-B25F-DF2BB37B20B1} - {BFA54451-5F5D-324C-B0D5-CDE8A2BBF67D} + {89AF006C-A764-6842-B2BC-B2FC9289CEFB} - {7A411471-4F4E-294D-AE60-6B660A8AA092} + {CBBCF6F7-7069-904A-A670-0DEBBAB4CC83} - {9D8F1A12-37E5-2B44-8602-7752846942BF} + {0C0787B0-885F-EA4E-B117-E1D206F7D9D9} - {44C418E6-6EE9-CC46-951B-EF9407F01849} + {CF78EB32-2445-774B-B9E4-9232B09B4F0D} - {9DABFA18-6C79-4B45-8894-05BA03D82D81} + {6CE140E4-C92A-294C-B32C-8448629F0264} - {54F61301-4796-E848-A755-4584AE86D6B1} + {AF64E6EC-CC2D-BC4B-A851-7D76CFC9DBAE} - {D90478CB-59F7-034B-A4AF-5438009EF29E} + {2691CFFC-C579-6D43-9DBC-7BC9A80DA1A1} - {F8B7DE39-5728-6C4A-BB59-1D35AE35320E} + {22CD67D6-12ED-9A4A-9BB0-DB8B32841AB1} - {1FD0AD76-D5AC-FB48-BD3D-6E79CB4DEC3F} + {0C859F4D-948F-1549-A4BD-BA7A52EB0797} - {105D7979-99A3-4446-A17B-FEF8FD2B060F} + {92D1C629-7805-D148-8AAF-7B9453AA68BE} - {B9C687B4-076B-F541-8A2E-0DA714389FBE} + {98A0D363-8641-A847-B551-14758C931D4A} - {F3F57CEC-2953-094C-8CFA-D3D9F89AE82A} + {7DE6F3D3-93BC-9249-9740-AABF42D06A6E} - {37586960-7805-4349-B706-2D389256A131} + {EED7AD50-DB86-BE43-A354-C11BA66C8359} - {23831B54-93D2-3347-A071-DDCEC52C3321} + {39E7E945-EF3F-9B4E-ACC6-B77FBA51DB7C} - {488B054F-4668-264F-ADC2-B7FE53E9E5F6} + {B3B7A877-BC26-1F45-8BED-8EBD439635A6} - {AB309314-B647-E344-80B8-2E5921930546} + {904D0CE3-41C0-AE4F-8FF4-2F3F3F28D2CA} - {83981213-437C-E141-819A-8962C5DA87E6} + {B1E02DC6-7DD3-8F4A-AC4A-C5BDC2D6322F} - {14B917FB-9AF5-E242-8177-97E954577204} + {3AF8166B-628E-A045-B932-F55EC29B5980} - {DAB7313F-CD84-8A45-9778-0A8C1483464A} + {D10E2DFE-14B4-C648-B612-43C5A06ABA96} - {46572491-D5A6-854A-894F-49654AA3851C} + {760A46CE-3956-F64A-8902-61742F0733E4} - {4A75D153-2972-C542-8CA3-25E3571FCD8F} + {059D9F14-FBEA-4247-B865-2E3F8F2B04E4} - {082C656F-8BFE-E64C-B4E4-BD46DEF92250} + {2C3E33B5-AEF2-6C43-BB7C-510936F5A581} - {254B14C7-9107-754D-ADAF-392B7EF16409} + {28D3787A-3627-3743-9FBE-B9E99C5A528F} - {8FA3B089-AEA2-C14E-BD42-A9BA22702C2C} + {FF5576EC-9453-DE41-9D90-AB37ACE55C72} - {78494070-FFB0-B941-95F9-C4EF4BF2D311} + {6698F8D5-60F4-C94B-B088-AEDE721E731F} - {BFB2DDB8-2EB7-734D-BA4D-986288DD2A48} + {CBFA4D1A-9AF8-E345-8E2F-516F07C196DA} - {174A1119-4527-DB4E-9031-07AE7F92B55C} + {5A95A7D0-939E-3C4E-9C0F-0C4C92001A58} - {1D174C18-0CBD-D44E-BE2A-8D5B5EF66110} + {8468180B-88F2-7A4B-A679-B97D99E564D6} - {B171C193-0949-DB40-8ABA-047F7956CAD8} + {C85FB201-EE63-9641-B589-47AB91F6F207} - {41EA910A-D1E0-8C40-A20B-BD612615D3C3} + {71AEB173-E652-6C46-BA2F-DCAF2B99D3B9} - {1F07181F-53C9-264B-BD64-898957380E08} + {CB19B540-239C-1F4B-8878-6537EE6FBA3E} - {9DC2F0F9-7D58-394C-AC89-1F40BE13C607} + {306A0F20-772D-F84A-BB9F-716AA35310F6} - {10DD542F-B2A3-5849-AB88-FB69D5899845} + {398F92BF-8EAC-D64F-B388-D41461FE0E83} - {8E4DBDD9-F4B7-9E43-8236-DD3F7CBE9D12} + {9E119404-8C47-5B4C-8183-33BF459B6070} - {C6844F4E-6818-5544-AE93-98AF62ACBE5B} + {DB10034C-D5BC-F340-A530-567AA55AE2CE} diff --git a/projects/vs2013/btperformance.vcxproj b/projects/vs2013/btperformance.vcxproj index ae653332..e9ceab8d 100644 --- a/projects/vs2013/btperformance.vcxproj +++ b/projects/vs2013/btperformance.vcxproj @@ -19,7 +19,7 @@ - {3AE50056-01F6-4A4F-9E27-A9DB312F634A} + {60BC45C8-125A-1045-8C62-E556418032A7} btperformance Win32Proj diff --git a/projects/vs2013/btperformance.vcxproj.filters b/projects/vs2013/btperformance.vcxproj.filters index 095fc4ce..90150517 100644 --- a/projects/vs2013/btperformance.vcxproj.filters +++ b/projects/vs2013/btperformance.vcxproj.filters @@ -2,22 +2,22 @@ - {8098246A-0982-4447-A270-EAC7AC01324A} + {AEE038CC-8B49-EB43-BF89-FCDC0E27F549} - {5403A889-8A77-B34B-ADCF-DC33ADDD79DA} + {13B7D681-ACA3-8F46-8120-78DFE0BAC3E9} - {C5AC5524-75E9-3C47-B808-54E9BCB19E21} + {23F7C09F-2938-ED48-9BFA-CD61B52CF138} - {FE3A117B-6115-424D-B0AE-263758D63272} + {FB5329FD-99B7-CC49-BAA7-7F60990E1895} - {01CC47DA-F67B-0348-8004-8AF99E390625} + {BA2BCDEF-5F96-6842-8D1D-EF0615CC4E3B} - {5FD04EC3-CC15-AC4C-B053-B60B5C57A266} + {E1B41B1B-F7A8-0B4E-8ACF-D53CF452CE21} diff --git a/projects/vs2013/btremotetest.vcxproj b/projects/vs2013/btremotetest.vcxproj index 715badee..a83d6b1b 100644 --- a/projects/vs2013/btremotetest.vcxproj +++ b/projects/vs2013/btremotetest.vcxproj @@ -19,7 +19,7 @@ - {1F212A0E-E79E-1441-9DBF-EEA7DBBC2464} + {FE94D69A-682C-4D45-BA5C-DF66FE48A5F4} btremotetest Win32Proj diff --git a/projects/vs2013/btremotetest.vcxproj.filters b/projects/vs2013/btremotetest.vcxproj.filters index 8bc2da9e..0c42c177 100644 --- a/projects/vs2013/btremotetest.vcxproj.filters +++ b/projects/vs2013/btremotetest.vcxproj.filters @@ -2,25 +2,25 @@ - {05C6A6F3-6E1E-274A-9BE7-010B14ECE838} + {D71D3396-37E3-5D4F-BB31-0F3ECCA5AB84} - {B4E957E9-D8F3-3A4F-B00B-C18CEFA069DB} + {AF3FE922-8438-4642-8A70-2DB7D9563703} - {2C5ABC4F-E853-5D4F-AA45-197867AA262B} + {28E437A6-C97C-4648-B894-D396712C29C8} - {CFDC593B-45EF-DE40-8DB8-D6FD150A4062} + {5E410A16-7E03-D343-AA56-CA19BBB71E3E} - {62949365-6D93-E34D-AC92-C4CFD8EB1FE8} + {653FB459-3629-6148-B565-5637987F2003} - {EF381090-ACF6-4F4B-837F-4F2F43C4AE1F} + {2685C7D6-F237-CA4D-B57D-C33038E3B8AD} - {65E8CAC6-ACA9-8E45-8E08-B82FC95C6919} + {28608742-B190-0741-9C3D-D083FC6923D3} diff --git a/projects/vs2013/btunittest.vcxproj b/projects/vs2013/btunittest.vcxproj index a5d05b6f..7d459930 100644 --- a/projects/vs2013/btunittest.vcxproj +++ b/projects/vs2013/btunittest.vcxproj @@ -19,7 +19,7 @@ - {1719AEB2-B56A-464A-A63A-5F7C2E54D337} + {7A59366D-BAA2-BB44-8F53-4AF9A16826EE} btunittest Win32Proj diff --git a/projects/vs2013/btunittest.vcxproj.filters b/projects/vs2013/btunittest.vcxproj.filters index 2fcea939..ec4e2584 100644 --- a/projects/vs2013/btunittest.vcxproj.filters +++ b/projects/vs2013/btunittest.vcxproj.filters @@ -2,52 +2,52 @@ - {DA191687-F7EE-9F4A-AA54-DC161CFF71F6} + {8C8E0470-D4F5-E748-A498-84FBAA90AFBA} - {525ECEB9-086E-294A-B302-465917A7CA99} + {DA387088-6E29-CC43-BC95-89141ED816F9} - {7197B3FD-6712-8A43-917E-61428D5BFE67} + {B2B39FF0-B079-224E-9902-6A8AAC70E463} - {6628C7E6-7522-6F4A-B5EF-34E328DFEA8A} + {6B1B7310-BB26-2F41-BB87-8EEFA2DAF096} - {E1A6D0C6-BFEB-2445-BE86-332CC18454B1} + {CCBAC763-36FB-8A47-AFF2-ABA0B456C96D} - {6CE7CE0E-3B1F-FD4E-8C3B-44F6FDE4E04B} + {5E380982-0F4F-6347-AF03-5128E9E96869} - {4BD72402-63B3-9446-919A-6702CBE87E85} + {E2D7CFC2-C6F1-5640-B058-4E0013152722} - {210C13D3-87D0-A542-B8B2-45B83BA6FB0E} + {8CC75AF3-01FF-C24C-AECA-5DD1AA8C9EDB} - {643ADA10-5F79-974E-882E-C112A5A02894} + {9B3C6122-52E2-0D45-8774-D7300577B4EA} - {DD412140-E188-9442-AF57-202E5502463A} + {81BCEFBA-A7CD-E64F-B639-2C4721774FC6} - {437BAA35-D42A-E241-8F38-1E65B568A523} + {69A42A8A-5980-B840-A1C9-7FA906F40F35} - {C3AFBBB6-1C55-7F40-9F74-DB7A39196620} + {93545697-746B-664B-BD26-FAE02B8502EC} - {0A93DF45-CAAE-4E4B-B83A-D967B1C03E8C} + {A05C7D15-390C-4840-ADD2-4A010E684B36} - {CE0971B9-DA80-F240-AB0D-9D6F8C5DA8FB} + {524CC7D1-D152-E446-8651-55E61A7C1976} - {1739E302-D9DE-594C-8C5A-6C666BECC61C} + {18B8DBD2-DBBD-2349-8B45-4CC27AA926CB} - {3CD7FD3A-22DC-AE4B-8895-054B53BE4DBE} + {0DB69980-6251-0F40-9D9F-101AFF6076D8} diff --git a/projects/vs2013/demo_running.vcxproj b/projects/vs2013/demo_running.vcxproj index 7b27ac09..c20782c9 100644 --- a/projects/vs2013/demo_running.vcxproj +++ b/projects/vs2013/demo_running.vcxproj @@ -19,7 +19,7 @@ - {803B3D92-0B30-4041-9492-B1B58F0D63BC} + {A395F726-39CF-1243-A3FD-2E4A2C28052C} demo_running Win32Proj diff --git a/projects/vs2013/demo_running.vcxproj.filters b/projects/vs2013/demo_running.vcxproj.filters index a3c83dac..a74a65f1 100644 --- a/projects/vs2013/demo_running.vcxproj.filters +++ b/projects/vs2013/demo_running.vcxproj.filters @@ -2,28 +2,28 @@ - {F57B648B-E258-234A-9F13-976482CF515E} + {23A4CC83-D542-2D47-99E1-22BD62179902} - {38696485-6A02-CC49-9FD8-CC8B8950C684} + {73406559-DDF7-D54D-AE9A-E1C9EF236536} - {C75CF597-25D8-CD49-830A-FC6908F4834B} + {10FBED2D-D700-2444-882C-53F8FA3E0163} - {9E076078-E357-314A-8D95-E5D0F302C80F} + {9B4483AE-78AD-164A-84FB-FA3AAA053D2B} - {F8F87647-5F0A-9A46-B334-6316C49F3E57} + {DE68310C-46F7-FA44-A1DA-1B58D456C656} - {C045368E-0391-974C-B70C-0DAE1AB56252} + {0F9C14A5-3833-9E46-B32B-5E9C3A87C0B9} - {BE409C23-58C6-794F-8105-48395C30AF91} + {AF157F97-E971-9E4D-B1A7-AE9ED2571460} - {89823AE3-6339-AA46-8C09-7DCD939E7592} + {DDC1573A-E23E-F740-A20B-714C2F377B37} diff --git a/projects/vs2013/tutorial_1.vcxproj b/projects/vs2013/tutorial_1.vcxproj index db25f00f..f71d0a90 100644 --- a/projects/vs2013/tutorial_1.vcxproj +++ b/projects/vs2013/tutorial_1.vcxproj @@ -19,7 +19,7 @@ - {C6BD24CC-FB22-0E4E-9A24-4480F03192FD} + {392B915F-37F8-D04C-AC37-1AC3F8F71347} tutorial_1 Win32Proj diff --git a/projects/vs2013/tutorial_1.vcxproj.filters b/projects/vs2013/tutorial_1.vcxproj.filters index 70dc14e2..1f750e46 100644 --- a/projects/vs2013/tutorial_1.vcxproj.filters +++ b/projects/vs2013/tutorial_1.vcxproj.filters @@ -2,22 +2,22 @@ - {5F023A70-7B63-E34D-976E-7B93F34A00F6} + {74A99EF3-70B4-EE47-BA95-A765F6EFECD3} - {6B6AFABD-E799-1240-844D-3BACB7CD149C} + {BF60369E-4B38-E542-B36B-6F9801A67AF4} - {0F7B9850-169D-B948-8D59-94712BB2999B} + {29FB33FC-73A1-CA4E-88F5-72665AEFF2D8} - {7805E903-1CF9-3645-A9BA-92D37B09A8FF} + {102C4CD2-BCDE-394E-AE36-ECC50BEBB313} - {4C806332-B9BC-AA4D-B5E1-48EC64CD5AA6} + {32FD51CB-A22F-1748-A091-A125FF3F163B} - {DB61FB15-CEA6-714C-BF8B-146AEBF9DAAE} + {D6691325-96D9-B743-B9A2-0A9D3A3BD2CB} diff --git a/projects/vs2013/tutorial_1_1.vcxproj b/projects/vs2013/tutorial_1_1.vcxproj index 99b9f326..d21f876a 100644 --- a/projects/vs2013/tutorial_1_1.vcxproj +++ b/projects/vs2013/tutorial_1_1.vcxproj @@ -19,7 +19,7 @@ - {9860146C-FA39-9346-9B79-193320168E43} + {B6995F32-4579-BC41-A170-5D2F22742841} tutorial_1_1 Win32Proj diff --git a/projects/vs2013/tutorial_1_1.vcxproj.filters b/projects/vs2013/tutorial_1_1.vcxproj.filters index e9054845..50687c1c 100644 --- a/projects/vs2013/tutorial_1_1.vcxproj.filters +++ b/projects/vs2013/tutorial_1_1.vcxproj.filters @@ -2,22 +2,22 @@ - {C473980B-A740-B644-86A5-E4C1F2032F63} + {791801B3-C5D6-2D40-A2F0-019AC976D90E} - {F9FEA073-E5F4-C64A-99EC-4D4DBF3BCBBF} + {164555D9-B2AE-4D4E-B232-2D4020ED3E4E} - {11CA29C1-7683-BE42-BC51-CB0353D16CD8} + {D126D649-B1DC-7B48-BCE5-876FDD9BB8F9} - {91174C5D-1E34-0E47-BF86-CD83682B4478} + {A90987DB-7765-7349-A246-6B8A9C719974} - {6014E75A-ACF9-6D4D-A9DF-0A1305F87BE4} + {460C06A2-7A76-3C47-AE1A-6709EA9EC552} - {207D601D-A04F-E54B-8FBB-15BCB5E6F44D} + {93C88926-442A-364D-8CCD-7C4CDBBE5C3F} diff --git a/projects/vs2013/tutorial_1_2.vcxproj b/projects/vs2013/tutorial_1_2.vcxproj index bd918c18..60871aff 100644 --- a/projects/vs2013/tutorial_1_2.vcxproj +++ b/projects/vs2013/tutorial_1_2.vcxproj @@ -19,7 +19,7 @@ - {F326205A-472F-9844-AF75-8D2B3E0BE934} + {63325692-4A43-2F4C-9ABB-66D11B4A3313} tutorial_1_2 Win32Proj diff --git a/projects/vs2013/tutorial_1_2.vcxproj.filters b/projects/vs2013/tutorial_1_2.vcxproj.filters index 0edc6267..cf1a8496 100644 --- a/projects/vs2013/tutorial_1_2.vcxproj.filters +++ b/projects/vs2013/tutorial_1_2.vcxproj.filters @@ -2,22 +2,22 @@ - {99496AED-0D24-AC4A-8321-F64D355C03BA} + {081B8362-403D-594C-95A6-ECFCD15E190E} - {2136FA28-C920-8E44-9931-AA12AB3641A6} + {C709CA05-467A-D54C-8EA5-1AE5CA801E3B} - {A1E6D4F3-3E7D-1C43-86FE-87AE40450DDD} + {02171D63-0579-5543-9E3D-4C6FD662DEB5} - {39B0B464-C204-2A4A-A0CE-852020AF2704} + {770B8BC3-B4EF-C64C-A998-6C27369A3FEF} - {DE132B93-50C9-1B4B-9FF7-705BC919C66C} + {8336E241-F0AD-3E4C-A4E8-1D1BC7A11A86} - {3530B039-5B03-3E41-8975-6AD8F81D7D23} + {57F78CAB-DCB1-1F47-B075-8560C46A371B} diff --git a/projects/vs2013/tutorial_2.vcxproj b/projects/vs2013/tutorial_2.vcxproj index 8d7580c7..5113c6e7 100644 --- a/projects/vs2013/tutorial_2.vcxproj +++ b/projects/vs2013/tutorial_2.vcxproj @@ -19,7 +19,7 @@ - {E6A0039C-FB6E-5A49-AE4F-D6F1C80A0757} + {5BCC7EAB-4B17-3B4C-8FDF-E350C2D534BA} tutorial_2 Win32Proj diff --git a/projects/vs2013/tutorial_2.vcxproj.filters b/projects/vs2013/tutorial_2.vcxproj.filters index 89091fc4..36ffc3fd 100644 --- a/projects/vs2013/tutorial_2.vcxproj.filters +++ b/projects/vs2013/tutorial_2.vcxproj.filters @@ -2,25 +2,25 @@ - {341681C3-2235-5B47-A01A-5C74EE340064} + {893388DE-2C93-E84C-A804-DA73EE8EF843} - {219DDF1B-5377-9F40-AA5C-B10D8964B8D2} + {270BBFA6-1B09-0B48-91F4-00026006DBFB} - {C5EF23CB-7032-8F4A-BA42-6B8200AEE80F} + {3AC4C651-7AB2-FC43-AD27-9B12A9E773C2} - {06AB6A0B-FB58-D947-8A28-D6126B15D4D2} + {9A2FDEA4-D133-CF47-870B-77DA11AFEEF1} - {D7506DDE-B882-9948-90F8-D2975D11DBB3} + {902C6DC7-1486-2E46-BC92-17F4831E7631} - {167A9D1F-4DD0-FA49-994B-BCC43E8D8742} + {8A518CE3-308A-EB4B-90AA-5B6C7F70FBB6} - {D25D07FB-E0AB-204C-B24A-ACC92771AB44} + {10C5F619-8A20-9449-92CE-6556EE9F0391} diff --git a/projects/vs2013/tutorial_3.vcxproj b/projects/vs2013/tutorial_3.vcxproj index 5f18fa93..0a23d020 100644 --- a/projects/vs2013/tutorial_3.vcxproj +++ b/projects/vs2013/tutorial_3.vcxproj @@ -19,7 +19,7 @@ - {F5C2EA87-ECF4-AC47-9802-C0E32BD963D8} + {2F7E4AD2-C1BA-1D41-81A3-A1D3D7103329} tutorial_3 Win32Proj diff --git a/projects/vs2013/tutorial_3.vcxproj.filters b/projects/vs2013/tutorial_3.vcxproj.filters index 802f4331..c3a1352d 100644 --- a/projects/vs2013/tutorial_3.vcxproj.filters +++ b/projects/vs2013/tutorial_3.vcxproj.filters @@ -2,22 +2,22 @@ - {75D9E1B7-46EB-6D48-BD2F-4D2559E20E33} + {BD9A1E4F-BEBF-C349-B305-5B2401BB57B5} - {429899C5-C728-7E48-9316-8A511CA52055} + {1C746284-461C-584F-81E3-86AFE5179C09} - {FDB26833-26EE-B94C-B15F-BD107405EDBD} + {8E76419F-6A6D-0B48-A29C-596672082143} - {785BC0C5-9A6E-F74D-A8E8-86960686CFA2} + {5F16BC26-CF3B-3342-BA2C-DBB75A4BB0E7} - {4FAEAF7A-C6F1-8F4E-BF74-23B59F35EF25} + {C82DF770-CF90-DA44-AC99-68959764AA79} - {60BE49CB-6B2E-B64B-ACA1-2868873503CC} + {4E7BC969-795E-5849-9D80-8988832C53AA} diff --git a/projects/vs2013/tutorial_4.vcxproj b/projects/vs2013/tutorial_4.vcxproj index fd8c8a97..a0fa19d4 100644 --- a/projects/vs2013/tutorial_4.vcxproj +++ b/projects/vs2013/tutorial_4.vcxproj @@ -19,7 +19,7 @@ - {CABFE60C-BCCC-C84B-AA53-F805FACA0D98} + {8EB72F80-A348-3840-A83C-328334219659} tutorial_4 Win32Proj diff --git a/projects/vs2013/tutorial_4.vcxproj.filters b/projects/vs2013/tutorial_4.vcxproj.filters index b96e21db..0881e38e 100644 --- a/projects/vs2013/tutorial_4.vcxproj.filters +++ b/projects/vs2013/tutorial_4.vcxproj.filters @@ -2,22 +2,22 @@ - {631F1C33-9C12-B043-973F-21ECBD57760E} + {91B43F8D-D3AC-6D46-BCF7-987BC93ACCAF} - {3CA2EE4B-6A7C-624E-8D7F-F7CCE9765962} + {24B2C1AB-0B8F-AD48-8FE5-2873DB392403} - {CAFD04E2-28C7-B44D-AE9D-A5774647DB35} + {FBE85872-5D9A-C145-88D8-2E3C2C75A6E7} - {129619A8-D846-A74D-B353-B696D1CE5D38} + {8BDD1250-B5B0-1C43-AD86-FE84CAD72E3E} - {EB55A70E-162D-294C-9F95-606E1AB24FD8} + {622E513B-6C3E-734D-8268-90D0F4B2F399} - {FD1893D6-7DE3-BC47-8AC1-E69226332F25} + {4F968972-ABBF-7E48-86E9-2B1C43CB1BB4} diff --git a/projects/vs2013/tutorial_5.vcxproj b/projects/vs2013/tutorial_5.vcxproj index 5d97aa5a..a1098606 100644 --- a/projects/vs2013/tutorial_5.vcxproj +++ b/projects/vs2013/tutorial_5.vcxproj @@ -19,7 +19,7 @@ - {26B3F0C3-B7FF-D247-89C8-04131AB5F0F0} + {7339497F-C8EB-114D-B510-C5306C30BE32} tutorial_5 Win32Proj diff --git a/projects/vs2013/tutorial_5.vcxproj.filters b/projects/vs2013/tutorial_5.vcxproj.filters index 7700d468..994edda0 100644 --- a/projects/vs2013/tutorial_5.vcxproj.filters +++ b/projects/vs2013/tutorial_5.vcxproj.filters @@ -2,22 +2,22 @@ - {D9BF6017-B87E-9642-B566-8382E9B55554} + {9F2E6028-DB1F-C24F-96FF-24C5BBD39331} - {5189F646-2BB3-2549-A809-5E7E071B7ED0} + {BE6CBE65-62A7-5D48-B6B6-85B461762017} - {D6EA0254-9B07-7A48-BD3F-A3559C0723C0} + {654AF238-5E41-C440-A7E0-A47DF43030DB} - {3F92101C-B5EF-054F-B9C2-6F0256772BFB} + {0288460A-F0AD-C94A-A748-CF68938DAAF9} - {23AB1803-3F2C-E941-AD76-B978B5791171} + {B342E620-6318-5445-A857-B6DD976B8E11} - {3D94E524-4271-2540-99B5-5D27C932D518} + {F6423D68-21C7-074F-A24D-B2DD8FEB293D} diff --git a/projects/vs2013/tutorial_6.vcxproj b/projects/vs2013/tutorial_6.vcxproj index 9da1b023..1e234983 100644 --- a/projects/vs2013/tutorial_6.vcxproj +++ b/projects/vs2013/tutorial_6.vcxproj @@ -19,7 +19,7 @@ - {1E8DCD6B-4AA3-1541-B018-68E7C4EB133A} + {80188EBF-E5C8-714D-96CC-65EDAA12609D} tutorial_6 Win32Proj diff --git a/projects/vs2013/tutorial_6.vcxproj.filters b/projects/vs2013/tutorial_6.vcxproj.filters index 86ae4d4a..fdab2a34 100644 --- a/projects/vs2013/tutorial_6.vcxproj.filters +++ b/projects/vs2013/tutorial_6.vcxproj.filters @@ -2,22 +2,22 @@ - {BA838636-C58F-7747-B773-02E45A5AE815} + {04B903CA-E8AB-2544-8A69-DDA575F3D5BB} - {D1B3399B-1CDC-794C-BDAF-996F148F6606} + {6864F220-1781-2F47-9921-1AC367862F72} - {A4539B6E-29B8-C24A-9671-623047568F30} + {E9609A1A-1EFF-974D-B355-FDCDBF7105C7} - {695BCD86-26CB-334E-BBCC-E2BFA00B0EAE} + {28923AC4-E72E-6946-BCAA-DDB73A335891} - {B36EC091-4514-BC4B-901D-BE044ABA18D2} + {D2167709-1A42-C448-8098-8B318F3CC458} - {2C1D1D33-A8BE-F04F-A0A9-FF871EAEAB0C} + {6C72A5FC-4639-9A4B-9FEA-923025269117} diff --git a/projects/vs2013/tutorial_0.vcxproj b/projects/vs2013/tutorial_7.vcxproj similarity index 88% rename from projects/vs2013/tutorial_0.vcxproj rename to projects/vs2013/tutorial_7.vcxproj index 9645fd66..f0913252 100644 --- a/projects/vs2013/tutorial_0.vcxproj +++ b/projects/vs2013/tutorial_7.vcxproj @@ -19,8 +19,8 @@ - {447E97AC-C89C-BE4B-82B1-96A1240276BA} - tutorial_0 + {25F5C81D-65CC-F041-9A80-FB56B35CB29B} + tutorial_7 Win32Proj @@ -66,29 +66,29 @@ ..\..\bin\ - ..\..\intermediate\debugstatic\vs2013\tutorial_0\x32\ - tutorial_0_debugstatic_win32_vs2013 + ..\..\intermediate\debugstatic\vs2013\tutorial_7\x32\ + tutorial_7_debugstatic_win32_vs2013 .exe true ..\..\bin\ - ..\..\intermediate\releasestatic\vs2013\tutorial_0\x32\ - tutorial_0_releasestatic_win32_vs2013 + ..\..\intermediate\releasestatic\vs2013\tutorial_7\x32\ + tutorial_7_releasestatic_win32_vs2013 .exe false ..\..\bin\ - ..\..\intermediate\debugdll\vs2013\tutorial_0\x32\ - tutorial_0_debugdll_win32_vs2013 + ..\..\intermediate\debugdll\vs2013\tutorial_7\x32\ + tutorial_7_debugdll_win32_vs2013 .exe true ..\..\bin\ - ..\..\intermediate\releasedll\vs2013\tutorial_0\x32\ - tutorial_0_releasedll_win32_vs2013 + ..\..\intermediate\releasedll\vs2013\tutorial_7\x32\ + tutorial_7_releasedll_win32_vs2013 .exe false @@ -108,7 +108,7 @@ false Fast EditAndContinue - $(OutDir)tutorial_0_debugstatic_win32_vs2013.pdb + $(OutDir)tutorial_7_debugstatic_win32_vs2013.pdb WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) @@ -117,7 +117,7 @@ Console true - $(OutDir)tutorial_0_debugstatic_win32_vs2013.exe + $(OutDir)tutorial_7_debugstatic_win32_vs2013.exe ..\..\lib;%(AdditionalLibraryDirectories) mainCRTStartup MachineX86 @@ -148,7 +148,7 @@ false true true - $(OutDir)tutorial_0_releasestatic_win32_vs2013.exe + $(OutDir)tutorial_7_releasestatic_win32_vs2013.exe ..\..\lib;%(AdditionalLibraryDirectories) mainCRTStartup MachineX86 @@ -170,7 +170,7 @@ false Fast EditAndContinue - $(OutDir)tutorial_0_debugdll_win32_vs2013.pdb + $(OutDir)tutorial_7_debugdll_win32_vs2013.pdb WIN32;_DEBUG;DEBUG;%(PreprocessorDefinitions) @@ -179,7 +179,7 @@ Console true - $(OutDir)tutorial_0_debugdll_win32_vs2013.exe + $(OutDir)tutorial_7_debugdll_win32_vs2013.exe ..\..\lib;%(AdditionalLibraryDirectories) mainCRTStartup MachineX86 @@ -210,26 +210,26 @@ false true true - $(OutDir)tutorial_0_releasedll_win32_vs2013.exe + $(OutDir)tutorial_7_releasedll_win32_vs2013.exe ..\..\lib;%(AdditionalLibraryDirectories) mainCRTStartup MachineX86 - - - - - - + + + + + + - + - + - + diff --git a/projects/vs2013/tutorial_7.vcxproj.filters b/projects/vs2013/tutorial_7.vcxproj.filters new file mode 100644 index 00000000..a21092a4 --- /dev/null +++ b/projects/vs2013/tutorial_7.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {75FA3156-1C0E-AB45-9751-C223C7DDBB42} + + + {F4525B24-3573-F840-8124-01C86ECB555E} + + + {B99851AF-A31D-BA43-940B-B41E3F235354} + + + {11850054-388E-E546-B4A0-FAED0C665975} + + + {582403B1-63E3-8945-AACE-B9ED08CE5AD2} + + + {3F5F5604-6C41-7548-865F-4014BF5A25F2} + + + + + tutorials\tutorial_7\cpp\behaviac_generated\types + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + + + tutorials\tutorial_7\cpp + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + tutorials\tutorial_7\cpp\behaviac_generated\types\internal + + + diff --git a/projects/vs2013/usertest.vcxproj b/projects/vs2013/usertest.vcxproj index 5fdfa009..9a25a3cf 100644 --- a/projects/vs2013/usertest.vcxproj +++ b/projects/vs2013/usertest.vcxproj @@ -19,7 +19,7 @@ - {E3B1BA89-2650-4E4F-8018-7109702702A9} + {E4F5BBDF-EDE3-CD4D-8C45-2332F920587E} usertest Win32Proj diff --git a/projects/vs2013/usertest.vcxproj.filters b/projects/vs2013/usertest.vcxproj.filters index 018bfab9..36e8c3b9 100644 --- a/projects/vs2013/usertest.vcxproj.filters +++ b/projects/vs2013/usertest.vcxproj.filters @@ -2,28 +2,28 @@ - {04D617BE-0DAF-744C-9DC7-C75AAEF584E5} + {47FC30E1-E12D-4940-B37C-461B0F874FE4} - {0BF86E2F-376C-DB40-8077-B7B3AD0DC2C3} + {927A2317-26EE-624B-B378-0F46D728FAAB} - {98D51115-3F47-9C48-A939-ED37FE0A94EA} + {FA34F9DF-A611-304B-A53D-2F6E51FA4903} - {FAED5850-5FE6-B549-AC23-F9AE8CE3D695} + {110FE0E0-AA21-444F-9A72-12BA6F0BF831} - {0339CB2C-FA67-204A-8634-6523E4980949} + {271C8E66-51EA-8547-9E63-189BF2800AF6} - {323BD9F9-BD02-F444-9F1A-0C7AB3C1C276} + {B6984785-9BC0-1F4A-BBE4-10898BE71F2F} - {1397214B-5545-6C40-8D52-33A277414010} + {054E37AF-D3EB-C84B-9535-F1B191F0A3E8} - {80C0F130-927A-B948-BFAC-9F65313EE61A} + {331AA122-B1E5-C547-930B-E5DEFB422CE0} diff --git a/src/agent/agent.cpp b/src/agent/agent.cpp index d4783dbc..92085314 100644 --- a/src/agent/agent.cpp +++ b/src/agent/agent.cpp @@ -178,22 +178,27 @@ namespace behaviac { this->m_variables->Clear(true); } } + void Agent::SetVariableFromString(const char* variableName, const char* valueStr) { - uint32_t variableId = MakeVariableId(variableName); - IInstanceMember* valueMember = AgentMeta::ParseProperty(valueStr); + //IInstanceMember* valueMember = AgentMeta::ParseProperty(valueStr); - if (valueMember) { - IInstantiatedVariable* v = this->GetInstantiatedVariable(variableId); + //if (valueMember) + if (valueStr) + { + uint32_t variableId = MakeVariableId(variableName); + IInstantiatedVariable* v = this->GetInstantiatedVariable(variableId); if (v != NULL) { - v->SetValue(this, (void*)valueMember->GetValueObject(this)); + //v->SetValue(this, (void*)valueMember->GetValueObject(this)); + v->SetValueFromString(valueStr); return; } IProperty* prop = this->GetProperty(variableId); if (prop) { - prop->SetValueFrom(this, valueMember); + //prop->SetValueFrom(this, valueMember); + prop->SetValueFromString(this, valueStr); } } } @@ -398,6 +403,7 @@ namespace behaviac { } } #endif//#if BEHAVIAC_ENABLE_NETWORKD + void Agent::LogVariables(bool bForce) { BEHAVIAC_UNUSED_VAR(bForce); #if !BEHAVIAC_RELEASE @@ -457,6 +463,27 @@ namespace behaviac { #endif//BEHAVIAC_RELEASE } + void Agent::LogRunningNodes() + { +#if !BEHAVIAC_RELEASE + if (Config::IsLoggingOrSocketing() && this->m_currentBT != NULL) + { + behaviac::vector runningNodes = this->m_currentBT->GetRunningNodes(false); + + for (unsigned int i = 0; i < runningNodes.size(); ++i) + { + string btStr = BehaviorTask::GetTickInfo(this, runningNodes[i], "enter"); + + //empty btStr is for internal BehaviorTreeTask + if (!StringUtils::IsNullOrEmpty(btStr.c_str())) + { + LogManager::GetInstance()->Log(this, btStr.c_str(), EAR_success, ELM_tick); + } + } + } +#endif//BEHAVIAC_RELEASE + } + void Agent::ResetChangedVariables() { //TODO: Reset() method removed, the below code need to remove //this->m_variables.Reset(); diff --git a/src/agent/context.cpp b/src/agent/context.cpp index e83a59d5..ba1cbb53 100644 --- a/src/agent/context.cpp +++ b/src/agent/context.cpp @@ -368,7 +368,9 @@ namespace behaviac { for (vector::iterator it = this->m_agents.begin(); it != this->m_agents.end(); ++it) { for (Agents_t::iterator pa = it->agents.begin(); pa != it->agents.end(); ++pa) { if (pa->second->IsMasked()) { - pa->second->LogVariables(true); + pa->second->LogVariables(true); + + pa->second->LogRunningNodes(); } } } diff --git a/src/common/logger/logmanager.cpp b/src/common/logger/logmanager.cpp index f95a0581..a2887cd1 100644 --- a/src/common/logger/logmanager.cpp +++ b/src/common/logger/logmanager.cpp @@ -188,12 +188,16 @@ namespace behaviac { //[tick]Ship::Ship_1 ships\suicide.xml->Selector[1]:enter [all/success/failure] [1] //[tick]Ship::Ship_1 ships\suicide.xml->Selector[1]:update [1] int count = Workspace::GetInstance()->UpdateActionCount(btMsg); + BEHAVIAC_UNUSED_VAR(count); - char buffer[1024]; - string_sprintf(buffer, "[tick]%s %s [%s] [%d]\n", agentName.c_str(), btMsg, actionResultStr, count); + if (!StringUtils::Compare(actionResultStr, "running")) + { + char buffer[1024]; + string_sprintf(buffer, "[tick]%s %s [%s] [%d]\n", agentName.c_str(), btMsg, actionResultStr, count); - this->Output(pAgent, buffer); - Socket::SendText(buffer); + this->Output(pAgent, buffer); + Socket::SendText(buffer); + } } else if (mode == behaviac::ELM_jump) { char buffer[1024]; string_sprintf(buffer, "[jump]%s %s\n", agentName.c_str(), btMsg); diff --git a/src/common/socket/socketconnect_base.cpp b/src/common/socket/socketconnect_base.cpp index ff33af99..1ec67599 100644 --- a/src/common/socket/socketconnect_base.cpp +++ b/src/common/socket/socketconnect_base.cpp @@ -183,8 +183,10 @@ namespace behaviac { #if BEHAVIAC_CCDEFINE_MSVC static int32_t t_packetBufferIndex = TLS_OUT_OF_INDEXES; -#elif BEHAVIAC_CCDEFINE_APPLE || BEHAVIAC_CCDEFINE_ANDROID +#elif BEHAVIAC_CCDEFINE_ANDROID static __thread int32_t t_packetBufferIndex = (int32_t) - 1; +#elif BEHAVIAC_CCDEFINE_APPLE + static int32_t t_packetBufferIndex = (int32_t) - 1; #else static __thread int32_t t_packetBufferIndex = (int32_t) - 1; #endif diff --git a/test/btunittest/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/test/btunittest/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index 5eae7f33..548ac7cb 100644 --- a/test/btunittest/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/test/btunittest/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct METHOD_TYPE_HTNAgentHouseBase_ObtainPermit { }; template<> inline void HTNAgentHouseBase::_Execute_Method_() diff --git a/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.cpp b/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.cpp index ee375e7f..3b6a4d5e 100644 --- a/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.cpp +++ b/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.cpp @@ -3553,7 +3553,7 @@ namespace behaviac meta->RegisterMethod(1560584299u, BEHAVIAC_NEW CAgentMethod_1< behaviac::vector, behaviac::vector >(FunctionPointer_EmployeeParTestAgent_Func_AgentListIR)); meta->RegisterMethod(47681223u, BEHAVIAC_NEW CAgentMethod_1< char*, char* >(FunctionPointer_EmployeeParTestAgent_Func_CSzStringIR)); meta->RegisterMethod(3627728538u, BEHAVIAC_NEW CAgentMethod_1< double, double >(FunctionPointer_EmployeeParTestAgent_Func_DoubleIR)); - meta->RegisterMethod(3461542282u, BEHAVIAC_NEW CAgentMethod_1< long long, long long& >(FunctionPointer_EmployeeParTestAgent_Func_LongLongIR)); + meta->RegisterMethod(3461542282u, BEHAVIAC_NEW CAgentMethod_1< long long, long long >(FunctionPointer_EmployeeParTestAgent_Func_LongLongIR)); meta->RegisterMethod(2272152182u, BEHAVIAC_NEW CMethod_EmployeeParTestAgent_Func_ParTestAgentBaseIR()); meta->RegisterMethod(1915934982u, BEHAVIAC_NEW CAgentMethod_1< behaviac::vector, behaviac::vector >(FunctionPointer_EmployeeParTestAgent_Func_ParTestAgentBaseListIR)); meta->RegisterMethod(3823157538u, BEHAVIAC_NEW CAgentMethod_1< float, float >(FunctionPointer_EmployeeParTestAgent_Func_SingleIR)); @@ -3563,7 +3563,7 @@ namespace behaviac meta->RegisterMethod(831825780u, BEHAVIAC_NEW CAgentMethod_1< char*, char* >(FunctionPointer_EmployeeParTestAgent_Func_SzStringIR)); meta->RegisterMethod(154570427u, BEHAVIAC_NEW CAgentMethod_1< unsigned int, unsigned int >(FunctionPointer_EmployeeParTestAgent_Func_UIntIR)); meta->RegisterMethod(3722383617u, BEHAVIAC_NEW CAgentMethod_1< unsigned long, unsigned long >(FunctionPointer_EmployeeParTestAgent_Func_ULongIR)); - meta->RegisterMethod(506761253u, BEHAVIAC_NEW CAgentMethod_1< unsigned long long, unsigned long long& >(FunctionPointer_EmployeeParTestAgent_Func_ULongLongIR)); + meta->RegisterMethod(506761253u, BEHAVIAC_NEW CAgentMethod_1< unsigned long long, unsigned long long >(FunctionPointer_EmployeeParTestAgent_Func_ULongLongIR)); meta->RegisterMethod(1957836262u, BEHAVIAC_NEW CAgentStaticMethod_1< behaviac::vector, behaviac::vector >(FunctionPointer_EmployeeParTestAgent_Func_AgentListSMF)); meta->RegisterMethod(4246976610u, BEHAVIAC_NEW CMethod_EmployeeParTestAgent_Func_AgentSMF()); meta->RegisterMethod(9683594u, BEHAVIAC_NEW CAgentStaticMethod_1< behaviac::vector, behaviac::vector >(FunctionPointer_EmployeeParTestAgent_Func_StringListSMF)); diff --git a/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.h b/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.h index df582451..d44030ba 100644 --- a/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.h +++ b/test/btunittest/behaviac_generated/types/internal/behaviac_agent_meta.h @@ -490,7 +490,7 @@ namespace behaviac inline behaviac::vector FunctionPointer_EmployeeParTestAgent_Func_AgentListIR(Agent* self, behaviac::vector param0) { return (behaviac::vector)((EmployeeParTestAgent*)self)->_Execute_Method_, behaviac::vector >(param0); } inline char* FunctionPointer_EmployeeParTestAgent_Func_CSzStringIR(Agent* self, char* param0) { return (char*)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } inline double FunctionPointer_EmployeeParTestAgent_Func_DoubleIR(Agent* self, double param0) { return (double)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } - inline long long FunctionPointer_EmployeeParTestAgent_Func_LongLongIR(Agent* self, long long& param0) { return (long long)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } + inline long long FunctionPointer_EmployeeParTestAgent_Func_LongLongIR(Agent* self, long long param0) { return (long long)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } inline behaviac::vector FunctionPointer_EmployeeParTestAgent_Func_ParTestAgentBaseListIR(Agent* self, behaviac::vector param0) { return (behaviac::vector)((EmployeeParTestAgent*)self)->_Execute_Method_, behaviac::vector >(param0); } inline float FunctionPointer_EmployeeParTestAgent_Func_SingleIR(Agent* self, float param0) { return (float)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } inline behaviac::vector FunctionPointer_EmployeeParTestAgent_Func_SingleListIR(Agent* self, behaviac::vector param0) { return (behaviac::vector)((EmployeeParTestAgent*)self)->_Execute_Method_, behaviac::vector >(param0); } @@ -498,7 +498,7 @@ namespace behaviac inline char* FunctionPointer_EmployeeParTestAgent_Func_SzStringIR(Agent* self, char* param0) { return (char*)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } inline unsigned int FunctionPointer_EmployeeParTestAgent_Func_UIntIR(Agent* self, unsigned int param0) { return (unsigned int)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } inline unsigned long FunctionPointer_EmployeeParTestAgent_Func_ULongIR(Agent* self, unsigned long param0) { return (unsigned long)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } - inline unsigned long long FunctionPointer_EmployeeParTestAgent_Func_ULongLongIR(Agent* self, unsigned long long& param0) { return (unsigned long long)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } + inline unsigned long long FunctionPointer_EmployeeParTestAgent_Func_ULongLongIR(Agent* self, unsigned long long param0) { return (unsigned long long)((EmployeeParTestAgent*)self)->_Execute_Method_(param0); } inline behaviac::vector FunctionPointer_EmployeeParTestAgent_Func_AgentListSMF(behaviac::vector param0) { return EmployeeParTestAgent::Func_AgentListSMF(param0); } inline behaviac::vector FunctionPointer_EmployeeParTestAgent_Func_StringListSMF(behaviac::vector param0) { return EmployeeParTestAgent::Func_StringListSMF(param0); } inline unsigned long FunctionPointer_EmployeeParTestAgent_Func_ULongSMF(unsigned long param0) { return EmployeeParTestAgent::Func_ULongSMF(param0); } diff --git a/tools/designer/BehaviacDesigner/BehaviorTreeView.cs b/tools/designer/BehaviacDesigner/BehaviorTreeView.cs index 3a64519e..9e0d4865 100644 --- a/tools/designer/BehaviacDesigner/BehaviorTreeView.cs +++ b/tools/designer/BehaviacDesigner/BehaviorTreeView.cs @@ -80,7 +80,7 @@ private void toolTipTimer_Tick(object sender, EventArgs e) { this.toolTipTimer.Stop(); - if (_currentNode != null) + if (_currentNode != null && this.toolTip != null) { if (_currentExpandNode != null) { @@ -88,12 +88,10 @@ private void toolTipTimer_Tick(object sender, EventArgs e) { this.toolTip.Show(_nodeToolTip, this, new Point((int)_currentNode.DisplayBoundingBox.X - 20, (int)_currentNode.DisplayBoundingBox.Y - 5 - 18)); } - else { this.toolTip.Show(_nodeToolTip, this, new Point((int)(_currentNode.DisplayBoundingBox.X + _currentNode.DisplayBoundingBox.Width) - 20, (int)_currentNode.DisplayBoundingBox.Y - 5 - 18)); } - } else { diff --git a/tools/designer/BehaviacDesigner/ControlsDialog.cs b/tools/designer/BehaviacDesigner/ControlsDialog.cs index a25ff621..6373d9fd 100644 --- a/tools/designer/BehaviacDesigner/ControlsDialog.cs +++ b/tools/designer/BehaviacDesigner/ControlsDialog.cs @@ -65,6 +65,7 @@ private void initWorkspaces() _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_7", "../../../tutorials/tutorial_7/workspace/tutorial_7_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"); @@ -74,6 +75,7 @@ private void initWorkspaces() _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"); + _workspaces.Add("C# Tutorial_7", "../../../tutorials/tutorial_7/workspace/tutorial_7_cs.workspace.xml"); #if DEBUG _workspaces.Add("Unity Unit Test", "../../../integration/unity/Assets/behaviac/workspace/behaviacunittest.workspace.xml"); diff --git a/tools/designer/BehaviacDesigner/MainWindow.cs b/tools/designer/BehaviacDesigner/MainWindow.cs index facbe64f..9ffdeeb8 100644 --- a/tools/designer/BehaviacDesigner/MainWindow.cs +++ b/tools/designer/BehaviacDesigner/MainWindow.cs @@ -971,7 +971,6 @@ private void Plugin_EditModeHandler(EditModes preEditMode, EditModes curEditMode } loadLayout(curEditMode, __layoutDesignFile, true); - } else { @@ -999,7 +998,6 @@ private void Plugin_EditModeHandler(EditModes preEditMode, EditModes curEditMode Utilities.ClearDirectory(logFileDir); } } - } catch { @@ -1138,9 +1136,9 @@ private BehaviorTreeViewDock behaviorTreeList_ShowBehavior(BehaviorNode node) dock.BehaviorTreeView = control; dock.Activated += new EventHandler(dock_Activated); dock.FormClosed += new FormClosedEventHandler(dock_FormClosed); - dock.Show(dockPanel, WeifenLuo.WinFormsUI.Docking.DockState.Document); - dock.ToolTipText = FileManagers.FileManager.GetRelativePath(node.Filename); + + dock.Show(dockPanel, WeifenLuo.WinFormsUI.Docking.DockState.Document); } catch { diff --git a/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs b/tools/designer/BehaviacDesigner/Properties/AssemblyInfo.cs index fc3db91b..b6ded628 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.25")] -[assembly: AssemblyFileVersion("3.6.25")] +[assembly: AssemblyVersion("3.6.26")] +[assembly: AssemblyFileVersion("3.6.26")] diff --git a/tools/designer/BehaviacDesignerBase/Agent.cs b/tools/designer/BehaviacDesignerBase/Agent.cs index 12d49981..874f6f12 100644 --- a/tools/designer/BehaviacDesignerBase/Agent.cs +++ b/tools/designer/BehaviacDesignerBase/Agent.cs @@ -853,7 +853,7 @@ public IList GetProperties(bool isStrSorted = false) foreach (PropertyDef prop in _propertyList) { - if (!findProperty(properties, prop.BasicName)) + if (!prop.IsInherited && !findProperty(properties, prop.BasicName)) { properties.Add(prop); } @@ -1057,7 +1057,7 @@ public IList GetMethods(bool isStrSorted = false) foreach (MethodDef method in _methodsList) { - if (!findMethod(methods, method.BasicName)) + if (!method.IsInherited && !findMethod(methods, method.BasicName)) { methods.Add(method); } diff --git a/tools/designer/BehaviacDesignerBase/Data/DataType.cs b/tools/designer/BehaviacDesignerBase/Data/DataType.cs index 7e42d617..7383a084 100644 --- a/tools/designer/BehaviacDesignerBase/Data/DataType.cs +++ b/tools/designer/BehaviacDesignerBase/Data/DataType.cs @@ -785,18 +785,10 @@ public bool IsInherited { get { - //if (_isInherited) - //{ - // return true; - //} - - //if (_agentType != null && _agentType.Base != null) - //{ - // if (null != _agentType.Base.GetMethodByName(this.BasicName)) - // { - // _isInherited = true; - // } - //} + if (!_isInherited && _agentType != null && _agentType.Name != this.ClassName) + { + _isInherited = true; + } return _isInherited; } @@ -908,7 +900,8 @@ public string ClassName if (index != -1) { - return _name.Substring(0, index - 1); + _classname = _name.Substring(0, index - 1); + return _classname; } } @@ -1650,6 +1643,11 @@ public bool IsInherited { get { + if (!_isInherited && _agentType != null && _agentType.Name != this.ClassName) + { + _isInherited = true; + } + return _isInherited; } set @@ -1922,7 +1920,8 @@ public string ClassName if (index != -1) { - return _name.Substring(0, index - 1); + _classname = _name.Substring(0, index - 1); + return _classname; } } diff --git a/tools/designer/BehaviacDesignerBase/NodeViewData/NodeViewData.cs b/tools/designer/BehaviacDesignerBase/NodeViewData/NodeViewData.cs index 86f4fc13..8be387e1 100644 --- a/tools/designer/BehaviacDesignerBase/NodeViewData/NodeViewData.cs +++ b/tools/designer/BehaviacDesignerBase/NodeViewData/NodeViewData.cs @@ -1232,9 +1232,11 @@ public virtual void UpdateFinalSize(Graphics graphics, BehaviorNode rootBehavior // store the required space depending on parallel and non-parallel subitems if (subitem.ShowParallelToLabel) { - subItemParallelHeight += subitem.Height; - _subItemParallelWidth = Math.Max(_subItemParallelWidth, subitem.Width); - + if (this.IsExpanded) + { + subItemParallelHeight += subitem.Height; + _subItemParallelWidth = Math.Max(_subItemParallelWidth, subitem.Width); + } } else { @@ -1451,14 +1453,13 @@ protected RectangleF GetSubItemBoundingBox(RectangleF nodeBoundingBox, int n) if (_subItems[i].ShowParallelToLabel) { if (i < n) - // store the height of all parallel subitems before the requested one { + // store the height of all parallel subitems before the requested one previousParallelHeight += _subItems[i].Height; } // store the height of all available subitems totalParallelHeight += _subItems[i].Height; - } else { @@ -1468,8 +1469,11 @@ protected RectangleF GetSubItemBoundingBox(RectangleF nodeBoundingBox, int n) } // calculate the final top - top = nodeBoundingBox.Top + (nodeBoundingBox.Height - totalParallelHeight) * 0.5f + previousParallelHeight; - + top = nodeBoundingBox.Top + previousParallelHeight; + if (this.IsExpanded) + { + top += (nodeBoundingBox.Height - totalParallelHeight) * 0.5f; + } } else { @@ -1520,7 +1524,7 @@ public RectangleF GetConnectorBoundingBox(RectangleF nodeBoundingBox, Connector } } - // first find the first and last parallel subitem + // find the first and last parallel subitem int firstParallel = -1; int lastParallel = -1; diff --git a/tools/designer/BehaviacDesignerBase/Workspace.cs b/tools/designer/BehaviacDesignerBase/Workspace.cs index 008ea91d..0185d4c9 100644 --- a/tools/designer/BehaviacDesignerBase/Workspace.cs +++ b/tools/designer/BehaviacDesignerBase/Workspace.cs @@ -1799,7 +1799,7 @@ private static void SaveAgents(XmlDocument bbfile, XmlNode meta) foreach (PropertyDef prop in agent.GetProperties()) { - if (prop.IsArrayElement || prop.IsPar) + if (prop.IsArrayElement || prop.IsPar || prop.IsInherited) { continue; } @@ -1828,6 +1828,11 @@ private static void SaveAgents(XmlDocument bbfile, XmlNode meta) foreach (MethodDef method in agent.GetMethods()) { + if (method.IsInherited) + { + continue; + } + XmlElement methodEle = bbfile.CreateElement("Method"); methodEle.SetAttribute("Name", method.BasicName); diff --git a/tools/designer/External/DockPanel/WinFormsUI/Docking/DockContentHandler.cs b/tools/designer/External/DockPanel/WinFormsUI/Docking/DockContentHandler.cs index e6902475..f9087cfe 100644 --- a/tools/designer/External/DockPanel/WinFormsUI/Docking/DockContentHandler.cs +++ b/tools/designer/External/DockPanel/WinFormsUI/Docking/DockContentHandler.cs @@ -501,19 +501,32 @@ internal void SetDockState(bool isHidden, DockState visibleState, DockPane oldPa m_isFloat = (m_visibleState == DockState.Float); if (Pane == null) - Pane = DockPanel.DockPaneFactory.CreateDockPane(Content, visibleState, true); + { + if (DockPanel != null) + { + Pane = DockPanel.DockPaneFactory.CreateDockPane(Content, visibleState, true); + } + } else if (Pane.DockState != visibleState) { if (Pane.Contents.Count == 1) Pane.SetDockState(visibleState); else - Pane = DockPanel.DockPaneFactory.CreateDockPane(Content, visibleState, true); + { + if (DockPanel != null) + { + Pane = DockPanel.DockPaneFactory.CreateDockPane(Content, visibleState, true); + } + } } } if (Form.ContainsFocus) if (DockState == DockState.Hidden || DockState == DockState.Unknown) - DockPanel.ContentFocusManager.GiveUpFocus(Content); + { + if (DockPanel != null) + DockPanel.ContentFocusManager.GiveUpFocus(Content); + } SetPaneAndVisible(Pane); @@ -531,11 +544,13 @@ internal void SetDockState(bool isHidden, DockState visibleState, DockPane oldPa if (oldDockState != DockState) { - if (DockState == DockState.Hidden || DockState == DockState.Unknown || - DockHelper.IsDockStateAutoHide(DockState)) - DockPanel.ContentFocusManager.RemoveFromList(Content); - else - DockPanel.ContentFocusManager.AddToList(Content); + if (DockPanel != null) + { + if (DockState == DockState.Hidden || DockState == DockState.Unknown || DockHelper.IsDockStateAutoHide(DockState)) + DockPanel.ContentFocusManager.RemoveFromList(Content); + else + DockPanel.ContentFocusManager.AddToList(Content); + } OnDockStateChanged(EventArgs.Empty); } diff --git a/tools/designer/External/DockPanel/WinFormsUI/Docking/DockPane.cs b/tools/designer/External/DockPanel/WinFormsUI/Docking/DockPane.cs index c5f305bb..7a776f1f 100644 --- a/tools/designer/External/DockPanel/WinFormsUI/Docking/DockPane.cs +++ b/tools/designer/External/DockPanel/WinFormsUI/Docking/DockPane.cs @@ -1075,11 +1075,13 @@ private void SetVisibleContentsToPane(DockPane pane, IDockContent activeContent) if (content.DockHandler.IsDockStateValid(pane.DockState)) { content.DockHandler.Pane = pane; - i--; + // +HC + //i--; + // -HC } } - if (activeContent.DockHandler.Pane == pane) + if (activeContent != null && activeContent.DockHandler.Pane == pane) pane.ActiveContent = activeContent; } diff --git a/tools/designer/Plugins/PluginBehaviac/Exporters/ExporterCpp.cs b/tools/designer/Plugins/PluginBehaviac/Exporters/ExporterCpp.cs index e820b84f..2ac75f18 100644 --- a/tools/designer/Plugins/PluginBehaviac/Exporters/ExporterCpp.cs +++ b/tools/designer/Plugins/PluginBehaviac/Exporters/ExporterCpp.cs @@ -586,9 +586,9 @@ private void GenerateMemberHandler(StringWriter file) if (!string.IsNullOrEmpty(ns)) { - foreach (PropertyDef property in agenType.GetProperties(true)) + foreach (PropertyDef prop in agenType.GetProperties(true)) { - if (property.IsMember && !property.IsAddedAutomatically) + if (!prop.IsPublic && !prop.IsInherited && !prop.IsArrayElement) { namespaces = GetNamespaces(ns); break; @@ -600,7 +600,7 @@ private void GenerateMemberHandler(StringWriter file) { foreach (MethodDef method in agenType.GetMethods(true)) { - if (method.ClassName == agenType.Name) + if (!method.IsPublic && !method.IsNamedEvent && method.ClassName == agenType.Name) { namespaces = GetNamespaces(ns); break; @@ -674,6 +674,10 @@ private void GenerateMemberHandler(StringWriter file) string methodName = agenType.Name.Replace("::", "_") + "_" + method.BasicName.Replace("::", "_"); string nativeReturnType = DataCppExporter.GetGeneratedNativeType(method.NativeReturnType); + if (Plugin.IsRefType(method.ReturnType) && !nativeReturnType.EndsWith("*")) + { + nativeReturnType += "*"; + } if (method.NativeReturnType.StartsWith("const ")) { @@ -1716,6 +1720,11 @@ private void ExportDelegateMethod(StringWriter file) } string methodReturnType = DataCppExporter.GetGeneratedNativeType(method.NativeReturnType); + if (Plugin.IsRefType(method.ReturnType) && !methodReturnType.EndsWith("*")) + { + methodReturnType += "*"; + } + string agentTypeName = agent.Name; string methodName = agentTypeName.Replace("::", "_") + "_" + method.BasicName.Replace("::", "_"); @@ -2273,7 +2282,13 @@ private void ExportAgentCppFile(AgentType agent, string filename) ExportMethodComment(file, indent, method.OldName); method.OldName = null; - file.WriteLine("{0}{1} {2}::{3}({4})", indent, DataCppExporter.GetGeneratedNativeType(method.NativeReturnType), agent.BasicName, method.BasicName, allParams); + string methodReturnType = DataCppExporter.GetGeneratedNativeType(method.NativeReturnType); + if (Plugin.IsRefType(method.ReturnType) && !methodReturnType.EndsWith("*")) + { + methodReturnType += "*"; + } + + file.WriteLine("{0}{1} {2}::{3}({4})", indent, methodReturnType, agent.BasicName, method.BasicName, allParams); file.WriteLine("{0}{{", indent); ExportBeginComment(file, "\t" + indent, method.BasicName); @@ -2830,6 +2845,11 @@ private void ExportAgentMeta(string agentFolder) file.WriteLine("\t\t\tAgentMeta::Register<{0}>(\"{0}\");", structFullname); } + foreach (string newTypes in Plugin.TypeRenames.Values) + { + file.WriteLine("\t\t\tAgentMeta::Register<{0}>(\"{0}\");", newTypes); + } + if (Plugin.InstanceNames.Count > 0) { file.WriteLine(); @@ -3078,6 +3098,11 @@ private void ExportMembers(StringWriter file) } string methodReturnType = DataCppExporter.GetGeneratedNativeType(method.NativeReturnType); + if (Plugin.IsRefType(method.ReturnType) && !methodReturnType.EndsWith("*")) + { + methodReturnType += "*"; + } + string methodName = agentTypeName.Replace("::", "_") + "_" + method.BasicName.Replace("::", "_"); if (method.IsNamedEvent) diff --git a/tutorials/CsTutorials/CsTutorials.sln b/tutorials/CsTutorials/CsTutorials.sln index 972df331..f2a8dc49 100644 --- a/tutorials/CsTutorials/CsTutorials.sln +++ b/tutorials/CsTutorials/CsTutorials.sln @@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tutorial_1_2", "..\tutorial EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tutorial_6", "..\tutorial_6\cs\tutorial_6.csproj", "{65CFD67D-4AE5-47D0-8E01-0A6BB988B9ED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tutorial_7", "..\tutorial_7\cs\tutorial_7.csproj", "{C940E541-78F4-47AB-994F-D9D26DB695EE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -121,6 +123,16 @@ Global {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 + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Debug|Win32.ActiveCfg = Debug|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Release|Any CPU.Build.0 = Release|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C940E541-78F4-47AB-994F-D9D26DB695EE}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tutorials/CsTutorials/behaviac/runtime/Agent/Agent.cs b/tutorials/CsTutorials/behaviac/runtime/Agent/Agent.cs index 9d49d4ca..8e21c5c0 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Agent/Agent.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Agent/Agent.cs @@ -141,7 +141,7 @@ void Awake() Init_(this.m_contextId, this, this.m_priority); #if !BEHAVIAC_RELEASE - this.SetName(this.name); + //this.SetName(this.name); this._members.Clear(); #endif } @@ -1366,6 +1366,27 @@ public void LogVariables(bool bForce) } } +#endif + } + + public void LogRunningNodes() + { +#if !BEHAVIAC_RELEASE + if (Config.IsLoggingOrSocketing && this.m_currentBT != null) + { + List runningNodes = this.m_currentBT.GetRunningNodes(false); + + foreach (BehaviorTask behaviorTask in runningNodes) + { + string btStr = BehaviorTask.GetTickInfo(this, behaviorTask, "enter"); + + //empty btStr is for internal BehaviorTreeTask + if (!string.IsNullOrEmpty(btStr)) + { + LogManager.Instance.Log(this, btStr, EActionResult.EAR_success, LogMode.ELM_tick); + } + } + } #endif } @@ -1382,6 +1403,7 @@ protected static void Init_(int contextId, Agent pAgent, int priority) pAgent.m_contextId = contextId; pAgent.m_id = ms_agent_index++; pAgent.m_priority = priority; + pAgent.SetName(pAgent.name); Context.AddAgent(pAgent); diff --git a/tutorials/CsTutorials/behaviac/runtime/Agent/Context.cs b/tutorials/CsTutorials/behaviac/runtime/Agent/Context.cs index 99b406b1..69c81bb7 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Agent/Context.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Agent/Context.cs @@ -310,6 +310,8 @@ private void LogCurrentState() if (e.Current.IsMasked()) { e.Current.LogVariables(true); + + e.Current.LogRunningNodes(); } } } diff --git a/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs b/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs index ac695378..9d794989 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Base/LogManager.cs @@ -163,9 +163,12 @@ public void Log(Agent pAgent, string btMsg, EActionResult actionResult, LogMode //[tick]Ship.Ship_1 ships\suicide.xml.Selector[1]:update [1] int count = Workspace.Instance.UpdateActionCount(btMsg); - string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); + if (actionResultStr != "running") + { + string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); - Output(pAgent, buffer); + Output(pAgent, buffer); + } } else if (mode == LogMode.ELM_jump) { diff --git a/tutorials/CsTutorials/behaviac/runtime/Base/socketconnect_base.cs b/tutorials/CsTutorials/behaviac/runtime/Base/socketconnect_base.cs index ea0daafe..67709144 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Base/socketconnect_base.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Base/socketconnect_base.cs @@ -564,7 +564,10 @@ public void AddPacket(Packet packet) } } - m_packetQueue.Enqueue(packet); + lock (m_packetQueue) + { + m_packetQueue.Enqueue(packet); + } } } @@ -577,23 +580,11 @@ public bool CollectPackets(PacketCollection coll) return true; } - Packet packet = m_packetQueue.Peek(); - - while (packet == null) + lock (m_packetQueue) { - m_packetQueue.Dequeue(); - - if (m_packetQueue.Count == 0) - { - break; - } - - packet = m_packetQueue.Peek(); - } + Packet packet = m_packetQueue.Peek(); - while (packet != null) - { - if (coll.Add(packet)) + while (packet == null) { m_packetQueue.Dequeue(); @@ -604,9 +595,24 @@ public bool CollectPackets(PacketCollection coll) packet = m_packetQueue.Peek(); } - else + + while (packet != null) { - return false; + if (coll.Add(packet)) + { + m_packetQueue.Dequeue(); + + if (m_packetQueue.Count == 0) + { + break; + } + + packet = m_packetQueue.Peek(); + } + else + { + return false; + } } } @@ -617,24 +623,27 @@ public bool CollectPackets(PacketCollection coll) private void SendPackets(Socket h) { - Packet packet = m_packetQueue.Peek(); - - while (packet != null) + lock (m_packetQueue) { - int bytesWritten = (0); - bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + Packet packet = m_packetQueue.Peek(); - // Failed to send data. Most probably sending too much, break and - // hope for the best next time - if (!success) + while (packet != null) { - Debug.Check(false); - behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); - break; - } + int bytesWritten = (0); + bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + + // Failed to send data. Most probably sending too much, break and + // hope for the best next time + if (!success) + { + Debug.Check(false); + behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); + break; + } - m_packetQueue.Dequeue(); // 'Commit' pop if data sent. - packet = m_packetQueue.Peek(); + m_packetQueue.Dequeue(); // 'Commit' pop if data sent. + packet = m_packetQueue.Peek(); + } } } diff --git a/tutorials/CsTutorials/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs b/tutorials/CsTutorials/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs index 54fe16ca..b86ee798 100644 --- a/tutorials/CsTutorials/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs +++ b/tutorials/CsTutorials/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs @@ -515,7 +515,7 @@ public static string GetTickInfo(Agent pAgent, BehaviorNode n, string action) if (Config.IsLoggingOrSocketing) { - if (pAgent != null && pAgent.IsMasked()) + if (!System.Object.ReferenceEquals(pAgent, null) && pAgent.IsMasked()) { //BEHAVIAC_PROFILE("GetTickInfo", true); diff --git a/tutorials/CsTutorials/behaviac/runtime/Workspace.cs b/tutorials/CsTutorials/behaviac/runtime/Workspace.cs index 26220b80..b3459ead 100644 --- a/tutorials/CsTutorials/behaviac/runtime/Workspace.cs +++ b/tutorials/CsTutorials/behaviac/runtime/Workspace.cs @@ -1217,13 +1217,15 @@ private void ParseProperty(string[] tokens) #endif } + private int m_frame = 0; + protected void LogFrames() { #if !BEHAVIAC_RELEASE if (Config.IsLoggingOrSocketing) { - LogManager.Instance.Log("[frame]{0}\n", this.FrameSinceStartup); + LogManager.Instance.Log("[frame]{0}\n", (this.FrameSinceStartup >= 0) ? this.FrameSinceStartup : (this.m_frame++)); } #endif diff --git a/tutorials/CsTutorials/behaviac/runtime/version.txt b/tutorials/CsTutorials/behaviac/runtime/version.txt index 927968ce..d2f69272 100644 --- a/tutorials/CsTutorials/behaviac/runtime/version.txt +++ b/tutorials/CsTutorials/behaviac/runtime/version.txt @@ -1 +1 @@ -3.6.25 +3.6.26 diff --git a/tutorials/tutorial_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index d9bd5650..1732e60e 100644 --- a/tutorials/tutorial_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} #endif // _BEHAVIAC_MEMBER_VISITOR_H_ diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs index 9d49d4ca..8e21c5c0 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Agent.cs @@ -141,7 +141,7 @@ void Awake() Init_(this.m_contextId, this, this.m_priority); #if !BEHAVIAC_RELEASE - this.SetName(this.name); + //this.SetName(this.name); this._members.Clear(); #endif } @@ -1366,6 +1366,27 @@ public void LogVariables(bool bForce) } } +#endif + } + + public void LogRunningNodes() + { +#if !BEHAVIAC_RELEASE + if (Config.IsLoggingOrSocketing && this.m_currentBT != null) + { + List runningNodes = this.m_currentBT.GetRunningNodes(false); + + foreach (BehaviorTask behaviorTask in runningNodes) + { + string btStr = BehaviorTask.GetTickInfo(this, behaviorTask, "enter"); + + //empty btStr is for internal BehaviorTreeTask + if (!string.IsNullOrEmpty(btStr)) + { + LogManager.Instance.Log(this, btStr, EActionResult.EAR_success, LogMode.ELM_tick); + } + } + } #endif } @@ -1382,6 +1403,7 @@ protected static void Init_(int contextId, Agent pAgent, int priority) pAgent.m_contextId = contextId; pAgent.m_id = ms_agent_index++; pAgent.m_priority = priority; + pAgent.SetName(pAgent.name); Context.AddAgent(pAgent); diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs index 99b406b1..69c81bb7 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Agent/Context.cs @@ -310,6 +310,8 @@ private void LogCurrentState() if (e.Current.IsMasked()) { e.Current.LogVariables(true); + + e.Current.LogRunningNodes(); } } } 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 ac695378..9d794989 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 @@ -163,9 +163,12 @@ public void Log(Agent pAgent, string btMsg, EActionResult actionResult, LogMode //[tick]Ship.Ship_1 ships\suicide.xml.Selector[1]:update [1] int count = Workspace.Instance.UpdateActionCount(btMsg); - string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); + if (actionResultStr != "running") + { + string buffer = string.Format("[tick]{0} {1} [{2}] [{3}]\n", agentName, btMsg, actionResultStr, count); - Output(pAgent, buffer); + Output(pAgent, buffer); + } } else if (mode == LogMode.ELM_jump) { diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs index ea0daafe..67709144 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Base/socketconnect_base.cs @@ -564,7 +564,10 @@ public void AddPacket(Packet packet) } } - m_packetQueue.Enqueue(packet); + lock (m_packetQueue) + { + m_packetQueue.Enqueue(packet); + } } } @@ -577,23 +580,11 @@ public bool CollectPackets(PacketCollection coll) return true; } - Packet packet = m_packetQueue.Peek(); - - while (packet == null) + lock (m_packetQueue) { - m_packetQueue.Dequeue(); - - if (m_packetQueue.Count == 0) - { - break; - } - - packet = m_packetQueue.Peek(); - } + Packet packet = m_packetQueue.Peek(); - while (packet != null) - { - if (coll.Add(packet)) + while (packet == null) { m_packetQueue.Dequeue(); @@ -604,9 +595,24 @@ public bool CollectPackets(PacketCollection coll) packet = m_packetQueue.Peek(); } - else + + while (packet != null) { - return false; + if (coll.Add(packet)) + { + m_packetQueue.Dequeue(); + + if (m_packetQueue.Count == 0) + { + break; + } + + packet = m_packetQueue.Peek(); + } + else + { + return false; + } } } @@ -617,24 +623,27 @@ public bool CollectPackets(PacketCollection coll) private void SendPackets(Socket h) { - Packet packet = m_packetQueue.Peek(); - - while (packet != null) + lock (m_packetQueue) { - int bytesWritten = (0); - bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + Packet packet = m_packetQueue.Peek(); - // Failed to send data. Most probably sending too much, break and - // hope for the best next time - if (!success) + while (packet != null) { - Debug.Check(false); - behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); - break; - } + int bytesWritten = (0); + bool success = SocketBase.Write(h, packet.GetData(), ref bytesWritten); + + // Failed to send data. Most probably sending too much, break and + // hope for the best next time + if (!success) + { + Debug.Check(false); + behaviac.Debug.LogWarning("A packet is not correctly sent...\n"); + break; + } - m_packetQueue.Dequeue(); // 'Commit' pop if data sent. - packet = m_packetQueue.Peek(); + m_packetQueue.Dequeue(); // 'Commit' pop if data sent. + packet = m_packetQueue.Peek(); + } } } diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs index 54fe16ca..b86ee798 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/BehaviorTree/BehaviorTree_task.cs @@ -515,7 +515,7 @@ public static string GetTickInfo(Agent pAgent, BehaviorNode n, string action) if (Config.IsLoggingOrSocketing) { - if (pAgent != null && pAgent.IsMasked()) + if (!System.Object.ReferenceEquals(pAgent, null) && pAgent.IsMasked()) { //BEHAVIAC_PROFILE("GetTickInfo", true); diff --git a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Workspace.cs b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Workspace.cs index 26220b80..b3459ead 100644 --- a/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Workspace.cs +++ b/tutorials/tutorial_1/unity/Assets/Scripts/behaviac/runtime/Workspace.cs @@ -1217,13 +1217,15 @@ private void ParseProperty(string[] tokens) #endif } + private int m_frame = 0; + protected void LogFrames() { #if !BEHAVIAC_RELEASE if (Config.IsLoggingOrSocketing) { - LogManager.Instance.Log("[frame]{0}\n", this.FrameSinceStartup); + LogManager.Instance.Log("[frame]{0}\n", (this.FrameSinceStartup >= 0) ? this.FrameSinceStartup : (this.m_frame++)); } #endif 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 927968ce..d2f69272 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.25 +3.6.26 diff --git a/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cpp.meta.xml b/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cpp.meta.xml index d7a6c96a..2e7b5d1e 100644 --- a/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cpp.meta.xml +++ b/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cpp.meta.xml @@ -27,27 +27,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cs.meta.xml b/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cs.meta.xml index d7a6c96a..2e7b5d1e 100644 --- a/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cs.meta.xml +++ b/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_cs.meta.xml @@ -27,27 +27,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_unity.meta.xml b/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_unity.meta.xml index d7a6c96a..2e7b5d1e 100644 --- a/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_unity.meta.xml +++ b/tutorials/tutorial_1/workspace/behaviors/behaviac_meta/tutorial_1_unity.meta.xml @@ -27,27 +27,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_1_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_1_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index 0edc9d91..390e5367 100644 --- a/tutorials/tutorial_1_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_1_1/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_FirstAgent_p1 { }; template<> inline int& FirstAgent::_Get_Property_() diff --git a/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cpp.meta.xml b/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cpp.meta.xml index 92ab3ba1..548e9779 100644 --- a/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cpp.meta.xml +++ b/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cpp.meta.xml @@ -30,27 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cs.meta.xml b/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cs.meta.xml index 3b0807c9..0c49d4d8 100644 --- a/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cs.meta.xml +++ b/tutorials/tutorial_1_1/workspace/behaviors/behaviac_meta/tutorial_1_1_cs.meta.xml @@ -30,27 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_1_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_1_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index 3de218c9..5cb36acd 100644 --- a/tutorials/tutorial_1_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_1_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_SecondAgent_p1 { }; template<> inline int& SecondAgent::_Get_Property_() diff --git a/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cpp.meta.xml b/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cpp.meta.xml index cdc02beb..7485d458 100644 --- a/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cpp.meta.xml +++ b/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cpp.meta.xml @@ -30,27 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cs.meta.xml b/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cs.meta.xml index 8610663e..46c0393d 100644 --- a/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cs.meta.xml +++ b/tutorials/tutorial_1_2/workspace/behaviors/behaviac_meta/tutorial_1_2_cs.meta.xml @@ -30,27 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index f28c879d..a45fb04c 100644 --- a/tutorials/tutorial_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_2/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_FirstAgent_p1 { }; template<> inline int& FirstAgent::_Get_Property_() diff --git a/tutorials/tutorial_2/workspace/behaviors/behaviac_meta/tutorial_2_cpp.meta.xml b/tutorials/tutorial_2/workspace/behaviors/behaviac_meta/tutorial_2_cpp.meta.xml index e8570abb..aae163fa 100644 --- a/tutorials/tutorial_2/workspace/behaviors/behaviac_meta/tutorial_2_cpp.meta.xml +++ b/tutorials/tutorial_2/workspace/behaviors/behaviac_meta/tutorial_2_cpp.meta.xml @@ -28,27 +28,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_3/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_3/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index ff2cd3c9..8823d7cd 100644 --- a/tutorials/tutorial_3/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_3/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_FirstAgent_p1 { }; template<> inline int& FirstAgent::_Get_Property_() diff --git a/tutorials/tutorial_3/workspace/behaviors/behaviac_meta/tutorial_3_cpp.meta.xml b/tutorials/tutorial_3/workspace/behaviors/behaviac_meta/tutorial_3_cpp.meta.xml index bd00cf11..22b63d3c 100644 --- a/tutorials/tutorial_3/workspace/behaviors/behaviac_meta/tutorial_3_cpp.meta.xml +++ b/tutorials/tutorial_3/workspace/behaviors/behaviac_meta/tutorial_3_cpp.meta.xml @@ -29,51 +29,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_4/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_4/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index f28c879d..a45fb04c 100644 --- a/tutorials/tutorial_4/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_4/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_FirstAgent_p1 { }; template<> inline int& FirstAgent::_Get_Property_() diff --git a/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cpp.meta.xml b/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cpp.meta.xml index 44a85816..bd0137b8 100644 --- a/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cpp.meta.xml +++ b/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cpp.meta.xml @@ -30,27 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cs.meta.xml b/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cs.meta.xml index 6d6254b7..2c36c209 100644 --- a/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cs.meta.xml +++ b/tutorials/tutorial_4/workspace/behaviors/behaviac_meta/tutorial_4_cs.meta.xml @@ -30,27 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_5/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_5/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index 8fc32121..d6e99645 100644 --- a/tutorials/tutorial_5/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/tutorials/tutorial_5/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_FirstAgent_p1 { }; template<> inline int& FirstAgent::_Get_Property_() diff --git a/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml b/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml index 08450b3a..f0642ba7 100644 --- a/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml +++ b/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml @@ -33,27 +33,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml b/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml index 2d3d0273..4c753fc1 100644 --- a/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml +++ b/tutorials/tutorial_5/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml @@ -33,27 +33,6 @@ - - - - - - - - - - - - - - - - - - - - - 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 index 8fc32121..d6e99645 100644 --- 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 @@ -9,9 +9,6 @@ // Agent property and method handlers -namespace behaviac -{ -} struct PROPERTY_TYPE_FirstAgent_p1 { }; template<> inline int& FirstAgent::_Get_Property_() diff --git a/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs b/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs index 740ef325..80cc93eb 100644 --- a/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs +++ b/tutorials/tutorial_6/cs/behaviac_generated/types/AgentProperties.cs @@ -208,7 +208,7 @@ public override bool Load() 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(702722749, new CAgentMethodVoid(delegate(Agent self, string param0) { ((FirstAgent)self).Say(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()); diff --git a/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs b/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs index 66844894..1a62b765 100644 --- a/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs +++ b/tutorials/tutorial_6/cs/behaviac_generated/types/FirstAgent.cs @@ -26,7 +26,7 @@ public int _get_p1() return p1; } - private void Say(string param0) + public void Say(string param0) { ///<<< BEGIN WRITING YOUR CODE Say Console.WriteLine(); diff --git a/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_6_cpp.meta.xml similarity index 58% rename from tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml rename to tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_6_cpp.meta.xml index 25ed83c4..18c8df46 100644 --- a/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml +++ b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_6_cpp.meta.xml @@ -31,28 +31,7 @@ - - - - - - - - - - - - - - - - - - - - - - + diff --git a/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_6_cs.meta.xml b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_6_cs.meta.xml new file mode 100644 index 00000000..83c4a506 --- /dev/null +++ b/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_6_cs.meta.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/cpp/CMakeLists.txt b/tutorials/tutorial_7/cpp/CMakeLists.txt new file mode 100644 index 00000000..95b725c8 --- /dev/null +++ b/tutorials/tutorial_7/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_7 ${BTUNITTEST_INC} ${BTUNITTEST_SRC}) + +target_link_libraries (tutorial_7 libbehaviac ${CMAKE_THREAD_LIBS_INIT}) + +set_target_properties(tutorial_7 PROPERTIES PREFIX "") +# set_target_properties(tutorial_7 PROPERTIES OUTPUT_NAME_DEBUG libbehaviac${${CMAKE_DEBUG_POSTFIX}} +# set_target_properties(tutorial_7 PROPERTIES OUTPUT_NAME_RELEASE libbehaviac${${CMAKE_RELEASE_POSTFIX}} +set_target_properties(tutorial_7 PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) +set_target_properties(tutorial_7 PROPERTIES RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX}) diff --git a/tutorials/tutorial_7/cpp/behaviac_generated/types/behaviac_types.h b/tutorials/tutorial_7/cpp/behaviac_generated/types/behaviac_types.h new file mode 100644 index 00000000..e5c90fa2 --- /dev/null +++ b/tutorials/tutorial_7/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_7/cpp/behaviac_generated/types/internal/FirstAgent.cpp b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/FirstAgent.cpp new file mode 100644 index 00000000..8616112b --- /dev/null +++ b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/FirstAgent.cpp @@ -0,0 +1,54 @@ +// ------------------------------------------------------------------------------- +// 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 + count = 0; +///<<< END WRITING YOUR CODE +} + +FirstAgent::~FirstAgent() +{ +///<<< BEGIN WRITING YOUR CODE DESTRUCTOR + +///<<< END WRITING YOUR CODE +} + +void FirstAgent::Start() +{ +///<<< BEGIN WRITING YOUR CODE Start + count = 0; +///<<< END WRITING YOUR CODE +} + +behaviac::EBTStatus FirstAgent::Wait() +{ +///<<< BEGIN WRITING YOUR CODE Wait + count++; + + printf("p1 = %i\n", p1); + + if (count == 10000) + { + return behaviac::BT_SUCCESS; + } + + return behaviac::BT_RUNNING; +///<<< END WRITING YOUR CODE +} + + +///<<< BEGIN WRITING YOUR CODE FILE_UNINIT + +///<<< END WRITING YOUR CODE diff --git a/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/FirstAgent.h b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/FirstAgent.h new file mode 100644 index 00000000..8e8eca65 --- /dev/null +++ b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/FirstAgent.h @@ -0,0 +1,42 @@ +// ------------------------------------------------------------------------------- +// 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 Start(); + + private: behaviac::EBTStatus Wait(); + +///<<< BEGIN WRITING YOUR CODE CLASS_PART +private: + int count; +///<<< END WRITING YOUR CODE +}; + +///<<< BEGIN WRITING YOUR CODE FILE_UNINIT + +///<<< END WRITING YOUR CODE + +#endif diff --git a/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_headers.h b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_headers.h new file mode 100644 index 00000000..d81173cc --- /dev/null +++ b/tutorials/tutorial_7/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_7/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h new file mode 100644 index 00000000..4e206291 --- /dev/null +++ b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -0,0 +1,32 @@ +// --------------------------------------------------------------------- +// 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 + + +struct PROPERTY_TYPE_FirstAgent_p1 { }; +template<> inline int& FirstAgent::_Get_Property_() +{ + return this->p1; +} + +struct METHOD_TYPE_FirstAgent_Start { }; +template<> inline void FirstAgent::_Execute_Method_() +{ + this->FirstAgent::Start(); +} + +struct METHOD_TYPE_FirstAgent_Wait { }; +template<> inline behaviac::EBTStatus FirstAgent::_Execute_Method_() +{ + return this->FirstAgent::Wait(); +} + + +#endif // _BEHAVIAC_MEMBER_VISITOR_H_ diff --git a/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp new file mode 100644 index 00000000..94e1acea --- /dev/null +++ b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp @@ -0,0 +1,301 @@ +// --------------------------------------------------------------------- +// 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); + } + }; + + AgentMeta::SetTotalSignature(1768708687u); + + 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(1318449072u); + 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(664995375u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_FirstAgent_Start)); + 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()); + meta->RegisterMethod(994837275u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_FirstAgent_Wait)); + + 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_7/cpp/behaviac_generated/types/internal/behaviac_agent_meta.h b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_meta.h new file mode 100644 index 00000000..0fcbceaa --- /dev/null +++ b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_agent_meta.h @@ -0,0 +1,27 @@ +// --------------------------------------------------------------------- +// 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); } + inline void FunctionPointer_FirstAgent_Start(Agent* self) { ((FirstAgent*)self)->_Execute_Method_(); } + inline behaviac::EBTStatus FunctionPointer_FirstAgent_Wait(Agent* self) { return (behaviac::EBTStatus)((FirstAgent*)self)->_Execute_Method_(); } +} +#endif // _BEHAVIAC_AGENT_PROPERTIES_H_ diff --git a/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_headers.h b/tutorials/tutorial_7/cpp/behaviac_generated/types/internal/behaviac_headers.h new file mode 100644 index 00000000..dc16254f --- /dev/null +++ b/tutorials/tutorial_7/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_7/cpp/exported/demo.xml b/tutorials/tutorial_7/cpp/exported/demo.xml new file mode 100644 index 00000000..481a2530 --- /dev/null +++ b/tutorials/tutorial_7/cpp/exported/demo.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/cpp/exported/meta/tutorial_7_cpp.meta.xml b/tutorials/tutorial_7/cpp/exported/meta/tutorial_7_cpp.meta.xml new file mode 100644 index 00000000..0ac5da70 --- /dev/null +++ b/tutorials/tutorial_7/cpp/exported/meta/tutorial_7_cpp.meta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/cpp/tutorial_7.cpp b/tutorials/tutorial_7/cpp/tutorial_7.cpp new file mode 100644 index 00000000..e859141b --- /dev/null +++ b/tutorials/tutorial_7/cpp/tutorial_7.cpp @@ -0,0 +1,141 @@ +///////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// 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_7", __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::Config::SetSocketBlocking(true); + //behaviac::Config::SetSocketPort(60636); + behaviac::Config::SetLogging(true); + + behaviac::Workspace::GetInstance()->SetFilePath("../tutorials/tutorial_7/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"); + + int frames = 0; + behaviac::EBTStatus status = behaviac::BT_RUNNING; + + while (status == behaviac::BT_RUNNING) + { + LOGI("frame %d\n", ++frames); + + behaviac::Workspace::GetInstance()->DebugUpdate(); + + status = g_FirstAgent->btexec(); + } +} + +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("demo"); + + if (bInit) + { + UpdateLoop(); + + CleanupPlayer(); + } + + CleanupBehaviac(); + + int ret = system("pause"); + BEHAVIAC_UNUSED_VAR(ret); + + return 0; +} + +#endif diff --git a/tutorials/tutorial_7/cs/Properties/AssemblyInfo.cs b/tutorials/tutorial_7/cs/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..1b179e99 --- /dev/null +++ b/tutorials/tutorial_7/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_7")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("tutorial_7")] +[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_7/cs/behaviac_generated/types/AgentProperties.cs b/tutorials/tutorial_7/cs/behaviac_generated/types/AgentProperties.cs new file mode 100644 index 00000000..2ea3ebac --- /dev/null +++ b/tutorials/tutorial_7/cs/behaviac_generated/types/AgentProperties.cs @@ -0,0 +1,231 @@ +// --------------------------------------------------------------------- +// 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 = 1768708687; + + 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(1318449072); + 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(664995375, new CAgentMethodVoid(delegate(Agent self) { AgentMetaVisitor.ExecuteMethod(self, "Start", null); })); + 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()); + meta.RegisterMethod(994837275, new CAgentMethod(delegate(Agent self) { return (behaviac.EBTStatus)AgentMetaVisitor.ExecuteMethod(self, "Wait", null); })); + + 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_7/cs/behaviac_generated/types/FirstAgent.cs b/tutorials/tutorial_7/cs/behaviac_generated/types/FirstAgent.cs new file mode 100644 index 00000000..cc55ac74 --- /dev/null +++ b/tutorials/tutorial_7/cs/behaviac_generated/types/FirstAgent.cs @@ -0,0 +1,61 @@ +// ------------------------------------------------------------------------------- +// 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 Start() + { +///<<< BEGIN WRITING YOUR CODE Start + count = 0; +///<<< END WRITING YOUR CODE + } + + private behaviac.EBTStatus Wait() + { +///<<< BEGIN WRITING YOUR CODE Wait + count++; + + Console.WriteLine("p1 = {0}", p1); + + if (count == 10000) + { + return behaviac.EBTStatus.BT_SUCCESS; + } + + return behaviac.EBTStatus.BT_RUNNING; +///<<< END WRITING YOUR CODE + } + +///<<< BEGIN WRITING YOUR CODE CLASS_PART + private int count; +///<<< END WRITING YOUR CODE + +} + +///<<< BEGIN WRITING YOUR CODE FILE_UNINIT + +///<<< END WRITING YOUR CODE + diff --git a/tutorials/tutorial_7/cs/exported/demo.xml b/tutorials/tutorial_7/cs/exported/demo.xml new file mode 100644 index 00000000..481a2530 --- /dev/null +++ b/tutorials/tutorial_7/cs/exported/demo.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/cs/exported/meta/tutorial_7_cs.meta.xml b/tutorials/tutorial_7/cs/exported/meta/tutorial_7_cs.meta.xml new file mode 100644 index 00000000..0ac5da70 --- /dev/null +++ b/tutorials/tutorial_7/cs/exported/meta/tutorial_7_cs.meta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/cs/tutorial_7.cs b/tutorials/tutorial_7/cs/tutorial_7.cs new file mode 100644 index 00000000..708b3eda --- /dev/null +++ b/tutorials/tutorial_7/cs/tutorial_7.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.IO; +using System.Diagnostics; + +namespace tutorial_7 +{ + class Program + { + static FirstAgent g_FirstAgent; + + static bool InitBehavic() + { + Console.WriteLine("InitBehavic"); + + behaviac.Config.IsSocketBlocking = true; + //behaviac.Config.SocketPort = 60636; + + 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"); + + int frames = 0; + behaviac.EBTStatus status = behaviac.EBTStatus.BT_RUNNING; + + while (status == behaviac.EBTStatus.BT_RUNNING) + { + Console.WriteLine("frame {0}", ++frames); + + behaviac.Workspace.Instance.DebugUpdate(); + + status = g_FirstAgent.btexec(); + } + } + + 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("demo"); + + if (bInit) + { + UpdateLoop(); + + CleanupPlayer(); + } + + CleanupBehaviac(); + + Console.Read(); + } + } +} diff --git a/tutorials/tutorial_7/cs/tutorial_7.csproj b/tutorials/tutorial_7/cs/tutorial_7.csproj new file mode 100644 index 00000000..58b63eeb --- /dev/null +++ b/tutorials/tutorial_7/cs/tutorial_7.csproj @@ -0,0 +1,59 @@ + + + + + Debug + AnyCPU + {C940E541-78F4-47AB-994F-D9D26DB695EE} + Exe + Properties + tutorial_7 + tutorial_7 + 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_7/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml b/tutorials/tutorial_7/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml new file mode 100644 index 00000000..ce4a0af3 --- /dev/null +++ b/tutorials/tutorial_7/workspace/behaviors/behaviac_meta/tutorial_5_cpp.meta.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml b/tutorials/tutorial_7/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml similarity index 100% rename from tutorials/tutorial_6/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml rename to tutorials/tutorial_7/workspace/behaviors/behaviac_meta/tutorial_5_cs.meta.xml diff --git a/tutorials/tutorial_7/workspace/behaviors/demo.xml b/tutorials/tutorial_7/workspace/behaviors/demo.xml new file mode 100644 index 00000000..5d911187 --- /dev/null +++ b/tutorials/tutorial_7/workspace/behaviors/demo.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/workspace/tutorial_7_cpp.workspace.xml b/tutorials/tutorial_7/workspace/tutorial_7_cpp.workspace.xml new file mode 100644 index 00000000..8e4fadf6 --- /dev/null +++ b/tutorials/tutorial_7/workspace/tutorial_7_cpp.workspace.xml @@ -0,0 +1,10 @@ + + + + + False + 1 + ../../cpp + + + \ No newline at end of file diff --git a/tutorials/tutorial_7/workspace/tutorial_7_cs.workspace.xml b/tutorials/tutorial_7/workspace/tutorial_7_cs.workspace.xml new file mode 100644 index 00000000..a94f3b92 --- /dev/null +++ b/tutorials/tutorial_7/workspace/tutorial_7_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 927968ce..d2f69272 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.6.25 +3.6.26