Trunk now compiles again.
This commit is contained in:
parent
9120a732ea
commit
9b257a97e9
6 changed files with 8 additions and 8 deletions
|
@ -126,11 +126,11 @@ namespace Bind
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GeneratorMode.Glu:
|
case GeneratorMode.Glu:
|
||||||
Generator = new Bind.Glu.Generator();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GeneratorMode.Glx:
|
case GeneratorMode.Glx:
|
||||||
Generator = new Bind.Glx.Generator();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GeneratorMode.GL3:
|
case GeneratorMode.GL3:
|
||||||
|
|
|
@ -107,7 +107,7 @@ namespace Examples.Tutorial
|
||||||
0.0, 1.0, 0.0
|
0.0, 1.0, 0.0
|
||||||
);
|
);
|
||||||
|
|
||||||
GL.Rotatef(angle, 0.0f, 1.0f, 0.0f);
|
GL.Rotate(angle, 0.0f, 1.0f, 0.0f);
|
||||||
angle += 0.5f;
|
angle += 0.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -150,8 +150,8 @@ namespace Examples.Tutorial
|
||||||
foreach (DisplayList d in lists)
|
foreach (DisplayList d in lists)
|
||||||
{
|
{
|
||||||
GL.LoadIdentity();
|
GL.LoadIdentity();
|
||||||
GL.Rotated(angle, 0.0, 0.0, 1.0);
|
GL.Rotate(angle, 0.0, 0.0, 1.0);
|
||||||
GL.Translated(5.0, 0.0, 0.0);
|
GL.Translate(5.0, 0.0, 0.0);
|
||||||
|
|
||||||
d.Render();
|
d.Render();
|
||||||
angle += 360 / lists.Count;
|
angle += 360 / lists.Count;
|
||||||
|
|
|
@ -96,7 +96,7 @@ namespace Examples.WinForms
|
||||||
0.0, 0.0, 0.0,
|
0.0, 0.0, 0.0,
|
||||||
0.0, 1.0, 0.0
|
0.0, 1.0, 0.0
|
||||||
);
|
);
|
||||||
GL.Rotatef(angle, 0.0f, 1.0f, 0.0f);
|
GL.Rotate(angle, 0.0f, 1.0f, 0.0f);
|
||||||
angle += 0.5f;
|
angle += 0.5f;
|
||||||
|
|
||||||
GL.Clear(GL.Enums.ClearBufferMask.COLOR_BUFFER_BIT | GL.Enums.ClearBufferMask.DEPTH_BUFFER_BIT);
|
GL.Clear(GL.Enums.ClearBufferMask.COLOR_BUFFER_BIT | GL.Enums.ClearBufferMask.DEPTH_BUFFER_BIT);
|
||||||
|
|
|
@ -267,7 +267,7 @@ namespace OpenTK.Platform.X11
|
||||||
[DllImport(Library, EntryPoint = "glXCreateContext")]
|
[DllImport(Library, EntryPoint = "glXCreateContext")]
|
||||||
public static extern IntPtr CreateContext(IntPtr dpy, IntPtr vis, IntPtr shareList, bool direct);
|
public static extern IntPtr CreateContext(IntPtr dpy, IntPtr vis, IntPtr shareList, bool direct);
|
||||||
|
|
||||||
public static IntPtr CreateContext(IntPtr dpy, VisualInfo vis, IntPtr shareList, bool direct)
|
public static IntPtr CreateContext(IntPtr dpy, XVisualInfo vis, IntPtr shareList, bool direct)
|
||||||
{
|
{
|
||||||
GCHandle h0 = GCHandle.Alloc(vis, GCHandleType.Pinned);
|
GCHandle h0 = GCHandle.Alloc(vis, GCHandleType.Pinned);
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ namespace OpenTK.Platform.X11
|
||||||
public IntPtr TopLevelWindow { get { return topLevelWindow; } set { topLevelWindow = value; } }
|
public IntPtr TopLevelWindow { get { return topLevelWindow; } set { topLevelWindow = value; } }
|
||||||
public IntPtr Display { get { return display; } set { display = value; } }
|
public IntPtr Display { get { return display; } set { display = value; } }
|
||||||
public int Screen { get { return screen; } set { screen = value; } }
|
public int Screen { get { return screen; } set { screen = value; } }
|
||||||
public VisualInfo VisualInfo { get { return visinfo; } set { visinfo = value; } }
|
public XVisualInfo VisualInfo { get { return visinfo; } set { visinfo = value; } }
|
||||||
|
|
||||||
public IntPtr Handle { get { return handle; } set { handle = value; } }
|
public IntPtr Handle { get { return handle; } set { handle = value; } }
|
||||||
public IWindowInfo Parent { get { return parent; } set { parent = value as WindowInfo; } }
|
public IWindowInfo Parent { get { return parent; } set { parent = value as WindowInfo; } }
|
||||||
|
|
Loading…
Reference in a new issue