Skip to content

Add pluginPath param to Initialize method #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alafi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add pluginPath param to Initialize method #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions MengeCS/MengeCS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@
<Compile Include="Vector2.cs" />
<Compile Include="Vector3.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="MengeCore.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>xcopy /y /d "$(MengeDir)\MengeCore.dll" $(ProjectDir)</PreBuildEvent>
<PreBuildEvent>if "$(ConfigurationName)" == "Debug" (
xcopy /y /d "$(MengeDir)\MengeCore_d.dll" $(TargetDir)
) ELSE (
xcopy /y /d "$(MengeDir)\MengeCore.dll" $(TargetDir)
)</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Binary file removed MengeCS/MengeCore_d.dll
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions MengeCS/Simulator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public Simulator() {
_agents = new List<Agent>();
}

public bool Initialize(String behaveXml, String sceneXml, String model)
public bool Initialize(String behaveXml, String sceneXml, String model, String pluginPath = null)
{
if (MengeWrapper.InitSimulator(behaveXml, sceneXml, model, null))
if (MengeWrapper.InitSimulator(behaveXml, sceneXml, model, pluginPath))
{
FindTriggers();
uint count = MengeWrapper.AgentCount();
Expand Down
13 changes: 7 additions & 6 deletions MengeCSExe/MengeCSExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@
<Name>MengeCS</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="..\MengeCS\MengeCore.dll">
<Link>MengeCore.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>if "$(ConfigurationName)" == "Debug" (
xcopy /y /d "$(ProjectDir)..\MengeCS\bin\Debug\MengeCore_d.dll" $(TargetDir)
) ELSE (
xcopy /y /d "$(ProjectDir)..\MengeCS\bin\Release\MengeCore.dll" $(TargetDir)
)</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down