Skip to content

Commit

Permalink
Fixed oops noticed by mellinoe and moved BEPUutilities/BEPUphysics/BE…
Browse files Browse the repository at this point in the history 
…PUik to netstandard2.0. Bumped version to 1.5.1.
  • Loading branch information
@RossNordby
RossNordby committed Apr 1, 2018
1 parent 487dad6 commit e043871
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 1,014 deletions.
141 changes: 17 additions & 124 deletions BEPUik/BEPUik.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,129 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2D5A0344-623A-4BFA-AAB6-8AC64E2A4129}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BEPUik</RootNamespace>
<AssemblyName>BEPUik</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<TargetFramework>netstandard2.0</TargetFramework>
<Platforms>AnyCPU;x64;x86</Platforms>
<PackageLicenseUrl>https://github.com/bepu/bepuphysics1/blob/master/LICENSE.md</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/bepu/bepuphysics1</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/bepu/bepuphysics1/master/Documentation/images/readme/bepuphysicslogo256.png</PackageIconUrl>
<RepositoryUrl>https://github.com/bepu/bepuphysics1.git</RepositoryUrl>
<PackageTags>ik;inverse kinematics;3d;real time</PackageTags>
<Description>Simulation based inverse kinematics solver.</Description>
<Version>1.5.1</Version>
<Authors>Ross Nordby</Authors>
<Company>Bepu Entertainment LLC</Company>
<Copyright>© Bepu Entertainment LLC</Copyright>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\BEPUik.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>bin\Debug\BEPUik.XML</DocumentationFile>
<Optimize>false</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\x64\Release\BEPUik.XML</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>bin\x64\Debug\BEPUik.XML</DocumentationFile>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\x86\Release\BEPUik.XML</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>bin\x86\Debug\BEPUik.XML</DocumentationFile>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Compile Include="ActiveSet.cs" />
<Compile Include="Bone.cs" />
<Compile Include="Control.cs" />
<Compile Include="AngularPlaneControl.cs" />
<Compile Include="IKTwistJoint.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SingleBoneAngularPlaneConstraint.cs" />
<Compile Include="RevoluteControl.cs" />
<Compile Include="SingleBoneRevoluteConstraint.cs" />
<Compile Include="DragControl.cs" />
<Compile Include="IKAngularJoint.cs" />
<Compile Include="IKBallSocketJoint.cs" />
<Compile Include="IKConstraint.cs" />
<Compile Include="IKDistanceJoint.cs" />
<Compile Include="IKDistanceLimit.cs" />
<Compile Include="IKJoint.cs" />
<Compile Include="IKLimit.cs" />
<Compile Include="IKLinearAxisLimit.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IKPointOnLineJoint.cs" />
<Compile Include="IKPointOnPlaneJoint.cs" />
<Compile Include="IKRevoluteJoint.cs" />
<Compile Include="IKSolver.cs" />
<Compile Include="IKSwingLimit.cs" />
<Compile Include="IKSwivelHingeJoint.cs" />
<Compile Include="IKTwistLimit.cs" />
<Compile Include="SingleBoneAngularMotor.cs" />
<Compile Include="SingleBoneConstraint.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SingleBoneLinearMotor.cs" />
<Compile Include="StateControl.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BEPUutilities\BEPUutilities.csproj">
<Project>{34853DEA-43A6-4F2F-A379-D1EE04D256D2}</Project>
<Name>BEPUutilities</Name>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<Reference Include="System" />
<ProjectReference Include="..\BEPUutilities\BEPUutilities.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
36 changes: 0 additions & 36 deletions BEPUik/Properties/AssemblyInfo.cs
View file

This file was deleted.

13 changes: 8 additions & 5 deletions BEPUphysics.sln
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2015
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEPUutilities", "BEPUutilities\BEPUutilities.csproj", "{34853DEA-43A6-4F2F-A379-D1EE04D256D2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BEPUutilities", "BEPUutilities\BEPUutilities.csproj", "{34853DEA-43A6-4F2F-A379-D1EE04D256D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEPUphysics", "BEPUphysics\BEPUphysics.csproj", "{C0D52C9F-14B8-4008-8DDC-109C27561A5C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BEPUphysics", "BEPUphysics\BEPUphysics.csproj", "{C0D52C9F-14B8-4008-8DDC-109C27561A5C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEPUik", "BEPUik\BEPUik.csproj", "{2D5A0344-623A-4BFA-AAB6-8AC64E2A4129}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BEPUik", "BEPUik\BEPUik.csproj", "{2D5A0344-623A-4BFA-AAB6-8AC64E2A4129}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -59,4 +59,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B8626FEB-BD01-4331-96D0-DB0FB96F2BC1}
EndGlobalSection
EndGlobal
Loading

0 comments on commit e043871

Please sign in to comment.