Set version to 0.11

AndresTraks · Jul 13, 2018 · 67057d6 · 67057d6
1 parent ac41383
commit 67057d6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/BulletSharp/Properties/AssemblyInfo.cs b/BulletSharp/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BulletSharpPInvoke")]
-[assembly: AssemblyCopyright("Copyright © Andres Traks 2017")]
+[assembly: AssemblyCopyright("Copyright © Andres Traks 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.10.0.0")]
-[assembly: AssemblyFileVersion("0.10.0.0")]
+[assembly: AssemblyVersion("0.11.0.0")]
+[assembly: AssemblyFileVersion("0.11.0.0")]
diff --git a/BulletSharp/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs b/BulletSharp/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using System.Windows.Forms;
 using System.Xml;
 
 namespace DemoFramework
@@ -15,7 +14,7 @@ public class GraphicsLibraryManager
         public static bool ExitWithReload { get; set; }
 
         static string[] supportedLibraries = {
-            "SharpDX (DirectX 11)", "SharpDX (DirectX 10)", "SlimDX (DirectX 9)", "OpenTK (OpenGL)", "MonoGame (OpenGL)" };
+            "SharpDX (DirectX 11)", "SlimDX (DirectX 9)", "OpenTK (OpenGL)", "MonoGame (OpenGL)" };
         public static string[] GetSupportedLibraries()
         {
             return supportedLibraries;
@@ -29,9 +28,6 @@ public static bool IsLibraryAvailable(string library)
                 case "SharpDX (DirectX 11)":
                     assemblyNames = new[] { "DemoFramework.SharpDX11", "SharpDX", "SharpDX.Direct3D11", "SharpDX.Direct3D11.Effects", "SharpDX.DXGI", "SharpDX.D3DCompiler" };
                     break;
-                case "SharpDX (DirectX 10)":
-                    assemblyNames = new[] { "DemoFramework.SharpDX", "SharpDX", "SharpDX.Direct3D10", "SharpDX.DXGI", "SharpDX.D3DCompiler" };
-                    break;
                 case "SlimDX (DirectX 9)":
                     assemblyNames = new[] { "DemoFramework.SlimDX", "SlimDX, Version=4.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9" };
                     break;
@@ -70,10 +66,6 @@ public static Graphics GetGraphics(Demo demo)
                     assembly = Assembly.Load("DemoFramework.SharpDX11");
                     graphicsType = assembly.GetType("DemoFramework.SharpDX11.SharpDX11Graphics");
                     break;
-                case "SharpDX (DirectX 10)":
-                    assembly = Assembly.Load("DemoFramework.SharpDX");
-                    graphicsType = assembly.GetType("DemoFramework.SharpDX.SharpDXGraphics");
-                    break;
                 case "SlimDX (DirectX 9)":
                     assembly = Assembly.Load("DemoFramework.SlimDX");
                     graphicsType = assembly.GetType("DemoFramework.SlimDX.SlimDXGraphics");

diff --git a/BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs
@@ -76,7 +76,7 @@ public override float FarPlane
         FormBorderStyle windowedFormBorderStyle;
         bool togglingFullScreen = false;
 
-        public override IDebugDraw GetPhysicsDebugDrawer()
+        public override DebugDraw GetPhysicsDebugDrawer()
         {
             return new PhysicsDebugDraw(Device);
         }

diff --git a/libbulletc/src/btSoftBodyHelpers_wrap.cpp b/libbulletc/src/btSoftBodyHelpers_wrap.cpp
@@ -97,13 +97,13 @@ void btSoftBodyHelpers_DrawFrame(btSoftBody* psb, btIDebugDraw* idraw)
 {
 	btSoftBodyHelpers::DrawFrame(psb, idraw);
 }
-
+#ifndef BULLETC_DISABLE_SOFTBODY_HELPERS
 void btSoftBodyHelpers_DrawInfos(btSoftBody* psb, btIDebugDraw* idraw, bool masses,
 	bool areas, bool stress)
 {
 	btSoftBodyHelpers::DrawInfos(psb, idraw, masses, areas, stress);
 }
-
+#endif
 void btSoftBodyHelpers_DrawNodeTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth,
 	int maxdepth)
 {

diff --git a/libbulletc/src/btSoftBodyHelpers_wrap.h b/libbulletc/src/btSoftBodyHelpers_wrap.h
@@ -21,7 +21,9 @@ extern "C" {
 	EXPORT void btSoftBodyHelpers_DrawClusterTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth, int maxdepth);
 	EXPORT void btSoftBodyHelpers_DrawFaceTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth, int maxdepth);
 	EXPORT void btSoftBodyHelpers_DrawFrame(btSoftBody* psb, btIDebugDraw* idraw);
+#ifndef BULLETC_DISABLE_SOFTBODY_HELPERS
 	EXPORT void btSoftBodyHelpers_DrawInfos(btSoftBody* psb, btIDebugDraw* idraw, bool masses, bool areas, bool stress);
+#endif
 	EXPORT void btSoftBodyHelpers_DrawNodeTree(btSoftBody* psb, btIDebugDraw* idraw, int mindepth, int maxdepth);
 #ifndef BULLETC_DISABLE_SOFTBODY_HELPERS
 	EXPORT void btSoftBodyHelpers_ReoptimizeLinkOrder(btSoftBody* psb);