Skip to content

Commit ec8a108

Browse files
neokabutoneokabuto
authored
Merge pull request #3 from rejurime/master
Add Nuget dependency and remove deprecated methods
2 parents 22648bf + d523941 commit ec8a108

42 files changed

Lines changed: 368 additions & 45 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ publish/
124124
# Publish Web Output
125125
*.[Pp]ublish.xml
126126
*.azurePubxml
127-
# TODO: Comment the next line if you want to checkin your web deploy settings
127+
# TODO: Comment the next line if you want to checkin your web deploy settings
128128
# but database connection strings (with potential passwords) will be unencrypted
129129
*.pubxml
130130
*.publishproj
@@ -181,3 +181,13 @@ UpgradeLog*.htm
181181

182182
# Microsoft Fakes
183183
FakesAssemblies/
184+
185+
#MonoDevelop
186+
#User Specific
187+
*.userprefs
188+
*.usertasks
189+
190+
#Mono Project Files
191+
*.pidb
192+
*.resources
193+
test-results/

‎OpenTKTutorial1/OpenTKTutorial1/Game.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected override void OnRenderFrame(FrameEventArgs e)
3636
* The first step is to tell OpenGL we want to draw something. We do this with the GL.Begin function.
3737
* This takes a single parameter, which is the drawing mode to use.
3838
* There are options to draw quadrilaterals, triangles, points, polygons, and "strips".*/
39-
GL.Begin(BeginMode.Triangles);
39+
GL.Begin(PrimitiveType.Triangles);
4040

4141
/* Now that we've told it how we want to draw, we need to give it the vertices for our shape.
4242
* To do this, we use the GL.Vertex3 function. It takes three floats as coordinates for a single point in 3D space.*/

‎OpenTKTutorial1/OpenTKTutorial1/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>

‎OpenTKTutorial1/OpenTKTutorial1/OpenTKTutorial1.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll</HintPath>
37+
<Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
38+
<HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
39+
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
@@ -52,6 +52,10 @@
5252
<Compile Include="Program.cs" />
5353
<Compile Include="Properties\AssemblyInfo.cs" />
5454
</ItemGroup>
55+
<ItemGroup>
56+
<None Include="OpenTK.dll.config" />
57+
<None Include="packages.config" />
58+
</ItemGroup>
5559
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5660
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5761
Other similar extension points exist, see Microsoft.Common.targets.

‎OpenTKTutorial1/OpenTKTutorial1/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="OpenTK" version="2.0.0" targetFramework="net40-client" />
4+
</packages>

‎OpenTKTutorial2/OpenTKTutorial2/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>

‎OpenTKTutorial2/OpenTKTutorial2/OpenTKTutorial2.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll</HintPath>
37+
<Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
38+
<HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
39+
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
@@ -56,6 +56,8 @@
5656
<None Include="fs.glsl">
5757
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5858
</None>
59+
<None Include="OpenTK.dll.config" />
60+
<None Include="packages.config" />
5961
<None Include="vs.glsl">
6062
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6163
</None>

‎OpenTKTutorial2/OpenTKTutorial2/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="OpenTK" version="2.0.0" targetFramework="net40-client" />
4+
</packages>

‎OpenTKTutorial3/OpenTKTutorial3/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>

‎OpenTKTutorial3/OpenTKTutorial3/OpenTKTutorial3.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\..\Documents\OpenTK\1.1\Binaries\OpenTK\Release\OpenTK.dll</HintPath>
37+
<Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
38+
<HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
39+
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
@@ -56,6 +56,8 @@
5656
<None Include="fs.glsl">
5757
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5858
</None>
59+
<None Include="OpenTK.dll.config" />
60+
<None Include="packages.config" />
5961
<None Include="vs.glsl">
6062
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6163
</None>

0 commit comments

Comments
 (0)