admin/opensim-libs
1
0
Fork 0
mirror of git://opensimulator.org/git/opensim-libs synced 2026-08-14 00:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

change bulletXNA do .net4.6

Browse Source
This commit is contained in:
UbitUmarov
2020-09-11 02:42:48 +01:00
parent 33cd0fae8b
commit c5aecee702
4 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/managed/Warp3Dmod/warp_Rasterizer.cs
-1
View File
@@ -304,7 +304,6 @@ namespace Warp3D
ny2 = ny4;
}
dy = dy21;
if (y2 >= 0 && dy > 0)
{
trunk/managed/bulletxna/BulletXNA/BulletDynamics/Dynamics/DiscreteDynamicsWorld.cs
+14 -2
View File
@@ -499,6 +499,8 @@ namespace BulletXNA.BulletDynamics
{
BulletGlobals.g_streamWriter.WriteLine("PredictUnconstraintMotion [{0}][{1}]", length, timeStep);
}
/* the used parallel lib was never pushed it would also be totally obsolete
Parallel.For(3,0, length, delegate(int i)
{
RigidBody body = m_nonStaticRigidBodies[i];
@@ -512,12 +514,22 @@ namespace BulletXNA.BulletDynamics
body.SetInterpolationWorldTransform(ref temp);
}
});
*/
//for (int i = 0; i < length;i++)
for (int i = 0; i < m_nonStaticRigidBodies.Count;i++ )
{
RigidBody body = m_nonStaticRigidBodies[i];
if (!body.IsStaticOrKinematicObject())
{
body.IntegrateVelocities(timeStep);
//dampingF
body.ApplyDamping(timeStep);
IndexedMatrix temp;
body.PredictIntegratedTransform(timeStep, out temp);
body.SetInterpolationWorldTransform(ref temp);
}
}
BulletGlobals.StopProfile();
}
trunk/managed/bulletxna/BulletXNA/BulletXNA-Windows.csproj
+5 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -11,7 +11,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BulletXNA</RootNamespace>
<AssemblyName>BulletXNA</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
@@ -41,6 +41,7 @@
<NoWarn>
</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -54,7 +55,7 @@
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\..\..\..\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -63,6 +64,7 @@
<NoWarn>
</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib">
@@ -109,7 +111,6 @@
<Compile Include="BulletDynamics\Vehicle\VehicleRaycaster.cs" />
<Compile Include="BulletDynamics\Vehicle\WheelInfo.cs" />
<Compile Include="BulletGlobals.cs" />
<Compile Include="Parallel.cs" />
<Compile Include="LinearMath\DebugDraw.cs" />
<Compile Include="DrawHelper.cs" />
<Compile Include="LinearMath\AabbUtil2.cs" />
trunk/managed/bulletxna/BulletXNA/BulletXNA.sln
+23 -18
View File
@@ -1,6 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1259
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BulletXNA-Windows", "BulletXNA-Windows.csproj", "{4E1937EE-3139-44CB-989D-F050BC099CE6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BulletXNADemos-Windows", "..\BulletXNADemos\BulletXNADemos-Windows.csproj", "{3E64761A-AC83-4C76-93BE-475F95165560}"
@@ -27,22 +29,22 @@ Global
Release|Xbox 360 = Release|Xbox 360
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Windows Phone.ActiveCfg = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Windows Phone.Build.0 = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|x86.ActiveCfg = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|x86.Build.0 = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Xbox 360.ActiveCfg = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Xbox 360.Build.0 = Debug|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Mixed Platforms.ActiveCfg = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Mixed Platforms.Build.0 = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Windows Phone.ActiveCfg = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Windows Phone.Build.0 = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|x86.ActiveCfg = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|x86.Build.0 = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Xbox 360.ActiveCfg = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Xbox 360.Build.0 = Release|x86
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Windows Phone.Build.0 = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|x86.ActiveCfg = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|x86.Build.0 = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Debug|Xbox 360.Build.0 = Debug|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Windows Phone.Build.0 = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|x86.ActiveCfg = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|x86.Build.0 = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Xbox 360.ActiveCfg = Release|Any CPU
{4E1937EE-3139-44CB-989D-F050BC099CE6}.Release|Xbox 360.Build.0 = Release|Any CPU
{3E64761A-AC83-4C76-93BE-475F95165560}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{3E64761A-AC83-4C76-93BE-475F95165560}.Debug|Mixed Platforms.Build.0 = Debug|x86
{3E64761A-AC83-4C76-93BE-475F95165560}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
@@ -129,4 +131,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {800CF0F4-3F1C-402E-B544-E878CD47C37D}
EndGlobalSection
EndGlobal