Skip to content

Commit

Permalink
Introduce external event triggers to Menge and its C-API (#57)
Browse files Browse the repository at this point in the history
Augmented the event system.
•Added ExternalEventTrigger; a trigger object that can be exposed to external code to trigger events.
•Added EventEffectAgentState; an event effect that will change the state of target agents.
•Added TargetAgentById; an event target for a single agent identified by its unique id.
•Augmented the viewer to detect external triggers and connect keyboard and mouse events to them. For details see src/Menge/MengeVis/Runtime/EventInjectContext.h
•Added new example exercising this functionality: examples/core/userEvent.xml. A single agent placed in a diamond-shaped environement. The arrow keys control what direction the agent moves (one of the four cardinal directions).
•Exposed external triggers in the C-API.
  • Loading branch information
curds01 authored and MengeCrowdSim committed Apr 23, 2017
1 parent ce58682 commit ba32a9c
Show file tree
Hide file tree
Showing 43 changed files with 1,651 additions and 128 deletions.
2 changes: 1 addition & 1 deletion examples/core/event/eventB.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Effect name="makeFatter" type="offset_agent_property" property="r" dist="c" value="0.01" />
<Effect name="makeFaster" type="offset_agent_property" property="pref_speed" dist="c" value="0.2" />
<Event name="lastInGetBig">
<Trigger type="state_pop_increase" state="GoalReached" />
<Trigger name="population_increased" type="state_pop_increase" state="GoalReached" />
<Response effect="makeFatter" target="notGoalReached" />
<Response effect="makeFaster" target="notGoalReached" />
</Event>
Expand Down
9 changes: 9 additions & 0 deletions examples/core/userEvent.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0"?>

<Project
scene="userEvent/userEventS.xml"
behavior="userEvent/userEventB.xml"
view="userEvent/userEventV.xml"
model="orca"
dumpPath="userEvent/images"
/>
57 changes: 57 additions & 0 deletions examples/core/userEvent/userEventB.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0"?>

<BFSM>
<EventSystem conservative="1">
<Target name="agent_0" type="agent_id" id="0" />
<Effect name="move_left" type="set_agent_state">
<StateSelector type="const" name="WalkLeft" />
</Effect>
<Effect name="move_right" type="set_agent_state">
<StateSelector type="const" name="WalkRight" />
</Effect>
<Effect name="move_up" type="set_agent_state">
<StateSelector type="const" name="WalkUp" />
</Effect>
<Effect name="move_down" type="set_agent_state">
<StateSelector type="const" name="WalkDown" />
</Effect>
<Event name="head_left">
<Trigger name="left_arrow" type="external" />
<Response effect="move_left" target="agent_0" />
</Event>
<Event name="head_right">
<Trigger name="right_arrow" type="external" />
<Response effect="move_right" target="agent_0" />
</Event>
<Event name="head_up">
<Trigger name="up_arrow" type="external" />
<Response effect="move_up" target="agent_0" />
</Event>
<Event name="head_down">
<Trigger name="down_arrow" type="external" />
<Response effect="move_down" target="agent_0" />
</Event>
</EventSystem>

<State name="Stand" final="0" >
<GoalSelector type="identity" />
<VelComponent type="zero" />
</State>
<State name="WalkLeft" final="0" >
<GoalSelector type="identity" />
<VelComponent type="const_dir" x="-1" y="0" />
</State>
<State name="WalkRight" final="0" >
<GoalSelector type="identity" />
<VelComponent type="const_dir" x="1" y="0" />
</State>
<State name="WalkUp" final="0" >
<GoalSelector type="identity" />
<VelComponent type="const_dir" x="0" y="-1" />
</State>
<State name="WalkDown" final="0" >
<GoalSelector type="identity" />
<VelComponent type="const_dir" x="0" y="1" />
</State>

</BFSM>
46 changes: 46 additions & 0 deletions examples/core/userEvent/userEventS.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0"?>

<Experiment version="2.0">
<SpatialQuery type="kd-tree" test_visibility="false" />

<OpenSteer max_force="8" leak_through="0.1" reaction_time="0.5" />
<Common time_step="0.1" />
<GCF reaction_time="0.5" max_agent_dist="2" max_agent_force="3" agent_interp_width="0.1" agent_force_strength="0.35" />
<Helbing agent_scale="2000" obstacle_scale="4000" reaction_time="0.5" body_force="1200" friction="2400" force_distance="0.015" />
<Johansson agent_scale="25" obstacle_scale="35" reaction_time="0.5" force_distance="0.15" stride_time="0.5" />
<Karamouzas orient_weight="0.8" fov="200" reaction_time="0.4" wall_steepness="2" wall_distance="2" colliding_count="5" d_min="1" d_mid="8" d_max="10" agent_force="4" />
<Zanlungo agent_scale="2000" obstacle_scale="4000" reaction_time="0.5" force_distance="0.005" />
<Dummy stddev="0.05" />

<AgentProfile name="group1" >
<OpenSteer tau="3" tauObst="6" />
<Common max_angle_vel="360" max_neighbors="10" obstacleSet="1" neighbor_dist="5" r="0.19" class="1" pref_speed="1.04" max_speed="2" max_accel="5" priority="0.0">
<Property name="pref_speed" dist="n" mean="1.3" stddev="0.25" />
</Common>
<PedVO factor="1.57" buffer="0.9" tau="3" tauObst="0.1" turningBias="1.0" />
<GCF stand_depth="0.18" move_scale="0.53" slow_width="0.25" sway_change="0.05" />
<Helbing mass="80" />
<Johansson fov_weight="0.16" />
<Karamouzas personal_space="0.69" anticipation="8" />
<ORCA tau="3.0" tauObst="0.15" />
<Zanlungo mass="80" />
</AgentProfile>

<AgentGroup>
<ProfileSelector type="const" name="group1" />
<StateSelector type="const" name="Stand" />
<Generator type="explicit">
<Agent p_x="0" p_y="0" />
</Generator>
</AgentGroup>


<ObstacleSet type="explicit" class="1">
<Obstacle closed="1" >
<Vertex p_x = "0" p_y = "5"/>
<Vertex p_x = "5" p_y = "0"/>
<Vertex p_x = "0" p_y = "-5"/>
<Vertex p_x = "-5" p_y = "0"/>
</Obstacle>
</ObstacleSet>
</Experiment>
14 changes: 14 additions & 0 deletions examples/core/userEvent/userEventV.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0"?>

<View width="530" height="530" >
<!-- Multiple cameras are mapped to a key from 1-9 in the order they are defined here -->
<Camera xpos="-0.235762" ypos="9.12995" zpos="0.060852" xtgt="-0.235762" ytgt="-5.56976e-05" ztgt="0.050852" far="400" near="0.01" fov="0.0" orthoScale="0.78749" />

<!-- Comment out lights for a constant-illuminated visualization -->
<Light x="1" y="0" z="-1" type="directional" diffR="1.0" diffG="0.8" diffB="0.8" space="camera"/>
<Light x="-1" y="0" z="-1" type="directional" diffR="0.8" diffG="0.8" diffB="1.0" space="camera"/>
<Light x="0" y="1" z="0" type="directional" diffR="0.8" diffG="0.8" diffB="0.8" space="world"/>

<Watermark file_name="../../mengeLogo.png" alignment="bottom_right" scale="0.5" opacity="0.25"/>
<Font r="1.0" g="1.0" b="1.0" a="0.75" />
</View>
File renamed without changes.
Binary file added img_rsrc/user_action_interface.psd
Binary file not shown.
51 changes: 11 additions & 40 deletions projects/VS2013/Menge/MengeCore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -298,16 +298,7 @@ xcopy /y $(TargetPath) $(ExeDir)
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\VelocityComponents\VelComponentDatabase.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\VelocityComponents\VelCompRoadMap.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\VelocityComponents\VelCompVF.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\Tasks\NavMeshLocalizerTask.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\Tasks\NavMeshLocalizerTask.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\Tasks\Task.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\Tasks\TaskDatabase.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\BFSM\Goals\Goal.cpp" />
Expand Down Expand Up @@ -358,41 +349,18 @@ xcopy /y $(TargetPath) $(ExeDir)
<ClCompile Include="$(SrcDir)\mengeCore\resources\Portal.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\PortalPath.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\Resource.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\ResourceManager.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="$(SrcDir)\mengeCore\resources\RoadMapPath.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="$(SrcDir)\mengeCore\resources\ResourceManager.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\RoadMapPath.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\Route.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\VectorField.cpp" />
<ClCompile Include="$(SrcDir)\mengeCore\resources\WayPortal.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="$(SrcDir)\mengeCore\resources\WayPortal.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\Agents\AgentGenerators\NavMeshAgentGenerator.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\menge_c_api.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\PluginEngine\CorePluginEngine.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\EventTriggerExternal.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\EventTriggerFactory.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\EventEffectAgentState.cpp" />
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\TargetAgentById.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)\mengeCore\Core.h" />
Expand Down Expand Up @@ -588,6 +556,9 @@ xcopy /y $(TargetPath) $(ExeDir)
<ClInclude Include="$(SrcDir)\MengeCore\menge_c_api.h" />
<ClInclude Include="$(SrcDir)\MengeCore\PluginEngine\BasePluginEngine.h" />
<ClInclude Include="$(SrcDir)\MengeCore\PluginEngine\CorePluginEngine.h" />
<ClInclude Include="$(SrcDir)\MengeCore\Agents\Events\EventTriggerExternal.h" />
<ClInclude Include="$(SrcDir)\MengeCore\Agents\Events\EventEffectAgentState.h" />
<ClInclude Include="$(SrcDir)\MengeCore\Agents\Events\TargetAgentById.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="tinyxml_lib.vcxproj">
Expand Down
21 changes: 21 additions & 0 deletions projects/VS2013/Menge/MengeCore.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,18 @@
<ClCompile Include="$(SrcDir)\MengeCore\Agents\AgentGenerators\NavMeshAgentGenerator.cpp">
<Filter>Source Files\Agents\AgentGenerators</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\EventTriggerExternal.cpp">
<Filter>Source Files\Agents\Events</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\EventTriggerFactory.cpp">
<Filter>Source Files\Agents\Events</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\EventEffectAgentState.cpp">
<Filter>Source Files\Agents\Events</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)\MengeCore\Agents\Events\TargetAgentById.cpp">
<Filter>Source Files\Agents\Events</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)\mengeCore\Core.h">
Expand Down Expand Up @@ -1190,5 +1202,14 @@
<ClInclude Include="$(SrcDir)\MengeCore\Agents\AgentGenerators\NavMeshAgentGenerator.h">
<Filter>Header Files\Agents\AgentGenerators</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)\MengeCore\Agents\Events\EventTriggerExternal.h">
<Filter>Header Files\Agents\Events</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)\MengeCore\Agents\Events\EventEffectAgentState.h">
<Filter>Header Files\Agents\Events</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)\MengeCore\Agents\Events\TargetAgentById.h">
<Filter>Header Files\Agents\Events</Filter>
</ClInclude>
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions projects/VS2013/Menge/MengeVis.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<ClCompile Include="$(SrcDir)\MengeVis\PluginEngine\VisPluginEngine.cpp" />
<ClCompile Include="$(SrcDir)\MengeVis\Runtime\VisAgent\VisAgent.cpp" />
<ClCompile Include="$(SrcDir)\MengeVis\Runtime\VisAgent\VisAgentDatabase.cpp" />
<ClCompile Include="$(SrcDir)\MengeVis\Runtime\EventInjectContext.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\SimSystem.h" />
Expand Down Expand Up @@ -114,6 +115,7 @@
<ClInclude Include="$(SrcDir)\MengeVis\PluginEngine\VisPluginEngine.h" />
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\VisAgent\VisAgent.h" />
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\VisAgent\VisAgentDatabase.h" />
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\EventInjectContext.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{57FA5E04-F7D0-47B7-900D-CA2BA94E9D52}</ProjectGuid>
Expand Down
6 changes: 6 additions & 0 deletions projects/VS2013/Menge/MengeVis.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@
<ClCompile Include="$(SrcDir)\MengeVis\Runtime\VisAgent\VisAgent.cpp">
<Filter>Source Files\Runtime\VisAgent</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)\MengeVis\Runtime\EventInjectContext.cpp">
<Filter>Source Files\Runtime</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\SimSystem.h">
Expand Down Expand Up @@ -344,5 +347,8 @@
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\VisAgent\VisAgent.h">
<Filter>Header Files\Runtime\VisAgent</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)\MengeVis\Runtime\EventInjectContext.h">
<Filter>Header Files\Runtime</Filter>
</ClInclude>
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions projects/VS2013/Menge/menge.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\..\resources\win\*.*" "$(ExeDir)" /d /y
<Command>xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\x86\*.*" "$(ExeDir)" /y
xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\*.*" "$(ExeDir)" /d /y
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y /e</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -133,9 +133,9 @@ xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
<SubSystem>Console</SubSystem>
</Link>
<PostBuildEvent>
<Command>xcopy "xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\x64\*.*" "$(ExeDir)" /d /y
<Command>xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\x64\*.*" "$(ExeDir)" /y
xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\*.*" "$(ExeDir)" /d /y
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y /e</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -160,9 +160,9 @@ xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\..\resources\win\*.*" "$(ExeDir)" /d /y
<Command>xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\x86\*.*" "$(ExeDir)" /y
xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\*.*" "$(ExeDir)" /d /y
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y /e</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -187,9 +187,9 @@ xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\x64\*.*" "$(ExeDir)" /d /y
<Command>xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\x64\*.*" "$(ExeDir)" /y
xcopy "$(SolutionDir)..\..\resources\win\exe_rsrc\*.*" "$(ExeDir)" /d /y
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y</Command>
xcopy "$(SolutionDir)..\..\resources\common\*.*" "$(ExeDir)" /d /y /e</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit ba32a9c

Please sign in to comment.