diff --git a/.gitignore b/.gitignore index 2b17417..7149224 100644 --- a/.gitignore +++ b/.gitignore @@ -124,7 +124,7 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings +# TODO: Comment the next line if you want to checkin your web deploy settings # but database connection strings (with potential passwords) will be unencrypted *.pubxml *.publishproj @@ -181,3 +181,13 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ + +#MonoDevelop +#User Specific +*.userprefs +*.usertasks + +#Mono Project Files +*.pidb +*.resources +test-results/ diff --git a/OpenTKTutorial1/OpenTKTutorial1/Game.cs b/OpenTKTutorial1/OpenTKTutorial1/Game.cs index acfaf73..0b23ca7 100644 --- a/OpenTKTutorial1/OpenTKTutorial1/Game.cs +++ b/OpenTKTutorial1/OpenTKTutorial1/Game.cs @@ -36,7 +36,7 @@ protected override void OnRenderFrame(FrameEventArgs e) * The first step is to tell OpenGL we want to draw something. We do this with the GL.Begin function. * This takes a single parameter, which is the drawing mode to use. * There are options to draw quadrilaterals, triangles, points, polygons, and "strips".*/ - GL.Begin(BeginMode.Triangles); + GL.Begin(PrimitiveType.Triangles); /* Now that we've told it how we want to draw, we need to give it the vertices for our shape. * To do this, we use the GL.Vertex3 function. It takes three floats as coordinates for a single point in 3D space.*/ diff --git a/OpenTKTutorial1/OpenTKTutorial1/OpenTK.dll.config b/OpenTKTutorial1/OpenTKTutorial1/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial1/OpenTKTutorial1/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial1/OpenTKTutorial1/OpenTKTutorial1.csproj b/OpenTKTutorial1/OpenTKTutorial1/OpenTKTutorial1.csproj index 50f7696..7fe8024 100644 --- a/OpenTKTutorial1/OpenTKTutorial1/OpenTKTutorial1.csproj +++ b/OpenTKTutorial1/OpenTKTutorial1/OpenTKTutorial1.csproj @@ -34,9 +34,9 @@ 4 - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -52,6 +52,10 @@ + + + + + + + + + + + diff --git a/OpenTKTutorial2/OpenTKTutorial2/OpenTKTutorial2.csproj b/OpenTKTutorial2/OpenTKTutorial2/OpenTKTutorial2.csproj index 6346909..6e7d676 100644 --- a/OpenTKTutorial2/OpenTKTutorial2/OpenTKTutorial2.csproj +++ b/OpenTKTutorial2/OpenTKTutorial2/OpenTKTutorial2.csproj @@ -34,9 +34,9 @@ 4 - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -56,6 +56,8 @@ Always + + Always diff --git a/OpenTKTutorial2/OpenTKTutorial2/packages.config b/OpenTKTutorial2/OpenTKTutorial2/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial2/OpenTKTutorial2/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial3/OpenTKTutorial3/OpenTK.dll.config b/OpenTKTutorial3/OpenTKTutorial3/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial3/OpenTKTutorial3/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial3/OpenTKTutorial3/OpenTKTutorial3.csproj b/OpenTKTutorial3/OpenTKTutorial3/OpenTKTutorial3.csproj index 7a9aeac..2723c67 100644 --- a/OpenTKTutorial3/OpenTKTutorial3/OpenTKTutorial3.csproj +++ b/OpenTKTutorial3/OpenTKTutorial3/OpenTKTutorial3.csproj @@ -34,9 +34,9 @@ 4 - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -56,6 +56,8 @@ PreserveNewest + + PreserveNewest diff --git a/OpenTKTutorial3/OpenTKTutorial3/packages.config b/OpenTKTutorial3/OpenTKTutorial3/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial3/OpenTKTutorial3/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial4/OpenTKTutorial4/Cube.cs b/OpenTKTutorial4/OpenTKTutorial4/Cube.cs index 795d034..04dbdb1 100644 --- a/OpenTKTutorial4/OpenTKTutorial4/Cube.cs +++ b/OpenTKTutorial4/OpenTKTutorial4/Cube.cs @@ -77,7 +77,7 @@ public override Vector3[] GetColorData() public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } } } diff --git a/OpenTKTutorial4/OpenTKTutorial4/OpenTK.dll.config b/OpenTKTutorial4/OpenTKTutorial4/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial4/OpenTKTutorial4/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial4/OpenTKTutorial4/OpenTKTutorial4.csproj b/OpenTKTutorial4/OpenTKTutorial4/OpenTKTutorial4.csproj index d8d39eb..a07f7f3 100644 --- a/OpenTKTutorial4/OpenTKTutorial4/OpenTKTutorial4.csproj +++ b/OpenTKTutorial4/OpenTKTutorial4/OpenTKTutorial4.csproj @@ -34,7 +34,10 @@ 4 - + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True + @@ -58,6 +61,8 @@ PreserveNewest + + PreserveNewest diff --git a/OpenTKTutorial4/OpenTKTutorial4/Sierpinski.cs b/OpenTKTutorial4/OpenTKTutorial4/Sierpinski.cs index 3f66dd8..733ee5b 100644 --- a/OpenTKTutorial4/OpenTKTutorial4/Sierpinski.cs +++ b/OpenTKTutorial4/OpenTKTutorial4/Sierpinski.cs @@ -67,7 +67,7 @@ public override int[] GetIndices(int offset = 0) public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } } diff --git a/OpenTKTutorial4/OpenTKTutorial4/Tetra.cs b/OpenTKTutorial4/OpenTKTutorial4/Tetra.cs index 9446775..72a5bea 100644 --- a/OpenTKTutorial4/OpenTKTutorial4/Tetra.cs +++ b/OpenTKTutorial4/OpenTKTutorial4/Tetra.cs @@ -93,7 +93,7 @@ public override Vector3[] GetColorData() public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } } } diff --git a/OpenTKTutorial4/OpenTKTutorial4/packages.config b/OpenTKTutorial4/OpenTKTutorial4/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial4/OpenTKTutorial4/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial5/OpenTKTutorial5/Cube.cs b/OpenTKTutorial5/OpenTKTutorial5/Cube.cs index 735d386..7d2377b 100644 --- a/OpenTKTutorial5/OpenTKTutorial5/Cube.cs +++ b/OpenTKTutorial5/OpenTKTutorial5/Cube.cs @@ -77,7 +77,7 @@ public override Vector3[] GetColorData() public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } } } diff --git a/OpenTKTutorial5/OpenTKTutorial5/OpenTK.dll.config b/OpenTKTutorial5/OpenTKTutorial5/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial5/OpenTKTutorial5/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial5/OpenTKTutorial5/OpenTKTutorial5.csproj b/OpenTKTutorial5/OpenTKTutorial5/OpenTKTutorial5.csproj index 348551e..17b97ad 100644 --- a/OpenTKTutorial5/OpenTKTutorial5/OpenTKTutorial5.csproj +++ b/OpenTKTutorial5/OpenTKTutorial5/OpenTKTutorial5.csproj @@ -34,9 +34,9 @@ 4 - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -60,6 +60,8 @@ PreserveNewest + + PreserveNewest diff --git a/OpenTKTutorial5/OpenTKTutorial5/packages.config b/OpenTKTutorial5/OpenTKTutorial5/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial5/OpenTKTutorial5/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial6/OpenTKTutorial6/Cube.cs b/OpenTKTutorial6/OpenTKTutorial6/Cube.cs index 1ad228b..2121f5b 100644 --- a/OpenTKTutorial6/OpenTKTutorial6/Cube.cs +++ b/OpenTKTutorial6/OpenTKTutorial6/Cube.cs @@ -77,7 +77,7 @@ public override Vector3[] GetColorData() public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } public override Vector2[] GetTextureCoords() diff --git a/OpenTKTutorial6/OpenTKTutorial6/OpenTK.dll.config b/OpenTKTutorial6/OpenTKTutorial6/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial6/OpenTKTutorial6/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial6/OpenTKTutorial6/OpenTKTutorial6.csproj b/OpenTKTutorial6/OpenTKTutorial6/OpenTKTutorial6.csproj index 948fcd0..0b9f32a 100644 --- a/OpenTKTutorial6/OpenTKTutorial6/OpenTKTutorial6.csproj +++ b/OpenTKTutorial6/OpenTKTutorial6/OpenTKTutorial6.csproj @@ -34,9 +34,9 @@ 4 - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -65,6 +65,8 @@ Always + + PreserveNewest diff --git a/OpenTKTutorial6/OpenTKTutorial6/ShaderProgram.cs b/OpenTKTutorial6/OpenTKTutorial6/ShaderProgram.cs index f08b1a2..6dcd9bb 100644 --- a/OpenTKTutorial6/OpenTKTutorial6/ShaderProgram.cs +++ b/OpenTKTutorial6/OpenTKTutorial6/ShaderProgram.cs @@ -66,8 +66,8 @@ public void Link() Console.WriteLine(GL.GetProgramInfoLog(ProgramID)); - GL.GetProgram(ProgramID, ProgramParameter.ActiveAttributes, out AttributeCount); - GL.GetProgram(ProgramID, ProgramParameter.ActiveUniforms, out UniformCount); + GL.GetProgram(ProgramID, GetProgramParameterName.ActiveAttributes, out AttributeCount); + GL.GetProgram(ProgramID, GetProgramParameterName.ActiveUniforms, out UniformCount); for (int i = 0; i < AttributeCount; i++) { diff --git a/OpenTKTutorial6/OpenTKTutorial6/packages.config b/OpenTKTutorial6/OpenTKTutorial6/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial6/OpenTKTutorial6/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial7/OpenTKTutorial7/OpenTK.dll.config b/OpenTKTutorial7/OpenTKTutorial7/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial7/OpenTKTutorial7/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial7/OpenTKTutorial7/OpenTKTutorial7.csproj b/OpenTKTutorial7/OpenTKTutorial7/OpenTKTutorial7.csproj index 92412e7..aee913a 100644 --- a/OpenTKTutorial7/OpenTKTutorial7/OpenTKTutorial7.csproj +++ b/OpenTKTutorial7/OpenTKTutorial7/OpenTKTutorial7.csproj @@ -37,9 +37,9 @@ OpenTKTutorial7.Program - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -72,6 +72,8 @@ Always + + Always diff --git a/OpenTKTutorial7/OpenTKTutorial7/packages.config b/OpenTKTutorial7/OpenTKTutorial7/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial7/OpenTKTutorial7/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial8-1/OpenTKTutorial8/Cube.cs b/OpenTKTutorial8-1/OpenTKTutorial8/Cube.cs index 119fc80..9db2c51 100644 --- a/OpenTKTutorial8-1/OpenTKTutorial8/Cube.cs +++ b/OpenTKTutorial8-1/OpenTKTutorial8/Cube.cs @@ -77,7 +77,7 @@ public override Vector3[] GetColorData() public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } public override Vector2[] GetTextureCoords() diff --git a/OpenTKTutorial8-1/OpenTKTutorial8/ObjVolume.cs b/OpenTKTutorial8-1/OpenTKTutorial8/ObjVolume.cs index 699273f..e3daedc 100644 --- a/OpenTKTutorial8-1/OpenTKTutorial8/ObjVolume.cs +++ b/OpenTKTutorial8-1/OpenTKTutorial8/ObjVolume.cs @@ -80,7 +80,7 @@ public override Vector2[] GetTextureCoords() /// public override void CalculateModelMatrix() { - ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); + ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position); } /// diff --git a/OpenTKTutorial8-1/OpenTKTutorial8/OpenTK.dll.config b/OpenTKTutorial8-1/OpenTKTutorial8/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial8-1/OpenTKTutorial8/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial8-1/OpenTKTutorial8/OpenTKTutorial8.csproj b/OpenTKTutorial8-1/OpenTKTutorial8/OpenTKTutorial8.csproj index 031d214..c443835 100644 --- a/OpenTKTutorial8-1/OpenTKTutorial8/OpenTKTutorial8.csproj +++ b/OpenTKTutorial8-1/OpenTKTutorial8/OpenTKTutorial8.csproj @@ -37,11 +37,9 @@ OpenTKTutorial8.Program - - - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -78,9 +76,11 @@ Always + Always + Always diff --git a/OpenTKTutorial8-1/OpenTKTutorial8/ShaderProgram.cs b/OpenTKTutorial8-1/OpenTKTutorial8/ShaderProgram.cs index 608a1ad..4a2e013 100644 --- a/OpenTKTutorial8-1/OpenTKTutorial8/ShaderProgram.cs +++ b/OpenTKTutorial8-1/OpenTKTutorial8/ShaderProgram.cs @@ -66,8 +66,8 @@ public void Link() Console.WriteLine(GL.GetProgramInfoLog(ProgramID)); - GL.GetProgram(ProgramID, ProgramParameter.ActiveAttributes, out AttributeCount); - GL.GetProgram(ProgramID, ProgramParameter.ActiveUniforms, out UniformCount); + GL.GetProgram(ProgramID, GetProgramParameterName.ActiveAttributes, out AttributeCount); + GL.GetProgram(ProgramID, GetProgramParameterName.ActiveUniforms, out UniformCount); for (int i = 0; i < AttributeCount; i++) { diff --git a/OpenTKTutorial8-1/OpenTKTutorial8/packages.config b/OpenTKTutorial8-1/OpenTKTutorial8/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial8-1/OpenTKTutorial8/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTK.dll.config b/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTKTutorial8-2.csproj b/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTKTutorial8-2.csproj index afef911..d67869c 100644 --- a/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTKTutorial8-2.csproj +++ b/OpenTKTutorial8-2/OpenTKTutorial8-2/OpenTKTutorial8-2.csproj @@ -37,9 +37,9 @@ OpenTKTutorial8.Program - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -71,6 +71,7 @@ Always + Always @@ -86,6 +87,7 @@ Always + Always diff --git a/OpenTKTutorial8-2/OpenTKTutorial8-2/ShaderProgram.cs b/OpenTKTutorial8-2/OpenTKTutorial8-2/ShaderProgram.cs index 608a1ad..4a2e013 100644 --- a/OpenTKTutorial8-2/OpenTKTutorial8-2/ShaderProgram.cs +++ b/OpenTKTutorial8-2/OpenTKTutorial8-2/ShaderProgram.cs @@ -66,8 +66,8 @@ public void Link() Console.WriteLine(GL.GetProgramInfoLog(ProgramID)); - GL.GetProgram(ProgramID, ProgramParameter.ActiveAttributes, out AttributeCount); - GL.GetProgram(ProgramID, ProgramParameter.ActiveUniforms, out UniformCount); + GL.GetProgram(ProgramID, GetProgramParameterName.ActiveAttributes, out AttributeCount); + GL.GetProgram(ProgramID, GetProgramParameterName.ActiveUniforms, out UniformCount); for (int i = 0; i < AttributeCount; i++) { diff --git a/OpenTKTutorial8-2/OpenTKTutorial8-2/packages.config b/OpenTKTutorial8-2/OpenTKTutorial8-2/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/OpenTKTutorial8-2/OpenTKTutorial8-2/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/TKSprites/TKSprites/OpenTK.dll.config b/TKSprites/TKSprites/OpenTK.dll.config new file mode 100644 index 0000000..7098d39 --- /dev/null +++ b/TKSprites/TKSprites/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TKSprites/TKSprites/TKSprites.csproj b/TKSprites/TKSprites/TKSprites.csproj index cf16cbc..93c7b76 100644 --- a/TKSprites/TKSprites/TKSprites.csproj +++ b/TKSprites/TKSprites/TKSprites.csproj @@ -42,9 +42,9 @@ - - False - ..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + True @@ -67,6 +67,8 @@ Always + + Always diff --git a/TKSprites/TKSprites/packages.config b/TKSprites/TKSprites/packages.config new file mode 100644 index 0000000..feefdda --- /dev/null +++ b/TKSprites/TKSprites/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file