Skip to content

Commit ea1234d

Browse files
AndresTraksAndresTraks
committed
Update graphics packages
1 parent d23072e commit ea1234d

File tree

9 files changed

+63
-35
lines changed

9 files changed

+63
-35
lines changed

‎BulletSharp/demos/DemoFramework/Graphics/OpenTK/InfoText.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ public void OnRender()
120120
GL.Enable(EnableCap.Texture2D);
121121
GL.Disable(EnableCap.Lighting);
122122
GL.Enable(EnableCap.Blend);
123-
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
123+
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
124124

125125
GL.BindTexture(TextureTarget.Texture2D, texture);
126126

127-
GL.Begin(BeginMode.Quads);
127+
GL.Begin(PrimitiveType.Quads);
128128
GL.TexCoord2(0.0f, 1.0f); GL.Vertex2(0, 0);
129129
GL.TexCoord2(0.0f, 0.0f); GL.Vertex2(0, height);
130130
GL.TexCoord2(1.0f, 0.0f); GL.Vertex2(width, height);

‎BulletSharp/demos/DemoFramework/Graphics/OpenTK/MeshFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ShapeData : IDisposable
2626
public int NormalBufferID;
2727
public int ElementBufferID;
2828
public DrawElementsType ElementsType;
29-
public BeginMode PrimitiveType = BeginMode.Triangles;
29+
public PrimitiveType PrimitiveType = PrimitiveType.Triangles;
3030

3131
public List<InstanceData> Instances = new List<InstanceData>();
3232
public Vector3[] SoftBodyVertices;
@@ -474,7 +474,7 @@ public void UpdateSoftBody(SoftBody softBody, ShapeData shapeData)
474474
else
475475
{
476476
shapeData.SetDynamicNormalBuffer(new Vector3[shapeData.VertexCount]); // hack, should use a different shader that doesn't process normals
477-
shapeData.PrimitiveType = BeginMode.Lines;
477+
shapeData.PrimitiveType = PrimitiveType.Lines;
478478
}
479479
}
480480
}

‎BulletSharp/demos/DemoFramework/Graphics/OpenTK/OpenTK.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@
9090
<SpecificVersion>False</SpecificVersion>
9191
<HintPath>..\..\..\..\bin\Release\BulletSharp.dll</HintPath>
9292
</Reference>
93-
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
94-
<HintPath>..\..\..\packages\OpenTK.1.1.2349.61993\lib\NET40\OpenTK.dll</HintPath>
93+
<Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
94+
<HintPath>..\..\..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll</HintPath>
9595
<Private>True</Private>
9696
</Reference>
97-
<Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
98-
<HintPath>..\..\..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
97+
<Reference Include="OpenTK.GLControl, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
98+
<HintPath>..\..\..\packages\OpenTK.GLControl.3.0.0\lib\net20\OpenTK.GLControl.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="System" />
@@ -134,6 +134,7 @@
134134
</ItemGroup>
135135
<ItemGroup>
136136
<None Include="app.config" />
137+
<None Include="OpenTK.dll.config" />
137138
<None Include="packages.config" />
138139
</ItemGroup>
139140
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎BulletSharp/demos/DemoFramework/Graphics/OpenTK/OpenTK.dll.config‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<configuration>
2+
<dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
3+
<dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
4+
<dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
5+
<dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
6+
<dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
7+
<dllmap os="linux" dll="libX11" target="libX11.so.6"/>
8+
<dllmap os="linux" dll="libXi" target="libXi.so.6"/>
9+
<dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
10+
<dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
11+
<dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
12+
<dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
13+
<dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
14+
<dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
15+
<dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
16+
<dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
17+
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
18+
<!-- XQuartz compatibility (X11 on Mac) -->
19+
<dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
20+
<dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
21+
<dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
22+
<dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
23+
<dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
24+
<dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
25+
</configuration>

‎BulletSharp/demos/DemoFramework/Graphics/OpenTK/PhysicsDebugDraw.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void DrawDebugWorld(DynamicsWorld world)
2828

2929
GL.VertexPointer(3, VertexPointerType.Float, 0, positionArray);
3030
GL.ColorPointer(3, ColorPointerType.UnsignedByte, sizeof(int), colorArray);
31-
GL.DrawArrays(BeginMode.Lines, 0, positionArray.Length);
31+
GL.DrawArrays(PrimitiveType.Lines, 0, positionArray.Length);
3232

3333
GL.DisableClientState(ArrayCap.ColorArray);
3434
GL.DisableClientState(ArrayCap.VertexArray);

