This commit is contained in:
Virgile Bello 2020-03-05 08:31:47 +01:00
Родитель aee2763628
Коммит f3b1bf2e07
8 изменённых файлов: 16 добавлений и 16 удалений

Просмотреть файл

@ -30,7 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core.Mathematics" Version="[0.0.0.0-a,]" />
<PackageReference Include="Stride.Core.Mathematics" Version="[0.0.0.0-a,]" />
</ItemGroup>
</Project>

Просмотреть файл

@ -3032,13 +3032,13 @@ namespace BulletSharp.Math
#endif
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Xenko.Core.Mathematics.Matrix(Matrix value)
public static implicit operator Stride.Core.Mathematics.Matrix(Matrix value)
{
// 11, 22, 33 & 44's offsets are shared, ~10% faster
Xenko.Core.Mathematics.Matrix d;
Stride.Core.Mathematics.Matrix d;
unsafe
{
d = *(Xenko.Core.Mathematics.Matrix*)&value;
d = *(Stride.Core.Mathematics.Matrix*)&value;
}
//11
d.M12 = value.M12;
@ -3060,7 +3060,7 @@ namespace BulletSharp.Math
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Matrix(Xenko.Core.Mathematics.Matrix value)
public static implicit operator Matrix(Stride.Core.Mathematics.Matrix value)
{
// 11, 22, 33 & 44's offsets are shared, ~10% faster
Matrix d;

Просмотреть файл

@ -1347,13 +1347,13 @@ namespace BulletSharp.Math
#endif
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Xenko.Core.Mathematics.Quaternion(Quaternion value)
public static implicit operator Stride.Core.Mathematics.Quaternion(Quaternion value)
{
unsafe { return *(Xenko.Core.Mathematics.Quaternion*)&value; }
unsafe { return *(Stride.Core.Mathematics.Quaternion*)&value; }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Quaternion(Xenko.Core.Mathematics.Quaternion value)
public static implicit operator Quaternion(Stride.Core.Mathematics.Quaternion value)
{
unsafe { return *(Quaternion*)&value; }
}

Просмотреть файл

@ -1912,13 +1912,13 @@ namespace BulletSharp.Math
#endif
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Xenko.Core.Mathematics.Vector3(Vector3 value)
public static implicit operator Stride.Core.Mathematics.Vector3(Vector3 value)
{
unsafe { return *(Xenko.Core.Mathematics.Vector3*)&value; }
unsafe { return *(Stride.Core.Mathematics.Vector3*)&value; }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Vector3(Xenko.Core.Mathematics.Vector3 value)
public static implicit operator Vector3(Stride.Core.Mathematics.Vector3 value)
{
unsafe { return *(Vector3*)&value; }
}

Просмотреть файл

@ -14,9 +14,9 @@ namespace BulletSharp.Math
[FieldOffset(12)] public readonly float unusedW;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Xenko.Core.Mathematics.Vector3(Vector3_Interop value)
public static implicit operator Stride.Core.Mathematics.Vector3(Vector3_Interop value)
{
unsafe { return *(Xenko.Core.Mathematics.Vector3*)&value; }
unsafe { return *(Stride.Core.Mathematics.Vector3*)&value; }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

Просмотреть файл

@ -1,4 +1,4 @@
This repo houses bullet 2, the physics engine used within [Xenko](https://github.com/xenko3d/xenko), its C++ / C# wrapper and build scripts for the different supported platforms.
This repo houses bullet 2, the physics engine used within [Stride](https://github.com/stride3d/stride), its C++ / C# wrapper and build scripts for the different supported platforms.
- bullet => Official bullet repo
- libbulletc => C++ wrapper
- BulletSharp => C# wrapper around C++ wrapper

Просмотреть файл

@ -2031,7 +2031,7 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = Xenko;
ORGANIZATIONNAME = Stride;
};
buildConfigurationList = 99335A5B197AC7D3000650DA /* Build configuration list for PBXProject "bulletc" */;
compatibilityVersion = "Xcode 3.2";

Просмотреть файл

@ -2,7 +2,7 @@
// bulletcTests.m
// bulletcTests
//
// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
//