agate-svn-commit Mailing List for AgateLib (Page 12)
Status: Alpha
Brought to you by:
kanato
Menu
▾
▴
agate-svn-commit — List with automated subversion commit messages.
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(86) |
May
(77) |
Jun
|
Jul
(1) |
Aug
(31) |
Sep
(12) |
Oct
(31) |
Nov
(53) |
Dec
(39) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(53) |
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(13) |
| 2011 |
Jan
(17) |
Feb
(5) |
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(21) |
Dec
|
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(5) |
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(8) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
(5) |
Nov
(9) |
Dec
(5) |
| 2014 |
Jan
(3) |
Feb
(2) |
Mar
(4) |
Apr
(3) |
May
|
Jun
(5) |
Jul
(33) |
Aug
(69) |
Sep
(35) |
Oct
(4) |
Nov
(1) |
Dec
|
|
From: <ka...@us...> - 2011-01-07 19:32:19
|
Revision: 1262
http://agate.svn.sourceforge.net/agate/?rev=1262&view=rev
Author: kanato
Date: 2011-01-07 19:32:13 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
* Properties/Resources.Designer.cs: Added ERY prefix to namespace to
make resources consistent with rest of the library.
* NotebookLib.csproj: MonoDevelop automated changes
Modified Paths:
--------------
trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs
Modified: trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
===================================================================
--- trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj 2010-12-29 21:38:41 UTC (rev 1261)
+++ trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj 2011-01-07 19:32:13 UTC (rev 1262)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -7,8 +7,6 @@
<ProjectGuid>{91F57346-B574-4D52-9EB0-AA191B552C94}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>NotebookLib</AssemblyName>
@@ -21,52 +19,41 @@
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>NotebookLib</RootNamespace>
- <StartupObject>
- </StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>True</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>False</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\..\Binaries\Debug\Libraries\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile>
</DocumentationFile>
- <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
- <Optimize>True</Optimize>
+ <Optimize>true</Optimize>
<OutputPath>..\..\..\Binaries\Debug\Libraries\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn>
- </NoWarn>
+ <DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -75,6 +62,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\..\Binaries\Debug\Libraries\</OutputPath>
@@ -83,6 +73,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x64</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -91,6 +83,9 @@
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>full</DebugType>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\..\Binaries\Debug\Libraries\</OutputPath>
@@ -99,6 +94,8 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
+ <DebugType>none</DebugType>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@@ -231,6 +228,7 @@
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
Modified: trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs 2010-12-29 21:38:41 UTC (rev 1261)
+++ trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs 2011-01-07 19:32:13 UTC (rev 1262)
@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
-namespace NotebookLib.Properties {
+namespace ERY.NotebookLib.Properties {
using System;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-29 21:38:47
|
Revision: 1261
http://agate.svn.sourceforge.net/agate/?rev=1261&view=rev
Author: kanato
Date: 2010-12-29 21:38:41 +0000 (Wed, 29 Dec 2010)
Log Message:
-----------
Add text to fullscreen test.
Modified Paths:
--------------
trunk/Tests/DisplayTests/FullScreen.cs
Modified: trunk/Tests/DisplayTests/FullScreen.cs
===================================================================
--- trunk/Tests/DisplayTests/FullScreen.cs 2010-12-27 01:21:34 UTC (rev 1260)
+++ trunk/Tests/DisplayTests/FullScreen.cs 2010-12-29 21:38:41 UTC (rev 1261)
@@ -19,6 +19,8 @@
get { return "Display"; }
}
+ string text = "Press Esc or Tilde to exit." + Environment.NewLine + "Starting Text";
+
public void Main(string[] args)
{
using (AgateSetup setup = new AgateSetup(args))
@@ -30,18 +32,30 @@
DisplayWindow wind = DisplayWindow.CreateFullScreen("Hello World", 640, 480);
Surface mySurface = new Surface("jellybean.png");
+ Keyboard.KeyDown += new InputEventHandler(Keyboard_KeyDown);
+ FontSurface font = FontSurface.AgateSans14;
+
// Run the program while the window is open.
while (Display.CurrentWindow.IsClosed == false &&
- Keyboard.Keys[KeyCode.Escape] == false)
+ Keyboard.Keys[KeyCode.Escape] == false &&
+ Keyboard.Keys[KeyCode.Tilde] == false)
{
Display.BeginFrame();
Display.Clear(Color.DarkGreen);
+
+ font.DrawText(text);
mySurface.Draw(Mouse.X, Mouse.Y);
+
Display.EndFrame();
Core.KeepAlive();
}
}
}
+ void Keyboard_KeyDown(InputEventArgs e)
+ {
+ text += e.KeyString;
+ }
+
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-27 01:21:40
|
Revision: 1260
http://agate.svn.sourceforge.net/agate/?rev=1260&view=rev
Author: kanato
Date: 2010-12-27 01:21:34 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
Fix output path for BallBuster.net.
Modified Paths:
--------------
trunk/Examples/BallBuster.Net/BallBuster.Net.csproj
trunk/Examples.sln
Modified: trunk/Examples/BallBuster.Net/BallBuster.Net.csproj
===================================================================
--- trunk/Examples/BallBuster.Net/BallBuster.Net.csproj 2010-12-26 07:25:40 UTC (rev 1259)
+++ trunk/Examples/BallBuster.Net/BallBuster.Net.csproj 2010-12-27 01:21:34 UTC (rev 1260)
@@ -59,7 +59,7 @@
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>bin\x64\Release\</OutputPath>
+ <OutputPath>out\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -78,7 +78,7 @@
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <OutputPath>bin\x86\Release\</OutputPath>
+ <OutputPath>out\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
Modified: trunk/Examples.sln
===================================================================
--- trunk/Examples.sln 2010-12-26 07:25:40 UTC (rev 1259)
+++ trunk/Examples.sln 2010-12-27 01:21:34 UTC (rev 1260)
@@ -1,6 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
+# SharpDevelop 4.0.0.7043
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BallBuster.Net", "Examples\BallBuster.Net\BallBuster.Net.csproj", "{DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShootTheTraps", "Examples\ShootTheTraps\ShootTheTraps.csproj", "{50743D1B-A19E-42F1-842F-65FAD6D168C3}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-26 07:25:46
|
Revision: 1259
http://agate.svn.sourceforge.net/agate/?rev=1259&view=rev
Author: kanato
Date: 2010-12-26 07:25:40 +0000 (Sun, 26 Dec 2010)
Log Message:
-----------
Optimize return of GetLayout for vertex.
Modified Paths:
--------------
trunk/AgateLib/Geometry/VertexTypes/PositionTextureColorNormal.cs
Modified: trunk/AgateLib/Geometry/VertexTypes/PositionTextureColorNormal.cs
===================================================================
--- trunk/AgateLib/Geometry/VertexTypes/PositionTextureColorNormal.cs 2010-12-26 07:25:16 UTC (rev 1258)
+++ trunk/AgateLib/Geometry/VertexTypes/PositionTextureColorNormal.cs 2010-12-26 07:25:40 UTC (rev 1259)
@@ -87,6 +87,8 @@
Position.X, Position.Y, Position.Z, Color, Texture.X, Texture.Y, Normal.X, Normal.Y, Normal.Z);
}
+ static VertexLayout sLayout;
+
/// <summary>
/// Vertex Layout for PositionTextureColorNormal.
/// </summary>
@@ -94,13 +96,18 @@
{
get
{
- return new VertexLayout
- {
- new VertexElementDesc(VertexElementDataType.Float3, VertexElement.Position),
- new VertexElementDesc(VertexElementDataType.Float2, VertexElement.Texture),
- new VertexElementDesc(VertexElementDataType.Int, VertexElement.DiffuseColor),
- new VertexElementDesc(VertexElementDataType.Float3, VertexElement.Normal),
- };
+ if (sLayout == null)
+ {
+ sLayout = new VertexLayout
+ {
+ new VertexElementDesc(VertexElementDataType.Float3, VertexElement.Position),
+ new VertexElementDesc(VertexElementDataType.Float2, VertexElement.Texture),
+ new VertexElementDesc(VertexElementDataType.Int, VertexElement.DiffuseColor),
+ new VertexElementDesc(VertexElementDataType.Float3, VertexElement.Normal),
+ };
+ }
+
+ return sLayout;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-26 07:25:22
|
Revision: 1258
http://agate.svn.sourceforge.net/agate/?rev=1258&view=rev
Author: kanato
Date: 2010-12-26 07:25:16 +0000 (Sun, 26 Dec 2010)
Log Message:
-----------
Fix NullReferenceException if no desktop driver is present.
Modified Paths:
--------------
trunk/AgateLib/Drivers/Registrar.cs
Modified: trunk/AgateLib/Drivers/Registrar.cs
===================================================================
--- trunk/AgateLib/Drivers/Registrar.cs 2010-12-23 19:53:29 UTC (rev 1257)
+++ trunk/AgateLib/Drivers/Registrar.cs 2010-12-26 07:25:16 UTC (rev 1258)
@@ -229,9 +229,13 @@
CreateDesktopDriver();
if (mDesktop == null)
+ {
SelectBestDrivers(chooseDisplay, chooseAudio, chooseInput,
preferredDisplay, preferredAudio, preferredInput,
out selectedDisplay, out selectedAudio, out selectedInput);
+
+ return true;
+ }
}
IUserSetSystems frm = mDesktop.CreateUserSetSystems();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 19:53:35
|
Revision: 1257
http://agate.svn.sourceforge.net/agate/?rev=1257&view=rev
Author: kanato
Date: 2010-12-23 19:53:29 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Switch to use RenderbufferStorage.StencilIndex8Ext flag.
Modified Paths:
--------------
trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
Modified: trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
===================================================================
--- trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-12-23 19:46:39 UTC (rev 1256)
+++ trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-12-23 19:53:29 UTC (rev 1257)
@@ -114,7 +114,7 @@
GL.Ext.BindRenderbuffer(RenderbufferTarget.Renderbuffer, mStencilBuffer);
GL.Ext.RenderbufferStorage(RenderbufferTarget.Renderbuffer,
- RenderbufferStorage.StencilIndex8, mSize.Width, mSize.Height);
+ RenderbufferStorage.StencilIndex8Ext, mSize.Width, mSize.Height);
// attach it.
GL.Ext.FramebufferRenderbuffer(FramebufferTarget.Framebuffer,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 19:46:45
|
Revision: 1256
http://agate.svn.sourceforge.net/agate/?rev=1256&view=rev
Author: kanato
Date: 2010-12-23 19:46:39 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Add some features to Prerendered test.
Modified Paths:
--------------
trunk/Tests/DisplayTests/Prerendered.cs
Modified: trunk/Tests/DisplayTests/Prerendered.cs
===================================================================
--- trunk/Tests/DisplayTests/Prerendered.cs 2010-12-23 19:46:21 UTC (rev 1255)
+++ trunk/Tests/DisplayTests/Prerendered.cs 2010-12-23 19:46:39 UTC (rev 1256)
@@ -32,18 +32,11 @@
FrameBuffer myBuffer = new FrameBuffer(200, 35);
FontSurface font = FontSurface.AgateSans10;
- Display.RenderTarget = myBuffer;
- Display.BeginFrame();
+ RenderToFrameBuffer(myBuffer, font);
- Display.Clear(Color.Blue);
- font.Color = Color.Red;
- font.DrawText(3, 3, "HELLO WORLD");
+ System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch();
+ watch.Start();
- Display.EndFrame();
- Display.FlushDrawBuffer();
- Display.RenderTarget = MainWindow.FrameBuffer;
-
-
while (MainWindow.IsClosed == false)
{
Display.BeginFrame();
@@ -55,9 +48,36 @@
Display.EndFrame();
Core.KeepAlive();
+
+ if (watch.ElapsedMilliseconds > 3000)
+ {
+ RenderToFrameBuffer(myBuffer, font);
+
+ watch.Reset();
+ watch.Start();
+ }
}
}
}
+ private static void RenderToFrameBuffer(FrameBuffer myBuffer, FontSurface font)
+ {
+ FrameBuffer save = Display.RenderTarget;
+
+ Display.RenderTarget = myBuffer;
+ Display.BeginFrame();
+
+ Display.Clear(Color.Blue);
+ Display.FillRect(new Rectangle(2, 2, 20, 20), Color.Black);
+
+ font.Color = Color.Red;
+ font.DrawText(3, 3, "HELLO WORLD");
+
+ Display.EndFrame();
+
+ Display.RenderTarget = save;
+
+ }
+
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 19:46:27
|
Revision: 1255
http://agate.svn.sourceforge.net/agate/?rev=1255&view=rev
Author: kanato
Date: 2010-12-23 19:46:21 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Add some error reporting to FrameBufferExt.
Modified Paths:
--------------
trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
Modified: trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
===================================================================
--- trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-12-23 19:30:40 UTC (rev 1254)
+++ trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-12-23 19:46:21 UTC (rev 1255)
@@ -38,9 +38,10 @@
InitializeFramebuffer(true, true);
return;
}
- catch
+ catch (Exception e)
{
Trace.WriteLine("Failed to create FBO with both depth and stencil buffers.");
+ Trace.WriteLine(e.Message);
}
}
if (sDepthSupported)
@@ -129,8 +130,18 @@
FramebufferErrorCode code =
GL.Ext.CheckFramebufferStatus(FramebufferTarget.Framebuffer);
+ GL.Ext.BindFramebuffer(FramebufferTarget.FramebufferExt, 0);
+
if (code != FramebufferErrorCode.FramebufferCompleteExt)
{
+ GL.Ext.DeleteFramebuffers(1, ref mFramebufferID);
+ GL.Ext.DeleteRenderbuffers(1, ref mDepthBuffer);
+ GL.Ext.DeleteRenderbuffers(1, ref mStencilBuffer);
+
+ mFramebufferID = 0;
+ mDepthBuffer = 0;
+ mStencilBuffer = 0;
+
throw new AgateException(
"Could not complete framebuffer object. Received error code "
+ code.ToString());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 19:30:46
|
Revision: 1254
http://agate.svn.sourceforge.net/agate/?rev=1254&view=rev
Author: kanato
Date: 2010-12-23 19:30:40 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Fix Prerendered test to actually dispose of AgateSetup when it exits.
Modified Paths:
--------------
trunk/Tests/DisplayTests/Prerendered.cs
Modified: trunk/Tests/DisplayTests/Prerendered.cs
===================================================================
--- trunk/Tests/DisplayTests/Prerendered.cs 2010-12-23 19:26:48 UTC (rev 1253)
+++ trunk/Tests/DisplayTests/Prerendered.cs 2010-12-23 19:30:40 UTC (rev 1254)
@@ -21,39 +21,41 @@
public void Main(string[] args)
{
- AgateSetup AS = new AgateSetup();
+ using (AgateSetup setup = new AgateSetup())
+ {
+ setup.AskUser = true;
+ setup.Initialize(true, false, true);
+ if (setup.WasCanceled)
+ return;
- AS.AskUser = true;
- AS.Initialize(true, false, true);
- if (AS.WasCanceled)
- return;
-
- DisplayWindow MainWindow = DisplayWindow.CreateWindowed ("Test", 800, 600);
- FrameBuffer myBuffer = new FrameBuffer(200,35);
- FontSurface font = FontSurface.AgateSans10;
+ DisplayWindow MainWindow = DisplayWindow.CreateWindowed("Test", 800, 600);
+ FrameBuffer myBuffer = new FrameBuffer(200, 35);
+ FontSurface font = FontSurface.AgateSans10;
- Display.RenderTarget = myBuffer;
- Display.BeginFrame();
+ Display.RenderTarget = myBuffer;
+ Display.BeginFrame();
- Display.Clear(Color.Blue);
- font.Color = Color.Red;
- font.DrawText(3,3 , "HELLO WORLD");
-
- Display.EndFrame();
- Display.FlushDrawBuffer();
- Display.RenderTarget = MainWindow.FrameBuffer;
+ Display.Clear(Color.Blue);
+ font.Color = Color.Red;
+ font.DrawText(3, 3, "HELLO WORLD");
-
- while (MainWindow.IsClosed == false)
- {
- Display.BeginFrame();
- Display.Clear(Color.Black);
-
- myBuffer.RenderTarget.Draw(35,35);
+ Display.EndFrame();
+ Display.FlushDrawBuffer();
+ Display.RenderTarget = MainWindow.FrameBuffer;
- Display.EndFrame();
-
- Core.KeepAlive();
+
+ while (MainWindow.IsClosed == false)
+ {
+ Display.BeginFrame();
+ Display.Clear(Color.Black);
+
+ myBuffer.RenderTarget.Draw(35, 35);
+ font.DrawText(38, 73, "HELLO WORLD");
+
+ Display.EndFrame();
+
+ Core.KeepAlive();
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 19:27:04
|
Revision: 1253
http://agate.svn.sourceforge.net/agate/?rev=1253&view=rev
Author: kanato
Date: 2010-12-23 19:26:48 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Update to OpenTK 1.0
Modified Paths:
--------------
trunk/Drivers/AgateOTK/OpenTK.dll
trunk/Drivers/AgateOTK/OpenTK.xml
Modified: trunk/Drivers/AgateOTK/OpenTK.dll
===================================================================
(Binary files differ)
Modified: trunk/Drivers/AgateOTK/OpenTK.xml
===================================================================
--- trunk/Drivers/AgateOTK/OpenTK.xml 2010-12-23 19:24:44 UTC (rev 1252)
+++ trunk/Drivers/AgateOTK/OpenTK.xml 2010-12-23 19:26:48 UTC (rev 1253)
@@ -20,8363 +20,934 @@
resource lookups using this strongly typed resource class.
</summary>
</member>
- <member name="T:OpenTK.Platform.X11.Glx">
- \internal
+ <member name="T:OpenTK.Audio.AudioContext">
<summary>
- Provides access to GLX functions.
+ Provides methods to instantiate, use and destroy an audio context for playback.
+ Static methods are provided to list available devices known by the driver.
</summary>
</member>
- <member name="T:OpenTK.BindingsBase">
+ <member name="M:OpenTK.Audio.AudioContext.#cctor">
+ \internal
<summary>
- Provides a common foundation for all flat API bindings and implements the extension loading interface.
+ Runs before the actual class constructor, to load available devices.
</summary>
</member>
- <member name="F:OpenTK.BindingsBase.DelegatesClass">
- <summary>
- A reflection handle to the nested type that contains the function delegates.
- </summary>
+ <member name="M:OpenTK.Audio.AudioContext.#ctor">
+ <summary>Constructs a new AudioContext, using the default audio device.</summary>
</member>
- <member name="F:OpenTK.BindingsBase.CoreClass">
+ <member name="M:OpenTK.Audio.AudioContext.#ctor(System.String)">
<summary>
- A refection handle to the nested type that contains core functions (i.e. not extensions).
+ Constructs a new AudioContext instance.
</summary>
+ <param name="device">The device name that will host this instance.</param>
</member>
- <member name="F:OpenTK.BindingsBase.CoreFunctionMap">
- <summary>
- A mapping of core function names to MethodInfo handles.
- </summary>
+ <member name="M:OpenTK.Audio.AudioContext.#ctor(System.String,System.Int32)">
+ <summary>Constructs a new AudioContext, using the specified audio device and device parameters.</summary>
+ <param name="device">The name of the audio device to use.</param>
+ <param name="freq">Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default.</param>
+ <remarks>
+ Use AudioContext.AvailableDevices to obtain a list of all available audio devices.
+ devices.
+ </remarks>
</member>
- <member name="M:OpenTK.BindingsBase.#ctor">
- <summary>
- Constructs a new BindingsBase instance.
- </summary>
- </member>
- <member name="M:OpenTK.BindingsBase.GetAddress(System.String)">
- <summary>
- Retrieves an unmanaged function pointer to the specified function.
- </summary>
- <param name="funcname">
- A <see cref="T:System.String"/> that defines the name of the function.
- </param>
- <returns>
- A <see cref="T:System.IntPtr"/> that contains the address of funcname or IntPtr.Zero,
- if the function is not supported by the drivers.
- </returns>
+ <member name="M:OpenTK.Audio.AudioContext.#ctor(System.String,System.Int32,System.Int32)">
+ <summary>Constructs a new AudioContext, using the specified audio device and device parameters.</summary>
+ <param name="device">The name of the audio device to use.</param>
+ <param name="freq">Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default.</param>
+ <param name="refresh">Refresh intervals, in units of Hz. Pass 0 for driver default.</param>
<remarks>
- Note: some drivers are known to return non-zero values for unsupported functions.
- Typical values include 1 and 2 - inheritors are advised to check for and ignore these
- values.
+ Use AudioContext.AvailableDevices to obtain a list of all available audio devices.
+ devices.
</remarks>
</member>
- <member name="P:OpenTK.BindingsBase.RebuildExtensionList">
- <summary>
- Gets or sets a <see cref="T:System.Boolean"/> that indicates whether the list of supported extensions may have changed.
- </summary>
- </member>
- <member name="P:OpenTK.BindingsBase.SyncRoot">
- <summary>
- Gets an object that can be used to synchronize access to the bindings implementation.
- </summary>
- <remarks>This object should be unique across bindings but consistent between bindings
- of the same type. For example, ES10.GL, OpenGL.GL and CL10.CL should all return
- unique objects, but all instances of ES10.GL should return the same object.</remarks>
- </member>
- <member name="T:OpenTK.Input.MouseButton">
- <summary>
- Enumerates all possible mouse buttons.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Left">
- <summary>
- The left mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Middle">
- <summary>
- The middle mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Right">
- <summary>
- The right mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button1">
- <summary>
- The first extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button2">
- <summary>
- The second extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button3">
- <summary>
- The third extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button4">
- <summary>
- The fourth extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button5">
- <summary>
- The fifth extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button6">
- <summary>
- The sixth extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button7">
- <summary>
- The seventh extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button8">
- <summary>
- The eigth extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.Button9">
- <summary>
- The ninth extra mouse button.
- </summary>
- </member>
- <member name="F:OpenTK.Input.MouseButton.LastButton">
- <summary>
- Indicates the last available mouse button.
- </summary>
- </member>
- <member name="T:OpenTK.Input.IInputDriver">
- <summary>
- Defines the interface for an input driver.
- </summary>
- </member>
- <member name="T:OpenTK.Input.IKeyboardDriver">
- <summary>
- Defines the interface for KeyboardDevice drivers.
- </summary>
- </member>
- <member name="P:OpenTK.Input.IKeyboardDriver.Keyboard">
- <summary>
- Gets the list of available KeyboardDevices.
- </summary>
- </member>
- <member name="T:OpenTK.Input.IMouseDriver">
- <summary>
- Defines the interface for MouseDevice drivers.
- </summary>
- </member>
- <member name="P:OpenTK.Input.IMouseDriver.Mouse">
- <summary>
- Gets the list of available MouseDevices.
- </summary>
- </member>
- <member name="T:OpenTK.Input.IJoystickDriver">
- <summary>
- Defines the interface for JoystickDevice drivers.
- </summary>
- </member>
- <member name="P:OpenTK.Input.IJoystickDriver.Joysticks">
- <summary>
- Gets the list of available JoystickDevices.
- </summary>
- </member>
- <member name="M:OpenTK.Input.IInputDriver.Poll">
- <summary>
- Updates the state of the driver.
- </summary>
- </member>
- <member name="T:OpenTK.Graphics.ES20.GL">
- <summary>
- Provides access to OpenGL ES 2.0 methods.
- </summary>
- </member>
- <member name="T:OpenTK.Graphics.GraphicsBindingsBase">
- <summary>
- Implements BindingsBase for the OpenTK.Graphics namespace (OpenGL and OpenGL|ES).
- </summary>
- </member>
- <member name="M:OpenTK.Graphics.GraphicsBindingsBase.GetAddress(System.String)">
- <summary>
- Retrieves an unmanaged function pointer to the specified function.
- </summary>
- <param name="funcname">
- A <see cref="T:System.String"/> that defines the name of the function.
- </param>
- <returns>
- A <see cref="T:System.IntPtr"/> that contains the address of funcname or IntPtr.Zero,
- if the function is not supported by the drivers.
- </returns>
+ <member name="M:OpenTK.Audio.AudioContext.#ctor(System.String,System.Int32,System.Int32,System.Boolean)">
+ <summary>Constructs a new AudioContext, using the specified audio device and device parameters.</summary>
+ <param name="device">The name of the audio device to use.</param>
+ <param name="freq">Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default.</param>
+ <param name="refresh">Refresh intervals, in units of Hz. Pass 0 for driver default.</param>
+ <param name="sync">Flag, indicating a synchronous context.</param>
<remarks>
- Note: some drivers are known to return non-zero values for unsupported functions.
- Typical values include 1 and 2 - inheritors are advised to check for and ignore these
- values.
+ Use AudioContext.AvailableDevices to obtain a list of all available audio devices.
+ devices.
</remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.ActiveTexture(OpenTK.Graphics.ES20.TextureUnit)">
- <summary>
- Select active texture unit
- </summary>
- <param name="texture">
+ <member name="M:OpenTK.Audio.AudioContext.#ctor(System.String,System.Int32,System.Int32,System.Boolean,System.Boolean)">
+ <summary>Creates the audio context using the specified device and device parameters.</summary>
+ <param name="device">The device descriptor obtained through AudioContext.AvailableDevices.</param>
+ <param name="freq">Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default.</param>
+ <param name="refresh">Refresh intervals, in units of Hz. Pass 0 for driver default.</param>
+ <param name="sync">Flag, indicating a synchronous context.</param>
+ <param name="enableEfx">Indicates whether the EFX extension should be initialized, if present.</param>
+ <exception cref="T:System.ArgumentNullException">Occurs when the device string is invalid.</exception>
+ <exception cref="T:System.ArgumentOutOfRangeException">Occurs when a specified parameter is invalid.</exception>
+ <exception cref="T:OpenTK.Audio.AudioDeviceException">
+ Occurs when the specified device is not available, or is in use by another program.
+ </exception>
+ <exception cref="T:OpenTK.Audio.AudioContextException">
+ Occurs when an audio context could not be created with the specified parameters.
+ </exception>
+ <exception cref="T:System.NotSupportedException">
+ Occurs when an AudioContext already exists.</exception>
+ <remarks>
+ <para>For maximum compatibility, you are strongly recommended to use the default constructor.</para>
+ <para>Multiple AudioContexts are not supported at this point.</para>
<para>
- Specifies which texture unit to make active. The number of texture units is implementation dependent, but must be at least two. texture must be one of GL_TEXTURE, where i ranges from 0 to the larger of (GL_MAX_TEXTURE_COORDS - 1) and (GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1). The initial value is GL_TEXTURE0.
+ The number of auxilliary EFX sends depends on the audio hardware and drivers. Most Realtek devices, as well
+ as the Creative SB Live!, support 1 auxilliary send. Creative's Audigy and X-Fi series support 4 sends.
+ Values higher than supported will be clamped by the driver.
</para>
- </param>
+ </remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.AttachShader(System.Int32,System.Int32)">
- <summary>
- Attaches a shader object to a program object
- </summary>
- <param name="program">
+ <member name="M:OpenTK.Audio.AudioContext.#ctor(System.String,System.Int32,System.Int32,System.Boolean,System.Boolean,OpenTK.Audio.AudioContext.MaxAuxiliarySends)">
+ <summary>Creates the audio context using the specified device and device parameters.</summary>
+ <param name="device">The device descriptor obtained through AudioContext.AvailableDevices.</param>
+ <param name="freq">Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default.</param>
+ <param name="refresh">Refresh intervals, in units of Hz. Pass 0 for driver default.</param>
+ <param name="sync">Flag, indicating a synchronous context.</param>
+ <param name="enableEfx">Indicates whether the EFX extension should be initialized, if present.</param>
+ <param name="efxMaxAuxSends">Requires EFX enabled. The number of desired Auxiliary Sends per source.</param>
+ <exception cref="T:System.ArgumentNullException">Occurs when the device string is invalid.</exception>
+ <exception cref="T:System.ArgumentOutOfRangeException">Occurs when a specified parameter is invalid.</exception>
+ <exception cref="T:OpenTK.Audio.AudioDeviceException">
+ Occurs when the specified device is not available, or is in use by another program.
+ </exception>
+ <exception cref="T:OpenTK.Audio.AudioContextException">
+ Occurs when an audio context could not be created with the specified parameters.
+ </exception>
+ <exception cref="T:System.NotSupportedException">
+ Occurs when an AudioContext already exists.</exception>
+ <remarks>
+ <para>For maximum compatibility, you are strongly recommended to use the default constructor.</para>
+ <para>Multiple AudioContexts are not supported at this point.</para>
<para>
- Specifies the program object to which a shader object will be attached.
+ The number of auxilliary EFX sends depends on the audio hardware and drivers. Most Realtek devices, as well
+ as the Creative SB Live!, support 1 auxilliary send. Creative's Audigy and X-Fi series support 4 sends.
+ Values higher than supported will be clamped by the driver.
</para>
- </param>
- <param name="shader">
- <para>
- Specifies the shader object that is to be attached.
- </para>
- </param>
+ </remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.AttachShader(System.UInt32,System.UInt32)">
- <summary>
- Attaches a shader object to a program object
- </summary>
- <param name="program">
+ <member name="M:OpenTK.Audio.AudioContext.CreateContext(System.String,System.Int32,System.Int32,System.Boolean,System.Boolean,OpenTK.Audio.AudioContext.MaxAuxiliarySends)">
+ \internal
+ <summary>Creates the audio context using the specified device.</summary>
+ <param name="device">The device descriptor obtained through AudioContext.AvailableDevices, or null for the default device.</param>
+ <param name="freq">Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default.</param>
+ <param name="refresh">Refresh intervals, in units of Hz. Pass 0 for driver default.</param>
+ <param name="sync">Flag, indicating a synchronous context.</param>
+ <param name="enableEfx">Indicates whether the EFX extension should be initialized, if present.</param>
+ <param name="efxAuxiliarySends">Requires EFX enabled. The number of desired Auxiliary Sends per source.</param>
+ <exception cref="T:System.ArgumentOutOfRangeException">Occurs when a specified parameter is invalid.</exception>
+ <exception cref="T:OpenTK.Audio.AudioDeviceException">
+ Occurs when the specified device is not available, or is in use by another program.
+ </exception>
+ <exception cref="T:OpenTK.Audio.AudioContextException">
+ Occurs when an audio context could not be created with the specified parameters.
+ </exception>
+ <exception cref="T:System.NotSupportedException">
+ Occurs when an AudioContext already exists.</exception>
+ <remarks>
+ <para>For maximum compatibility, you are strongly recommended to use the default constructor.</para>
+ <para>Multiple AudioContexts are not supported at this point.</para>
<para>
- Specifies the program object to which a shader object will be attached.
+ The number of auxilliary EFX sends depends on the audio hardware and drivers. Most Realtek devices, as well
+ as the Creative SB Live!, support 1 auxilliary send. Creative's Audigy and X-Fi series support 4 sends.
+ Values higher than supported will be clamped by the driver.
</para>
- </param>
- <param name="shader">
- <para>
- Specifies the shader object that is to be attached.
- </para>
- </param>
+ </remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BindAttribLocation(System.Int32,System.Int32,System.String)">
- <summary>
- Associates a generic vertex attribute index with a named attribute variable
- </summary>
- <param name="program">
- <para>
- Specifies the handle of the program object in which the association is to be made.
- </para>
- </param>
- <param name="index">
- <para>
- Specifies the index of the generic vertex attribute to be bound.
- </para>
- </param>
- <param name="name">
- <para>
- Specifies a null terminated string containing the name of the vertex shader attribute variable to which index is to be bound.
- </para>
- </param>
+ <member name="M:OpenTK.Audio.AudioContext.MakeCurrent(OpenTK.Audio.AudioContext)">
+ \internal
+ <summary>Makes the specified AudioContext current in the calling thread.</summary>
+ <param name="context">The OpenTK.Audio.AudioContext to make current, or null.</param>
+ <exception cref="T:System.ObjectDisposedException">
+ Occurs if this function is called after the AudioContext has been disposed.
+ </exception>
+ <exception cref="T:OpenTK.Audio.AudioContextException">
+ Occurs when the AudioContext could not be made current.
+ </exception>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BindAttribLocation(System.UInt32,System.UInt32,System.String)">
+ <member name="M:OpenTK.Audio.AudioContext.CheckErrors">
<summary>
- Associates a generic vertex attribute index with a named attribute variable
+ Checks for ALC error conditions.
</summary>
- <param name="program">
- <para>
- Specifies the handle of the program object in which the association is to be made.
- </para>
- </param>
- <param name="index">
- <para>
- Specifies the index of the generic vertex attribute to be bound.
- </para>
- </param>
- <param name="name">
- <para>
- Specifies a null terminated string containing the name of the vertex shader attribute variable to which index is to be bound.
- </para>
- </param>
+ <exception cref="T:System.OutOfMemoryException">Raised when an out of memory error is detected.</exception>
+ <exception cref="T:OpenTK.Audio.AudioValueException">Raised when an invalid value is detected.</exception>
+ <exception cref="T:OpenTK.Audio.AudioDeviceException">Raised when an invalid device is detected.</exception>
+ <exception cref="T:OpenTK.Audio.AudioContextException">Raised when an invalid context is detected.</exception>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BindBuffer(OpenTK.Graphics.ES20.BufferTarget,System.Int32)">
- <summary>
- Bind a named buffer object
- </summary>
- <param name="target">
- <para>
- Specifies the target to which the buffer object is bound. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="buffer">
- <para>
- Specifies the name of a buffer object.
- </para>
- </param>
+ <member name="M:OpenTK.Audio.AudioContext.MakeCurrent">
+ <summary>Makes the AudioContext current in the calling thread.</summary>
+ <exception cref="T:System.ObjectDisposedException">
+ Occurs if this function is called after the AudioContext has been disposed.
+ </exception>
+ <exception cref="T:OpenTK.Audio.AudioContextException">
+ Occurs when the AudioContext could not be made current.
+ </exception>
+ <remarks>
+ Only one AudioContext can be current in the application at any time,
+ <b>regardless of the number of threads</b>.
+ </remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BindBuffer(OpenTK.Graphics.ES20.BufferTarget,System.UInt32)">
+ <member name="M:OpenTK.Audio.AudioContext.Process">
<summary>
- Bind a named buffer object
+ Processes queued audio events.
</summary>
- <param name="target">
+ <remarks>
<para>
- Specifies the target to which the buffer object is bound. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+ If AudioContext.IsSynchronized is true, this function will resume
+ the internal audio processing thread. If AudioContext.IsSynchronized is false,
+ you will need to call this function multiple times per second to process
+ audio events.
</para>
- </param>
- <param name="buffer">
<para>
- Specifies the name of a buffer object.
+ In some implementations this function may have no effect.
</para>
- </param>
+ </remarks>
+ <exception cref="T:System.ObjectDisposedException">Occurs when this function is called after the AudioContext had been disposed.</exception>
+ <seealso cref="M:OpenTK.Audio.AudioContext.Suspend"/>
+ <seealso cref="P:OpenTK.Audio.AudioContext.IsProcessing"/>
+ <seealso cref="P:OpenTK.Audio.AudioContext.IsSynchronized"/>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BindTexture(OpenTK.Graphics.ES20.TextureTarget,System.Int32)">
+ <member name="M:OpenTK.Audio.AudioContext.Suspend">
<summary>
- Bind a named texture to a texturing target
+ Suspends processing of audio events.
</summary>
- <param name="target">
+ <remarks>
<para>
- Specifies the target to which the texture is bound. Must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
+ To avoid audio artifacts when calling this function, set audio gain to zero before
+ suspending an AudioContext.
</para>
- </param>
- <param name="texture">
<para>
- Specifies the name of a texture.
+ In some implementations, it can be faster to suspend processing before changing
+ AudioContext state.
</para>
- </param>
- </member>
- <member name="M:OpenTK.Graphics.ES20.GL.BindTexture(OpenTK.Graphics.ES20.TextureTarget,System.UInt32)">
- <summary>
- Bind a named texture to a texturing target
- </summary>
- <param name="target">
<para>
- Specifies the target to which the texture is bound. Must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
+ In some implementations this function may have no effect.
</para>
- </param>
- <param name="texture">
- <para>
- Specifies the name of a texture.
- </para>
- </param>
+ </remarks>
+ <exception cref="T:System.ObjectDisposedException">Occurs when this function is called after the AudioContext had been disposed.</exception>
+ <seealso cref="M:OpenTK.Audio.AudioContext.Process"/>
+ <seealso cref="P:OpenTK.Audio.AudioContext.IsProcessing"/>
+ <seealso cref="P:OpenTK.Audio.AudioContext.IsSynchronized"/>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BlendColor(System.Single,System.Single,System.Single,System.Single)">
+ <member name="M:OpenTK.Audio.AudioContext.SupportsExtension(System.String)">
<summary>
- Set the blend color
+ Checks whether the specified OpenAL extension is supported.
</summary>
- <param name="red">
- <para>
- specify the components of GL_BLEND_COLOR
- </para>
- </param>
+ <param name="extension">The name of the extension to check (e.g. "ALC_EXT_EFX").</param>
+ <returns>true if the extension is supported; false otherwise.</returns>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode)">
+ <member name="M:OpenTK.Audio.AudioContext.Dispose">
<summary>
- Specify the equation used for both the RGB blend equation and the Alpha blend equation
+ Disposes of the AudioContext, cleaning up all resources consumed by it.
</summary>
- <param name="mode">
- <para>
- specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
- </para>
- </param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode,OpenTK.Graphics.ES20.BlendEquationMode)">
+ <member name="M:OpenTK.Audio.AudioContext.Finalize">
<summary>
- Set the RGB blend equation and the alpha blend equation separately
+ Finalizes this instance.
</summary>
- <param name="modeRGB">
- <para>
- specifies the RGB blend equation, how the red, green, and blue components of the source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
- </para>
- </param>
- <param name="modeAlpha">
- <para>
- specifies the alpha blend equation, how the alpha component of the source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
- </para>
- </param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc,OpenTK.Graphics.ES20.BlendingFactorDest)">
+ <member name="M:OpenTK.Audio.AudioContext.GetHashCode">
<summary>
- Specify pixel arithmetic
+ Calculates the hash code for this instance.
</summary>
- <param name="sfactor">
- <para>
- Specifies how the red, green, blue, and alpha source blending factors are computed. The following symbolic constants are accepted: GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, and GL_SRC_ALPHA_SATURATE. The initial value is GL_ONE.
- </para>
- </param>
- <param name="dfactor">
- <para>
- Specifies how the red, green, blue, and alpha destination blending factors are computed. The following symbolic constants are accepted: GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA. GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, GL_CONSTANT_ALPHA, and GL_ONE_MINUS_CONSTANT_ALPHA. The initial value is GL_ZERO.
- </para>
- </param>
+ <returns></returns>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc,OpenTK.Graphics.ES20.BlendingFactorDest,OpenTK.Graphics.ES20.BlendingFactorSrc,OpenTK.Graphics.ES20.BlendingFactorDest)">
+ <member name="M:OpenTK.Audio.AudioContext.Equals(System.Object)">
<summary>
- Specify pixel arithmetic for RGB and alpha components separately
+ Compares this instance with another.
</summary>
- <param name="srcRGB">
- <para>
- Specifies how the red, green, and blue blending factors are computed. The following symbolic constants are accepted: GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, and GL_SRC_ALPHA_SATURATE. The initial value is GL_ONE.
- </para>
- </param>
- <param name="dstRGB">
- <para>
- Specifies how the red, green, and blue destination blending factors are computed. The following symbolic constants are accepted: GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA. GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, GL_CONSTANT_ALPHA, and GL_ONE_MINUS_CONSTANT_ALPHA. The initial value is GL_ZERO.
- </para>
- </param>
- <param name="srcAlpha">
- <para>
- Specified how the alpha source blending factor is computed. The same symbolic constants are accepted as for srcRGB. The initial value is GL_ONE.
- </para>
- </param>
- <param name="dstAlpha">
- <para>
- Specified how the alpha destination blending factor is computed. The same symbolic constants are accepted as for dstRGB. The initial value is GL_ZERO.
- </para>
- </param>
+ <param name="obj">The instance to compare to.</param>
+ <returns>True, if obj refers to this instance; false otherwise.</returns>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferData(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,System.IntPtr,OpenTK.Graphics.ES20.BufferUsage)">
+ <member name="M:OpenTK.Audio.AudioContext.ToString">
<summary>
- Creates and initializes a buffer object's data store
+ Returns a <see cref="T:System.String"/> that desrcibes this instance.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the buffer object's new data store.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to data that will be copied into the data store for initialization, or NULL if no data is to be copied.
- </para>
- </param>
- <param name="usage">
- <para>
- Specifies the expected usage pattern of the data store. The symbolic constant must be GL_STREAM_DRAW, GL_STREAM_READ, GL_STREAM_COPY, GL_STATIC_DRAW, GL_STATIC_READ, GL_STATIC_COPY, GL_DYNAMIC_DRAW, GL_DYNAMIC_READ, or GL_DYNAMIC_COPY.
- </para>
- </param>
+ <returns>A <see cref="T:System.String"/> that desrcibes this instance.</returns>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,``0[],OpenTK.Graphics.ES20.BufferUsage)">
+ <member name="P:OpenTK.Audio.AudioContext.IsCurrent">
<summary>
- Creates and initializes a buffer object's data store
+ Gets or sets a System.Boolean indicating whether the AudioContext
+ is current.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the buffer object's new data store.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to data that will be copied into the data store for initialization, or NULL if no data is to be copied.
- </para>
- </param>
- <param name="usage">
- <para>
- Specifies the expected usage pattern of the data store. The symbolic constant must be GL_STREAM_DRAW, GL_STREAM_READ, GL_STREAM_COPY, GL_STATIC_DRAW, GL_STATIC_READ, GL_STATIC_COPY, GL_DYNAMIC_DRAW, GL_DYNAMIC_READ, or GL_DYNAMIC_COPY.
- </para>
- </param>
+ <remarks>
+ Only one AudioContext can be current in the application at any time,
+ <b>regardless of the number of threads</b>.
+ </remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,``0[0:,0:],OpenTK.Graphics.ES20.BufferUsage)">
+ <member name="P:OpenTK.Audio.AudioContext.CurrentError">
<summary>
- Creates and initializes a buffer object's data store
+ Returns the ALC error code for this instance.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the buffer object's new data store.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to data that will be copied into the data store for initialization, or NULL if no data is to be copied.
- </para>
- </param>
- <param name="usage">
- <para>
- Specifies the expected usage pattern of the data store. The symbolic constant must be GL_STREAM_DRAW, GL_STREAM_READ, GL_STREAM_COPY, GL_STATIC_DRAW, GL_STATIC_READ, GL_STATIC_COPY, GL_DYNAMIC_DRAW, GL_DYNAMIC_READ, or GL_DYNAMIC_COPY.
- </para>
- </param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,``0[0:,0:,0:],OpenTK.Graphics.ES20.BufferUsage)">
+ <member name="P:OpenTK.Audio.AudioContext.IsProcessing">
<summary>
- Creates and initializes a buffer object's data store
+ Gets a System.Boolean indicating whether the AudioContext is
+ currently processing audio events.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the buffer object's new data store.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to data that will be copied into the data store for initialization, or NULL if no data is to be copied.
- </para>
- </param>
- <param name="usage">
- <para>
- Specifies the expected usage pattern of the data store. The symbolic constant must be GL_STREAM_DRAW, GL_STREAM_READ, GL_STREAM_COPY, GL_STATIC_DRAW, GL_STATIC_READ, GL_STATIC_COPY, GL_DYNAMIC_DRAW, GL_DYNAMIC_READ, or GL_DYNAMIC_COPY.
- </para>
- </param>
+ <seealso cref="M:OpenTK.Audio.AudioContext.Process"/>
+ <seealso cref="M:OpenTK.Audio.AudioContext.Suspend"/>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,``0@,OpenTK.Graphics.ES20.BufferUsage)">
+ <member name="P:OpenTK.Audio.AudioContext.IsSynchronized">
<summary>
- Creates and initializes a buffer object's data store
+ Gets a System.Boolean indicating whether the AudioContext is
+ synchronized.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the buffer object's new data store.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to data that will be copied into the data store for initialization, or NULL if no data is to be copied.
- </para>
- </param>
- <param name="usage">
- <para>
- Specifies the expected usage pattern of the data store. The symbolic constant must be GL_STREAM_DRAW, GL_STREAM_READ, GL_STREAM_COPY, GL_STATIC_DRAW, GL_STATIC_READ, GL_STATIC_COPY, GL_DYNAMIC_DRAW, GL_DYNAMIC_READ, or GL_DYNAMIC_COPY.
- </para>
- </param>
+ <seealso cref="M:OpenTK.Audio.AudioContext.Process"/>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferSubData(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,System.IntPtr,System.IntPtr)">
+ <member name="P:OpenTK.Audio.AudioContext.CurrentDevice">
<summary>
- Updates a subset of a buffer object's data store
+ Gets a System.String with the name of the device used in this context.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="offset">
- <para>
- Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the data store region being replaced.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the new data that will be copied into the data store.
- </para>
- </param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferSubData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,System.IntPtr,``0[])">
+ <member name="P:OpenTK.Audio.AudioContext.CurrentContext">
<summary>
- Updates a subset of a buffer object's data store
+ Gets the OpenTK.Audio.AudioContext which is current in the application.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="offset">
- <para>
- Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the data store region being replaced.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the new data that will be copied into the data store.
- </para>
- </param>
+ <remarks>
+ Only one AudioContext can be current in the application at any time,
+ <b>regardless of the number of threads</b>.
+ </remarks>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferSubData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,System.IntPtr,``0[0:,0:])">
+ <member name="P:OpenTK.Audio.AudioContext.AvailableDevices">
<summary>
- Updates a subset of a buffer object's data store
+ Returns a list of strings containing all known playback devices.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="offset">
- <para>
- Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the data store region being replaced.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the new data that will be copied into the data store.
- </para>
- </param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferSubData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,System.IntPtr,``0[0:,0:,0:])">
+ <member name="P:OpenTK.Audio.AudioContext.DefaultDevice">
<summary>
- Updates a subset of a buffer object's data store
+ Returns the name of the device that will be used as playback default.
</summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="offset">
- <para>
- Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the data store region being replaced.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the new data that will be copied into the data store.
- </para>
- </param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.BufferSubData``1(OpenTK.Graphics.ES20.BufferTarget,System.IntPtr,System.IntPtr,``0@)">
- <summary>
- Updates a subset of a buffer object's data store
- </summary>
- <param name="target">
- <para>
- Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
- </para>
- </param>
- <param name="offset">
- <para>
- Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
- </para>
- </param>
- <param name="size">
- <para>
- Specifies the size in bytes of the data store region being replaced.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the new data that will be copied into the data store.
- </para>
- </param>
+ <member name="T:OpenTK.Audio.AudioContext.MaxAuxiliarySends">
+ <summary>May be passed at context construction time to indicate the number of desired auxiliary effect slot sends per source.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.Clear(OpenTK.Graphics.ES20.ClearBufferMask)">
- <summary>
- Clear buffers to preset values
- </summary>
- <param name="mask">
- <para>
- Bitwise OR of masks that indicate the buffers to be cleared. The four masks are GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT, GL_ACCUM_BUFFER_BIT, and GL_STENCIL_BUFFER_BIT.
- </para>
- </param>
+ <member name="F:OpenTK.Audio.AudioContext.MaxAuxiliarySends.UseDriverDefault">
+ <summary>Will chose a reliably working parameter.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.ClearColor(System.Single,System.Single,System.Single,System.Single)">
- <summary>
- Specify clear values for the color buffers
- </summary>
- <param name="red">
- <para>
- Specify the red, green, blue, and alpha values used when the color buffers are cleared. The initial values are all 0.
- </para>
- </param>
+ <member name="F:OpenTK.Audio.AudioContext.MaxAuxiliarySends.One">
+ <summary>One send per source.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.ClearDepth(System.Single)">
- <summary>
- Specify the clear value for the depth buffer
- </summary>
- <param name="depth">
- <para>
- Specifies the depth value used when the depth buffer is cleared. The initial value is 1.
- </para>
- </param>
+ <member name="F:OpenTK.Audio.AudioContext.MaxAuxiliarySends.Two">
+ <summary>Two sends per source.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.ClearStencil(System.Int32)">
- <summary>
- Specify the clear value for the stencil buffer
- </summary>
- <param name="s">
- <para>
- Specifies the index used when the stencil buffer is cleared. The initial value is 0.
- </para>
- </param>
+ <member name="F:OpenTK.Audio.AudioContext.MaxAuxiliarySends.Three">
+ <summary>Three sends per source.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.ColorMask(System.Boolean,System.Boolean,System.Boolean,System.Boolean)">
- <summary>
- Enable and disable writing of frame buffer color components
- </summary>
- <param name="red">
- <para>
- Specify whether red, green, blue, and alpha can or cannot be written into the frame buffer. The initial values are all GL_TRUE, indicating that the color components can be written.
- </para>
- </param>
+ <member name="F:OpenTK.Audio.AudioContext.MaxAuxiliarySends.Four">
+ <summary>Four sends per source.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.CompileShader(System.Int32)">
- <summary>
- Compiles a shader object
- </summary>
- <param name="shader">
- <para>
- Specifies the shader object to be compiled.
- </para>
- </param>
+ <member name="T:OpenTK.Audio.AudioValueException">
+ <summary>Represents exceptions related to invalid values.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.CompileShader(System.UInt32)">
- <summary>
- Compiles a shader object
- </summary>
- <param name="shader">
- <para>
- Specifies the shader object to be compiled.
- </para>
- </param>
+ <member name="T:OpenTK.Audio.AudioException">
+ <summary>Represents exceptions related to the OpenTK.Audio subsystem.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.CompressedTexImage2D(OpenTK.Graphics.ES20.TextureTarget,System.Int32,OpenTK.Graphics.ES20.PixelInternalFormat,System.Int32,System.Int32,System.Int32,System.Int32,System.IntPtr)">
- <summary>
- Specify a two-dimensional texture image in a compressed format
- </summary>
- <param name="target">
- <para>
- Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
- </para>
- </param>
- <param name="level">
- <para>
- Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
- </para>
- </param>
- <param name="internalformat">
- <para>
- Specifies the format of the compressed image data stored at address data.
- </para>
- </param>
- <param name="width">
- <para>
- Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
- </para>
- </param>
- <param name="height">
- <para>
- Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
- </para>
- </param>
- <param name="border">
- <para>
- Specifies the width of the border. Must be either 0 or 1.
- </para>
- </param>
- <param name="imageSize">
- <para>
- Specifies the number of unsigned bytes of image data starting at the address specified by data.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the compressed image data in memory.
- </para>
- </param>
+ <member name="M:OpenTK.Audio.AudioException.#ctor">
+ <summary>Constructs a new AudioException.</summary>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.CompressedTexImage2D``1(OpenTK.Graphics.ES20.TextureTarget,System.Int32,OpenTK.Graphics.ES20.PixelInternalFormat,System.Int32,System.Int32,System.Int32,System.Int32,``0[])">
- <summary>
- Specify a two-dimensional texture image in a compressed format
- </summary>
- <param name="target">
- <para>
- Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
- </para>
- </param>
- <param name="level">
- <para>
- Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
- </para>
- </param>
- <param name="internalformat">
- <para>
- Specifies the format of the compressed image data stored at address data.
- </para>
- </param>
- <param name="width">
- <para>
- Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
- </para>
- </param>
- <param name="height">
- <para>
- Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
- </para>
- </param>
- <param name="border">
- <para>
- Specifies the width of the border. Must be either 0 or 1.
- </para>
- </param>
- <param name="imageSize">
- <para>
- Specifies the number of unsigned bytes of image data starting at the address specified by data.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the compressed image data in memory.
- </para>
- </param>
+ <member name="M:OpenTK.Audio.AudioException.#ctor(System.String)">
+ <summary>Constructs a new AudioException with the specified error message.</summary>
+ <param name="message">The error message of the AudioException.</param>
</member>
- <member name="M:OpenTK.Graphics.ES20.GL.CompressedTexImage2D``1(OpenTK.Graphics.ES20.TextureTarget,System.Int32,OpenTK.Graphics.ES20.PixelInternalFormat,System.Int32,System.Int32,System.Int32,System.Int32,``0[0:,0:])">
- <summary>
- Specify a two-dimensional texture image in a compressed format
- </summary>
- <param name="target">
- <para>
- Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
- </para>
- </param>
- <param name="level">
- <para>
- Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
- </para>
- </param>
- <param name="internalformat">
- <para>
- Specifies the format of the compressed image data stored at address data.
- </para>
- </param>
- <param name="width">
- <para>
- Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
- </para>
- </param>
- <param name="height">
- <para>
- Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
- </para>
- </param>
- <param name="border">
- <para>
- Specifies the width of the border. Must be either 0 or 1.
- </para>
- </param>
- <param name="imageSize">
- <para>
- Specifies the number of unsigned bytes of image data starting at the address specified by data.
- </para>
- </param>
- <param name="data">
- <para>
- Specifies a pointer to the compressed image data in memory.
- </para>
- </param>
+ <member name="M:OpenTK.Audio.AudioValueException.#ctor">
+ <summary>Constructs a new instance.</summary>
</member>
- <member name="M:OpenTK.Graphi...
[truncated message content] |
|
From: <ka...@us...> - 2010-12-23 19:24:50
|
Revision: 1252
http://agate.svn.sourceforge.net/agate/?rev=1252&view=rev
Author: kanato
Date: 2010-12-23 19:24:44 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Make AgateSetup detect if multiple AgateSetups are created without disposing previous ones.
Added descriptive error message if AgateBuiltInShaders.InitializeShaders is called more than once.
Modified Paths:
--------------
trunk/AgateLib/AgateSetup.cs
trunk/AgateLib/DisplayLib/Shaders/AgateBuiltInShaders.cs
Modified: trunk/AgateLib/AgateSetup.cs
===================================================================
--- trunk/AgateLib/AgateSetup.cs 2010-12-23 18:56:59 UTC (rev 1251)
+++ trunk/AgateLib/AgateSetup.cs 2010-12-23 19:24:44 UTC (rev 1252)
@@ -57,6 +57,8 @@
/// </summary>
public sealed class AgateSetup : IDisposable
{
+ private static AgateSetup sCreatedSetup;
+
private bool mWasCanceled = false;
private bool mAskUser = false;
private bool mAlreadyAsked = false;
@@ -105,8 +107,9 @@
/// <summary>
/// Constructs a Setup object.
/// </summary>
- public AgateSetup()
+ public AgateSetup() : this("AgateLib", null)
{
+
Core.Initialize();
}
/// <summary>
@@ -114,10 +117,8 @@
/// </summary>
/// <param name="title"></param>
public AgateSetup(string title)
+ : this(title, null)
{
- Core.Initialize();
-
- mTitle = title;
}
/// <summary>
/// Constructs a Setup object.
@@ -134,8 +135,13 @@
/// <param name="args">Command line arguments to the program.</param>
public AgateSetup(string title, string[] args)
{
- Core.Initialize();
+ if (sCreatedSetup != null)
+ {
+ throw new AgateException("Error: You have created a second AgateSetup object without disposing the previous one.");
+ }
+ sCreatedSetup = this;
+
mTitle = title;
if (args != null)
@@ -263,6 +269,9 @@
Display.Dispose();
Audio.Dispose();
InputLib.JoystickInput.Dispose();
+
+ if (sCreatedSetup == this)
+ sCreatedSetup = null;
}
/// <summary>
Modified: trunk/AgateLib/DisplayLib/Shaders/AgateBuiltInShaders.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Shaders/AgateBuiltInShaders.cs 2010-12-23 18:56:59 UTC (rev 1251)
+++ trunk/AgateLib/DisplayLib/Shaders/AgateBuiltInShaders.cs 2010-12-23 19:24:44 UTC (rev 1252)
@@ -31,7 +31,13 @@
internal static void InitializeShaders()
{
if (Basic2DShader != null)
+ {
+ throw new AgateException(
+ "AgateBuiltInShaders.InitializeShaders was called more than once when it shouldn't be." + Environment.NewLine +
+ "Either something strange has happened, or an AgateSetup object was never disposed of.");
+
throw new InvalidOperationException();
+ }
Basic2DShader = new Basic2DShader();
Lighting2D = new Lighting2D();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 18:57:05
|
Revision: 1251
http://agate.svn.sourceforge.net/agate/?rev=1251&view=rev
Author: kanato
Date: 2010-12-23 18:56:59 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Add CPU configurations to examples.
Modified Paths:
--------------
trunk/Examples/BallBuster.Net/BallBuster.Net.csproj
trunk/Examples/Pong/Pong.csproj
trunk/Examples/ShootTheTraps/ShootTheTraps.csproj
trunk/Examples.sln
Removed Paths:
-------------
trunk/Examples/Pong/Pong.csproj.user
Modified: trunk/Examples/BallBuster.Net/BallBuster.Net.csproj
===================================================================
--- trunk/Examples/BallBuster.Net/BallBuster.Net.csproj 2010-12-23 18:56:05 UTC (rev 1250)
+++ trunk/Examples/BallBuster.Net/BallBuster.Net.csproj 2010-12-23 18:56:59 UTC (rev 1251)
@@ -49,6 +49,42 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>out\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+ <OutputPath>bin\x64\Release\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>out\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
Modified: trunk/Examples/Pong/Pong.csproj
===================================================================
--- trunk/Examples/Pong/Pong.csproj 2010-12-23 18:56:05 UTC (rev 1250)
+++ trunk/Examples/Pong/Pong.csproj 2010-12-23 18:56:59 UTC (rev 1251)
@@ -34,6 +34,46 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+ <OutputPath>bin\x64\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
Deleted: trunk/Examples/Pong/Pong.csproj.user
===================================================================
--- trunk/Examples/Pong/Pong.csproj.user 2010-12-23 18:56:05 UTC (rev 1250)
+++ trunk/Examples/Pong/Pong.csproj.user 2010-12-23 18:56:59 UTC (rev 1251)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <StartArguments>--choose</StartArguments>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Modified: trunk/Examples/ShootTheTraps/ShootTheTraps.csproj
===================================================================
--- trunk/Examples/ShootTheTraps/ShootTheTraps.csproj 2010-12-23 18:56:05 UTC (rev 1250)
+++ trunk/Examples/ShootTheTraps/ShootTheTraps.csproj 2010-12-23 18:56:59 UTC (rev 1251)
@@ -34,6 +34,42 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+ <OutputPath>bin\x64\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
Modified: trunk/Examples.sln
===================================================================
--- trunk/Examples.sln 2010-12-23 18:56:05 UTC (rev 1250)
+++ trunk/Examples.sln 2010-12-23 18:56:59 UTC (rev 1251)
@@ -20,41 +20,109 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Debug|x64.ActiveCfg = Debug|x64
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Debug|x64.Build.0 = Debug|x64
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Debug|x86.ActiveCfg = Debug|x86
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Debug|x86.Build.0 = Debug|x86
{DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Release|x64.ActiveCfg = Release|x64
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Release|x64.Build.0 = Release|x64
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Release|x86.ActiveCfg = Release|x86
+ {DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}.Release|x86.Build.0 = Release|x86
{50743D1B-A19E-42F1-842F-65FAD6D168C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50743D1B-A19E-42F1-842F-65FAD6D168C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Debug|x64.ActiveCfg = Debug|x64
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Debug|x64.Build.0 = Debug|x64
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Debug|x86.ActiveCfg = Debug|x86
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Debug|x86.Build.0 = Debug|x86
{50743D1B-A19E-42F1-842F-65FAD6D168C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50743D1B-A19E-42F1-842F-65FAD6D168C3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Release|x64.ActiveCfg = Release|x64
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Release|x64.Build.0 = Release|x64
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Release|x86.ActiveCfg = Release|x86
+ {50743D1B-A19E-42F1-842F-65FAD6D168C3}.Release|x86.Build.0 = Release|x86
{436641C4-846C-42D0-8E8F-95F70E211D22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{436641C4-846C-42D0-8E8F-95F70E211D22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Debug|x64.ActiveCfg = Debug|x64
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Debug|x64.Build.0 = Debug|x64
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Debug|x86.ActiveCfg = Debug|x86
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Debug|x86.Build.0 = Debug|x86
{436641C4-846C-42D0-8E8F-95F70E211D22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{436641C4-846C-42D0-8E8F-95F70E211D22}.Release|Any CPU.Build.0 = Release|Any CPU
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Release|x64.ActiveCfg = Release|x64
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Release|x64.Build.0 = Release|x64
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Release|x86.ActiveCfg = Release|x86
+ {436641C4-846C-42D0-8E8F-95F70E211D22}.Release|x86.Build.0 = Release|x86
{164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|x64.ActiveCfg = Debug|x64
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|x64.Build.0 = Debug|x64
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|x86.ActiveCfg = Debug|x86
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Debug|x86.Build.0 = Debug|x86
{164A785D-924E-40FB-A517-D7E677F3B53A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{164A785D-924E-40FB-A517-D7E677F3B53A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x64.ActiveCfg = Release|x64
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x64.Build.0 = Release|x64
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x86.ActiveCfg = Release|x86
+ {164A785D-924E-40FB-A517-D7E677F3B53A}.Release|x86.Build.0 = Release|x86
{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|x64.ActiveCfg = Debug|x64
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|x64.Build.0 = Debug|x64
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|x86.ActiveCfg = Debug|x86
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Debug|x86.Build.0 = Debug|x86
{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|x64.ActiveCfg = Release|x64
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|x64.Build.0 = Release|x64
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|x86.ActiveCfg = Release|x86
+ {9E095F03-BA3F-4EAD-A905-2A2647CE4405}.Release|x86.Build.0 = Release|x86
{9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x64.ActiveCfg = Debug|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x64.Build.0 = Debug|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x86.ActiveCfg = Debug|x86
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Debug|x86.Build.0 = Debug|x86
{9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9490B719-829E-43A7-A5FE-8001F8A81759}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x64.ActiveCfg = Release|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x64.Build.0 = Release|x64
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x86.ActiveCfg = Release|x86
+ {9490B719-829E-43A7-A5FE-8001F8A81759}.Release|x86.Build.0 = Release|x86
{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x64.ActiveCfg = Debug|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x64.Build.0 = Debug|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x86.ActiveCfg = Debug|x86
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Debug|x86.Build.0 = Debug|x86
{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x64.ActiveCfg = Release|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x64.Build.0 = Release|x64
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x86.ActiveCfg = Release|x86
+ {BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}.Release|x86.Build.0 = Release|x86
{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|x64.ActiveCfg = Debug|x64
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|x64.Build.0 = Debug|x64
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|x86.ActiveCfg = Debug|x86
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Debug|x86.Build.0 = Debug|x86
{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|Any CPU.Build.0 = Release|Any CPU
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|x64.ActiveCfg = Release|x64
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|x64.Build.0 = Release|x64
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|x86.ActiveCfg = Release|x86
+ {00C7FA95-98F4-43D9-9B63-34122B1DB003}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 18:56:11
|
Revision: 1250
http://agate.svn.sourceforge.net/agate/?rev=1250&view=rev
Author: kanato
Date: 2010-12-23 18:56:05 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Catch bad image format exception when loading SDL binaries.
Modified Paths:
--------------
trunk/Drivers/AgateSDL/Reporter.cs
Modified: trunk/Drivers/AgateSDL/Reporter.cs
===================================================================
--- trunk/Drivers/AgateSDL/Reporter.cs 2010-12-23 18:47:34 UTC (rev 1249)
+++ trunk/Drivers/AgateSDL/Reporter.cs 2010-12-23 18:56:05 UTC (rev 1250)
@@ -42,6 +42,14 @@
{
return false;
}
+ catch (BadImageFormatException e)
+ {
+ AgateLib.Core.ErrorReporting.Report(AgateLib.ErrorLevel.Warning,
+ "A BadImageFormatException was thrown when attempting to load SDL binaries." + Environment.NewLine +
+ "This is likely due to running a 64-bit executable with 32-bit SDL binaries.", e);
+
+ return false;
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-12-23 18:47:40
|
Revision: 1249
http://agate.svn.sourceforge.net/agate/?rev=1249&view=rev
Author: kanato
Date: 2010-12-23 18:47:34 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Add conversions between Point, PointF and Vector2.
Modified Paths:
--------------
trunk/AgateLib/Geometry/Point.cs
trunk/AgateLib/Geometry/PointF.cs
trunk/AgateLib/Geometry/Vector2.cs
Modified: trunk/AgateLib/Geometry/Point.cs
===================================================================
--- trunk/AgateLib/Geometry/Point.cs 2010-11-08 06:32:31 UTC (rev 1248)
+++ trunk/AgateLib/Geometry/Point.cs 2010-12-23 18:47:34 UTC (rev 1249)
@@ -139,6 +139,16 @@
return new PointF((float)a.X, (float)a.Y);
}
+ /// <summary>
+ /// Converts to a Vector2 object.
+ /// </summary>
+ /// <param name="a"></param>
+ /// <returns></returns>
+ public static explicit operator Vector2(Point a)
+ {
+ return new Vector2((float)a.X, (float)a.Y);
+ }
+
#endregion
#region --- Object Overrides ---
Modified: trunk/AgateLib/Geometry/PointF.cs
===================================================================
--- trunk/AgateLib/Geometry/PointF.cs 2010-11-08 06:32:31 UTC (rev 1248)
+++ trunk/AgateLib/Geometry/PointF.cs 2010-12-23 18:47:34 UTC (rev 1249)
@@ -137,9 +137,18 @@
return new Point((int)a.X, (int)a.Y);
}
+ /// <summary>
+ /// Converts to a Vector2 object.
+ /// </summary>
+ /// <param name="a"></param>
+ /// <returns></returns>
+ public static explicit operator Vector2(PointF a)
+ {
+ return new Vector2(a.x, a.y);
+ }
+
#endregion
-
-
+
#region --- Object Overrides ---
/// <summary>
Modified: trunk/AgateLib/Geometry/Vector2.cs
===================================================================
--- trunk/AgateLib/Geometry/Vector2.cs 2010-11-08 06:32:31 UTC (rev 1248)
+++ trunk/AgateLib/Geometry/Vector2.cs 2010-12-23 18:47:34 UTC (rev 1249)
@@ -79,6 +79,25 @@
}
/// <summary>
+ /// Converts to a PointF object.
+ /// </summary>
+ /// <param name="v"></param>
+ /// <returns></returns>
+ public static explicit operator PointF(Vector2 v)
+ {
+ return new PointF(v.X, v.Y);
+ }
+ /// <summary>
+ /// Converts to a Point object.
+ /// </summary>
+ /// <param name="v"></param>
+ /// <returns></returns>
+ public static explicit operator Point(Vector2 v)
+ {
+ return new Point((int)v.X, (int)v.Y);
+ }
+
+ /// <summary>
/// Vector representing the origin.
/// </summary>
public static readonly Vector2 Empty = new Vector2();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-08 06:32:37
|
Revision: 1248
http://agate.svn.sourceforge.net/agate/?rev=1248&view=rev
Author: kanato
Date: 2010-11-08 06:32:31 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
Fix memory leak in GL_Surface constructor.
Modified Paths:
--------------
trunk/Drivers/AgateOTK/GL_Surface.cs
Modified: trunk/Drivers/AgateOTK/GL_Surface.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Surface.cs 2010-11-03 01:40:33 UTC (rev 1247)
+++ trunk/Drivers/AgateOTK/GL_Surface.cs 2010-11-08 06:32:31 UTC (rev 1248)
@@ -80,9 +80,10 @@
mDrawBuffer = mDisplay.DrawBuffer;
// Load The Bitmap
- Drawing.Bitmap sourceImage = new Drawing.Bitmap(st);
-
- LoadFromBitmap(sourceImage);
+ using (Drawing.Bitmap sourceImage = new Drawing.Bitmap(st))
+ {
+ LoadFromBitmap(sourceImage);
+ }
}
public GL_Surface(Size size)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-03 01:40:39
|
Revision: 1247
http://agate.svn.sourceforge.net/agate/?rev=1247&view=rev
Author: kanato
Date: 2010-11-03 01:40:33 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Avoid going through resize image operation if it doesn't need to be resized.
Modified Paths:
--------------
trunk/Drivers/AgateOTK/GL_Surface.cs
Modified: trunk/Drivers/AgateOTK/GL_Surface.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Surface.cs 2010-11-03 01:39:55 UTC (rev 1246)
+++ trunk/Drivers/AgateOTK/GL_Surface.cs 2010-11-03 01:40:33 UTC (rev 1247)
@@ -395,20 +395,25 @@
private void LoadFromBitmap(Drawing.Bitmap sourceImage)
{
+ Drawing.Bitmap textureImage;
+ Size newSize = GetOGLSize(sourceImage);
mSourceRect.Size = Interop.Convert(sourceImage.Size);
- Size newSize = GetOGLSize(sourceImage);
+ if (newSize != mSourceRect.Size)
+ {
+ // create a new bitmap of the size OpenGL expects, and copy the source image to it.
+ textureImage = new Drawing.Bitmap(newSize.Width, newSize.Height);
+ Drawing.Graphics g = Drawing.Graphics.FromImage(textureImage);
- // create a new bitmap of the size OpenGL expects, and copy the source image to it.
- Drawing.Bitmap textureImage = new Drawing.Bitmap(newSize.Width, newSize.Height);
- Drawing.Graphics g = Drawing.Graphics.FromImage(textureImage);
+ g.Transform = new System.Drawing.Drawing2D.Matrix();
+ g.Clear(Drawing.Color.FromArgb(0, 0, 0, 0));
+ g.DrawImage(sourceImage, new Drawing.Rectangle(new Drawing.Point(0, 0), sourceImage.Size));
+ g.Dispose();
+ }
+ else
+ textureImage = sourceImage;
- g.Transform = new System.Drawing.Drawing2D.Matrix();
- g.Clear(Drawing.Color.FromArgb(0, 0, 0, 0));
- g.DrawImage(sourceImage, new Drawing.Rectangle(new Drawing.Point(0, 0), sourceImage.Size));
- g.Dispose();
-
mTextureSize = Interop.Convert(textureImage.Size);
mTexCoord = GetTextureCoords(mSourceRect);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-03 01:40:01
|
Revision: 1246
http://agate.svn.sourceforge.net/agate/?rev=1246&view=rev
Author: kanato
Date: 2010-11-03 01:39:55 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Fix initialization of drivers from user selection.
Modified Paths:
--------------
trunk/AgateLib/AgateSetup.cs
Modified: trunk/AgateLib/AgateSetup.cs
===================================================================
--- trunk/AgateLib/AgateSetup.cs 2010-11-02 05:18:22 UTC (rev 1245)
+++ trunk/AgateLib/AgateSetup.cs 2010-11-03 01:39:55 UTC (rev 1246)
@@ -199,7 +199,7 @@
private void InitializeDisplay()
{
DoAskUser();
- InitializeDisplay(mPreferredDisplay);
+ InitializeDisplay(mSelectDisplay);
}
/// <summary>
@@ -220,7 +220,7 @@
private void InitializeAudio()
{
DoAskUser();
- InitializeAudio(mPreferredAudio);
+ InitializeAudio(mSelectAudio);
}
/// <summary>
/// Initializes the Audio subsystem, to the specified driver.
@@ -241,7 +241,7 @@
private void InitializeInput()
{
DoAskUser();
- InitializeInput(mPreferredInput);
+ InitializeInput(mSelectInput);
}
/// <summary>
/// Initializes the Input subsystem, to the specified driver.
@@ -330,7 +330,6 @@
mPreferredDisplay, mPreferredAudio, mPreferredInput ,
out mSelectDisplay, out mSelectAudio, out mSelectInput);
-
mAlreadyAsked = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-02 05:18:28
|
Revision: 1245
http://agate.svn.sourceforge.net/agate/?rev=1245&view=rev
Author: kanato
Date: 2010-11-02 05:18:22 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Fix SetClipRect to call FlushDrawBuffer before changing the clip rectangle.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/Display.cs
Modified: trunk/AgateLib/DisplayLib/Display.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Display.cs 2010-11-02 03:03:54 UTC (rev 1244)
+++ trunk/AgateLib/DisplayLib/Display.cs 2010-11-02 05:18:22 UTC (rev 1245)
@@ -340,6 +340,7 @@
/// <param name="newClipRect"></param>
public static void SetClipRect(Rectangle newClipRect)
{
+ FlushDrawBuffer();
impl.SetClipRect(newClipRect);
}
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-02 03:04:00
|
Revision: 1244
http://agate.svn.sourceforge.net/agate/?rev=1244&view=rev
Author: kanato
Date: 2010-11-02 03:03:54 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Fix from Chris the Avatar for ReadPixels when specified size is smaller than the surface size.
Modified Paths:
--------------
trunk/Drivers/AgateOTK/GL_Surface.cs
Modified: trunk/Drivers/AgateOTK/GL_Surface.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Surface.cs 2010-11-02 03:01:44 UTC (rev 1243)
+++ trunk/Drivers/AgateOTK/GL_Surface.cs 2010-11-02 03:03:54 UTC (rev 1244)
@@ -341,9 +341,9 @@
Marshal.FreeHGlobal(memory);
if (format == PixelFormat.RGBA8888)
- return new PixelBuffer(format, SurfaceSize, data);
+ return new PixelBuffer(format, rect.Size, data);
else
- return new PixelBuffer(format, SurfaceSize, data, PixelFormat.RGBA8888);
+ return new PixelBuffer(format, rect.Size, data, PixelFormat.RGBA8888);
}
public override void WritePixels(PixelBuffer buffer)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-02 03:01:51
|
Revision: 1243
http://agate.svn.sourceforge.net/agate/?rev=1243&view=rev
Author: kanato
Date: 2010-11-02 03:01:44 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Change default high score table.
Modified Paths:
--------------
trunk/Examples/BallBuster.Net/main.cs
Modified: trunk/Examples/BallBuster.Net/main.cs
===================================================================
--- trunk/Examples/BallBuster.Net/main.cs 2010-11-02 02:57:33 UTC (rev 1242)
+++ trunk/Examples/BallBuster.Net/main.cs 2010-11-02 03:01:44 UTC (rev 1243)
@@ -4341,11 +4341,11 @@
// and it will be saved.
highscores.Add(new CHighscore("Kanato", 500000));
highscores.Add(new CHighscore("Skel1", 400000));
- highscores.Add(new CHighscore("Alison", 300000));
+ highscores.Add(new CHighscore("Yelena", 300000));
highscores.Add(new CHighscore("Dave", 200000));
highscores.Add(new CHighscore("John", 100000));
- highscores.Add(new CHighscore("Larry", 50000));
- highscores.Add(new CHighscore("Robert", 25000));
+ highscores.Add(new CHighscore("Robert", 50000));
+ highscores.Add(new CHighscore("Victor", 25000));
highscores.Add(new CHighscore("Brant", 10000));
highscores.Add(new CHighscore("Alexis", 5000));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-11-02 02:57:42
|
Revision: 1242
http://agate.svn.sourceforge.net/agate/?rev=1242&view=rev
Author: kanato
Date: 2010-11-02 02:57:33 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Upgrade to Visual Studio 2010
Modified Paths:
--------------
trunk/AgateLib/AgateLib.csproj
trunk/AgateLib/InternalResources/DataResources.Designer.cs
trunk/AgateLib-Windows.sln
trunk/AgateLib.sln
trunk/AgateTools.sln
trunk/Drivers/AgateDrawing/AgateDrawing.csproj
trunk/Drivers/AgateFMOD/AgateFMOD.csproj
trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
trunk/Drivers/AgateLib.WinForms/Icons.Designer.cs
trunk/Drivers/AgateOTK/AgateOTK.csproj
trunk/Drivers/AgateOTK/GL3/Shaders/ShaderSources.Designer.cs
trunk/Drivers/AgateSDL/AgateSDL.csproj
trunk/Drivers/AgateSDX/AgateSDX.csproj
trunk/Examples/BallBuster.Net/BallBuster.Net.csproj
trunk/Examples/BallBuster.Net/Properties/Resources.Designer.cs
trunk/Examples/BallBuster.Net/Properties/Settings.Designer.cs
trunk/Examples/Pong/Pong.csproj
trunk/Examples/Pong/Pong.csproj.user
trunk/Examples/Pong/Properties/Resources.Designer.cs
trunk/Examples/Pong/Properties/Settings.Designer.cs
trunk/Examples/ShootTheTraps/ShootTheTraps.csproj
trunk/Examples.sln
trunk/Tests/Tests.csproj
trunk/Tools/AgateDataLib/AgateDataLib.csproj
trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
trunk/Tools/DatabaseEditor/Properties/Resources.Designer.cs
trunk/Tools/DatabaseEditor/Properties/Settings.Designer.cs
trunk/Tools/FontCreator/FontCreator.csproj
trunk/Tools/FontCreator/Properties/Resources.Designer.cs
trunk/Tools/FontCreator/Properties/Settings.Designer.cs
trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs
trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
trunk/Tools/PackedSpriteCreator/Properties/Resources.Designer.cs
trunk/Tools/ResourceEditor/Properties/Resources.Designer.cs
trunk/Tools/ResourceEditor/ResourceEditor.csproj
Modified: trunk/AgateLib/AgateLib.csproj
===================================================================
--- trunk/AgateLib/AgateLib.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/AgateLib/AgateLib.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -482,6 +485,8 @@
<Compile Include="InternalResources\DataResources.Designer.cs">
<DependentUpon>DataResources.resx</DependentUpon>
<SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
</Compile>
<Compile Include="Meshes\Loaders\OBJFileRepresentation.cs">
<SubType>Code</SubType>
Modified: trunk/AgateLib/InternalResources/DataResources.Designer.cs
===================================================================
--- trunk/AgateLib/InternalResources/DataResources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/AgateLib/InternalResources/DataResources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class DataResources {
Modified: trunk/AgateLib-Windows.sln
===================================================================
--- trunk/AgateLib-Windows.sln 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/AgateLib-Windows.sln 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,5 +1,12 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{6AFA2E43-361A-4AA6-83D9-6DE946C1F0B6}"
+ ProjectSection(SolutionItems) = preProject
+ ChangeLog.txt = ChangeLog.txt
+ ReleaseNotes.txt = ReleaseNotes.txt
+ TODO.txt = TODO.txt
+ EndProjectSection
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateLib.WinForms", "Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj", "{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}"
@@ -16,13 +23,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateOTK", "Drivers\AgateOTK\AgateOTK.csproj", "{9E095F03-BA3F-4EAD-A905-2A2647CE4405}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{6AFA2E43-361A-4AA6-83D9-6DE946C1F0B6}"
- ProjectSection(SolutionItems) = preProject
- ChangeLog.txt = ChangeLog.txt
- ReleaseNotes.txt = ReleaseNotes.txt
- TODO.txt = TODO.txt
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Modified: trunk/AgateLib.sln
===================================================================
--- trunk/AgateLib.sln 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/AgateLib.sln 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,5 +1,12 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{0CE8B58F-922D-40A6-92E6-2F6913A97049}"
+ ProjectSection(SolutionItems) = preProject
+ ChangeLog.txt = ChangeLog.txt
+ ReleaseNotes.txt = ReleaseNotes.txt
+ TODO.txt = TODO.txt
+ EndProjectSection
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateSDL", "Drivers\AgateSDL\AgateSDL.csproj", "{00C7FA95-98F4-43D9-9B63-34122B1DB003}"
@@ -14,13 +21,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateFMOD", "Drivers\AgateFMOD\AgateFMOD.csproj", "{424C08A9-6CC6-4FFF-B782-CBD58BC42FCA}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{0CE8B58F-922D-40A6-92E6-2F6913A97049}"
- ProjectSection(SolutionItems) = preProject
- ChangeLog.txt = ChangeLog.txt
- ReleaseNotes.txt = ReleaseNotes.txt
- TODO.txt = TODO.txt
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Modified: trunk/AgateTools.sln
===================================================================
--- trunk/AgateTools.sln 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/AgateTools.sln 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,5 +1,12 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{4B147B99-8BC3-4B78-938A-1035B16A8D1B}"
+ ProjectSection(SolutionItems) = preProject
+ ChangeLog.txt = ChangeLog.txt
+ ReleaseNotes.txt = ReleaseNotes.txt
+ TODO.txt = TODO.txt
+ EndProjectSection
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "Tools\ResourceEditor\ResourceEditor.csproj", "{FAB0D7E5-E6AF-4B29-BFE1-6545D6C22621}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateLib.WinForms", "Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj", "{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}"
@@ -14,13 +21,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotebookLib", "Tools\NotebookLib\NotebookLib\NotebookLib.csproj", "{91F57346-B574-4D52-9EB0-AA191B552C94}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{4B147B99-8BC3-4B78-938A-1035B16A8D1B}"
- ProjectSection(SolutionItems) = preProject
- ChangeLog.txt = ChangeLog.txt
- ReleaseNotes.txt = ReleaseNotes.txt
- TODO.txt = TODO.txt
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgateDataLib", "Tools\AgateDataLib\AgateDataLib.csproj", "{2F7A686B-2272-4803-9EF9-0B34BA7802DC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseEditor", "Tools\DatabaseEditor\DatabaseEditor.csproj", "{685E7B82-4609-4ABB-B25B-0DC7C58BD45F}"
Modified: trunk/Drivers/AgateDrawing/AgateDrawing.csproj
===================================================================
--- trunk/Drivers/AgateDrawing/AgateDrawing.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateDrawing/AgateDrawing.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
Modified: trunk/Drivers/AgateFMOD/AgateFMOD.csproj
===================================================================
--- trunk/Drivers/AgateFMOD/AgateFMOD.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateFMOD/AgateFMOD.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
Modified: trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
===================================================================
--- trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -153,6 +156,8 @@
<Compile Include="Icons.Designer.cs">
<DependentUpon>Icons.resx</DependentUpon>
<SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
</Compile>
<Compile Include="SetSystemsForm.cs">
<SubType>Form</SubType>
Modified: trunk/Drivers/AgateLib.WinForms/Icons.Designer.cs
===================================================================
--- trunk/Drivers/AgateLib.WinForms/Icons.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateLib.WinForms/Icons.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,99 +1,84 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
-namespace AgateLib.WinForms
-{
- using System;
-
-
- /// <summary>
- /// A strongly-typed resource class, for looking up localized strings, etc.
- /// </summary>
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Icons
- {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Icons()
- {
- }
-
- /// <summary>
- /// Returns the cached ResourceManager instance used by this class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if (object.ReferenceEquals(resourceMan, null))
- {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AgateLib.WinForms.Icons", typeof(Icons).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- /// <summary>
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
- return resourceCulture;
- }
- set
- {
- resourceCulture = value;
- }
- }
-
- internal static System.Drawing.Icon AgateLib
- {
- get
- {
- object obj = ResourceManager.GetObject("AgateLib", resourceCulture);
- return ((System.Drawing.Icon)(obj));
- }
- }
-
- internal static System.Drawing.Icon AgateLib_mono
- {
- get
- {
- object obj = ResourceManager.GetObject("AgateLib_mono", resourceCulture);
- return ((System.Drawing.Icon)(obj));
- }
- }
-
- internal static byte[] blankcursor
- {
- get
- {
- object obj = ResourceManager.GetObject("blankcursor", resourceCulture);
- return ((byte[])(obj));
- }
- }
- }
+namespace AgateLib.WinForms {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Icons {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Icons() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AgateLib.WinForms.Icons", typeof(Icons).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ internal static System.Drawing.Icon AgateLib {
+ get {
+ object obj = ResourceManager.GetObject("AgateLib", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon AgateLib_mono {
+ get {
+ object obj = ResourceManager.GetObject("AgateLib_mono", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static byte[] blankcursor {
+ get {
+ object obj = ResourceManager.GetObject("blankcursor", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+ }
}
Modified: trunk/Drivers/AgateOTK/AgateOTK.csproj
===================================================================
--- trunk/Drivers/AgateOTK/AgateOTK.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateOTK/AgateOTK.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Modified: trunk/Drivers/AgateOTK/GL3/Shaders/ShaderSources.Designer.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL3/Shaders/ShaderSources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateOTK/GL3/Shaders/ShaderSources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class ShaderSources {
@@ -63,17 +63,18 @@
/// <summary>
/// Looks up a localized string similar to #version 140
///
- ///in vec2 texture;
- ///in int color;
- ///
///uniform sampler2D texture;
///
+ ///in vec4 colorVal;
+ ///in vec2 texCoordVal;
+ ///
+ ///out vec4 color;
+ ///
///void main()
///{
- /// vec4 pos = vec4(position, 1);
- ///
- /// gl_Position = transform * pos;
- ///}.
+ /// color = texture2D(texture, texCoordVal);
+ ///}
+ ///.
/// </summary>
internal static string Basic2D_pixel {
get {
@@ -85,17 +86,24 @@
/// Looks up a localized string similar to #version 140
///
///in vec3 position;
- ///inout vec2 texture;
- ///inout int color;
+ ///in vec4 color;
+ ///in vec2 texCoord;
///
///uniform mat4x4 transform;
///
+ ///out vec4 colorVal;
+ ///out vec2 texCoordVal;
+ ///
///void main()
///{
/// vec4 pos = vec4(position, 1);
///
+ /// colorVal = color;
+ /// texCoordVal = texCoord;
+ ///
/// gl_Position = transform * pos;
- ///}.
+ ///}
+ ///.
/// </summary>
internal static string Basic2D_vert {
get {
Modified: trunk/Drivers/AgateSDL/AgateSDL.csproj
===================================================================
--- trunk/Drivers/AgateSDL/AgateSDL.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateSDL/AgateSDL.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Modified: trunk/Drivers/AgateSDX/AgateSDX.csproj
===================================================================
--- trunk/Drivers/AgateSDX/AgateSDX.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Drivers/AgateSDX/AgateSDX.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Modified: trunk/Examples/BallBuster.Net/BallBuster.Net.csproj
===================================================================
--- trunk/Examples/BallBuster.Net/BallBuster.Net.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/BallBuster.Net/BallBuster.Net.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +12,7 @@
<AssemblyName>BallBuster.Net</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl>
Modified: trunk/Examples/BallBuster.Net/Properties/Resources.Designer.cs
===================================================================
--- trunk/Examples/BallBuster.Net/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/BallBuster.Net/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Examples/BallBuster.Net/Properties/Settings.Designer.cs
===================================================================
--- trunk/Examples/BallBuster.Net/Properties/Settings.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/BallBuster.Net/Properties/Settings.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Examples/Pong/Pong.csproj
===================================================================
--- trunk/Examples/Pong/Pong.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/Pong/Pong.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +12,7 @@
<AssemblyName>Pong</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
Modified: trunk/Examples/Pong/Pong.csproj.user
===================================================================
--- trunk/Examples/Pong/Pong.csproj.user 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/Pong/Pong.csproj.user 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartArguments>--choose</StartArguments>
</PropertyGroup>
Modified: trunk/Examples/Pong/Properties/Resources.Designer.cs
===================================================================
--- trunk/Examples/Pong/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/Pong/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Examples/Pong/Properties/Settings.Designer.cs
===================================================================
--- trunk/Examples/Pong/Properties/Settings.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/Pong/Properties/Settings.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Examples/ShootTheTraps/ShootTheTraps.csproj
===================================================================
--- trunk/Examples/ShootTheTraps/ShootTheTraps.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples/ShootTheTraps/ShootTheTraps.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +12,7 @@
<AssemblyName>ShootTheTraps</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
Modified: trunk/Examples.sln
===================================================================
--- trunk/Examples.sln 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Examples.sln 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BallBuster.Net", "Examples\BallBuster.Net\BallBuster.Net.csproj", "{DD3CF4AA-02CC-4881-AFB1-6F10DFA1F8AF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShootTheTraps", "Examples\ShootTheTraps\ShootTheTraps.csproj", "{50743D1B-A19E-42F1-842F-65FAD6D168C3}"
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tests/Tests.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -22,6 +22,8 @@
<StartupObject>Tests.Launcher</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<BaseAddress>285212672</BaseAddress>
Modified: trunk/Tools/AgateDataLib/AgateDataLib.csproj
===================================================================
--- trunk/Tools/AgateDataLib/AgateDataLib.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/AgateDataLib/AgateDataLib.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,10 @@
<AssemblyName>DataLib</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/Tools/DatabaseEditor/DatabaseEditor.csproj
===================================================================
--- trunk/Tools/DatabaseEditor/DatabaseEditor.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/DatabaseEditor/DatabaseEditor.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,10 @@
<AssemblyName>DatabaseEditor</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/Tools/DatabaseEditor/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/DatabaseEditor/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/DatabaseEditor/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Tools/DatabaseEditor/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/DatabaseEditor/Properties/Settings.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/DatabaseEditor/Properties/Settings.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/FontCreator/FontCreator.csproj
===================================================================
--- trunk/Tools/FontCreator/FontCreator.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/FontCreator/FontCreator.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -196,6 +199,8 @@
<Compile Include="Properties\Settings.Designer.cs">
<DependentUpon>Settings.settings</DependentUpon>
<SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="CreateFont.resx">
<SubType>Designer</SubType>
Modified: trunk/Tools/FontCreator/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/FontCreator/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/FontCreator/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4200
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Tools/FontCreator/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/FontCreator/Properties/Settings.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/FontCreator/Properties/Settings.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj
===================================================================
--- trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/NotebookLib/NotebookLib/NotebookLib.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -198,6 +201,8 @@
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<DependentUpon>Settings.settings</DependentUpon>
Modified: trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/NotebookLib/NotebookLib/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
-namespace ERY.NotebookLib.Properties {
+namespace NotebookLib.Properties {
using System;
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -39,7 +39,7 @@
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ERY.NotebookLib.Properties.Resources", typeof(Resources).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NotebookLib.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
Modified: trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj
===================================================================
--- trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/PackedSpriteCreator/PackedSpriteCreator.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -181,6 +184,8 @@
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="frmAddSpriteFrames.resx">
<SubType>Designer</SubType>
Modified: trunk/Tools/PackedSpriteCreator/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/PackedSpriteCreator/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/PackedSpriteCreator/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Tools/ResourceEditor/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/ResourceEditor/Properties/Resources.Designer.cs 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/ResourceEditor/Properties/Resources.Designer.cs 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Tools/ResourceEditor/ResourceEditor.csproj
===================================================================
--- trunk/Tools/ResourceEditor/ResourceEditor.csproj 2010-08-22 16:25:40 UTC (rev 1241)
+++ trunk/Tools/ResourceEditor/ResourceEditor.csproj 2010-11-02 02:57:33 UTC (rev 1242)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
@@ -24,6 +25,8 @@
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -163,6 +166,8 @@
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<SubType>Code</SubType>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<DependentUpon>Settings.settings</DependentUpon>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-22 16:25:46
|
Revision: 1241
http://agate.svn.sourceforge.net/agate/?rev=1241&view=rev
Author: kanato
Date: 2010-08-22 16:25:40 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
Added some extra error reporting if creation of GL framebuffer fails.
Modified Paths:
--------------
trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs
trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
Modified: trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs 2010-08-03 06:10:32 UTC (rev 1240)
+++ trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs 2010-08-22 16:25:40 UTC (rev 1241)
@@ -58,7 +58,8 @@
if (code != FramebufferErrorCode.FramebufferCompleteExt)
{
throw new AgateException(
- "Could not complete framebuffer object.");
+ "Could not complete framebuffer object. Received error code "
+ + code.ToString());
}
mHasDepth = true;
Modified: trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
===================================================================
--- trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-08-03 06:10:32 UTC (rev 1240)
+++ trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-08-22 16:25:40 UTC (rev 1241)
@@ -132,7 +132,8 @@
if (code != FramebufferErrorCode.FramebufferCompleteExt)
{
throw new AgateException(
- "Could not complete framebuffer object.");
+ "Could not complete framebuffer object. Received error code "
+ + code.ToString());
}
mHasDepth = depth;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-03 06:10:38
|
Revision: 1240
http://agate.svn.sourceforge.net/agate/?rev=1240&view=rev
Author: kanato
Date: 2010-08-03 06:10:32 +0000 (Tue, 03 Aug 2010)
Log Message:
-----------
Display: add some documentation
Vector2: add multiplication overload
Tests: Add Prerendered.cs test.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/Display.cs
trunk/AgateLib/Geometry/Vector2.cs
trunk/Tests/Tests.csproj
Added Paths:
-----------
trunk/Tests/DisplayTests/Prerendered.cs
Modified: trunk/AgateLib/DisplayLib/Display.cs
===================================================================
--- trunk/AgateLib/DisplayLib/Display.cs 2010-02-25 23:56:35 UTC (rev 1239)
+++ trunk/AgateLib/DisplayLib/Display.cs 2010-08-03 06:10:32 UTC (rev 1240)
@@ -441,8 +441,11 @@
/// <summary>
/// When using Direct3D or OpenGL, calls to Surface.Draw are cached to be sent to
/// the 3D API all as a batch. Calling Display.FlushDrawBuffer forces all cached
- /// vertices to be sent to the rendering system. You should not need to call this
- /// function in normal operation of your application.
+ /// vertices to be sent to the rendering system. This method should only be called
+ /// between BeginFrame..EndFrame. You should not need to call this
+ /// function in normal operation of your application. If you find that this is necessary
+ /// for proper functioning of your program, there is probably a bug in AgateLib somewhere,
+ /// and please report it at http://www.agatelib.org/
/// </summary>
public static void FlushDrawBuffer()
{
Modified: trunk/AgateLib/Geometry/Vector2.cs
===================================================================
--- trunk/AgateLib/Geometry/Vector2.cs 2010-02-25 23:56:35 UTC (rev 1239)
+++ trunk/AgateLib/Geometry/Vector2.cs 2010-08-03 06:10:32 UTC (rev 1240)
@@ -155,6 +155,16 @@
return new Vector2(a.X * b, a.Y * b);
}
/// <summary>
+ /// Scales a vector by a scalar floating point value.
+ /// </summary>
+ /// <param name="a"></param>
+ /// <param name="b"></param>
+ /// <returns></returns>
+ public static Vector2 operator *(float b, Vector2 a)
+ {
+ return new Vector2(a.X * b, a.Y * b);
+ }
+ /// <summary>
/// Divides a vector's components by a floating point value.
/// </summary>
/// <param name="a"></param>
Copied: trunk/Tests/DisplayTests/Prerendered.cs (from rev 1234, trunk/Tests/DisplayTests/FullScreen.cs)
===================================================================
--- trunk/Tests/DisplayTests/Prerendered.cs (rev 0)
+++ trunk/Tests/DisplayTests/Prerendered.cs 2010-08-03 06:10:32 UTC (rev 1240)
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using AgateLib;
+using AgateLib.DisplayLib;
+using AgateLib.Geometry;
+using AgateLib.InputLib;
+
+namespace Tests.DisplayTests
+{
+ class PrerenderedTest : IAgateTest
+ {
+ public string Name
+ {
+ get { return "Prerendering"; }
+ }
+
+ public string Category
+ {
+ get { return "Display"; }
+ }
+
+ public void Main(string[] args)
+ {
+ AgateSetup AS = new AgateSetup();
+
+ AS.AskUser = true;
+ AS.Initialize(true, false, true);
+ if (AS.WasCanceled)
+ return;
+
+ DisplayWindow MainWindow = DisplayWindow.CreateWindowed ("Test", 800, 600);
+ FrameBuffer myBuffer = new FrameBuffer(200,35);
+ FontSurface font = FontSurface.AgateSans10;
+
+ Display.RenderTarget = myBuffer;
+ Display.BeginFrame();
+
+ Display.Clear(Color.Blue);
+ font.Color = Color.Red;
+ font.DrawText(3,3 , "HELLO WORLD");
+
+ Display.EndFrame();
+ Display.FlushDrawBuffer();
+ Display.RenderTarget = MainWindow.FrameBuffer;
+
+
+ while (MainWindow.IsClosed == false)
+ {
+ Display.BeginFrame();
+ Display.Clear(Color.Black);
+
+ myBuffer.RenderTarget.Draw(35,35);
+
+ Display.EndFrame();
+
+ Core.KeepAlive();
+ }
+ }
+
+ }
+}
\ No newline at end of file
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2010-02-25 23:56:35 UTC (rev 1239)
+++ trunk/Tests/Tests.csproj 2010-08-03 06:10:32 UTC (rev 1240)
@@ -137,6 +137,7 @@
<DependentUpon>frmCapabilities.cs</DependentUpon>
</Compile>
<Compile Include="DisplayTests\ClipRect.cs" />
+ <Compile Include="DisplayTests\Prerendered.cs" />
<Compile Include="Fonts\Builtin.cs" />
<Compile Include="Fonts\Kerning.cs" />
<Compile Include="frmLauncher.cs">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-02-25 23:56:41
|
Revision: 1239
http://agate.svn.sourceforge.net/agate/?rev=1239&view=rev
Author: kanato
Date: 2010-02-25 23:56:35 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
Added HasDepthBuffer and HasStencilBuffer properties to FrameBuffer.
Modified Paths:
--------------
trunk/AgateLib/DisplayLib/FrameBuffer.cs
trunk/AgateLib/DisplayLib/ImplementationBase/FrameBufferImpl.cs
trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs
trunk/Drivers/AgateOTK/ContextFB.cs
trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs
trunk/Drivers/AgateOTK/GL_Display.cs
trunk/Drivers/AgateOTK/GL_DisplayControl.cs
trunk/Drivers/AgateOTK/GL_FrameBuffer.cs
trunk/Drivers/AgateOTK/GL_GameWindow.cs
trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
trunk/Drivers/AgateSDX/AgateSDX.csproj
trunk/Drivers/AgateSDX/FrameBufferSurface.cs
trunk/Drivers/AgateSDX/FrameBufferWindow.cs
trunk/Drivers/AgateSDX/SDX_Display.cs
trunk/Drivers/AgateSDX/SDX_FrameBuffer.cs
Modified: trunk/AgateLib/DisplayLib/FrameBuffer.cs
===================================================================
--- trunk/AgateLib/DisplayLib/FrameBuffer.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/AgateLib/DisplayLib/FrameBuffer.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -83,6 +83,20 @@
{
get { return Impl.Height; }
}
+ /// <summary>
+ /// Gets whether or not the frame buffer has a depth buffer.
+ /// </summary>
+ public bool HasDepthBuffer
+ {
+ get { return Impl.HasDepthBuffer; }
+ }
+ /// <summary>
+ /// Gets whether or not the frame buffer has a stencil buffer.
+ /// </summary>
+ public bool HasStencilBuffer
+ {
+ get { return Impl.HasStencilBuffer; }
+ }
/// <summary>
/// Returns true if the RenderTarget property is readable, and this surface that is
Modified: trunk/AgateLib/DisplayLib/ImplementationBase/FrameBufferImpl.cs
===================================================================
--- trunk/AgateLib/DisplayLib/ImplementationBase/FrameBufferImpl.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/AgateLib/DisplayLib/ImplementationBase/FrameBufferImpl.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -58,6 +58,15 @@
public abstract void EndRender();
/// <summary>
+ /// Gets whether or not the frame buffer has a depth buffer.
+ /// </summary>
+ public abstract bool HasDepthBuffer { get; }
+ /// <summary>
+ /// Gets whether or not the frame buffer has a stencil buffer.
+ /// </summary>
+ public abstract bool HasStencilBuffer { get; }
+
+ /// <summary>
/// Return true to indicate that the back buffer can be read and used as a texture.
/// </summary>
public virtual bool CanAccessRenderTarget
Modified: trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateDrawing/Drawing_FrameBuffer.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -22,9 +22,17 @@
backBuffer = bmp;
}
+ public override bool HasDepthBuffer
+ {
+ get { return false; }
+ }
+ public override bool HasStencilBuffer
+ {
+ get { return false; }
+ }
public override void Dispose()
{
- throw new NotImplementedException();
+ backBuffer.Dispose();
}
public override Size Size
Modified: trunk/Drivers/AgateOTK/ContextFB.cs
===================================================================
--- trunk/Drivers/AgateOTK/ContextFB.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/ContextFB.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -15,11 +15,15 @@
IWindowInfo mWindowInfo;
Size mSize;
- public ContextFB(IGraphicsContext context, IWindowInfo window, Size size)
+ public ContextFB(IGraphicsContext context, IWindowInfo window, Size size,
+ bool depthBuffer, bool stencilBuffer)
{
mContext = context;
mWindowInfo = window;
mSize = size;
+
+ mHasDepth = depthBuffer;
+ mHasStencil = stencilBuffer;
}
public override void Dispose()
Modified: trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/GL3/FrameBuffer.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -61,6 +61,8 @@
"Could not complete framebuffer object.");
}
+ mHasDepth = true;
+ mHasStencil = true;
}
public override SurfaceImpl RenderTarget
Modified: trunk/Drivers/AgateOTK/GL_Display.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Display.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/GL_Display.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -221,7 +221,13 @@
DrawBuffer.Flush();
GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- GL.Clear(ClearBufferMask.DepthBufferBit | ClearBufferMask.ColorBufferBit | ClearBufferMask.StencilBufferBit);
+
+ ClearBufferMask mask = ClearBufferMask.ColorBufferBit;
+
+ mask |= RenderTarget.HasDepthBuffer ? ClearBufferMask.DepthBufferBit : 0;
+ mask |= RenderTarget.HasStencilBuffer ? ClearBufferMask.StencilBufferBit : 0;
+
+ GL.Clear(mask);
}
public override void Clear(Color color, Rectangle dest)
{
Modified: trunk/Drivers/AgateOTK/GL_DisplayControl.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_DisplayControl.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/GL_DisplayControl.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -225,7 +225,7 @@
mContext.MakeCurrent(mWindowInfo);
(mContext as IGraphicsContextInternal).LoadAll();
- mFrameBuffer = new ContextFB(mContext, mWindowInfo, this.Size);
+ mFrameBuffer = new ContextFB(mContext, mWindowInfo, this.Size, true, false);
}
private IWindowInfo CreateWindowInfo(GraphicsMode mode)
Modified: trunk/Drivers/AgateOTK/GL_FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_FrameBuffer.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/GL_FrameBuffer.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -11,6 +11,8 @@
abstract class GL_FrameBuffer: FrameBufferImpl
{
GLDrawBuffer mDrawBuffer;
+ protected bool mHasDepth;
+ protected bool mHasStencil;
public GL_FrameBuffer()
{
@@ -20,11 +22,14 @@
public GLDrawBuffer DrawBuffer { get { return mDrawBuffer; } }
public abstract void MakeCurrent();
- // TODO: fix this hack and remove these interface members.
- [Obsolete]
- public void HideCursor() { throw new NotImplementedException(); }
- [Obsolete]
- public void ShowCursor() { throw new NotImplementedException(); }
+ public override bool HasDepthBuffer
+ {
+ get { return mHasDepth; }
+ }
+ public override bool HasStencilBuffer
+ {
+ get { return mHasStencil; }
+ }
}
}
Modified: trunk/Drivers/AgateOTK/GL_GameWindow.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_GameWindow.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/GL_GameWindow.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -197,7 +197,7 @@
CreateWindowedDisplay();
mFrameBuffer = new ContextFB(mWindow.Context, mWindow.WindowInfo,
- new Size(mWindow.ClientSize.Width, mWindow.ClientSize.Height ));
+ new Size(mWindow.ClientSize.Width, mWindow.ClientSize.Height), true, false);
mDisplay = Display.Impl as GL_Display;
Modified: trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs
===================================================================
--- trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateOTK/Legacy/FrameBufferExt.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -135,6 +135,8 @@
"Could not complete framebuffer object.");
}
+ mHasDepth = depth;
+ mHasStencil = stencil;
}
public override SurfaceImpl RenderTarget
Modified: trunk/Drivers/AgateSDX/AgateSDX.csproj
===================================================================
--- trunk/Drivers/AgateSDX/AgateSDX.csproj 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateSDX/AgateSDX.csproj 2010-02-25 23:56:35 UTC (rev 1239)
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{EF993B30-D9A9-4962-80BB-6826D39B3465}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -67,7 +67,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
+ <OutputPath>..\..\Binaries\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -75,7 +75,7 @@
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
+ <OutputPath>..\..\Binaries\Release\</OutputPath>
<DefineConstants>TRACE;</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -85,7 +85,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
+ <OutputPath>..\..\Binaries\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -93,7 +93,7 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>bin\x64\Release\</OutputPath>
+ <OutputPath>..\..\Binaries\Release\</OutputPath>
<DefineConstants>TRACE;</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Modified: trunk/Drivers/AgateSDX/FrameBufferSurface.cs
===================================================================
--- trunk/Drivers/AgateSDX/FrameBufferSurface.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateSDX/FrameBufferSurface.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -19,7 +19,9 @@
SDX_Surface mAgateSurface;
Direct3D.Texture mTexture;
Direct3D.Surface mRenderTarget;
-
+ bool mHasDepth;
+ bool mHasStencil;
+
public FrameBufferSurface(Size size)
{
mDisplay = Display.Impl as SDX_Display;
@@ -44,6 +46,7 @@
mAgateSurface = new SDX_Surface(new AgateLib.Utility.Ref<Texture>(mTexture),
new Rectangle(Point.Empty, Size));
+ //SetHasDepthStencil(
}
public override void Dispose()
Modified: trunk/Drivers/AgateSDX/FrameBufferWindow.cs
===================================================================
--- trunk/Drivers/AgateSDX/FrameBufferWindow.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateSDX/FrameBufferWindow.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -26,6 +26,11 @@
mSwap = swap;
mBackBuffer = backBuffer;
mBackDepthStencil = backDepthStencil;
+
+ if (mBackDepthStencil != null)
+ {
+ SetHasDepthStencil(mBackDepthStencil.Description.Format);
+ }
}
public override void Dispose()
Modified: trunk/Drivers/AgateSDX/SDX_Display.cs
===================================================================
--- trunk/Drivers/AgateSDX/SDX_Display.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateSDX/SDX_Display.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -377,8 +377,8 @@
{
ClearFlags retval = ClearFlags.Target;
- if (mHasDepth) retval |= ClearFlags.ZBuffer;
- if (mHasStencil) retval |= ClearFlags.Stencil;
+ retval |= RenderTarget.HasDepthBuffer ? ClearFlags.ZBuffer : 0;
+ retval |= RenderTarget.HasStencilBuffer ? ClearFlags.Stencil : 0;
return retval;
}
Modified: trunk/Drivers/AgateSDX/SDX_FrameBuffer.cs
===================================================================
--- trunk/Drivers/AgateSDX/SDX_FrameBuffer.cs 2010-02-22 05:33:44 UTC (rev 1238)
+++ trunk/Drivers/AgateSDX/SDX_FrameBuffer.cs 2010-02-25 23:56:35 UTC (rev 1239)
@@ -5,10 +5,49 @@
using AgateLib.DisplayLib;
using AgateLib.Geometry;
using AgateLib.DisplayLib.ImplementationBase;
+using SlimDX.Direct3D9;
namespace AgateSDX
{
public abstract class SDX_FrameBuffer: FrameBufferImpl
{
+ bool mHasDepth;
+ bool mHasStencil;
+
+ protected void SetHasDepthStencil(Format fmt)
+ {
+ switch (fmt)
+ {
+ case Format.D16:
+ case Format.D16Lockable:
+ case Format.D24X8:
+ case Format.D32:
+ case Format.D32Lockable:
+ case Format.D32SingleLockable:
+ mHasDepth = true;
+ break;
+
+ case Format.D15S1:
+ case Format.D24S8:
+ case Format.D24SingleS8:
+ case Format.D24X4S4:
+ mHasDepth = true;
+ mHasStencil = true;
+ break;
+
+ case Format.S8Lockable:
+ mHasStencil = true;
+ break;
+ }
+ }
+
+ public override bool HasDepthBuffer
+ {
+ get { return mHasDepth; }
+ }
+ public override bool HasStencilBuffer
+ {
+ get { return mHasStencil; }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-02-22 05:33:51
|
Revision: 1238
http://agate.svn.sourceforge.net/agate/?rev=1238&view=rev
Author: kanato
Date: 2010-02-22 05:33:44 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
Complete loading of new gui theme from resource file.
Modified Paths:
--------------
trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs
trunk/AgateLib/IFileProvider.cs
trunk/AgateLib/Resources/AgateResourceCollection.cs
trunk/AgateLib/Utility/FileProviderList.cs
trunk/AgateLib/Utility/FileSystemProvider.cs
trunk/AgateLib/Utility/TgzFileProvider.cs
trunk/AgateLib/Utility/ZipFileProvider.cs
trunk/Drivers/AgateOTK/GL_Surface.cs
trunk/TODO.txt
trunk/Tests/Data/CssTest.css
trunk/Tests/Shaders/Hlsl.cs
trunk/Tests/Tests.csproj
trunk/Tests/frmLauncher.Designer.cs
trunk/Tests/frmLauncher.cs
Added Paths:
-----------
trunk/Tests/Data/gui.zip
trunk/Tests/GuiTests/Buttons.cs
trunk/Tests/ResourceTests/
trunk/Tests/ResourceTests/Res040.cs
Modified: trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs
===================================================================
--- trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/Gui/ThemeEngines/Venus/Venus.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -4,6 +4,7 @@
using System.IO;
using System.Text;
using AgateLib.Geometry;
+using AgateLib.Resources;
namespace AgateLib.Gui.ThemeEngines.Venus
{
@@ -13,7 +14,30 @@
{
}
+ public Venus(AgateResourceCollection resources)
+ {
+ if (resources.GuiThemes.Count == 0)
+ throw new AgateGuiException("The specified resource collection does not contain GuiTheme resource.");
+ FileProvider = resources.FileProvider;
+
+ string filename = resources.GuiThemes[0].CssFile;
+
+ LoadCss(FileProvider.ReadAllText(filename));
+
+ }
+ public Venus(AgateResourceCollection resources, string guiThemeName)
+ {
+ FileProvider = resources.FileProvider;
+
+ string filename = resources.GuiThemes[guiThemeName].CssFile;
+
+ LoadCss(FileProvider.ReadAllText(filename));
+
+ }
+
+ public IFileProvider FileProvider { get; set; }
+
public void LoadCss(string text)
{
CssData d = new CssData();
Modified: trunk/AgateLib/IFileProvider.cs
===================================================================
--- trunk/AgateLib/IFileProvider.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/IFileProvider.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -32,7 +32,7 @@
/// Opens the specified file returning a stream. Throws
/// FileNotFoundException if the file does not exist.
/// </summary>
- /// <param name="filename"></param>
+ /// <param name="filename">The path and filename of the file to read from.</param>
/// <returns></returns>
Stream OpenRead(string filename);
/// <summary>
@@ -56,5 +56,11 @@
/// <param name="searchPattern"></param>
/// <returns></returns>
IEnumerable<string> GetAllFiles(string searchPattern);
+ /// <summary>
+ /// Returns a string containing the entire contents of the specified file.
+ /// </summary>
+ /// <param name="filename">The path and filename of the file to read from.</param>
+ /// <returns></returns>
+ string ReadAllText(string filename);
}
}
Modified: trunk/AgateLib/Resources/AgateResourceCollection.cs
===================================================================
--- trunk/AgateLib/Resources/AgateResourceCollection.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/Resources/AgateResourceCollection.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -19,6 +19,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.Linq;
using System.Text;
using System.Xml;
using System.IO;
@@ -37,13 +38,15 @@
Dictionary<string, AgateResource> mStore = new Dictionary<string, AgateResource>();
List<ImageResource> mImages = new List<ImageResource>();
+ List<GuiThemeResource> mGuiThemes = new List<GuiThemeResource>();
const string mStringTableKey = "Strings";
bool mOwnFileProvider;
IFileProvider mFileProvider;
SurfaceResourceList mSurfaceAccessor;
-
+ GuiThemeResourceList mGuiThemeAccessor;
+
public class SurfaceResourceList
{
AgateResourceCollection mResources;
@@ -59,23 +62,60 @@
{
foreach (var img in mResources.mImages)
{
- foreach (var surface in img.Surfaces)
- {
- if (surface.Name == key)
- return surface;
- }
+ var retval = img.Surfaces.FirstOrDefault(x => x.Name == key);
+
+ if (retval != null)
+ return retval;
}
-
+
throw new AgateResourceException("Could not find the surface resource {0}.", key);
}
}
+
+ public int Count
+ {
+ get { return mResources.mImages.Count; }
+ }
}
+ public class GuiThemeResourceList
+ {
+ AgateResourceCollection mResources;
+
+ internal GuiThemeResourceList(AgateResourceCollection resources)
+ {
+ mResources = resources;
+ }
+
+ public GuiThemeResource this[string key]
+ {
+ get
+ {
+ var retval = mResources.mGuiThemes.FirstOrDefault(x => x.Name == key);
+
+ if (retval == null)
+ throw new AgateResourceException("Could not find the gui theme resource {0}.", key);
+
+ return retval;
+ }
+ }
+ public GuiThemeResource this[int index]
+ {
+ get { return mResources.mGuiThemes[index]; }
+ }
+ public int Count
+ {
+ get { return mResources.mGuiThemes.Count; }
+ }
+ }
+
/// <summary>
/// Constructs a new AgateResourceCollection object.
/// </summary>
public AgateResourceCollection()
{
mSurfaceAccessor = new SurfaceResourceList(this);
+ mGuiThemeAccessor = new GuiThemeResourceList(this);
+
this.mStore.Add(mStringTableKey, new StringTable());
}
/// <summary>
@@ -100,6 +140,7 @@
public AgateResourceCollection(IFileProvider fileProvider, string filename)
{
mSurfaceAccessor = new SurfaceResourceList(this);
+ mGuiThemeAccessor = new GuiThemeResourceList(this);
FileProvider = fileProvider;
RootDirectory = Path.GetDirectoryName(filename);
@@ -176,6 +217,13 @@
}
}
/// <summary>
+ /// Gets the list of GuiThemeResource objects.
+ /// </summary>
+ public GuiThemeResourceList GuiThemes
+ {
+ get { return mGuiThemeAccessor; }
+ }
+ /// <summary>
/// Enumerates through the DisplayWindowResources contained in this group of resources.
/// </summary>
public IEnumerable<DisplayWindowResource> DisplayWindows
@@ -219,6 +267,10 @@
mImages.Add(img);
}
+ else if (item is GuiThemeResource)
+ {
+ mGuiThemes.Add((GuiThemeResource)item);
+ }
else
mStore.Add(item.Name, item);
}
Modified: trunk/AgateLib/Utility/FileProviderList.cs
===================================================================
--- trunk/AgateLib/Utility/FileProviderList.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/Utility/FileProviderList.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -258,6 +258,17 @@
#endregion
+ /// <summary>
+ /// Returns a string containing all the text in the specified file.
+ /// </summary>
+ /// <param name="filename">The name of the file to read from.</param>
+ /// <returns></returns>
+ public string ReadAllText(string filename)
+ {
+ Stream s = OpenRead(filename);
+ return new StreamReader(s).ReadToEnd();
+ }
+
}
}
Modified: trunk/AgateLib/Utility/FileSystemProvider.cs
===================================================================
--- trunk/AgateLib/Utility/FileSystemProvider.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/Utility/FileSystemProvider.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -227,5 +227,18 @@
{
return string.Format("FileSystemProvider: {0}", mPath);
}
+
+ /// <summary>
+ /// Returns a string containing all the text in the specified file.
+ /// </summary>
+ /// <param name="filename">The name of the file to read from.</param>
+ /// <returns></returns>
+ public string ReadAllText(string filename)
+ {
+ Stream s = OpenRead(filename);
+
+ return new StreamReader(s).ReadToEnd();
+ }
+
}
}
Modified: trunk/AgateLib/Utility/TgzFileProvider.cs
===================================================================
--- trunk/AgateLib/Utility/TgzFileProvider.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/Utility/TgzFileProvider.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -271,6 +271,17 @@
}
}
}
+ /// <summary>
+ /// Returns a string containing all the text in the specified file.
+ /// </summary>
+ /// <param name="filename">The name of the file to read from.</param>
+ /// <returns></returns>
+ public string ReadAllText(string filename)
+ {
+ Stream s = OpenRead(filename);
+ return new StreamReader(s).ReadToEnd();
+ }
+
}
}
\ No newline at end of file
Modified: trunk/AgateLib/Utility/ZipFileProvider.cs
===================================================================
--- trunk/AgateLib/Utility/ZipFileProvider.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/AgateLib/Utility/ZipFileProvider.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -321,7 +321,18 @@
}
#endregion
+ /// <summary>
+ /// Returns a string containing all the text in the specified file.
+ /// </summary>
+ /// <param name="filename">The name of the file to read from.</param>
+ /// <returns></returns>
+ public string ReadAllText(string filename)
+ {
+ Stream s = OpenRead(filename);
+ return new StreamReader(s).ReadToEnd();
+ }
+
}
enum ZipStorageType
Modified: trunk/Drivers/AgateOTK/GL_Surface.cs
===================================================================
--- trunk/Drivers/AgateOTK/GL_Surface.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/Drivers/AgateOTK/GL_Surface.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -130,7 +130,6 @@
mTextureSize = textureSize;
mTexCoord = GetTextureCoords(mSourceRect);
-
}
private void AddTextureRef(int textureID)
Modified: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/TODO.txt 2010-02-22 05:33:44 UTC (rev 1238)
@@ -11,6 +11,8 @@
Implement better Platform.HasWriteAccessToAppDirectory method.
Test ClipRects with AgateOTK
Test if GL_GameWindow is viable.
+ Remove old resource code so that surface and sprites are loaded only as subelements
+ of the Image tag.
Goals for 0.3.2
--------------------------------
Modified: trunk/Tests/Data/CssTest.css
===================================================================
--- trunk/Tests/Data/CssTest.css 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/Tests/Data/CssTest.css 2010-02-22 05:33:44 UTC (rev 1238)
@@ -1,7 +1,45 @@
window
{
- background-image: url('test.png');
+ background-image: Window;
background-color: #000000;
background-repeat: no-repeat;
+}
+
+button
+{
+ background-image: Button;
+ bg-image-stretch-left: 5;
+ bg-image-stretch-right: 5;
+ bg-image-stretch-top: 5;
+ bg-image-stretch-bottom: 5;
+ text-color: white;
+ align: center;
+ vertical-align: center;
+}
+
+button:default
+{
+ background-image: ButtonDefault;
+}
+
+button:pressed
+{
+ background-image: ButtonPressed;
+}
+
+button:hover
+{
+ overlay-image: ButtonHover;
+}
+
+button:focus
+{
+ overlay-image: ButtonFocus;
+}
+
+button:disabled
+{
+ overlay-image: ButtonDisabled;
+ text-color: gray;
}
\ No newline at end of file
Copied: trunk/Tests/Data/gui.zip (from rev 1234, trunk/Tests/Data/dogs.zip)
===================================================================
(Binary files differ)
Copied: trunk/Tests/GuiTests/Buttons.cs (from rev 1234, trunk/Tests/GuiTests/Textboxes.cs)
===================================================================
--- trunk/Tests/GuiTests/Buttons.cs (rev 0)
+++ trunk/Tests/GuiTests/Buttons.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib;
+using AgateLib.DisplayLib;
+using AgateLib.Geometry;
+using AgateLib.Gui;
+using AgateLib.Resources;
+
+namespace Tests.GuiTests
+{
+ class Buttons : AgateGame, IAgateTest
+ {
+ #region IAgateTest Members
+
+ public string Name
+ {
+ get { return "Buttons"; }
+ }
+
+ public string Category
+ {
+ get { return "Gui"; }
+ }
+
+ public void Main(string[] args)
+ {
+ Run(args);
+ }
+
+ #endregion
+
+ protected override void AdjustAppInitParameters(ref AppInitParameters initParams)
+ {
+ initParams.ShowSplashScreen = false;
+ }
+ protected override void Initialize()
+ {
+ AgateResourceCollection resources = AgateResourceCollection.FromZipArchive("Data/gui.zip");
+
+ this.GuiRoot = new GuiRoot();
+ this.GuiRoot.ThemeEngine = new AgateLib.Gui.ThemeEngines.Venus.Venus(resources);
+
+ Window wind = new Window("Buttons test");
+ wind.Size = new AgateLib.Geometry.Size(320, 240);
+
+ Button b = new Button();
+ b.Text = "Press me";
+
+ Button c = new Button();
+ c.Text = "No, press me!";
+
+ wind.Children.Add(b);
+ wind.Children.Add(c);
+
+ this.GuiRoot.Children.Add(wind);
+ }
+
+ protected override void Render()
+ {
+ Display.Clear(Color.Maroon);
+ }
+ }
+}
\ No newline at end of file
Copied: trunk/Tests/ResourceTests/Res040.cs (from rev 1234, trunk/Tests/CoreTests/App.cs)
===================================================================
--- trunk/Tests/ResourceTests/Res040.cs (rev 0)
+++ trunk/Tests/ResourceTests/Res040.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AgateLib;
+using AgateLib.DisplayLib;
+using AgateLib.InputLib;
+using AgateLib.Resources;
+
+namespace Tests.ResourceTests
+{
+ class Resources040: AgateGame, IAgateTest
+ {
+ public void Main(string[] args)
+ {
+ Run(args);
+ }
+
+ protected override void AdjustAppInitParameters(ref AppInitParameters initParams)
+ {
+ initParams.AllowResize = true;
+ }
+
+ public string Name { get { return "Resources 0.4.0"; } }
+ public string Category { get { return "Resources"; } }
+
+ AgateResourceCollection resources;
+ Surface btn;
+
+ protected override void Initialize()
+ {
+ resources = AgateResourceCollection.FromZipArchive("Data/gui.zip");
+
+ btn = new Surface(resources, "Button");
+ }
+
+ protected override void Update(double time_ms)
+ {
+ base.Update(time_ms);
+
+ if (Keyboard.Keys[KeyCode.Space])
+ Quit();
+ }
+
+ protected override void Render()
+ {
+ btn.Draw(5, 5);
+ }
+ }
+}
Modified: trunk/Tests/Shaders/Hlsl.cs
===================================================================
--- trunk/Tests/Shaders/Hlsl.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/Tests/Shaders/Hlsl.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -11,7 +11,7 @@
using AgateLib.Geometry;
using AgateLib.InputLib;
-namespace Tests.Display3D.Glsl
+namespace Tests.Shaders
{
public class Hlsl: IAgateTest
{
Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/Tests/Tests.csproj 2010-02-22 05:33:44 UTC (rev 1238)
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DC687DB2-90A8-484D-AB99-B3D29FDD8D44}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -146,10 +146,12 @@
<DependentUpon>frmLauncher.cs</DependentUpon>
<SubType>Code</SubType>
</Compile>
+ <Compile Include="GuiTests\Buttons.cs" />
<Compile Include="GuiTests\Listboxes.cs" />
<Compile Include="GuiTests\RenderGui.cs" />
<Compile Include="GuiTests\ScrollBars.cs" />
<Compile Include="GuiTests\Textboxes.cs" />
+ <Compile Include="GuiTests\Transitions.cs" />
<Compile Include="IAgateTest.cs">
<SubType>Code</SubType>
</Compile>
@@ -220,6 +222,7 @@
<Compile Include="DisplayTests\Interpolation.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="ResourceTests\Res040.cs" />
<Compile Include="Shaders\CoordinateSystem.cs">
<SubType>Code</SubType>
</Compile>
@@ -457,6 +460,9 @@
<None Include="Data\boxsprite.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
+ <None Include="Data\gui.zip">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
<None Include="Data\dogs.tar.gz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Modified: trunk/Tests/frmLauncher.Designer.cs
===================================================================
--- trunk/Tests/frmLauncher.Designer.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/Tests/frmLauncher.Designer.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -41,17 +41,17 @@
this.lstTests.Location = new System.Drawing.Point(12, 12);
this.lstTests.MultiColumn = true;
this.lstTests.Name = "lstTests";
- this.lstTests.Size = new System.Drawing.Size(439, 368);
+ this.lstTests.Size = new System.Drawing.Size(513, 368);
this.lstTests.TabIndex = 0;
this.lstTests.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.lstTests_DrawItem);
- this.lstTests.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.lstTests_MeasureItem);
this.lstTests.DoubleClick += new System.EventHandler(this.lstTests_DoubleClick);
+ this.lstTests.KeyUp += new System.Windows.Forms.KeyEventHandler(this.lstTests_KeyUp);
//
// frmLauncher
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(463, 406);
+ this.ClientSize = new System.Drawing.Size(537, 391);
this.Controls.Add(this.lstTests);
this.Name = "frmLauncher";
this.Text = "AgateLib Test Launcher";
Modified: trunk/Tests/frmLauncher.cs
===================================================================
--- trunk/Tests/frmLauncher.cs 2010-02-21 22:46:35 UTC (rev 1237)
+++ trunk/Tests/frmLauncher.cs 2010-02-22 05:33:44 UTC (rev 1238)
@@ -89,6 +89,18 @@
LaunchTest(t);
}
+ private void lstTests_KeyUp(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ TestInfo t = lstTests.SelectedItem as TestInfo;
+ if (t == null)
+ return;
+
+ LaunchTest(t);
+ }
+ }
+
private void LaunchTest(TestInfo m)
{
IAgateTest obj = (IAgateTest)Activator.CreateInstance(m.Class);
@@ -155,11 +167,7 @@
e.DrawFocusRectangle();
}
- private void lstTests_MeasureItem(object sender, MeasureItemEventArgs e)
- {
- }
-
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