‎BulletSharp/demos/DemoFramework/Graphics/OpenTK/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK" version="1.1.2349.61993" targetFramework="net40-client" />
4-
<package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net40-client" />
3+
<package id="OpenTK" version="3.0.0" targetFramework="net462" />
4+
<package id="OpenTK.GLControl" version="3.0.0" targetFramework="net462" />
55
</packages>

‎BulletSharp/demos/DemoFramework/Graphics/SharpDX11/SharpDX11.csproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,36 +100,36 @@
100100
<Reference Include="BulletSharp">
101101
<HintPath>..\..\..\..\bin\Release\BulletSharp.dll</HintPath>
102102
</Reference>
103-
<Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
104-
<HintPath>..\..\..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
103+
<Reference Include="SharpDX, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
104+
<HintPath>..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll</HintPath>
105105
<Private>True</Private>
106106
</Reference>
107-
<Reference Include="SharpDX.D3DCompiler, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
108-
<HintPath>..\..\..\packages\SharpDX.D3DCompiler.4.0.1\lib\net45\SharpDX.D3DCompiler.dll</HintPath>
107+
<Reference Include="SharpDX.D3DCompiler, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
108+
<HintPath>..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll</HintPath>
109109
<Private>True</Private>
110110
</Reference>
111-
<Reference Include="SharpDX.Desktop, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
112-
<HintPath>..\..\..\packages\SharpDX.Desktop.4.0.1\lib\net45\SharpDX.Desktop.dll</HintPath>
111+
<Reference Include="SharpDX.Desktop, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
112+
<HintPath>..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll</HintPath>
113113
<Private>True</Private>
114114
</Reference>
115-
<Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
116-
<HintPath>..\..\..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
115+
<Reference Include="SharpDX.Direct2D1, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
116+
<HintPath>..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
117117
<Private>True</Private>
118118
</Reference>
119-
<Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
120-
<HintPath>..\..\..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
119+
<Reference Include="SharpDX.Direct3D11, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
120+
<HintPath>..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
121121
<Private>True</Private>
122122
</Reference>
123-
<Reference Include="SharpDX.Direct3D11.Effects, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
124-
<HintPath>..\..\..\packages\SharpDX.Direct3D11.Effects.4.0.1\lib\net45\SharpDX.Direct3D11.Effects.dll</HintPath>
123+
<Reference Include="SharpDX.Direct3D11.Effects, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
124+
<HintPath>..\..\..\packages\SharpDX.Direct3D11.Effects.4.1.0\lib\net45\SharpDX.Direct3D11.Effects.dll</HintPath>
125125
<Private>True</Private>
126126
</Reference>
127-
<Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
128-
<HintPath>..\..\..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
127+
<Reference Include="SharpDX.DXGI, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
128+
<HintPath>..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll</HintPath>
129129
<Private>True</Private>
130130
</Reference>
131-
<Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
132-
<HintPath>..\..\..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
131+
<Reference Include="SharpDX.Mathematics, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
132+
<HintPath>..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
133133
<Private>True</Private>
134134
</Reference>
135135
<Reference Include="System" />

‎BulletSharp/demos/DemoFramework/Graphics/SharpDX11/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="SharpDX" version="4.0.1" targetFramework="net461" />
4-
<package id="SharpDX.D3DCompiler" version="4.0.1" targetFramework="net461" />
5-
<package id="SharpDX.Desktop" version="4.0.1" targetFramework="net461" />
6-
<package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net461" />
7-
<package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net461" />
8-
<package id="SharpDX.Direct3D11.Effects" version="4.0.1" targetFramework="net461" />
9-
<package id="SharpDX.DXGI" version="4.0.1" targetFramework="net461" />
10-
<package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net461" />
3+
<package id="SharpDX" version="4.1.0" targetFramework="net462" />
4+
<package id="SharpDX.D3DCompiler" version="4.1.0" targetFramework="net462" />
5+
<package id="SharpDX.Desktop" version="4.1.0" targetFramework="net462" />
6+
<package id="SharpDX.Direct2D1" version="4.1.0" targetFramework="net462" />
7+
<package id="SharpDX.Direct3D11" version="4.1.0" targetFramework="net462" />
8+
<package id="SharpDX.Direct3D11.Effects" version="4.1.0" targetFramework="net462" />
9+
<package id="SharpDX.DXGI" version="4.1.0" targetFramework="net462" />
10+
<package id="SharpDX.Mathematics" version="4.1.0" targetFramework="net462" />
1111
</packages>

‎BulletSharp/demos/DistanceDemo/DistanceDemo.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public void DrawDistance()
112112
World.DebugDrawer.DrawLine(ref distanceFrom, ref distanceTo, ref _red);
113113
}
114114
}
115+
116+
input.Dispose();
115117
}
116118

117119
public void Dispose()

0 commit comments

Comments
 (0)