Temporarily disabled full screen fade effect on resolution change.
This commit is contained in:
parent
c0b1f170e8
commit
d0aa219d11
1 changed files with 7 additions and 7 deletions
|
@ -34,7 +34,7 @@ namespace OpenTK.Graphics
|
||||||
static List<DisplayDevice> available_displays = new List<DisplayDevice>();
|
static List<DisplayDevice> available_displays = new List<DisplayDevice>();
|
||||||
static object display_lock = new object();
|
static object display_lock = new object();
|
||||||
static DisplayDevice primary_display;
|
static DisplayDevice primary_display;
|
||||||
static FadeEffect effect = new FadeEffect();
|
//static FadeEffect effect = new FadeEffect();
|
||||||
|
|
||||||
static IDisplayDeviceDriver implementation;
|
static IDisplayDeviceDriver implementation;
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ namespace OpenTK.Graphics
|
||||||
if (resolution == current_resolution)
|
if (resolution == current_resolution)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
effect.FadeOut();
|
//effect.FadeOut();
|
||||||
|
|
||||||
if (implementation.TryChangeResolution(this, resolution))
|
if (implementation.TryChangeResolution(this, resolution))
|
||||||
{
|
{
|
||||||
|
@ -203,7 +203,7 @@ namespace OpenTK.Graphics
|
||||||
else throw new GraphicsModeException(String.Format("Device {0}: Failed to change resolution to {1}.",
|
else throw new GraphicsModeException(String.Format("Device {0}: Failed to change resolution to {1}.",
|
||||||
this, resolution));
|
this, resolution));
|
||||||
|
|
||||||
effect.FadeIn();
|
//effect.FadeIn();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -231,7 +231,7 @@ namespace OpenTK.Graphics
|
||||||
{
|
{
|
||||||
if (original_resolution != null)
|
if (original_resolution != null)
|
||||||
{
|
{
|
||||||
effect.FadeOut();
|
//effect.FadeOut();
|
||||||
|
|
||||||
if (implementation.TryRestoreResolution(this))
|
if (implementation.TryRestoreResolution(this))
|
||||||
{
|
{
|
||||||
|
@ -240,7 +240,7 @@ namespace OpenTK.Graphics
|
||||||
}
|
}
|
||||||
else throw new GraphicsModeException(String.Format("Device {0}: Failed to restore resolution.", this));
|
else throw new GraphicsModeException(String.Format("Device {0}: Failed to restore resolution.", this));
|
||||||
|
|
||||||
effect.FadeIn();
|
//effect.FadeIn();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -325,7 +325,7 @@ namespace OpenTK.Graphics
|
||||||
}
|
}
|
||||||
|
|
||||||
#region --- FadeEffect ---
|
#region --- FadeEffect ---
|
||||||
|
#if false
|
||||||
class FadeEffect : IDisposable
|
class FadeEffect : IDisposable
|
||||||
{
|
{
|
||||||
List<Form> forms = new List<Form>();
|
List<Form> forms = new List<Form>();
|
||||||
|
@ -438,6 +438,6 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue