Skip to content

Commit 67057d6

Browse files
committed
Set version to 0.11
1 parent ac41383 commit 67057d6

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

BulletSharp/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("BulletSharpPInvoke")]
13-
[assembly: AssemblyCopyright("Copyright © Andres Traks 2017")]
13+
[assembly: AssemblyCopyright("Copyright © Andres Traks 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.10.0.0")]
36-
[assembly: AssemblyFileVersion("0.10.0.0")]
35+
[assembly: AssemblyVersion("0.11.0.0")]
36+
[assembly: AssemblyFileVersion("0.11.0.0")]

BulletSharp/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.IO;
33
using System.Reflection;
4-
using System.Windows.Forms;
54
using System.Xml;
65

76
namespace DemoFramework
@@ -15,7 +14,7 @@ public class GraphicsLibraryManager
1514
public static bool ExitWithReload { get; set; }
1615

1716
static string[] supportedLibraries = {
18-
"SharpDX (DirectX 11)", "SharpDX (DirectX 10)", "SlimDX (DirectX 9)", "OpenTK (OpenGL)", "MonoGame (OpenGL)" };
17+
"SharpDX (DirectX 11)", "SlimDX (DirectX 9)", "OpenTK (OpenGL)", "MonoGame (OpenGL)" };
1918
public static string[] GetSupportedLibraries()
2019
{
2120
return supportedLibraries;
@@ -29,9 +28,6 @@ public static bool IsLibraryAvailable(string library)
2928
case "SharpDX (DirectX 11)":
3029
assemblyNames = new[] { "DemoFramework.SharpDX11", "SharpDX", "SharpDX.Direct3D11", "SharpDX.Direct3D11.Effects", "SharpDX.DXGI", "SharpDX.D3DCompiler" };
3130
break;
32-
case "SharpDX (DirectX 10)":
33-
assemblyNames = new[] { "DemoFramework.SharpDX", "SharpDX", "SharpDX.Direct3D10", "SharpDX.DXGI", "SharpDX.D3DCompiler" };
34-
break;
3531
case "SlimDX (DirectX 9)":
3632
assemblyNames = new[] { "DemoFramework.SlimDX", "SlimDX, Version=4.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9" };
3733
break;
@@ -70,10 +66,6 @@ public static Graphics GetGraphics(Demo demo)
7066
assembly = Assembly.Load("DemoFramework.SharpDX11");
7167
graphicsType = assembly.GetType("DemoFramework.SharpDX11.SharpDX11Graphics");
7268
break;
73-
case "SharpDX (DirectX 10)":
74-
assembly = Assembly.Load("DemoFramework.SharpDX");
75-
graphicsType = assembly.GetType("DemoFramework.SharpDX.SharpDXGraphics");
76-
break;
7769
case "SlimDX (DirectX 9)":
7870
assembly = Assembly.Load("DemoFramework.SlimDX");
7971
graphicsType = assembly.GetType("DemoFramework.SlimDX.SlimDXGraphics");

BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public override float FarPlane
7676
FormBorderStyle windowedFormBorderStyle;
7777
bool togglingFullScreen = false;
7878

79-
public override IDebugDraw GetPhysicsDebugDrawer()
79+
public override DebugDraw GetPhysicsDebugDrawer()
8080
{
8181
return new PhysicsDebugDraw(Device);
8282
}

libbulletc/src/btSoftBodyHelpers_wrap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ void btSoftBodyHelpers_DrawFrame(btSoftBody* psb, btIDebugDraw* idraw)
9797
{
9898
btSoftBodyHelpers::DrawFrame(psb, idraw);
9999
}
100-
100+
#ifndef BULLETC_DISABLE_SOFTBODY_HELPERS
101101
void btSoftBodyHelpers_DrawInfos(btSoftBody* psb, btIDebugDraw* idraw, bool masses,
102102
bool areas, bool stress)
103103
{
104104
btSoftBodyHelpers::DrawInfos(psb, idraw, masses, areas, stress);
105105
}
106-
106+
#endif
107107
void btSoftBodyHelpers_DrawNodeTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth,
108108
int maxdepth)
109109
{

libbulletc/src/btSoftBodyHelpers_wrap.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ extern "C" {
2121
EXPORT void btSoftBodyHelpers_DrawClusterTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth, int maxdepth);
2222
EXPORT void btSoftBodyHelpers_DrawFaceTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth, int maxdepth);
2323
EXPORT void btSoftBodyHelpers_DrawFrame(btSoftBody* psb, btIDebugDraw* idraw);
24+
#ifndef BULLETC_DISABLE_SOFTBODY_HELPERS
2425
EXPORT void btSoftBodyHelpers_DrawInfos(btSoftBody* psb, btIDebugDraw* idraw, bool masses, bool areas, bool stress);
26+
#endif
2527
EXPORT void btSoftBodyHelpers_DrawNodeTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth, int maxdepth);
2628
#ifndef BULLETC_DISABLE_SOFTBODY_HELPERS
2729
EXPORT void btSoftBodyHelpers_ReoptimizeLinkOrder(btSoftBody* psb);

0 commit comments

Comments
 (0)