Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some Re# warnings

Browse Source
This commit is contained in:
Flamefire committed 2013-04-18 21:46:46 +02:00
1 parent 74396eda2f
commit 9aa81b7ba2
5 files changed
+273 -346
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CConfig.cs
+11 -29
View File
@@ -20,6 +20,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Windows.Forms; using System.Windows.Forms;
@@ -75,7 +76,7 @@ namespace Vocaluxe.Base
public static EPlaybackLib PlayBackLib = EPlaybackLib.Gstreamer; public static EPlaybackLib PlayBackLib = EPlaybackLib.Gstreamer;
public static ERecordLib RecordLib = ERecordLib.PortAudio; public static ERecordLib RecordLib = ERecordLib.PortAudio;
public static EBufferSize AudioBufferSize = EBufferSize.B2048; public static EBufferSize AudioBufferSize = EBufferSize.B2048;
public static int AudioLatency = 0; public static int AudioLatency;
public static int BackgroundMusicVolume = 30; public static int BackgroundMusicVolume = 30;
public static EOffOn BackgroundMusic = EOffOn.TR_CONFIG_ON; public static EOffOn BackgroundMusic = EOffOn.TR_CONFIG_ON;
public static EBackgroundMusicSource BackgroundMusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC; public static EBackgroundMusicSource BackgroundMusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC;
@@ -84,7 +85,7 @@ namespace Vocaluxe.Base
public static int GameMusicVolume = 80; public static int GameMusicVolume = 80;
// Game // Game
public static List<string> SongFolder = new List<string>(); public static readonly List<string> SongFolder = new List<string>();
public static ESongMenu SongMenu = ESongMenu.TR_CONFIG_TILE_BOARD; public static ESongMenu SongMenu = ESongMenu.TR_CONFIG_TILE_BOARD;
public static ESongSorting SongSorting = ESongSorting.TR_CONFIG_ARTIST; public static ESongSorting SongSorting = ESongSorting.TR_CONFIG_ARTIST;
public static EOffOn IgnoreArticles = EOffOn.TR_CONFIG_ON; public static EOffOn IgnoreArticles = EOffOn.TR_CONFIG_ON;
@@ -94,7 +95,7 @@ namespace Vocaluxe.Base
public static EOffOn Tabs = EOffOn.TR_CONFIG_OFF; public static EOffOn Tabs = EOffOn.TR_CONFIG_OFF;
public static string Language = "English"; public static string Language = "English";
public static EOffOn LyricsOnTop = EOffOn.TR_CONFIG_OFF; public static EOffOn LyricsOnTop = EOffOn.TR_CONFIG_OFF;
public static string[] Players = new string[CSettings.MaxNumPlayer]; public static readonly string[] Players = new string[CSettings.MaxNumPlayer];
public static float MinLineBreakTime = 0.1f; //Minimum time to show the text before it is (to be) sung (if possible) public static float MinLineBreakTime = 0.1f; //Minimum time to show the text before it is (to be) sung (if possible)
@@ -132,17 +133,14 @@ namespace Vocaluxe.Base
if (!File.Exists(CSettings.FileConfig)) if (!File.Exists(CSettings.FileConfig))
SaveConfig(); SaveConfig();
LoadConfig(); _LoadConfig();
} }
public static bool LoadConfig() private static void _LoadConfig()
{ {
CXMLReader xmlReader = CXMLReader.OpenFile(CSettings.FileConfig); CXMLReader xmlReader = CXMLReader.OpenFile(CSettings.FileConfig);
if (xmlReader == null) if (xmlReader == null)
return false; return;
string value = string.Empty;
xmlReader.TryGetEnumValue("//root/Debug/DebugLevel", ref DebugLevel); xmlReader.TryGetEnumValue("//root/Debug/DebugLevel", ref DebugLevel);
@@ -191,7 +189,7 @@ namespace Vocaluxe.Base
#region Game #region Game
// Songfolder // Songfolder
value = string.Empty; string value = string.Empty;
int i = 1; int i = 1;
while (xmlReader.GetValue("//root/Game/SongFolder" + i.ToString(), ref value, value)) while (xmlReader.GetValue("//root/Game/SongFolder" + i.ToString(), ref value, value))
{ {
@@ -251,7 +249,6 @@ namespace Vocaluxe.Base
#region Record #region Record
MicConfig = new SMicConfig[CSettings.MaxNumPlayer]; MicConfig = new SMicConfig[CSettings.MaxNumPlayer];
value = string.Empty;
for (int p = 1; p <= CSettings.MaxNumPlayer; p++) for (int p = 1; p <= CSettings.MaxNumPlayer; p++)
{ {
MicConfig[p - 1] = new SMicConfig(0); MicConfig[p - 1] = new SMicConfig(0);
@@ -264,8 +261,6 @@ namespace Vocaluxe.Base
xmlReader.TryGetIntValueRange("//root/Record/MicDelay", ref MicDelay, 0, 500); xmlReader.TryGetIntValueRange("//root/Record/MicDelay", ref MicDelay, 0, 500);
MicDelay = (int)(20 * Math.Round(MicDelay / 20.0)); MicDelay = (int)(20 * Math.Round(MicDelay / 20.0));
#endregion Record #endregion Record
return true;
} }
public static bool SaveConfig() public static bool SaveConfig()
@@ -585,8 +580,6 @@ namespace Vocaluxe.Base
if (devices == null) if (devices == null)
return false; return false;
if (devices != null)
{
for (int dev = 0; dev < devices.Length; dev++) for (int dev = 0; dev < devices.Length; dev++)
{ {
for (int inp = 0; inp < devices[dev].Inputs.Count; inp++) for (int inp = 0; inp < devices[dev].Inputs.Count; inp++)
@@ -596,8 +589,6 @@ namespace Vocaluxe.Base
} }
} }
return false; return false;
}
return false;
} }
/// <summary> /// <summary>
@@ -683,9 +674,7 @@ namespace Vocaluxe.Base
Regex spliterParam = new Regex(@"ReplacedStr:::0:::", RegexOptions.IgnoreCase); Regex spliterParam = new Regex(@"ReplacedStr:::0:::", RegexOptions.IgnoreCase);
//Complete argument string //Complete argument string
string arguments = string.Empty; string arguments = args.Aggregate(string.Empty, (current, arg) => current + (arg + " "));
foreach (string arg in args)
arguments += arg + " ";
args = spliterParam.Split(arguments); args = spliterParam.Split(arguments);
@@ -693,11 +682,8 @@ namespace Vocaluxe.Base
{ {
Regex spliterVal = new Regex(@"ReplacedStr:::2:::", RegexOptions.IgnoreCase); Regex spliterVal = new Regex(@"ReplacedStr:::2:::", RegexOptions.IgnoreCase);
//Array for parts of an arg
string[] parts;
//split arg with Spilter-Regex and save in parts //split arg with Spilter-Regex and save in parts
parts = spliterVal.Split(text, 2); string[] parts = spliterVal.Split(text, 2);
switch (parts.Length) switch (parts.Length)
{ {
@@ -812,11 +798,7 @@ namespace Vocaluxe.Base
if (value.Contains(chars[i].ToString())) if (value.Contains(chars[i].ToString()))
return false; return false;
} }
if (Path.GetFileName(value).Length == 0) return !String.IsNullOrEmpty(Path.GetFileName(value)) && Path.HasExtension(value);
return false;
if (!Path.HasExtension(value))
return false;
return true;
} }
/// <summary> /// <summary>
Vocaluxe/Lib/Draw/CDirect3D.cs
+259 -303
View File
@@ -126,19 +126,21 @@ namespace Vocaluxe.Lib.Draw
ClientSize = new Size(CConfig.ScreenW, CConfig.ScreenH); ClientSize = new Size(CConfig.ScreenW, CConfig.ScreenH);
_SizeBeforeMinimize = ClientSize; _SizeBeforeMinimize = ClientSize;
_PresentParameters = new PresentParameters(); _PresentParameters = new PresentParameters
_PresentParameters.Windowed = true; {
_PresentParameters.SwapEffect = SwapEffect.Discard; Windowed = true,
_PresentParameters.BackBufferHeight = CConfig.ScreenH; SwapEffect = SwapEffect.Discard,
_PresentParameters.BackBufferWidth = CConfig.ScreenW; BackBufferHeight = CConfig.ScreenH,
_PresentParameters.BackBufferFormat = _D3D.Adapters.DefaultAdapter.CurrentDisplayMode.Format; BackBufferWidth = CConfig.ScreenW,
_PresentParameters.Multisample = MultisampleType.None; BackBufferFormat = _D3D.Adapters.DefaultAdapter.CurrentDisplayMode.Format,
_PresentParameters.MultisampleQuality = 0; Multisample = MultisampleType.None,
MultisampleQuality = 0
};
//Apply antialiasing and check if antialiasing mode is supported //Apply antialiasing and check if antialiasing mode is supported
#region Antialiasing #region Antialiasing
int quality = 1; int quality;
MultisampleType msType; MultisampleType msType;
switch (CConfig.AAMode) switch (CConfig.AAMode)
{ {
@@ -174,18 +176,11 @@ namespace Vocaluxe.Lib.Draw
#endregion Antialiasing #endregion Antialiasing
//Apply the VSync configuration //Apply the VSync configuration
if (CConfig.VSync == EOffOn.TR_CONFIG_ON) _PresentParameters.PresentationInterval = CConfig.VSync == EOffOn.TR_CONFIG_ON ? PresentInterval.Default : PresentInterval.Immediate;
_PresentParameters.PresentationInterval = PresentInterval.Default;
else
_PresentParameters.PresentationInterval = PresentInterval.Immediate;
//GMA 950 graphics devices can only process vertices in software mode //GMA 950 graphics devices can only process vertices in software mode
Capabilities caps = _D3D.GetDeviceCaps(_D3D.Adapters.DefaultAdapter.Adapter, DeviceType.Hardware); Capabilities caps = _D3D.GetDeviceCaps(_D3D.Adapters.DefaultAdapter.Adapter, DeviceType.Hardware);
CreateFlags flags = CreateFlags.None; CreateFlags flags = (caps.DeviceCaps & DeviceCaps.HWTransformAndLight) != 0 ? CreateFlags.HardwareVertexProcessing : CreateFlags.SoftwareVertexProcessing;
if ((caps.DeviceCaps & DeviceCaps.HWTransformAndLight) != 0)
flags = CreateFlags.HardwareVertexProcessing;
else
flags = CreateFlags.SoftwareVertexProcessing;
//Check if Pow2 textures are needed //Check if Pow2 textures are needed
_NonPowerOf2TextureSupported = true; _NonPowerOf2TextureSupported = true;
@@ -290,7 +285,7 @@ namespace Vocaluxe.Lib.Draw
_PresentParameters.BackBufferHeight = ClientSize.Height; _PresentParameters.BackBufferHeight = ClientSize.Height;
ClearScreen(); ClearScreen();
//To set new PresentParameters the device has to be resetted //To set new PresentParameters the device has to be resetted
Reset(); _Reset();
//All configurations got flushed due to Reset(), so apply them again //All configurations got flushed due to Reset(), so apply them again
Init(); Init();
@@ -417,82 +412,80 @@ namespace Vocaluxe.Lib.Draw
/// <returns>True if it succeeded else false</returns> /// <returns>True if it succeeded else false</returns>
public bool Init() public bool Init()
{ {
if (!_Device.Disposed) if (_Device.Disposed)
{
Text = CSettings.GetFullVersionText();
SlimDX.Matrix translate = SlimDX.Matrix.Translation(new Vector3(-CSettings.RenderW / 2, CSettings.RenderH / 2, 0));
SlimDX.Matrix projection = SlimDX.Matrix.OrthoOffCenterLH(-CSettings.RenderW / 2, CSettings.RenderW / 2, -CSettings.RenderH / 2, CSettings.RenderH / 2,
CSettings.ZNear, CSettings.ZFar);
_VertexBuffer = new VertexBuffer(_Device, CSettings.VertexBufferElements * (4 * Marshal.SizeOf(typeof(STexturedColoredVertex))), Usage.WriteOnly | Usage.Dynamic,
VertexFormat.Position | VertexFormat.Texture1 | VertexFormat.Diffuse, Pool.Default);
if (_Device.SetStreamSource(0, _VertexBuffer, 0, Marshal.SizeOf(typeof(STexturedColoredVertex))).IsFailure)
CLog.LogError("Failed to set stream source");
_Device.VertexDeclaration = STexturedColoredVertex.GetDeclaration(_Device);
if (_Device.SetTransform(TransformState.Projection, projection).IsFailure)
CLog.LogError("Failed to set orthogonal matrix");
if (_Device.SetTransform(TransformState.World, translate).IsFailure)
CLog.LogError("Failed to set translation matrix");
if (_Device.SetRenderState(RenderState.CullMode, Cull.None).IsFailure)
CLog.LogError("Failed to set cull mode");
if (_Device.SetRenderState(RenderState.AlphaBlendEnable, true).IsFailure)
CLog.LogError("Failed to enable alpha blending");
if (_Device.SetRenderState(RenderState.Lighting, false).IsFailure)
CLog.LogError("Failed to disable lighting");
if (_Device.SetRenderState(RenderState.DestinationBlend, SlimDX.Direct3D9.Blend.InverseSourceAlpha).IsFailure)
CLog.LogError("Failed to set destination blend");
if (_Device.SetRenderState(RenderState.SourceBlend, SlimDX.Direct3D9.Blend.SourceAlpha).IsFailure)
CLog.LogError("Failed to set source blend");
if (_PresentParameters.Multisample != MultisampleType.None)
{
if (_Device.SetRenderState(RenderState.MultisampleAntialias, true).IsFailure)
CLog.LogError("Failed to set antialiasing");
}
if (_Device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Linear).IsFailure)
CLog.LogError("Failed to set min filter");
if (_Device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Linear).IsFailure)
CLog.LogError("Failed to set mag filter");
if (_Device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear).IsFailure)
CLog.LogError("Failed to set mip filter");
if (_Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Clamp).IsFailure)
CLog.LogError("Failed to set clamping on u");
if (_Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Clamp).IsFailure)
CLog.LogError("Failed to set claming on v");
if (_Device.SetTextureStageState(0, TextureStage.AlphaArg1, TextureArgument.Texture).IsFailure)
CLog.LogError("Failed to set alpha argument 1");
if (_Device.SetTextureStageState(0, TextureStage.AlphaArg2, TextureArgument.Diffuse).IsFailure)
CLog.LogError("Failed to set alpha argument 2");
if (_Device.SetTextureStageState(0, TextureStage.AlphaOperation, TextureOperation.Modulate).IsFailure)
CLog.LogError("Failed to set alpha operation");
Int16[] indices = new Int16[6];
indices[0] = 0;
indices[1] = 1;
indices[2] = 2;
indices[3] = 0;
indices[4] = 2;
indices[5] = 3;
_IndexBuffer = new IndexBuffer(_Device, 6 * sizeof(Int16), Usage.WriteOnly, Pool.Managed, true);
DataStream stream = _IndexBuffer.Lock(0, 0, LockFlags.Discard);
stream.WriteRange(indices);
_IndexBuffer.Unlock();
_Device.Indices = _IndexBuffer;
//This creates a new white texture and adds it to the texture pool
//This texture is used for the DrawRect method
using (Bitmap blankMap = new Bitmap(1, 1))
{
Graphics g = Graphics.FromImage(blankMap);
g.Clear(Color.White);
g.Dispose();
_BlankTexture = AddTexture(blankMap);
}
return true;
}
else
return false; return false;
Text = CSettings.GetFullVersionText();
SlimDX.Matrix translate = SlimDX.Matrix.Translation(new Vector3(-(float)CSettings.RenderW / 2, (float)CSettings.RenderH / 2, 0));
SlimDX.Matrix projection = SlimDX.Matrix.OrthoOffCenterLH(-(float)CSettings.RenderW / 2, (float)CSettings.RenderW / 2, -(float)CSettings.RenderH / 2,
(float)CSettings.RenderH / 2,
CSettings.ZNear, CSettings.ZFar);
_VertexBuffer = new VertexBuffer(_Device, CSettings.VertexBufferElements * (4 * Marshal.SizeOf(typeof(STexturedColoredVertex))), Usage.WriteOnly | Usage.Dynamic,
VertexFormat.Position | VertexFormat.Texture1 | VertexFormat.Diffuse, Pool.Default);
if (_Device.SetStreamSource(0, _VertexBuffer, 0, Marshal.SizeOf(typeof(STexturedColoredVertex))).IsFailure)
CLog.LogError("Failed to set stream source");
_Device.VertexDeclaration = STexturedColoredVertex.GetDeclaration(_Device);
if (_Device.SetTransform(TransformState.Projection, projection).IsFailure)
CLog.LogError("Failed to set orthogonal matrix");
if (_Device.SetTransform(TransformState.World, translate).IsFailure)
CLog.LogError("Failed to set translation matrix");
if (_Device.SetRenderState(RenderState.CullMode, Cull.None).IsFailure)
CLog.LogError("Failed to set cull mode");
if (_Device.SetRenderState(RenderState.AlphaBlendEnable, true).IsFailure)
CLog.LogError("Failed to enable alpha blending");
if (_Device.SetRenderState(RenderState.Lighting, false).IsFailure)
CLog.LogError("Failed to disable lighting");
if (_Device.SetRenderState(RenderState.DestinationBlend, SlimDX.Direct3D9.Blend.InverseSourceAlpha).IsFailure)
CLog.LogError("Failed to set destination blend");
if (_Device.SetRenderState(RenderState.SourceBlend, SlimDX.Direct3D9.Blend.SourceAlpha).IsFailure)
CLog.LogError("Failed to set source blend");
if (_PresentParameters.Multisample != MultisampleType.None)
{
if (_Device.SetRenderState(RenderState.MultisampleAntialias, true).IsFailure)
CLog.LogError("Failed to set antialiasing");
}
if (_Device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Linear).IsFailure)
CLog.LogError("Failed to set min filter");
if (_Device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Linear).IsFailure)
CLog.LogError("Failed to set mag filter");
if (_Device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear).IsFailure)
CLog.LogError("Failed to set mip filter");
if (_Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Clamp).IsFailure)
CLog.LogError("Failed to set clamping on u");
if (_Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Clamp).IsFailure)
CLog.LogError("Failed to set claming on v");
if (_Device.SetTextureStageState(0, TextureStage.AlphaArg1, TextureArgument.Texture).IsFailure)
CLog.LogError("Failed to set alpha argument 1");
if (_Device.SetTextureStageState(0, TextureStage.AlphaArg2, TextureArgument.Diffuse).IsFailure)
CLog.LogError("Failed to set alpha argument 2");
if (_Device.SetTextureStageState(0, TextureStage.AlphaOperation, TextureOperation.Modulate).IsFailure)
CLog.LogError("Failed to set alpha operation");
Int16[] indices = new Int16[6];
indices[0] = 0;
indices[1] = 1;
indices[2] = 2;
indices[3] = 0;
indices[4] = 2;
indices[5] = 3;
_IndexBuffer = new IndexBuffer(_Device, 6 * sizeof(Int16), Usage.WriteOnly, Pool.Managed, true);
DataStream stream = _IndexBuffer.Lock(0, 0, LockFlags.Discard);
stream.WriteRange(indices);
_IndexBuffer.Unlock();
_Device.Indices = _IndexBuffer;
//This creates a new white texture and adds it to the texture pool
//This texture is used for the DrawRect method
using (Bitmap blankMap = new Bitmap(1, 1))
{
Graphics g = Graphics.FromImage(blankMap);
g.Clear(Color.White);
g.Dispose();
_BlankTexture = AddTexture(blankMap);
}
return true;
} }
/// <summary> /// <summary>
@@ -511,61 +504,57 @@ namespace Vocaluxe.Lib.Draw
} }
//Resize window if aspect ratio is incorrect //Resize window if aspect ratio is incorrect
if (_W / (float)_H != CSettings.GetRenderAspect()) if (Math.Abs(_W / (float)_H - CSettings.GetRenderAspect()) > 0.01)
_DoResize(); _DoResize();
while (_Run) while (_Run)
{ {
Application.DoEvents(); Application.DoEvents();
//Clear the previous Frame
if (_Run) ClearScreen();
//We want to begin drawing
if (_Device.BeginScene().IsFailure)
CLog.LogError("Failed to begin scene");
_CheckQueque();
_Run = _Run && CGraphics.Draw();
_RenderVertexBuffer();
//We finished drawing the frame
if (_Device.EndScene().IsFailure)
CLog.LogError("Failed to end scene");
_Run = CGraphics.UpdateGameLogic(_Keys, _Mouse);
try
{ {
//Clear the previous Frame //Now push the frame to the Viewport
ClearScreen(); _Device.Present();
//We want to begin drawing
if (_Device.BeginScene().IsFailure)
CLog.LogError("Failed to begin scene");
_CheckQueque();
_Run = _Run && CGraphics.Draw();
_RenderVertexBuffer();
//We finished drawing the frame
if (_Device.EndScene().IsFailure)
CLog.LogError("Failed to end scene");
_Run = CGraphics.UpdateGameLogic(_Keys, _Mouse);
try
{
//Now push the frame to the Viewport
_Device.Present();
}
catch (Direct3D9Exception)
{
//In Direct3D devices can get lost.
//This happens for example when opening the Task Manager in Vista/Windows 7 or if a UAC message is opening
//We need to reset the device to get it to workable state again
//After a reset Init() needs to be called because all data in the Direct3D default pool are lost and need to be recreated
if (_Device.TestCooperativeLevel() == ResultCode.DeviceNotReset)
{
Reset();
Init();
}
}
//Apply fullscreen mode
if (CSettings.IsFullScreen != _Fullscreen)
{
if (!_Fullscreen)
_EnterFullScreen();
else
_LeaveFullScreen();
}
if (CTime.IsRunning())
delay = (int)Math.Floor(CConfig.CalcCycleTime() - CTime.GetMilliseconds());
if (delay >= 1 && CConfig.VSync == EOffOn.TR_CONFIG_OFF)
Thread.Sleep(delay);
//Calculate the FPS Rate and restart the timer after a frame
CTime.CalculateFPS();
CTime.Restart();
} }
catch (Direct3D9Exception)
{
//In Direct3D devices can get lost.
//This happens for example when opening the Task Manager in Vista/Windows 7 or if a UAC message is opening
//We need to reset the device to get it to workable state again
//After a reset Init() needs to be called because all data in the Direct3D default pool are lost and need to be recreated
if (_Device.TestCooperativeLevel() == ResultCode.DeviceNotReset)
{
_Reset();
Init();
}
}
//Apply fullscreen mode
if (CSettings.IsFullScreen != _Fullscreen)
{
if (!_Fullscreen)
_EnterFullScreen();
else
_LeaveFullScreen();
}
if (CTime.IsRunning())
delay = (int)Math.Floor(CConfig.CalcCycleTime() - CTime.GetMilliseconds());
if (delay >= 1 && CConfig.VSync == EOffOn.TR_CONFIG_OFF)
Thread.Sleep(delay);
//Calculate the FPS Rate and restart the timer after a frame
CTime.CalculateFPS();
CTime.Restart();
} }
Close(); Close();
} }
@@ -573,7 +562,7 @@ namespace Vocaluxe.Lib.Draw
/// <summary> /// <summary>
/// Resets the device, all objects in the Direct3D default pool get flushed and need to be recreated /// Resets the device, all objects in the Direct3D default pool get flushed and need to be recreated
/// </summary> /// </summary>
public void Reset() private void _Reset()
{ {
//Dispose all objects in the default pool, those need to be recreated //Dispose all objects in the default pool, those need to be recreated
STexturedColoredVertex.GetDeclaration(_Device).Dispose(); STexturedColoredVertex.GetDeclaration(_Device).Dispose();
@@ -670,31 +659,30 @@ namespace Vocaluxe.Lib.Draw
/// </summary> /// </summary>
private void _RenderVertexBuffer() private void _RenderVertexBuffer()
{ {
if (_Vertices.Count > 0) if (_Vertices.Count <= 0)
{ return;
//The vertex buffer locks are slow actions, its better to lock once per frame and write all vertices to the buffer at once //The vertex buffer locks are slow actions, its better to lock once per frame and write all vertices to the buffer at once
DataStream stream = _VertexBuffer.Lock(0, _Vertices.Count * Marshal.SizeOf(typeof(STexturedColoredVertex)), LockFlags.Discard); DataStream stream = _VertexBuffer.Lock(0, _Vertices.Count * Marshal.SizeOf(typeof(STexturedColoredVertex)), LockFlags.Discard);
stream.WriteRange(_Vertices.ToArray()); stream.WriteRange(_Vertices.ToArray());
_VertexBuffer.Unlock(); _VertexBuffer.Unlock();
stream.Dispose(); stream.Dispose();
for (int i = 0; i < _Vertices.Count; i += 4) for (int i = 0; i < _Vertices.Count; i += 4)
{ {
//Apply rotation //Apply rotation
if (_Device.SetTransform(TransformState.World, _VerticesRotationMatrices.Dequeue()).IsFailure) if (_Device.SetTransform(TransformState.World, _VerticesRotationMatrices.Dequeue()).IsFailure)
CLog.LogError("Failed to set world transformation"); CLog.LogError("Failed to set world transformation");
//Apply texture //Apply texture
if (_Device.SetTexture(0, _VerticesTextures.Dequeue()).IsFailure) if (_Device.SetTexture(0, _VerticesTextures.Dequeue()).IsFailure)
CLog.LogError("Failed to set texture"); CLog.LogError("Failed to set texture");
//Draw 2 triangles from vertexbuffer //Draw 2 triangles from vertexbuffer
if (_Device.DrawIndexedPrimitives(PrimitiveType.TriangleList, i, 0, 4, 0, 2).IsFailure) if (_Device.DrawIndexedPrimitives(PrimitiveType.TriangleList, i, 0, 4, 0, 2).IsFailure)
CLog.LogError("Failed to draw quad"); CLog.LogError("Failed to draw quad");
}
//Clear the queues for the next frame
_Vertices.Clear();
_VerticesTextures.Clear();
_VerticesRotationMatrices.Clear();
} }
//Clear the queues for the next frame
_Vertices.Clear();
_VerticesTextures.Clear();
_VerticesRotationMatrices.Clear();
} }
#endregion main stuff #endregion main stuff
@@ -744,7 +732,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="texture">The texture in which the frame is copied to</param> /// <param name="texture">The texture in which the frame is copied to</param>
public void CopyScreen(ref STexture texture) public void CopyScreen(ref STexture texture)
{ {
if (!_TextureExists(ref texture) || (texture.Width != GetScreenWidth()) || (texture.Height != GetScreenHeight())) if (!_TextureExists(ref texture) || (Math.Abs(texture.Width - GetScreenWidth()) > float.Epsilon) || (Math.Abs(texture.Height - GetScreenHeight()) > float.Epsilon))
{ {
RemoveTexture(ref texture); RemoveTexture(ref texture);
texture = CopyScreen(); texture = CopyScreen();
@@ -762,7 +750,7 @@ namespace Vocaluxe.Lib.Draw
/// </summary> /// </summary>
public void MakeScreenShot() public void MakeScreenShot()
{ {
string file = "Screenshot_"; const string file = "Screenshot_";
string path = Path.Combine(Environment.CurrentDirectory, CSettings.FolderScreenshots); string path = Path.Combine(Environment.CurrentDirectory, CSettings.FolderScreenshots);
int i = 0; int i = 0;
@@ -794,7 +782,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="y2">The end y-value</param> /// <param name="y2">The end y-value</param>
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2) public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
{ {
SColorF color = new SColorF(a / 255, g / 255, b / 255, a / 255); SColorF color = new SColorF((float)a / 255, (float)g / 255, (float)b / 255, (float)a / 255);
DrawTexture(_BlankTexture, new SRectF(x1, y1, x2, y2, 1), color); DrawTexture(_BlankTexture, new SRectF(x1, y1, x2, y2, 1), color);
} }
@@ -805,20 +793,8 @@ namespace Vocaluxe.Lib.Draw
/// <param name="x">The text's x-position</param> /// <param name="x">The text's x-position</param>
/// <param name="y">The text's y-position</param> /// <param name="y">The text's y-position</param>
/// <param name="h">The text's height</param> /// <param name="h">The text's height</param>
public void DrawText(string text, int x, int y, int h) /// <param name="z">The text's z-position</param>
{ public void DrawText(string text, int x, int y, int h, int z = 0)
DrawText(text, x, y, h, 0f);
}
/// <summary>
/// Draws a text string
/// </summary>
/// <param name="text">The text to be drawn</param>
/// <param name="x">The text's x-position</param>
/// <param name="y">The text's y-position</param>
/// <param name="h">The text's height</param>
/// <param name="z">The text's x-position</param>
public void DrawText(string text, int x, int y, float h, float z)
{ {
CFonts.DrawText(text, h, x, y, z, new SColorF(1f, 1f, 1f, 1f)); CFonts.DrawText(text, h, x, y, z, new SColorF(1f, 1f, 1f, 1f));
} }
@@ -871,7 +847,7 @@ namespace Vocaluxe.Lib.Draw
STexture s; STexture s;
try try
{ {
s = AddTexture(bmp, texturePath); s = AddTexture(bmp);
} }
finally finally
{ {
@@ -887,9 +863,8 @@ namespace Vocaluxe.Lib.Draw
/// Adds a texture and stores it in the Vram /// Adds a texture and stores it in the Vram
/// </summary> /// </summary>
/// <param name="bmp">The Bitmap of which the texure will be created from</param> /// <param name="bmp">The Bitmap of which the texure will be created from</param>
/// <param name="texturePath">The path to the texture</param>
/// <returns>A STexture object containing the added texture</returns> /// <returns>A STexture object containing the added texture</returns>
public STexture AddTexture(Bitmap bmp, string texturePath) public STexture AddTexture(Bitmap bmp)
{ {
if (bmp.Height == 0 || bmp.Width == 0) if (bmp.Height == 0 || bmp.Width == 0)
return new STexture(-1); return new STexture(-1);
@@ -971,22 +946,9 @@ namespace Vocaluxe.Lib.Draw
bmp2.Dispose(); bmp2.Dispose();
} }
if (data == null)
return new STexture(-1);
return AddTexture(w, h, ref data); return AddTexture(w, h, ref data);
} }
/// <summary>
/// Adds a texture and stores it in the Vram
/// </summary>
/// <param name="bmp">The Bitmap of which the texure will be created from</param>
/// <returns>A STexture object containing the added texture</returns>
public STexture AddTexture(Bitmap bmp)
{
return AddTexture(bmp, String.Empty);
}
public STexture AddTexture(int w, int h, IntPtr data) public STexture AddTexture(int w, int h, IntPtr data)
{ {
byte[] pointerData = new Byte[4 * w * h]; byte[] pointerData = new Byte[4 * w * h];
@@ -1051,11 +1013,8 @@ namespace Vocaluxe.Lib.Draw
public STexture QuequeTexture(int w, int h, ref byte[] data) public STexture QuequeTexture(int w, int h, ref byte[] data)
{ {
STexture texture = new STexture(-1); STexture texture = new STexture(-1);
STextureQueque queque = new STextureQueque(); STextureQueque queque = new STextureQueque {Data = data, Height = h, Width = w};
queque.Data = data;
queque.Height = h;
queque.Width = w;
texture.Height = h; texture.Height = h;
texture.Width = w; texture.Width = w;
@@ -1131,8 +1090,7 @@ namespace Vocaluxe.Lib.Draw
s.UnlockRectangle(); s.UnlockRectangle();
return true; */ return true; */
} }
else return false;
return false;
} }
#endregion updating #endregion updating
@@ -1331,36 +1289,35 @@ namespace Vocaluxe.Lib.Draw
/// <param name="end">A Value ranging from 0 to 1 containing the ending of the texture</param> /// <param name="end">A Value ranging from 0 to 1 containing the ending of the texture</param>
public void DrawTexture(STexture texture, SRectF rect, SColorF color, float begin, float end) public void DrawTexture(STexture texture, SRectF rect, SColorF color, float begin, float end)
{ {
if (_TextureExists(ref texture)) if (!_TextureExists(ref texture))
{ return;
if (_D3DTextures[texture.Index] == null) if (_D3DTextures[texture.Index] == null)
return; return;
float x1 = 0f + begin * texture.WidthRatio; float x1 = 0f + begin * texture.WidthRatio;
float x2 = texture.WidthRatio * end; float x2 = texture.WidthRatio * end;
float y1 = 0f; const float y1 = 0f;
float y2 = texture.HeightRatio; float y2 = texture.HeightRatio;
float rx1 = rect.X + begin * rect.W; float rx1 = rect.X + begin * rect.W;
float rx2 = rect.X + end * rect.W; float rx2 = rect.X + end * rect.W;
float ry1 = rect.Y; float ry1 = rect.Y;
float ry2 = rect.Y + rect.H; float ry2 = rect.Y + rect.H;
//Align the pixels because Direct3D expects the pixels to be the left top corner //Align the pixels because Direct3D expects the pixels to be the left top corner
rx1 -= 0.5f; rx1 -= 0.5f;
ry1 -= 0.5f; ry1 -= 0.5f;
rx2 -= 0.5f; rx2 -= 0.5f;
ry2 -= 0.5f; ry2 -= 0.5f;
Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255)); Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
STexturedColoredVertex[] vert = new STexturedColoredVertex[4]; STexturedColoredVertex[] vert = new STexturedColoredVertex[4];
vert[0] = new STexturedColoredVertex(new Vector3(rx1, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x1, y1), c.ToArgb()); vert[0] = new STexturedColoredVertex(new Vector3(rx1, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x1, y1), c.ToArgb());
vert[1] = new STexturedColoredVertex(new Vector3(rx1, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x1, y2), c.ToArgb()); vert[1] = new STexturedColoredVertex(new Vector3(rx1, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x1, y2), c.ToArgb());
vert[2] = new STexturedColoredVertex(new Vector3(rx2, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x2, y2), c.ToArgb()); vert[2] = new STexturedColoredVertex(new Vector3(rx2, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x2, y2), c.ToArgb());
vert[3] = new STexturedColoredVertex(new Vector3(rx2, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x2, y1), c.ToArgb()); vert[3] = new STexturedColoredVertex(new Vector3(rx2, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x2, y1), c.ToArgb());
_AddToVertexBuffer(vert, _D3DTextures[texture.Index], _CalculateRotationMatrix(rect.Rotation, rx1, rx2, ry1, ry2)); _AddToVertexBuffer(vert, _D3DTextures[texture.Index], _CalculateRotationMatrix(rect.Rotation, rx1, rx2, ry1, ry2));
}
} }
/// <summary> /// <summary>
@@ -1374,76 +1331,76 @@ namespace Vocaluxe.Lib.Draw
/// <param name="height">The height of the reflection</param> /// <param name="height">The height of the reflection</param>
public void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float space, float height) public void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float space, float height)
{ {
if (!_TextureExists(ref texture))
return;
if (_D3DTextures[texture.Index] == null)
return;
if (Math.Abs(rect.W) < float.Epsilon || Math.Abs(rect.H) < float.Epsilon || Math.Abs(bounds.H) < float.Epsilon || Math.Abs(bounds.W) < float.Epsilon ||
Math.Abs(color.A) < float.Epsilon || height <= 0f)
return;
if (bounds.X > rect.X + rect.W || bounds.X + bounds.W < rect.X)
return;
if (bounds.Y > rect.Y + rect.H || bounds.Y + bounds.H < rect.Y)
return;
if (height > bounds.H)
height = bounds.H;
if (_TextureExists(ref texture)) if (_TextureExists(ref texture))
{ {
if (_D3DTextures[texture.Index] == null) float x1 = (bounds.X - rect.X) / rect.W * texture.WidthRatio;
return; float x2 = (bounds.X + bounds.W - rect.X) / rect.W * texture.WidthRatio;
float y1 = (bounds.Y - rect.Y + rect.H - height) / rect.H * texture.HeightRatio;
float y2 = (bounds.Y + bounds.H - rect.Y) / rect.H * texture.HeightRatio;
if (rect.W == 0f || rect.H == 0f || bounds.H == 0f || bounds.W == 0f || color.A == 0f || height <= 0f) if (x1 < 0)
return; x1 = 0f;
if (bounds.X > rect.X + rect.W || bounds.X + bounds.W < rect.X) if (x2 > texture.WidthRatio)
return; x2 = texture.WidthRatio;
if (bounds.Y > rect.Y + rect.H || bounds.Y + bounds.H < rect.Y) if (y1 < 0)
return; y1 = 0f;
if (height > bounds.H) if (y2 > texture.HeightRatio)
height = bounds.H; y2 = texture.HeightRatio;
if (_TextureExists(ref texture))
{
float x1 = (bounds.X - rect.X) / rect.W * texture.WidthRatio;
float x2 = (bounds.X + bounds.W - rect.X) / rect.W * texture.WidthRatio;
float y1 = (bounds.Y - rect.Y + rect.H - height) / rect.H * texture.HeightRatio;
float y2 = (bounds.Y + bounds.H - rect.Y) / rect.H * texture.HeightRatio;
if (x1 < 0)
x1 = 0f;
if (x2 > texture.WidthRatio)
x2 = texture.WidthRatio;
if (y1 < 0)
y1 = 0f;
if (y2 > texture.HeightRatio)
y2 = texture.HeightRatio;
float rx1 = rect.X; float rx1 = rect.X;
float rx2 = rect.X + rect.W; float rx2 = rect.X + rect.W;
float ry1 = rect.Y + rect.H + space; float ry1 = rect.Y + rect.H + space;
float ry2 = rect.Y + rect.H + space + height; float ry2 = rect.Y + rect.H + space + height;
if (rx1 < bounds.X) if (rx1 < bounds.X)
rx1 = bounds.X; rx1 = bounds.X;
if (rx2 > bounds.X + bounds.W) if (rx2 > bounds.X + bounds.W)
rx2 = bounds.X + bounds.W; rx2 = bounds.X + bounds.W;
if (ry1 < bounds.Y + space) if (ry1 < bounds.Y + space)
ry1 = bounds.Y + space; ry1 = bounds.Y + space;
if (ry2 > bounds.Y + bounds.H + space + height) if (ry2 > bounds.Y + bounds.H + space + height)
ry2 = bounds.Y + bounds.H + space + height; ry2 = bounds.Y + bounds.H + space + height;
//Align the pixels because Direct3D expects the pixels to be the left top corner //Align the pixels because Direct3D expects the pixels to be the left top corner
rx1 -= 0.5f; rx1 -= 0.5f;
ry1 -= 0.5f; ry1 -= 0.5f;
rx2 -= 0.5f; rx2 -= 0.5f;
ry2 -= 0.5f; ry2 -= 0.5f;
Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255)); Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
Color transparent = Color.FromArgb(0, (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255)); Color transparent = Color.FromArgb(0, (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
STexturedColoredVertex[] vert = new STexturedColoredVertex[4]; STexturedColoredVertex[] vert = new STexturedColoredVertex[4];
vert[0] = new STexturedColoredVertex(new Vector3(rx1, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x1, y2), c.ToArgb()); vert[0] = new STexturedColoredVertex(new Vector3(rx1, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x1, y2), c.ToArgb());
vert[1] = new STexturedColoredVertex(new Vector3(rx1, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x1, y1), transparent.ToArgb()); vert[1] = new STexturedColoredVertex(new Vector3(rx1, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x1, y1), transparent.ToArgb());
vert[2] = new STexturedColoredVertex(new Vector3(rx2, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x2, y1), transparent.ToArgb()); vert[2] = new STexturedColoredVertex(new Vector3(rx2, -ry2, rect.Z + CGraphics.ZOffset), new Vector2(x2, y1), transparent.ToArgb());
vert[3] = new STexturedColoredVertex(new Vector3(rx2, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x2, y2), c.ToArgb()); vert[3] = new STexturedColoredVertex(new Vector3(rx2, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x2, y2), c.ToArgb());
_AddToVertexBuffer(vert, _D3DTextures[texture.Index], _CalculateRotationMatrix(rect.Rotation, rx1, rx2, ry1, ry2)); _AddToVertexBuffer(vert, _D3DTextures[texture.Index], _CalculateRotationMatrix(rect.Rotation, rx1, rx2, ry1, ry2));
}
} }
} }
#endregion drawing #endregion drawing
@@ -1490,20 +1447,17 @@ namespace Vocaluxe.Lib.Draw
/// <returns>The next power of two</returns> /// <returns>The next power of two</returns>
private float _CheckForNextPowerOf2(float n) private float _CheckForNextPowerOf2(float n)
{ {
if (!_NonPowerOf2TextureSupported) if (_NonPowerOf2TextureSupported)
{
if (n < 0)
throw new ArgumentOutOfRangeException("n", "Must be positive.");
return (float)Math.Pow(2, Math.Ceiling(Math.Log(n, 2)));
}
else
return n; return n;
if (n < 0)
throw new ArgumentOutOfRangeException("n", "Must be positive.");
return (float)Math.Pow(2, Math.Ceiling(Math.Log(n, 2)));
} }
private SlimDX.Matrix _CalculateRotationMatrix(float rot, float rx1, float rx2, float ry1, float ry2) private SlimDX.Matrix _CalculateRotationMatrix(float rot, float rx1, float rx2, float ry1, float ry2)
{ {
SlimDX.Matrix originTranslation = SlimDX.Matrix.Translation(new Vector3(-CSettings.RenderW / 2, CSettings.RenderH / 2, 0)); SlimDX.Matrix originTranslation = SlimDX.Matrix.Translation(new Vector3(-(float)CSettings.RenderW / 2, (float)CSettings.RenderH / 2, 0));
if (rot != 0) if (Math.Abs(rot) > float.Epsilon)
{ {
float rotation = rot * (float)Math.PI / 180; float rotation = rot * (float)Math.PI / 180;
float centerX = (rx1 + rx2) / 2f; float centerX = (rx1 + rx2) / 2f;
@@ -1525,10 +1479,10 @@ namespace Vocaluxe.Lib.Draw
#endregion utility #endregion utility
#region TexturedColoredVertex #region TexturedColoredVertex
public struct STexturedColoredVertex private struct STexturedColoredVertex
{ {
private static VertexDeclaration _Declaration; private static VertexDeclaration _Declaration;
public static VertexElement[] Elements = private static readonly VertexElement[] _Elements =
{ {
new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0), new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0),
new VertexElement(0, sizeof(float) * 3, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0), new VertexElement(0, sizeof(float) * 3, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0),
@@ -1536,21 +1490,23 @@ namespace Vocaluxe.Lib.Draw
VertexElement.VertexDeclarationEnd VertexElement.VertexDeclarationEnd
}; };
public Vector3 Position; // ReSharper disable NotAccessedField.Local
public Vector2 Texture; private Vector3 _Position;
public int Color; private Vector2 _Texture;
private int _Color;
// ReSharper restore NotAccessedField.Local
public STexturedColoredVertex(Vector3 position, Vector2 texture, int color) public STexturedColoredVertex(Vector3 position, Vector2 texture, int color)
{ {
Position = position; _Position = position;
Texture = texture; _Texture = texture;
Color = color; _Color = color;
} }
public static VertexDeclaration GetDeclaration(Device device) public static VertexDeclaration GetDeclaration(Device device)
{ {
if (_Declaration == null || _Declaration.Disposed) if (_Declaration == null || _Declaration.Disposed)
_Declaration = new VertexDeclaration(device, Elements); _Declaration = new VertexDeclaration(device, _Elements);
return _Declaration; return _Declaration;
} }
Vocaluxe/Lib/Draw/CDrawWinForm.cs
+1 -7
View File
@@ -346,13 +346,7 @@ namespace Vocaluxe.Lib.Draw
} }
// Draw Basic Text // Draw Basic Text
public void DrawText(string text, int x, int y, int h) public void DrawText(string text, int x, int y, int h, int z=0)
{
DrawText(text, x, y, h, 0f);
}
// Draw Basic Text
public void DrawText(string text, int x, int y, float h, float z)
{ {
CFonts.DrawText(text, h, x, y, z, new SColorF(1, 1, 1, 1)); CFonts.DrawText(text, h, x, y, z, new SColorF(1, 1, 1, 1));
} }
Vocaluxe/Lib/Draw/COpenGL.cs
+1 -6
View File
@@ -633,12 +633,7 @@ namespace Vocaluxe.Lib.Draw
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2) {} public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2) {}
// Draw Basic Text (must be deleted later) // Draw Basic Text (must be deleted later)
public void DrawText(string text, int x, int y, int h) public void DrawText(string text, int x, int y, int h, int z=0)
{
DrawText(text, x, y, h, 0f);
}
public void DrawText(string text, int x, int y, float h, float z)
{ {
CFonts.DrawText(text, h, x, y, z, new SColorF(1, 1, 1, 1)); CFonts.DrawText(text, h, x, y, z, new SColorF(1, 1, 1, 1));
} }
Vocaluxe/Lib/Draw/IDraw.cs
+1 -1
View File
@@ -46,7 +46,7 @@ namespace Vocaluxe.Lib.Draw
void MakeScreenShot(); void MakeScreenShot();
// Draw Basic Text (must be deleted later) // Draw Basic Text (must be deleted later)
void DrawText(string text, int x, int y, int h); void DrawText(string text, int x, int y, int h, int z=0);
STexture AddTexture(string texturePath); STexture AddTexture(string texturePath);
STexture AddTexture(Bitmap bitmap); STexture AddTexture(Bitmap bitmap);