Menu
▾
▴
cs-sdl-commits — SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
(40) |
Jun
(6) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(1) |
Feb
(48) |
Mar
(2) |
Apr
(15) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
|
Oct
|
Nov
(61) |
Dec
|
| 2010 |
Jan
|
Feb
(22) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
|
Nov
(30) |
Dec
(4) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <je...@us...> - 2008-02-07 21:19:13
|
Revision: 1435
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1435&view=rev
Author: jendave
Date: 2008-02-07 13:18:34 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
a few build fixes
Modified Paths:
--------------
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe025.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe026.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe034.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build
trunk/SdlDotNet/src/SdlDotNet.csproj
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe025.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe025.cs 2008-02-07 21:08:41 UTC (rev 1434)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe025.cs 2008-02-07 21:18:34 UTC (rev 1435)
@@ -29,7 +29,7 @@
using System.IO;
using System.Text;
using System.Globalization;
-using System.Windows.Forms;
+//using System.Windows.Forms;
using System.Drawing;
using System.Drawing.Imaging;
using System.Reflection;
@@ -307,8 +307,8 @@
// Handle Any Exceptions While Loading Object Data, Exit App
string errorMsg = SdlDotNetExamplesBrowser.StringManager.GetString(
"LoadError", CultureInfo.CurrentUICulture) + "\n\t" + filename + "\n" + "\n\n\n\t" + e.StackTrace + "\n";
- MessageBox.Show(errorMsg, SdlDotNetExamplesBrowser.StringManager.GetString(
- "Error", CultureInfo.CurrentUICulture), MessageBoxButtons.OK, MessageBoxIcon.Stop, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly);
+ //MessageBox.Show(errorMsg, SdlDotNetExamplesBrowser.StringManager.GetString(
+ // "Error", CultureInfo.CurrentUICulture), MessageBoxButtons.OK, MessageBoxIcon.Stop, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly);
throw;
}
finally
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe026.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe026.cs 2008-02-07 21:08:41 UTC (rev 1434)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe026.cs 2008-02-07 21:18:34 UTC (rev 1435)
@@ -28,7 +28,7 @@
using System;
using System.IO;
using System.Text;
-using System.Windows.Forms;
+//using System.Windows.Forms;
using System.Drawing;
using System.Drawing.Imaging;
using System.Reflection;
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe034.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe034.cs 2008-02-07 21:08:41 UTC (rev 1434)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe034.cs 2008-02-07 21:18:34 UTC (rev 1435)
@@ -29,7 +29,7 @@
using System.IO;
using System.Text;
using System.Globalization;
-using System.Windows.Forms;
+//using System.Windows.Forms;
using System.Drawing;
using System.Drawing.Imaging;
using System.Reflection;
@@ -148,10 +148,10 @@
if (!File.Exists(name) && !File.Exists(fileName1) &&
!File.Exists(fileName2))
{
- MessageBox.Show(SdlDotNetExamplesBrowser.StringManager.GetString(
- "CantFindTheHeightMap", CultureInfo.CurrentUICulture),
- SdlDotNetExamplesBrowser.StringManager.GetString(
- "Error", CultureInfo.CurrentUICulture), MessageBoxButtons.OK, MessageBoxIcon.Stop, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly);
+ //MessageBox.Show(SdlDotNetExamplesBrowser.StringManager.GetString(
+ // "CantFindTheHeightMap", CultureInfo.CurrentUICulture),
+ // SdlDotNetExamplesBrowser.StringManager.GetString(
+ // "Error", CultureInfo.CurrentUICulture), MessageBoxButtons.OK, MessageBoxIcon.Stop, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly);
}
// Does The File Exist Here?
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj 2008-02-07 21:08:41 UTC (rev 1434)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj 2008-02-07 21:18:34 UTC (rev 1435)
@@ -66,14 +66,6 @@
<Name>System</Name>
<HintPath>\System.dll</HintPath>
</Reference>
- <Reference Include="System.Windows.Forms">
- <Name>System.Windows.Forms</Name>
- <HintPath>\System.Windows.Forms.dll</HintPath>
- </Reference>
- <Reference Include="System.Data">
- <Name>System.Data</Name>
- <HintPath>\System.Data.dll</HintPath>
- </Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
<HintPath>\System.Drawing.dll</HintPath>
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build 2008-02-07 21:08:41 UTC (rev 1434)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build 2008-02-07 21:18:34 UTC (rev 1435)
@@ -5,20 +5,10 @@
<mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}" flatten="true">
<fileset basedir="${project::get-base-directory()}">
- <include name="../../lib/net-2.0/atk-sharp.dll" />
- <include name="../../lib/net-2.0/gdk-sharp.dll" />
- <include name="../../lib/net-2.0/pango-sharp.dll" />
- <include name="../../lib/net-2.0/gtk-sharp.dll" />
- <include name="../../lib/net-2.0/glib-sharp.dll" />
- <include name="../../lib/net-2.0/glade-sharp.dll" />
<include name="../../src/${build.dir}/SdlDotNet.dll" />
<include name="../OpenGl/${build.dir}/SdlDotNet.OpenGl.dll" />
- <include name="../GtkSharp/${build.dir}/SdlDotNet.GtkSharp.dll" />
- <include name="../Particles/${build.dir}/SdlDotNet.Particles.dll" />
<include name="../../lib/net-2.0/Tao.Sdl.dll" />
<include name="../../lib/net-2.0/Tao.OpenGl.dll" />
- <include name="../../lib/net-2.0/Tao.FreeGlut.dll" />
- <include name="../../lib/net-2.0/Tao.Platform.Windows.dll" />
</fileset>
</copy>
<copy todir="${project::get-base-directory()}/${build.dir}">
@@ -28,208 +18,10 @@
<csc target="winexe" debug="${build.debug}" keyfile="../../src/SdlDotNet.snk" unsafe="False" define="DEBUG;TRACE;CODE_ANALYSIS" main="SdlDotNetExamples.SdlDotNetExamplesBrowser" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
<resources prefix="SdlDotNetExamples" dynamicprefix="true" >
<include name="App.ico" />
- <include name="SmallDemos/ui.glade" />
<include name="Properties/Resources.resx" />
</resources>
<sources failonempty="true">
- <include name="SdlDotNetExamplesBrowser.cs" />
- <include name="TextButtonSprite.cs" />
- <include name="Isotope/Actor.cs" />
- <include name="Isotope/Anime.cs" />
- <include name="Isotope/Collider.cs" />
- <include name="Isotope/Dissolver.cs" />
- <include name="Isotope/DissolverRandomCreator.cs" />
- <include name="Isotope/Engine.cs" />
- <include name="Isotope/Isometric.cs" />
- <include name="Isotope/IsotopeMain.cs" />
- <include name="Isotope/Keys.cs" />
- <include name="Isotope/LeadActor.cs" />
- <include name="Isotope/Monster.cs" />
- <include name="Isotope/Object3d.cs" />
- <include name="Isotope/ObjectGravity.cs" />
- <include name="Isotope/ObjectPortable.cs" />
- <include name="Isotope/ObjectTime.cs" />
- <include name="Isotope/Physics.cs" />
- <include name="Isotope/Pointing.cs" />
- <include name="Isotope/Portal.cs" />
- <include name="Isotope/Scene.cs" />
- <include name="Isotope/Simulator.cs" />
- <include name="Isotope/Skin.cs" />
- <include name="Isotope/SkinsLib.cs" />
- <include name="Isotope/Sprites.cs" />
- <include name="Isotope/Vector.cs" />
- <include name="Isotope/View.cs" />
- <include name="NeHe/NeHe001.cs" />
- <include name="NeHe/NeHe002.cs" />
- <include name="NeHe/NeHe003.cs" />
- <include name="NeHe/NeHe004.cs" />
- <include name="NeHe/NeHe005.cs" />
- <include name="NeHe/NeHe006.cs" />
- <include name="NeHe/NeHe007.cs" />
- <include name="NeHe/NeHe008.cs" />
- <include name="NeHe/NeHe009.cs" />
- <include name="NeHe/NeHe010.cs" />
- <include name="NeHe/NeHe011.cs" />
- <include name="NeHe/NeHe012.cs" />
- <include name="NeHe/NeHe013.cs" />
- <include name="NeHe/NeHe014.cs" />
- <include name="NeHe/NeHe015.cs" />
- <include name="NeHe/NeHe016.cs" />
- <include name="NeHe/NeHe017.cs" />
- <include name="NeHe/NeHe018.cs" />
- <include name="NeHe/NeHe019.cs" />
- <include name="NeHe/NeHe020.cs" />
- <include name="NeHe/NeHe023.cs" />
- <include name="NeHe/NeHe025.cs" />
- <include name="NeHe/NeHe026.cs" />
- <include name="NeHe/NeHe034.cs" />
- <include name="Properties/AssemblyInfo.cs" />
- <include name="Properties/Resources.Designer.cs" />
- <include name="RedBook/Jitter.cs" />
- <include name="RedBook/JitterPoint.cs" />
- <include name="RedBook/RedBookAAIndex.cs" />
- <include name="RedBook/RedBookAAPoly.cs" />
- <include name="RedBook/RedBookAARgb.cs" />
- <include name="RedBook/RedBookAccAnti.cs" />
- <include name="RedBook/RedBookAccumulationPerspective.cs" />
- <include name="RedBook/RedBookAlpha.cs" />
- <include name="RedBook/RedBookAlpha3D.cs" />
- <include name="RedBook/RedBookAnti.cs" />
- <include name="RedBook/RedBookBezierCurve.cs" />
- <include name="RedBook/RedBookBezierMesh.cs" />
- <include name="RedBook/RedBookBezierSurface.cs" />
- <include name="RedBook/RedBookChecker.cs" />
- <include name="RedBook/RedBookCheckerOld.cs" />
- <include name="RedBook/RedBookClip.cs" />
- <include name="RedBook/RedBookColorMat.cs" />
- <include name="RedBook/RedBookCube.cs" />
- <include name="RedBook/RedBookDepthCue.cs" />
- <include name="RedBook/RedBookDepthOfField.cs" />
- <include name="RedBook/RedBookDisplayList.cs" />
- <include name="RedBook/RedBookDouble.cs" />
- <include name="RedBook/RedBookDrawF.cs" />
- <include name="RedBook/RedBookFeedback.cs" />
- <include name="RedBook/RedBookFog.cs" />
- <include name="RedBook/RedBookFogIndex.cs" />
- <include name="RedBook/RedBookFogIndexOld.cs" />
- <include name="RedBook/RedBookFogOld.cs" />
- <include name="RedBook/RedBookFont.cs" />
- <include name="RedBook/RedBookHello.cs" />
- <include name="RedBook/RedBookImage.cs" />
- <include name="RedBook/RedBookLight.cs" />
- <include name="RedBook/RedBookLines.cs" />
- <include name="RedBook/RedBookMaterial.cs" />
- <include name="RedBook/RedBookMipMap.cs" />
- <include name="RedBook/RedBookModel.cs" />
- <include name="RedBook/RedBookMoveLight.cs" />
- <include name="RedBook/RedBookNurbs.cs" />
- <include name="RedBook/RedBookPickDepth.cs" />
- <include name="RedBook/RedBookPickSquare.cs" />
- <include name="RedBook/RedBookPlane.cs" />
- <include name="RedBook/RedBookPlanet.cs" />
- <include name="RedBook/RedBookPolygonStippling.cs" />
- <include name="RedBook/RedBookPolyOff.cs" />
- <include name="RedBook/RedBookQuadric.cs" />
- <include name="RedBook/RedBookRobot.cs" />
- <include name="RedBook/RedBookScene.cs" />
- <include name="RedBook/RedBookSceneBlueAmbient.cs" />
- <include name="RedBook/RedBookSceneColorLight.cs" />
- <include name="RedBook/RedBookSceneFlat.cs" />
- <include name="RedBook/RedBookSelect.cs" />
- <include name="RedBook/RedBookSmooth.cs" />
- <include name="RedBook/RedBookStencil.cs" />
- <include name="RedBook/RedBookStroke.cs" />
- <include name="RedBook/RedBookSurface.cs" />
- <include name="RedBook/RedBookSurfaceOld.cs" />
- <include name="RedBook/RedBookTeaAmbient.cs" />
- <include name="RedBook/RedBookTeapots.cs" />
- <include name="RedBook/RedBookTess.cs" />
- <include name="RedBook/RedBookTessWind.cs" />
- <include name="RedBook/RedBookTexBind.cs" />
- <include name="RedBook/RedBookTexGen.cs" />
- <include name="RedBook/RedBookTexSub.cs" />
- <include name="RedBook/RedBookTextureProxies.cs" />
- <include name="RedBook/RedBookTextureSurf.cs" />
- <include name="RedBook/RedBookTorus.cs" />
- <include name="RedBook/RedBookTrim.cs" />
- <include name="RedBook/RedBookUnproject.cs" />
- <include name="RedBook/RedBookVertexArray.cs" />
- <include name="RedBook/RedBookWrap.cs" />
- <include name="SimpleGame/Entity.cs" />
- <include name="SimpleGame/EntityMoveEventArgs.cs" />
- <include name="SimpleGame/EntityMoveRequestEventArgs.cs" />
- <include name="SimpleGame/EntityPlaceEventArgs.cs" />
- <include name="SimpleGame/EntitySprite.cs" />
- <include name="SimpleGame/EventManager.cs" />
- <include name="SimpleGame/Game.cs" />
- <include name="SimpleGame/GameStatusEventArgs.cs" />
- <include name="SimpleGame/GameView.cs" />
- <include name="SimpleGame/InputController.cs" />
- <include name="SimpleGame/LogFile.cs" />
- <include name="SimpleGame/Map.cs" />
- <include name="SimpleGame/MapBuiltEventArgs.cs" />
- <include name="SimpleGame/Names.cs" />
- <include name="SimpleGame/Player.cs" />
- <include name="SimpleGame/Sector.cs" />
- <include name="SimpleGame/SectorSprite.cs" />
- <include name="SimpleGame/SimpleGameMain.cs" />
- <include name="SmallDemos/AudioExample.cs" />
- <include name="SmallDemos/Bomb.cs" />
- <include name="SmallDemos/BombRun.cs" />
- <include name="SmallDemos/BounceSprite.cs" />
- <include name="SmallDemos/BounceSprites.cs" />
- <include name="SmallDemos/Bullet.cs" />
- <include name="SmallDemos/FireEventArgs.cs" />
- <include name="SmallDemos/FontExample.cs" />
- <include name="SmallDemos/Gears.cs" />
- <include name="SmallDemos/GtkSprite.cs" />
- <include name="SmallDemos/GtkSpriteExample.cs" />
- <include name="SmallDemos/GtkWindow.cs" />
- <include name="SmallDemos/GtkWindowExample.cs" />
- <include name="SmallDemos/HelloWorld.cs" />
- <include name="SmallDemos/HeroExample.cs" />
- <include name="SmallDemos/JoystickExample.cs" />
- <include name="SmallDemos/MoviePlayer.cs" />
- <include name="SmallDemos/OpenGlFont.cs" />
- <include name="SmallDemos/ParticlesExample.cs" />
- <include name="SmallDemos/Player.cs" />
- <include name="SmallDemos/PongExample.cs" />
- <include name="SmallDemos/PrimitivesExample.cs" />
- <include name="SmallDemos/Rectangles.cs" />
- <include name="SmallDemos/SimpleExample.cs" />
- <include name="SmallDemos/SnowDemo.cs" />
- <include name="SmallDemos/Snowflake.cs" />
- <include name="SmallDemos/SpriteCollectionSort.cs" />
- <include name="SmallDemos/StreamingAudio.cs" />
- <include name="SmallDemos/Template.cs" />
- <include name="SmallDemos/TextItem.cs" />
- <include name="SpriteDemos/BounceMode.cs" />
- <include name="SpriteDemos/BounceSprite.cs" />
- <include name="SpriteDemos/BoundedSprite.cs" />
- <include name="SpriteDemos/BoundedTextSprite.cs" />
- <include name="SpriteDemos/DemoMode.cs" />
- <include name="SpriteDemos/DragMode.cs" />
- <include name="SpriteDemos/DragSprite.cs" />
- <include name="SpriteDemos/FontMode.cs" />
- <include name="SpriteDemos/MultipleMode.cs" />
- <include name="SpriteDemos/SpriteDemosMain.cs" />
- <include name="SpriteDemos/ViewportMode.cs" />
- <include name="Triad/Block.cs" />
- <include name="Triad/BlockGrid.cs" />
- <include name="Triad/BlueSquare.cs" />
- <include name="Triad/BouncingSquare.cs" />
- <include name="Triad/Enums.cs" />
- <include name="Triad/Events.cs" />
- <include name="Triad/GameArea.cs" />
- <include name="Triad/GameException.cs" />
- <include name="Triad/GameObject.cs" />
- <include name="Triad/MyGameArea.cs" />
- <include name="Triad/NullBlock.cs" />
- <include name="Triad/Scoreboard.cs" />
- <include name="Triad/TriadGame.cs" />
- <include name="Triad/TriadMain.cs" />
- <include name="Triad/TriadTests.cs" />
- <include name="Triad/Utilities.cs" />
+ <include name="**/*.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>
@@ -237,23 +29,11 @@
<include name="${project::get-base-directory()}/${build.dir}" />
</lib>
<include name="System.dll" />
- <include name="System.Windows.Forms.dll" />
- <include name="System.Data.dll" />
<include name="System.Drawing.dll" />
- <include name="../../lib/net-2.0/atk-sharp.dll" />
- <include name="../../lib/net-2.0/gdk-sharp.dll" />
- <include name="../../lib/net-2.0/pango-sharp.dll" />
- <include name="../../lib/net-2.0/gtk-sharp.dll" />
- <include name="../../lib/net-2.0/glib-sharp.dll" />
- <include name="../../lib/net-2.0/glade-sharp.dll" />
<include name="../../src/${build.dir}/SdlDotNet.dll" />
<include name="../OpenGl/${build.dir}/SdlDotNet.OpenGl.dll" />
- <include name="../GtkSharp/${build.dir}/SdlDotNet.GtkSharp.dll" />
- <include name="../Particles/${build.dir}/SdlDotNet.Particles.dll" />
<include name="../../lib/net-2.0/Tao.Sdl.dll" />
<include name="../../lib/net-2.0/Tao.OpenGl.dll" />
- <include name="../../lib/net-2.0/Tao.FreeGlut.dll" />
- <include name="../../lib/net-2.0/Tao.Platform.Windows.dll" />
</references>
</csc>
</target>
Modified: trunk/SdlDotNet/src/SdlDotNet.csproj
===================================================================
--- trunk/SdlDotNet/src/SdlDotNet.csproj 2008-02-07 21:08:41 UTC (rev 1434)
+++ trunk/SdlDotNet/src/SdlDotNet.csproj 2008-02-07 21:18:34 UTC (rev 1435)
@@ -66,7 +66,6 @@
<Name>System</Name>
<HintPath>\System.dll</HintPath>
</Reference>
- <Reference Include="System.Data" />
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
<HintPath>\System.Windows.Forms.dll</HintPath>
@@ -75,7 +74,6 @@
<Name>System.Drawing</Name>
<HintPath>\System.Drawing.dll</HintPath>
</Reference>
- <Reference Include="System.Xml" />
<Reference Include="Tao.Sdl">
<Name>Tao.Sdl</Name>
<HintPath>../lib/net-2.0\Tao.Sdl.dll</HintPath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-07 21:08:53
|
Revision: 1434
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1434&view=rev
Author: jendave
Date: 2008-02-07 13:08:41 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
fix references
Modified Paths:
--------------
trunk/SdlDotNet/src/SdlDotNet.csproj
trunk/SdlDotNet/src/SdlDotNet.dll.build
Modified: trunk/SdlDotNet/src/SdlDotNet.csproj
===================================================================
--- trunk/SdlDotNet/src/SdlDotNet.csproj 2008-02-07 21:04:11 UTC (rev 1433)
+++ trunk/SdlDotNet/src/SdlDotNet.csproj 2008-02-07 21:08:41 UTC (rev 1434)
@@ -76,14 +76,6 @@
<HintPath>\System.Drawing.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="Tao.OpenGl, Version=2.1.0.7, Culture=neutral, PublicKeyToken=1ca010269a4501ef, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\net-2.0\Tao.OpenGl.dll</HintPath>
- </Reference>
- <Reference Include="Tao.Platform.Windows, Version=1.0.0.4, Culture=neutral, PublicKeyToken=701104b2da67a104, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\net-2.0\Tao.Platform.Windows.dll</HintPath>
- </Reference>
<Reference Include="Tao.Sdl">
<Name>Tao.Sdl</Name>
<HintPath>../lib/net-2.0\Tao.Sdl.dll</HintPath>
Modified: trunk/SdlDotNet/src/SdlDotNet.dll.build
===================================================================
--- trunk/SdlDotNet/src/SdlDotNet.dll.build 2008-02-07 21:04:11 UTC (rev 1433)
+++ trunk/SdlDotNet/src/SdlDotNet.dll.build 2008-02-07 21:08:41 UTC (rev 1434)
@@ -6,8 +6,6 @@
<copy todir="${project::get-base-directory()}/${build.dir}" flatten="true">
<fileset basedir="${project::get-base-directory()}">
<include name="../lib/net-2.0/Tao.Sdl.dll" />
- <include name="../lib/net-2.0/Tao.Platform.Windows.dll" />
- <include name="../lib/net-2.0/Tao.OpenGl.dll" />
</fileset>
</copy>
<copy todir="${project::get-base-directory()}/${build.dir}">
@@ -34,8 +32,6 @@
<include name="System.Windows.Forms.dll" />
<include name="System.Drawing.dll" />
<include name="../lib/net-2.0/Tao.Sdl.dll" />
- <include name="../lib/net-2.0/Tao.Platform.Windows.dll" />
- <include name="../lib/net-2.0/Tao.OpenGl.dll" />
</references>
</csc>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-07 21:04:18
|
Revision: 1433
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1433&view=rev
Author: jendave
Date: 2008-02-07 13:04:11 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/SdlDotNet/SdlDotNet.sln
Modified: trunk/SdlDotNet/SdlDotNet.sln
===================================================================
--- trunk/SdlDotNet/SdlDotNet.sln 2008-02-07 21:01:31 UTC (rev 1432)
+++ trunk/SdlDotNet/SdlDotNet.sln 2008-02-07 21:04:11 UTC (rev 1433)
@@ -41,9 +41,6 @@
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
EndProjectSection
- ProjectSection(SolutionItems) = preProject
- prebuild.xml = prebuild.xml
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-07 21:01:35
|
Revision: 1432
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1432&view=rev
Author: jendave
Date: 2008-02-07 13:01:31 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
remove extra deps
Modified Paths:
--------------
trunk/SdlDotNet/SdlDotNet.build
trunk/SdlDotNet/SdlDotNet.sln
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj
trunk/SdlDotNet/src/SdlDotNet.csproj
Removed Paths:
-------------
trunk/SdlDotNet/examples/GtkSharp/
trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSprite.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSpriteExample.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindow.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindowExample.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/glade-2.0.dtd
trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/ui.glade
trunk/SdlDotNet/lib/net-2.0/atk-sharp.dll
trunk/SdlDotNet/lib/net-2.0/gdk-sharp.dll
trunk/SdlDotNet/lib/net-2.0/glade-sharp.dll
trunk/SdlDotNet/lib/net-2.0/glib-sharp.dll
trunk/SdlDotNet/lib/net-2.0/gtk-sharp.dll
trunk/SdlDotNet/lib/net-2.0/osx/Tao.FreeGlut.dll.config
trunk/SdlDotNet/lib/net-2.0/pango-sharp.dll
trunk/SdlDotNet/src/Particles/COPYING
trunk/SdlDotNet/src/Particles/Properties/
trunk/SdlDotNet/src/Particles/SdlDotNet.Particles.csproj
trunk/SdlDotNet/src/Particles/SdlDotNet.Particles.dll.build
Modified: trunk/SdlDotNet/SdlDotNet.build
===================================================================
--- trunk/SdlDotNet/SdlDotNet.build 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/SdlDotNet.build 2008-02-07 21:01:31 UTC (rev 1432)
@@ -47,8 +47,6 @@
<delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" />
<nant buildfile="../SdlDotNet/src/SdlDotNet.dll.build" target="clean" />
- <nant buildfile="../SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build" target="clean" />
- <nant buildfile="../SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build" target="clean" />
<nant buildfile="../SdlDotNet/examples/CDPlayer/CDPlayer.exe.build" target="clean" />
<nant buildfile="../SdlDotNet/tests/Tests.dll.build" target="clean" />
<nant buildfile="../SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build" target="clean" />
@@ -58,9 +56,7 @@
<target name="build" depends="init" description="">
<nant buildfile="../SdlDotNet/src/SdlDotNet.dll.build" target="build" />
- <nant buildfile="../SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build" target="build" />
<nant buildfile="../SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build" target="build" />
- <nant buildfile="../SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build" target="build" />
<nant buildfile="../SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build" target="build" />
<nant buildfile="../SdlDotNet/tests/Tests.dll.build" target="build" />
<nant buildfile="../SdlDotNet/examples/CDPlayer/CDPlayer.exe.build" target="build" />
@@ -76,8 +72,6 @@
<target name="doc" depends="build-release">
<echo message="Generating all documentation from all builds" />
<nant buildfile="../SdlDotNet/src/SdlDotNet.dll.build" target="doc" />
- <nant buildfile="../SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build" target="doc" />
- <nant buildfile="../SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build" target="doc" />
<nant buildfile="../SdlDotNet/examples/CDPlayer/CDPlayer.exe.build" target="doc" />
<nant buildfile="../SdlDotNet/tests/Tests.dll.build" target="doc" />
<nant buildfile="../SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build" target="doc" />
Modified: trunk/SdlDotNet/SdlDotNet.sln
===================================================================
--- trunk/SdlDotNet/SdlDotNet.sln 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/SdlDotNet.sln 2008-02-07 21:01:31 UTC (rev 1432)
@@ -6,18 +6,6 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNet.Particles", "examples\Particles\SdlDotNet.Particles.csproj", "{6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}"
- ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNet.GtkSharp", "examples\GtkSharp\SdlDotNet.GtkSharp.csproj", "{48A130BE-E071-41E7-8DC7-CA9579438E02}"
- ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDPlayer", "examples\CDPlayer\CDPlayer.csproj", "{9A356993-75C1-43DD-9D2F-E0444573F368}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -67,14 +55,6 @@
{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Release|Any CPU.Build.0 = Release|Any CPU
- {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Release|Any CPU.Build.0 = Release|Any CPU
- {48A130BE-E071-41E7-8DC7-CA9579438E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {48A130BE-E071-41E7-8DC7-CA9579438E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {48A130BE-E071-41E7-8DC7-CA9579438E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {48A130BE-E071-41E7-8DC7-CA9579438E02}.Release|Any CPU.Build.0 = Release|Any CPU
{9A356993-75C1-43DD-9D2F-E0444573F368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A356993-75C1-43DD-9D2F-E0444573F368}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A356993-75C1-43DD-9D2F-E0444573F368}.Release|Any CPU.ActiveCfg = Release|Any CPU
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj 2008-02-07 21:01:31 UTC (rev 1432)
@@ -78,30 +78,6 @@
<Name>System.Drawing</Name>
<HintPath>\System.Drawing.dll</HintPath>
</Reference>
- <Reference Include="atk-sharp">
- <Name>atk-sharp</Name>
- <HintPath>../../lib/net-2.0\atk-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gdk-sharp">
- <Name>gdk-sharp</Name>
- <HintPath>../../lib/net-2.0\gdk-sharp.dll</HintPath>
- </Reference>
- <Reference Include="pango-sharp">
- <Name>pango-sharp</Name>
- <HintPath>../../lib/net-2.0\pango-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gtk-sharp">
- <Name>gtk-sharp</Name>
- <HintPath>../../lib/net-2.0\gtk-sharp.dll</HintPath>
- </Reference>
- <Reference Include="glib-sharp">
- <Name>glib-sharp</Name>
- <HintPath>../../lib/net-2.0\glib-sharp.dll</HintPath>
- </Reference>
- <Reference Include="glade-sharp">
- <Name>glade-sharp</Name>
- <HintPath>../../lib/net-2.0\glade-sharp.dll</HintPath>
- </Reference>
<Reference Include="Tao.Sdl">
<Name>Tao.Sdl</Name>
<HintPath>../../lib/net-2.0\Tao.Sdl.dll</HintPath>
@@ -122,22 +98,10 @@
<Project>{7697533B-8996-45E1-BC7E-FA969789FC72}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
- <ProjectReference Include="..\GtkSharp\SdlDotNet.GtkSharp.csproj">
- <Name>SdlDotNet.GtkSharp</Name>
- <Project>{48A130BE-E071-41E7-8DC7-CA9579438E02}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- </ProjectReference>
- <ProjectReference Include="..\Particles\SdlDotNet.Particles.csproj">
- <Name>SdlDotNet.Particles</Name>
- <Project>{6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="App.ico">
</EmbeddedResource>
- <EmbeddedResource Include="SmallDemos\ui.glade">
- </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
@@ -502,18 +466,6 @@
<Compile Include="SmallDemos\Gears.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="SmallDemos\GtkSprite.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="SmallDemos\GtkSpriteExample.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="SmallDemos\GtkWindow.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="SmallDemos\GtkWindowExample.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="SmallDemos\HelloWorld.cs">
<SubType>Code</SubType>
</Compile>
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSprite.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSprite.cs 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSprite.cs 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,98 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 by Thomas Krieger
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Exclusive rights to for use to SDL.NET & GTK# projects !!!
- * Others may contact me on SDL.NET forums under nickname Shoky
- */
-#endregion LICENSE
-
-using System;
-using System.Drawing;
-using System.Collections;
-
-using SdlDotNet;
-using SdlDotNet.Graphics;
-using SdlDotNet.Graphics.Sprites;
-using SdlDotNet.Input;
-using SdlDotNet.Core;
-
-namespace SdlDotNetExamples.SmallDemos
-{
- public class GtkSprite : Sprite
- {
- /// <summary>
- /// Defaultkonstruktor
- /// </summary>
- /// <param name="path">Image path (png,jpg etc.)</param>
- public GtkSprite(string path)
- : base(path)
- {
- this.AllowDrag = true;
- }
-
- /// <summary>
- /// Update Method for Mouse Motion Events
- /// </summary>
- /// <param name="args"></param>
- public override void Update(MouseMotionEventArgs args)
- {
- if (args == null)
- {
- throw new ArgumentNullException("args");
- }
- if (!AllowDrag)
- {
- return;
- }
-
- // Move the window as appropriate
- if (this.BeingDragged)
- {
- this.X += args.RelativeX;
- this.Y += args.RelativeY;
- }
- }
-
- /// <summary>
- /// Update Method for the Mouse Button Events
- /// </summary>
- /// <param name="args"></param>
- public override void Update(MouseButtonEventArgs args)
- {
- if (args == null)
- {
- throw new ArgumentNullException("args");
- }
- if (this.IntersectsWith(new Point(args.X, args.Y)))
- {
- // If we are being held down, pick up the marble
- if (args.ButtonPressed)
- {
- if (args.Button == MouseButton.PrimaryButton)
- {
- this.BeingDragged = true;
- }
- }
- }
- else
- {
- this.BeingDragged = false;
- }
- }
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSpriteExample.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSpriteExample.cs 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkSpriteExample.cs 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,266 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 by Thomas Krieger
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Exclusive rights to for use to SDL.NET & GTK# projects !!!
- * Others may contact me on SDL.NET forums under nickname Shoky
- */
-#endregion LICENSE
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Drawing;
-using System.IO;
-
-using Gtk;
-using Glade;
-using SdlDotNet;
-using SdlDotNet.Graphics;
-using SdlDotNet.Graphics.Sprites;
-using SdlDotNet.Input;
-using SdlDotNet.GtkSharp;
-
-namespace SdlDotNetExamples.SmallDemos
-{
- /// <summary>
- /// Description of MainWindow.
- /// </summary>
- public class GtkSpriteExample : IDisposable
- {
- /// <summary>
- /// Ansichtselement des Graphen
- /// </summary>
- [CLSCompliant(false)]
- protected SurfaceGtk graphView;
-
- /// <summary>
- /// Graphenansicht
- /// </summary>
- [CLSCompliant(false)]
- [Glade.Widget]
- protected Gtk.Window GraphWindow;
-
- /// <summary>
- /// Container f\xFCr die Graphenansicht
- /// </summary>
- [CLSCompliant(false)]
- [Glade.Widget]
- protected Gtk.VBox vbox1;
-
- /// <summary>
- /// Collection of Sprites
- /// </summary>
- protected SpriteCollection spriteCollection;
-
- /// <summary>
- /// Timer
- /// </summary>
- protected System.Timers.Timer tickTimer;
- string filePath;
- string fileDirectory;
-
- /// <summary>
- /// Defaultkonstruktor
- /// </summary>
- public GtkSpriteExample()
- {
- filePath = Path.Combine("..", "..");
- fileDirectory = "Data";
- string fileName = "circle.png";
- if (File.Exists(fileName))
- {
- filePath = "";
- fileDirectory = "";
- }
- else if (File.Exists(Path.Combine(fileDirectory, fileName)))
- {
- filePath = "";
- }
-
- Glade.XML gxml = new Glade.XML(null, "SdlDotNetExamples.SmallDemos.ui.glade", "GraphWindow", null);
- gxml.Autoconnect(this);
-
- // init graph viewer
- initGraphView();
-
- tickTimer = new System.Timers.Timer(200);
- tickTimer.Elapsed += new System.Timers.ElapsedEventHandler(this.OnRedrawTick);
- tickTimer.Enabled = true;
-
- GraphWindow.ShowAll();
- }
-
- /// <summary>
- /// Timer Handler f\xFCr die Aktualisierung der Ansicht
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="args"></param>
- protected void OnRedrawTick(object sender, System.Timers.ElapsedEventArgs args)
- {
- Collection<Rectangle> rects = new Collection<Rectangle>();
-
- graphView.Surface.Fill(new Rectangle(0, 0, 800, 600), System.Drawing.Color.AliceBlue);
- rects = graphView.Surface.Blit(spriteCollection);
- graphView.Surface.Update(rects);
- graphView.QueueDraw();
- }
-
- /// <summary>
- /// inits the view for the first time with an background image
- /// </summary>
- protected void initGraphView()
- {
- GtkSprite node = new GtkSprite(Path.Combine(filePath, Path.Combine(fileDirectory, "circle.png")));
- GtkSprite node2 = new GtkSprite(Path.Combine(filePath, Path.Combine(fileDirectory, "circle.png")));
-
- node2.X = 100;
- node2.Y = 100;
-
- spriteCollection = new SpriteCollection();
-
- spriteCollection.EnableMouseButtonEvent();
- spriteCollection.EnableMouseMotionEvent();
-
- spriteCollection.Add(node);
- spriteCollection.Add(node2);
-
- graphView = new SurfaceGtk();
- graphView.Surface = new Surface(Path.Combine(filePath, Path.Combine(fileDirectory, "background.jpg")));
- graphView.Surface.Blit(spriteCollection);
- graphView.Surface.Update();
-
- vbox1.PackEnd(graphView);
- }
-
- /// <summary>
- /// Quit Handler f\xFCr das Schlie\xDFen des Hauptfensters
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="args"></param>
- [CLSCompliant(false)]
- protected void OnDeleteWindow(object sender, Gtk.DeleteEventArgs args)
- {
- Gtk.Application.Quit();
- }
-
- /// <summary>
- /// Quit Handler f\xFCr das Schlie\xDFen des Hauptfensters
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="args"></param>
- [CLSCompliant(false)]
- protected void OnKeyPress(object sender, Gtk.KeyPressEventArgs args)
- {
- if (args != null)
- {
- if (args.Event.Key == Gdk.Key.Escape || args.Event.Key == Gdk.Key.q)
- {
- GraphWindow.Destroy();
- Application.Quit();
- }
- }
- }
-
- /// <summary>
- ///
- /// </summary>
- public void Go()
- {
- Gtk.Application.Run();
- }
-
-
- /// <summary>
- /// Haupteinstiegspunkt f\xFCr das Programm
- /// </summary>
- /// <param name="args"></param>
- [STAThread]
- public static void Main()
- {
- Gtk.Application.Init();
- GtkSpriteExample gtkSpriteExample = new GtkSpriteExample();
- gtkSpriteExample.Go();
- }
-
- /// <summary>
- /// Lesson Title
- /// </summary>
- public static string Title
- {
- get
- {
- return "GtkSpriteExample: GTK Widgets and Sprites using Glade";
- }
- }
-
- #region IDisposable Members
-
- private bool disposed;
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="disposing"></param>
- protected virtual void Dispose(bool disposing)
- {
- if (!this.disposed)
- {
- if (disposing)
- {
- if (this.graphView != null)
- {
- this.graphView.Dispose();
- this.graphView = null;
- }
- if (this.tickTimer != null)
- {
- this.tickTimer.Dispose();
- this.tickTimer = null;
- }
- }
- this.disposed = true;
- }
- }
- /// <summary>
- ///
- /// </summary>
- public void Dispose()
- {
- this.Dispose(true);
- GC.SuppressFinalize(this);
- }
-
- /// <summary>
- ///
- /// </summary>
- public void Close()
- {
- Dispose();
- }
-
- /// <summary>
- ///
- /// </summary>
- ~GtkSpriteExample()
- {
- Dispose(false);
- }
-
- #endregion
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindow.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindow.cs 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindow.cs 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,193 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2006 by Drazen Soronda, Croatia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Exclusive rights to for use to SDL.NET & GTK# projects !!!
- * Others may contact me on SDL.NET forums under nickname Shoky
- */
-#endregion LICENSE
-
-using System;
-using System.Drawing;
-using System.IO;
-using System.Diagnostics.CodeAnalysis;
-
-using Gtk;
-using SdlDotNet.GtkSharp;
-using SdlDotNet.Graphics;
-
-namespace SdlDotNetExamples.SmallDemos
-{
- [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Correct Spelling")]
- public class GtkWindow : IDisposable
- {
- // widgets
- Gtk.Window win;
- Gtk.Button btn;
- SdlDotNet.Graphics.Surface sdlScreen;
- Gtk.VBox verBox;
- Gtk.Image myImg;
-
- public GtkWindow()
- {
- // constructor
- // window
- win = new Gtk.Window("SDL.NET Gtk# Example");
- win.BorderWidth = 0;
- win.DeleteEvent += new DeleteEventHandler(Window_Delete);
- win.KeyPressEvent += new KeyPressEventHandler(win_KeyPressEvent);
- //win.Decorated = false;
- win.DoubleBuffered = true;
-
- //vertical box
- verBox = new VBox();
- verBox.BorderWidth = 3;
- win.Add(verBox);
-
-
- sdlScreen = new Surface(new System.Drawing.Size(250, 100));
- sdlScreen.Draw(new SdlDotNet.Graphics.Primitives.Box(10, 10, 240, 90), System.Drawing.Color.Blue);
-
- // RENDERING THRU Gtk.Image
- myImg = new Gtk.Image(ImageToPixbuf(sdlScreen.Bitmap));
- myImg.DoubleBuffered = true;
- verBox.Add(myImg);
-
- // Rendering using GTK Widget !! :)
- SurfaceGtk mySurface = new SurfaceGtk();
- sdlScreen.Draw(new SdlDotNet.Graphics.Primitives.Circle(125, 50, 25), System.Drawing.Color.Red, false, true); // ADD RED Circle
- mySurface.Surface = sdlScreen;
- verBox.Add(mySurface);
-
- // button
- btn = new Button("Close");
- btn.Clicked += new EventHandler(btn_click);
- verBox.Add(btn);
- }
-
- void win_KeyPressEvent(object o, KeyPressEventArgs args)
- {
- if (args.Event.Key == Gdk.Key.Escape || args.Event.Key == Gdk.Key.q)
- {
- win.Destroy();
- Application.Quit();
- }
- }
-
- public void ShowWindow()
- {
- win.ShowAll(); // show window
- }
- static void Window_Delete(object obj, DeleteEventArgs args)
- {
- Application.Quit();
- }
-
- void btn_click(object obj, EventArgs args)
- {
- win.Destroy();
- Application.Quit();
- }
-
- private static Gdk.Pixbuf ImageToPixbuf(System.Drawing.Bitmap image)
- {
- if (image != null)
- {
- using (System.IO.MemoryStream stream = new MemoryStream())
- {
- image.Save(stream, System.Drawing.Imaging.ImageFormat.Bmp);
- stream.Position = 0;
- Gdk.Pixbuf pixbuf = new Gdk.Pixbuf(stream);
- return pixbuf;
- }
- }
- else
- {
- return null;
- }
- }
- #region IDisposable Members
-
- private bool disposed;
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="disposing"></param>
- protected virtual void Dispose(bool disposing)
- {
- if (!this.disposed)
- {
- if (disposing)
- {
- if (this.sdlScreen != null)
- {
- this.sdlScreen.Dispose();
- this.sdlScreen = null;
- }
- if (this.win != null)
- {
- this.win.Dispose();
- this.win = null;
- }
- if (this.verBox != null)
- {
- this.verBox.Dispose();
- this.verBox = null;
- }
- if (this.btn != null)
- {
- this.btn.Dispose();
- this.btn = null;
- }
- if (this.myImg != null)
- {
- this.myImg.Dispose();
- this.myImg = null;
- }
- }
- this.disposed = true;
- }
- }
- /// <summary>
- ///
- /// </summary>
- public void Dispose()
- {
- this.Dispose(true);
- GC.SuppressFinalize(this);
- }
-
- /// <summary>
- ///
- /// </summary>
- public void Close()
- {
- Dispose();
- }
-
- /// <summary>
- ///
- /// </summary>
- ~GtkWindow()
- {
- Dispose(false);
- }
-
- #endregion
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindowExample.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindowExample.cs 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/GtkWindowExample.cs 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,59 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2006 by Drazen Soronda, Croatia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Exclusive rights to for use to SDL.NET & GTK# projects !!!
- * Others may contact me on SDL.NET forums under nickname Shoky
- */
-#endregion LICENSE
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-using Gtk;
-using SdlDotNet.GtkSharp;
-
-namespace SdlDotNetExamples.SmallDemos
-{
- [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Correct Spelling")]
- public static class GtkWindowExample
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- public static void Main()
- {
- Application.Quit();
- Application.Init();
- GtkWindow gtkWindow = new GtkWindow(); // create window
- gtkWindow.ShowWindow();
- Application.Run();
- }
-
- /// <summary>
- /// Lesson Title
- /// </summary>
- public static string Title
- {
- get
- {
- return "GtkExample: GTK Widgets";
- }
- }
- }
-}
\ No newline at end of file
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/glade-2.0.dtd
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/glade-2.0.dtd 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/glade-2.0.dtd 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,76 +0,0 @@
-<!-- proposed DTD for new glade format -->
-
-<!ELEMENT glade-interface (requires*, widget*) >
-<!ATTLIST glade-interface
- xmlns CDATA #FIXED 'http://glade.gnome.org/glade-2.0.dtd' >
-
-<!ELEMENT requires EMPTY >
-<!ATTLIST requires
- lib CDATA #REQUIRED >
-
-<!ELEMENT widget (property*, accessibility?, signal*, accelerator*, child*) >
-<!ATTLIST widget
- class CDATA #REQUIRED
- id ID #REQUIRED >
-
-<!ELEMENT property (#PCDATA) >
-<!-- type is an optional tag, and should be the string name of the
- GType for the property -->
-<!-- translatable specifies whether the property should be translated
- before use. -->
-<!-- context indicates that the value has a |-separated
- context which must be stripped before use, look up g_strip_context()
- in the GLib API documentation for details.-->
-<!ATTLIST property
- name CDATA #REQUIRED
- type CDATA #IMPLIED
- translatable (yes|no) 'no'
- context (yes|no) 'no'
- comments CDATA #IMPLIED
- agent CDATA #IMPLIED >
-
-<!ELEMENT atkproperty (#PCDATA | accessibility)* >
-<!ATTLIST atkproperty
- name CDATA #REQUIRED
- type CDATA #IMPLIED
- translatable (yes|no) 'no'
- context (yes|no) 'no'
- comments CDATA #IMPLIED >
-
-<!ELEMENT atkrelation EMPTY >
-<!ATTLIST atkrelation
- target CDATA #REQUIRED
- type CDATA #REQUIRED >
-
-<!-- description is assumed to be a translatable string -->
-<!ELEMENT atkaction EMPTY >
-<!ATTLIST atkaction
- action_name CDATA #REQUIRED
- description CDATA #IMPLIED >
-
-<!ELEMENT accessibility (atkrelation | atkaction | atkproperty)* >
-
-<!ELEMENT signal (property*) >
-<!ATTLIST signal
- name CDATA #REQUIRED
- handler CDATA #REQUIRED
- after (yes|no) 'no'
- object IDREF #IMPLIED
- last_modification_time CDATA #IMPLIED >
-
-<!ELEMENT accelerator EMPTY >
-<!ATTLIST accelerator
- key CDATA #REQUIRED
- modifiers CDATA #REQUIRED
- signal CDATA #REQUIRED >
-
-<!ELEMENT child ((widget|placeholder), packing?) >
-<!-- internal children should not have any properties set on them.
- (Internal children are things like the scrollbars in a
- GtkScrolledWindow, or the vbox in a GtkDialog). -->
-<!ATTLIST child
- internal-child CDATA #IMPLIED >
-
-<!ELEMENT packing (property+) >
-
-<!ELEMENT placeholder EMPTY >
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/ui.glade
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/ui.glade 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/SmallDemos/ui.glade 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.0.2 on Mon Mar 26 10:23:34 2007 by DYYH@L0084120-->
-<glade-interface>
- <widget class="GtkWindow" id="GraphWindow">
- <property name="title" translatable="yes">SDL.NET GTK# Graph Example</property>
- <signal name="key_press_event" handler="OnKeyPress"/>
- <signal name="delete_event" handler="OnDeleteWindow"/>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span size="5"><b>GraphEditor</b></span></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">10</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
Deleted: trunk/SdlDotNet/lib/net-2.0/atk-sharp.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/net-2.0/gdk-sharp.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/net-2.0/glade-sharp.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/net-2.0/glib-sharp.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/net-2.0/gtk-sharp.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/net-2.0/osx/Tao.FreeGlut.dll.config
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/osx/Tao.FreeGlut.dll.config 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/lib/net-2.0/osx/Tao.FreeGlut.dll.config 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,3 +0,0 @@
-<configuration>
- <dllmap dll="freeglut.dll" target="/System/Library/Frameworks/GLUT.framework/GLUT" />
-</configuration>
Deleted: trunk/SdlDotNet/lib/net-2.0/pango-sharp.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/src/Particles/COPYING
===================================================================
--- trunk/SdlDotNet/src/Particles/COPYING 2008-02-07 19:32:21 UTC (rev 1431)
+++ trunk/SdlDotNet/src/Particles/COPYING 2008-02-07 21:01:31 UTC (rev 1432)
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the gre...
[truncated message content] |
|
From: <je...@us...> - 2008-02-07 19:32:26
|
Revision: 1431
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1431&view=rev
Author: jendave
Date: 2008-02-07 11:32:21 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
move Particles into the main assembly/project
Added Paths:
-----------
trunk/SdlDotNet/src/Particles/
Removed Paths:
-------------
trunk/SdlDotNet/examples/Particles/
Copied: trunk/SdlDotNet/src/Particles (from rev 1429, trunk/SdlDotNet/examples/Particles)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-07 19:29:49
|
Revision: 1430
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1430&view=rev
Author: jendave
Date: 2008-02-07 11:29:43 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
Removed Tao.Windows.Platform and Tao.FreeGlut. i had to remove some NeHe and redbook examples as a result.
Modified Paths:
--------------
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookMipMap.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookQuadric.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookSelect.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookSmooth.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookTexSub.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookTextureProxies.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamplesBrowser.cs
Removed Paths:
-------------
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe017.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccAnti.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccumulationPerspective.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAlpha3D.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAnti.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookClip.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookColorMat.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookCube.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookDepthCue.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookDepthOfField.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookFog.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookFogIndex.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookFogIndexOld.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookFogOld.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookLight.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookMaterial.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookMoveLight.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookPlanet.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookPolyOff.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookRobot.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookScene.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookSceneBlueAmbient.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookSceneColorLight.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookSceneFlat.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookStencil.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookTeaAmbient.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookTeapots.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookTexGen.cs
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.License.txt
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.Readme.txt
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll.config
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.License.txt
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.Readme.txt
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll.config
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs 2008-02-06 23:10:19 UTC (rev 1429)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs 2008-02-07 19:29:43 UTC (rev 1430)
@@ -1,330 +0,0 @@
-#region License
-/*
-MIT License
-Copyright \xA92003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
-
-using System;
-using System.Drawing;
-using System.Globalization;
-using System.Diagnostics.CodeAnalysis;
-
-using SdlDotNet.Core;
-using SdlDotNet.Graphics;
-using Tao.OpenGl;
-using Tao.Platform.Windows;
-
-namespace SdlDotNetExamples.NeHe
-{
- /// <summary>
- /// Lesson 13: Bitmap Fonts
- /// </summary>
- [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
- public class NeHe013 : NeHe006, IDisposable
- {
- #region Fields
-
- /// <summary>
- /// Lesson Title
- /// </summary>
- public new static string Title
- {
- get
- {
- return "Lesson 13: Bitmap Fonts";
- }
- }
-
- IntPtr hDC;
-
- /// <summary>
- /// Window Handle
- /// </summary>
- public IntPtr Hdc
- {
- get
- {
- return hDC;
- }
- set
- {
- hDC = value;
- }
- }
-
- int fontBase;
-
- /// <summary>
- /// Base Display List For The Font Set
- /// </summary>
- public int FontBase
- {
- get
- {
- return fontBase;
- }
- set
- {
- fontBase = value;
- }
- }
-
- float cnt1;
-
- /// <summary>
- /// 1st Counter Used To Move Text & For Coloring
- /// </summary>
- public float Cnt1
- {
- get
- {
- return cnt1;
- }
- set
- {
- cnt1 = value;
- }
- }
-
- float cnt2;
-
- /// <summary>
- /// 2nd Counter Used To Move Text & For Coloring
- /// </summary>
- public float Cnt2
- {
- get
- {
- return cnt2;
- }
- set
- {
- cnt2 = value;
- }
- }
-
- #endregion Fields
-
- #region Constructor
-
- /// <summary>
- /// Basic Constructor
- /// </summary>
- public NeHe013()
- {
- Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
- }
-
- #endregion Constructor
-
- #region Lesson Setup
-
- /// <summary>
- /// Initialize OpenGL
- /// </summary>
- protected override void InitGL()
- {
- GC.KeepAlive(this);
- hDC = User.GetDC(Video.WindowHandle);
-
- // Enable Smooth Shading
- Gl.glShadeModel(Gl.GL_SMOOTH);
- // Black Background
- Gl.glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
- // Depth Buffer Setup
- Gl.glClearDepth(1.0f);
- // Enables Depth Testing
- Gl.glEnable(Gl.GL_DEPTH_TEST);
- // The Type Of Depth Testing To Do
- Gl.glDepthFunc(Gl.GL_LEQUAL);
- // Really Nice Perspective Calculations
- Gl.glHint(Gl.GL_PERSPECTIVE_CORRECTION_HINT, Gl.GL_NICEST);
- BuildFont();
- }
-
- /// <summary>
- /// Create Font
- /// </summary>
- protected virtual void BuildFont()
- {
- GC.KeepAlive(this);
- fontBase = Gl.glGenLists(96);
-
- System.Drawing.Font font = new System.Drawing.Font(
- "Courier New",
- 17,
- FontStyle.Bold);
-
- IntPtr oldfont = Gdi.SelectObject(hDC, font.ToHfont());
- // Selects The Font We Want
- Wgl.wglUseFontBitmapsA(hDC, 32, 96, fontBase);
- // Builds 96 Characters Starting At Character 32
- Gdi.SelectObject(hDC, oldfont);
- // Selects The Font We Want
- }
-
- #endregion Lesson Setup
-
- #region Render
-
- /// <summary>
- /// Renders the scene
- /// </summary>
- protected override void DrawGLScene()
- {
- // Clear Screen And Depth Buffer
- Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT);
- // Reset The Current Modelview Matrix
- Gl.glLoadIdentity();
- // Move One Unit Into The Screen
- Gl.glTranslatef(0, 0, -1);
- // Pulsing Colors Based On Text Position
- Gl.glColor3f(1.0f * ((float)(Math.Cos(Cnt1))), 1.0f * ((float)(Math.Sin(cnt2))), 1.0f - 0.5f * ((float)(Math.Cos(Cnt1 + cnt2))));
- // Position The Text On The Screen
- Gl.glRasterPos2f(-0.45f + 0.05f * ((float)(Math.Cos(Cnt1))), 0.32f * ((float)(Math.Sin(cnt2))));
- // Print GL Text To The Screen
- GlPrint(string.Format(CultureInfo.CurrentCulture, "Active OpenGL Text With NeHe - {0:0.00}", Cnt1));
- // Increase The First Counter
- Cnt1 += 0.051f;
- // Increase The First Counter
- cnt2 += 0.005f;
- }
-
- /// <summary>
- /// Print font to screen
- /// </summary>
- /// <param name="text"></param>
- [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
- protected virtual void GlPrint(string text)
- {
- // If There's No Text
- if (text == null || text.Length == 0)
- {
- // Do Nothing
- return;
-
- }
- // Pushes The Display List Bits
- Gl.glPushAttrib(Gl.GL_LIST_BIT);
- // Sets The Base Character to 32
- Gl.glListBase(fontBase - 32);
- // .NET -- we can't just pass text, we need to convert
- byte[] textbytes = new byte[text.Length];
-
- for (int i = 0; i < text.Length; i++)
- {
- textbytes[i] = (byte)text[i];
- }
-
- // Draws The Display List Text
- Gl.glCallLists(text.Length, Gl.GL_UNSIGNED_BYTE, textbytes);
- // Pops The Display List Bits
- Gl.glPopAttrib();
- }
-
- #endregion Render
-
- #region Close Lesson
-
- /// <summary>
- /// Close font
- /// </summary>
- protected virtual void KillFont()
- {
- // Delete All 96 Characters
- Gl.glDeleteLists(fontBase, 96);
- }
-
- #endregion Close Lesson
-
- #region Event Handlers
-
- private void Quit(object sender, QuitEventArgs e)
- {
- this.KillFont();
- }
-
- #endregion Event Handlers
-
- #region IDisposable Members
-
- private bool disposed;
-
- /// <summary>
- /// Destroy sprite
- /// </summary>
- /// <param name="disposing">If true, remove all unamanged resources</param>
- protected virtual void Dispose(bool disposing)
- {
- if (!this.disposed)
- {
- if (disposing)
- {
- GC.SuppressFinalize(this);
- }
- this.disposed = true;
- }
- }
- /// <summary>
- /// Destroy object
- /// </summary>
- public void Dispose()
- {
- this.Dispose(true);
- }
-
- /// <summary>
- /// Destroy object
- /// </summary>
- public void Close()
- {
- Dispose();
- }
-
- /// <summary>
- /// Destroy object
- /// </summary>
- ~NeHe013()
- {
- Dispose(false);
- }
-
- #endregion
-
- #region Run Loop
- /// <summary>
- /// Starts lesson
- /// </summary>
- [STAThread]
- public static new void Main()
- {
- NeHe013 t = new NeHe013();
- t.Reshape();
- t.InitGL();
- Events.Run();
- }
-
- #endregion Run Loop
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs 2008-02-06 23:10:19 UTC (rev 1429)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs 2008-02-07 19:29:43 UTC (rev 1430)
@@ -1,255 +0,0 @@
-#region License
-/*
-MIT License
-Copyright \xA92003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
-
-using System;
-using System.Globalization;
-using System.Drawing;
-using System.Diagnostics.CodeAnalysis;
-
-using SdlDotNet.Core;
-using Tao.OpenGl;
-using Tao.Platform.Windows;
-
-namespace SdlDotNetExamples.NeHe
-{
- /// <summary>
- /// Lesson 14: Outline Fonts
- /// </summary>
- [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
- public class NeHe014 : NeHe013
- {
- #region Fields
-
- /// <summary>
- /// Lesson Title
- /// </summary>
- public new static string Title
- {
- get
- {
- return "Lesson 14: Outline Fonts";
- }
- }
-
- // Storage For Information About Our Outline Font Characters
- Gdi.GLYPHMETRICSFLOAT[] gmf = new Gdi.GLYPHMETRICSFLOAT[256];
-
- float rot;
-
- /// <summary>
- /// Used To Rotate The Text
- /// </summary>
- public float Rotation
- {
- get
- {
- return rot;
- }
- set
- {
- rot = value;
- }
- }
-
- #endregion Fields
-
- #region Constructor
-
- /// <summary>
- /// Basic Constructor
- /// </summary>
- public NeHe014()
- {
- Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
- }
-
- #endregion Constructor
-
- #region Lesson Setup
-
- /// <summary>
- /// Build Font
- /// </summary>
- protected override void BuildFont()
- {
- // Windows Font ID
- IntPtr font;
- // Storage For 256 Characters
- this.FontBase = Gl.glGenLists(256);
-
- // Create The Font
- font = Gdi.CreateFont(
- // Height Of Font
- -12,
- // Width Of Font
- 0,
- // Angle Of Escapement
- 0,
- // Orientation Angle
- 0,
- // Font Weight
- Gdi.FW_BOLD,
- // Italic
- false,
- // Underline
- false,
- // Strikeout
- false,
- // Character Set Identifier
- Gdi.ANSI_CHARSET,
- // Output Precision
- Gdi.OUT_TT_PRECIS,
- // Clipping Precision
- Gdi.CLIP_DEFAULT_PRECIS,
- // Output Quality
- Gdi.ANTIALIASED_QUALITY,
- // Family And Pitch
- Gdi.FF_DONTCARE | Gdi.DEFAULT_PITCH,
- // Font Name
- "Comic Sans MS");
-
- // Selects The Font We Created
- Gdi.SelectObject(this.Hdc, font);
- // Select The Current DC
- Wgl.wglUseFontOutlinesA(
- this.Hdc,
- // Starting Character
- 0,
- // Number Of Display Lists To Build
- 255,
- // Starting Display Lists
- this.FontBase,
- // Deviation From The True Outlines
- 0,
- // Font Thickness In The Z Direction
- 0.2f,
- // Use Polygons, Not Lines
- Wgl.WGL_FONT_POLYGONS,
- // Address Of Buffer To Recieve Data
- gmf);
- }
-
- #endregion Lesson Setup
-
- #region Render
-
- /// <summary>
- /// Renders the scene
- /// </summary>
- protected override void DrawGLScene()
- {
- // Clear Screen And Depth Buffer
- Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT);
- // Reset The Current Modelview Matrix
- Gl.glLoadIdentity();
- // Move One Unit Into The Screen
- Gl.glTranslatef(0, 0, -10);
- // Rotate On The X Axis
- Gl.glRotatef(rot, 1, 0, 0);
- // Rotate On The Y Axis
- Gl.glRotatef(rot * 1.5f, 0, 1, 0);
- // Rotate On The Z Axis
- Gl.glRotatef(rot * 1.4f, 0, 0, 1);
- // Pulsing Colors Based On The Rotation
- Gl.glColor3f(1.0f * ((float)(Math.Cos(rot / 20.0f))), 1.0f * ((float)(Math.Sin(rot / 25.0f))), 1.0f - 0.5f * ((float)(Math.Cos(rot / 17.0f))));
- // Print GL Text To The Screen
- GlPrint(string.Format(CultureInfo.CurrentCulture, "NeHe - {0:0.00}", rot / 50));
- // Increase The Rotation Variable
- rot += 0.5f;
- }
-
- #region GlPrint(string text)
- /// <summary>
- /// Custom GL "print" routine.
- /// </summary>
- /// <param name="text">
- /// The text to print.
- /// </param>
- protected override void GlPrint(string text)
- {
- // If There's No Text
- if (text == null || text.Length == 0)
- {
- // Do Nothing
- return;
- }
-
- // Used To Find The Length Of The Text
- float length = 0;
- // Holds Our String
- char[] chars = text.ToCharArray();
-
- // Loop To Find Text Length
- for (int loop = 0; loop < text.Length; loop++)
- {
- // Increase Length By Each Characters Width
- length += gmf[chars[loop]].gmfCellIncX;
- }
-
- // Center Our Text On The Screen
- Gl.glTranslatef(-length / 2, 0, 0);
- // Pushes The Display List Bits
- Gl.glPushAttrib(Gl.GL_LIST_BIT);
- // Sets The Base Character to 0
- Gl.glListBase(this.FontBase);
- // .NET - can't call text, it's a string!
- byte[] textbytes = new byte[text.Length];
- for (int i = 0; i < text.Length; i++) textbytes[i] = (byte)text[i];
- // Draws The Display List Text
- Gl.glCallLists(text.Length, Gl.GL_UNSIGNED_BYTE, textbytes);
- // Pops The Display List Bits
- Gl.glPopAttrib();
- }
- #endregion GlPrint(string text)
-
- #endregion Render
-
- #region Event Handlers
-
- private void Quit(object sender, QuitEventArgs e)
- {
- KillFont();
- }
-
- #endregion Event Handlers
-
- #region Run Loop
- /// <summary>
- /// Starts lesson
- /// </summary>
- [STAThread]
- public static new void Main()
- {
- NeHe014 t = new NeHe014();
- t.Reshape();
- t.InitGL();
- Events.Run();
- }
-
- #endregion Run Loop
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs 2008-02-06 23:10:19 UTC (rev 1429)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs 2008-02-07 19:29:43 UTC (rev 1430)
@@ -1,323 +0,0 @@
-#region License
-/*
-MIT License
-Copyright \xA92003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
-
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Globalization;
-using System.Diagnostics.CodeAnalysis;
-
-using SdlDotNet.Core;
-using SdlDotNet.Graphics;
-using Tao.OpenGl;
-using Tao.Platform.Windows;
-
-namespace SdlDotNetExamples.NeHe
-{
- /// <summary>
- /// Lesson 15: Texture Mapped Outline Fonts
- /// </summary>
- [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
- public class NeHe015 : NeHe014
- {
- #region Fields
-
- /// <summary>
- /// Lesson Title
- /// </summary>
- public new static string Title
- {
- get
- {
- return "Lesson 15: Texture Mapped Outline Fonts";
- }
- }
-
- // Storage For Information About Our Outline Font Characters
- private Gdi.GLYPHMETRICSFLOAT[] gmf = new Gdi.GLYPHMETRICSFLOAT[256];
-
- #endregion Fields
-
- #region Constructor
-
- /// <summary>
- /// Basic Constructor
- /// </summary>
- public NeHe015()
- {
- // One Texture Map
- this.SetTexture(new int[1]);
- this.SetTextureName(new string[1]);
- this.GetTextureName()[0] = "NeHe015.bmp";
- Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
- }
-
- #endregion Constructor
-
- #region Lesson Setup
-
- /// <summary>
- /// Initialize OpenGL
- /// </summary>
- protected override void InitGL()
- {
- GC.KeepAlive(this);
- this.Hdc = User.GetDC(Video.WindowHandle);
-
- this.LoadGLTextures();
- this.BuildFont();
- // Enable Smooth Shading
- Gl.glShadeModel(Gl.GL_SMOOTH);
- // Black Background
- Gl.glClearColor(0.0F, 0.0F, 0.0F, 0.5F);
- // Depth Buffer Setup
- Gl.glClearDepth(1.0F);
- // Enables Depth Testing
- Gl.glEnable(Gl.GL_DEPTH_TEST);
- // The Type Of Depth Testing To Do
- Gl.glDepthFunc(Gl.GL_LEQUAL);
- // Quick And Dirty Lighting (Assumes Light0 Is Set Up)
- Gl.glEnable(Gl.GL_LIGHT0);
- // Enable Lighting
- Gl.glEnable(Gl.GL_LIGHTING);
- // Really Nice Perspective Calculations
- Gl.glHint(Gl.GL_PERSPECTIVE_CORRECTION_HINT, Gl.GL_NICEST);
- // Enable Texture Mapping ( NEW )
- Gl.glEnable(Gl.GL_TEXTURE_2D);
- // Select The Texture
- Gl.glBindTexture(Gl.GL_TEXTURE_2D, this.GetTexture()[0]);
- }
-
- /// <summary>
- /// Build Font
- /// </summary>
- protected override void BuildFont()
- {
- // Windows Font ID
- IntPtr font;
- // Storage For 256 Characters
- this.FontBase = Gl.glGenLists(256);
-
- // Create The Font
- font = Gdi.CreateFont(
- // Height Of Font
- -12,
- // Width Of Font
- 0,
- // Angle Of Escapement
- 0,
- // Orientation Angle
- 0,
- // Font Weight
- Gdi.FW_BOLD,
- // Italic
- false,
- // Underline
- false,
- // Strikeout
- false,
- // Character Set Identifier
- Gdi.SYMBOL_CHARSET,
- // Output Precision
- Gdi.OUT_TT_PRECIS,
- // Clipping Precision
- Gdi.CLIP_DEFAULT_PRECIS,
- // Output Quality
- Gdi.ANTIALIASED_QUALITY,
- // Family And Pitch
- Gdi.FF_DONTCARE | Gdi.DEFAULT_PITCH,
- // Font Name
- "Wingdings");
-
- // Selects The Font We Created
- Gdi.SelectObject(this.Hdc, font);
- Wgl.wglUseFontOutlinesA(
- // Select The Current DC
- this.Hdc,
- // Starting Character
- 0,
- // Number Of Display Lists To Build
- 255,
- // Starting Display Lists
- this.FontBase,
- // Deviation From The True Outlines
- 0,
- // Font Thickness In The Z Direction
- 0.2f,
- // Use Polygons, Not Lines
- Wgl.WGL_FONT_POLYGONS,
- // Address Of Buffer To Recieve Data
- gmf);
- }
-
- /// <summary>
- /// Load textures
- /// </summary>
- protected override void LoadGLTextures()
- {
- if (File.Exists(Path.Combine(this.DataDirectory, this.GetTextureName()[0])))
- {
- this.FilePath = "";
- }
- // Status Indicator
- Bitmap[] textureImage = new Bitmap[this.GetTextureName().Length];
- // Create Storage Space For The Texture
-
- textureImage[0] = new Bitmap(Path.Combine(this.FilePath, Path.Combine(this.DataDirectory, this.GetTextureName()[0])));
- // Load The Bitmap
- // Check For Errors, If Bitmap's Not Found, Quit
- if (textureImage[0] != null)
- {
- Gl.glGenTextures(this.GetTexture().Length, this.GetTexture());
-
- textureImage[0].RotateFlip(RotateFlipType.RotateNoneFlipY);
- // Flip The Bitmap Along The Y-Axis
- // Rectangle For Locking The Bitmap In Memory
- Rectangle rectangle = new Rectangle(0, 0, textureImage[0].Width, textureImage[0].Height);
- // Get The Bitmap's Pixel Data From The Locked Bitmap
- BitmapData bitmapData = textureImage[0].LockBits(rectangle, ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb);
-
- // Create Linear Filtered Texture
- Gl.glBindTexture(Gl.GL_TEXTURE_2D, this.GetTexture()[0]);
- Glu.gluBuild2DMipmaps(Gl.GL_TEXTURE_2D, Gl.GL_RGB8, textureImage[0].Width, textureImage[0].Height, Gl.GL_RGB, Gl.GL_UNSIGNED_BYTE, bitmapData.Scan0);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, Gl.GL_LINEAR);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, Gl.GL_LINEAR_MIPMAP_NEAREST);
- Gl.glTexGeni(Gl.GL_S, Gl.GL_TEXTURE_GEN_MODE, Gl.GL_OBJECT_LINEAR);
- Gl.glTexGeni(Gl.GL_T, Gl.GL_TEXTURE_GEN_MODE, Gl.GL_OBJECT_LINEAR);
- Gl.glEnable(Gl.GL_TEXTURE_GEN_S);
- Gl.glEnable(Gl.GL_TEXTURE_GEN_T);
-
- // If Texture Exists
- if (textureImage[0] != null)
- {
- // Unlock The Pixel Data From Memory
- textureImage[0].UnlockBits(bitmapData);
- // Dispose The Bitmap
- textureImage[0].Dispose();
- }
- }
- }
-
- #endregion Lesson Setup
-
- #region Render
-
- /// <summary>
- /// Renders the scene
- /// </summary>
- protected override void DrawGLScene()
- {
- // Clear Screen And Depth Buffer
- Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT);
- // Reset The Current Modelview Matrix
- Gl.glLoadIdentity();
- Gl.glTranslatef(1.1f * ((float)(Math.Cos(this.Rotation / 16.0f))), 0.8f * ((float)(Math.Sin(this.Rotation / 20.0f))), -3.0f);
- // Rotate On The X Axis
- Gl.glRotatef(this.Rotation, 1, 0, 0);
- // Rotate On The Y Axis
- Gl.glRotatef(this.Rotation * 1.2f, 0, 1, 0);
- // Rotate On The Z Axis
- Gl.glRotatef(this.Rotation * 1.4f, 0, 0, 1);
- // Center On X, Y, Z Axis
- Gl.glTranslatef(-0.35f, -0.35f, 0.1f);
- // Draw A Skull And Crossbones Symbol
- GlPrint(SdlDotNetExamplesBrowser.StringManager.GetString(
- "N", CultureInfo.CurrentUICulture));
- // Increase The Rotation Variable
- this.Rotation += 0.1f;
- }
-
- #region GlPrint(string text)
- /// <summary>
- /// Custom GL "print" routine.
- /// </summary>
- /// <param name="text">
- /// The text to print.
- /// </param>
- protected override void GlPrint(string text)
- {
- if (text == null || text.Length == 0)
- {
- // If There's No Text
- return;
- // Do Nothing
- }
- float length = 0;
- // Used To Find The Length Of The Text
- char[] chars = text.ToCharArray();
- // Holds Our String
-
- for (int loop = 0; loop < text.Length; loop++)
- { // Loop To Find Text Length
- length += gmf[chars[loop]].gmfCellIncX;
- // Increase Length By Each Characters Width
- }
-
- Gl.glTranslatef(-length / 2, 0, 0);
- // Center Our Text On The Screen
- Gl.glPushAttrib(Gl.GL_LIST_BIT);
- // Pushes The Display List Bits
- Gl.glListBase(this.FontBase);
- // Sets The Base Character to 0
- // .NET - can't call text, it's a string!
- byte[] textbytes = new byte[text.Length];
- for (int i = 0; i < text.Length; i++) textbytes[i] = (byte)text[i];
- Gl.glCallLists(text.Length, Gl.GL_UNSIGNED_BYTE, textbytes);
- // Draws The Display List Text
- Gl.glPopAttrib();
- // Pops The Display List Bits
- }
- #endregion GlPrint(string text)
-
- #endregion Render
-
- #region Event Handlers
-
- private void Quit(object sender, QuitEventArgs e)
- {
- KillFont();
- }
-
- #endregion Event Handlers
-
- #region Run Loop
- /// <summary>
- /// Starts lesson
- /// </summary>
- [STAThread]
- public static new void Main()
- {
- NeHe015 t = new NeHe015();
- t.Reshape();
- t.InitGL();
- Events.Run();
- }
-
- #endregion Run Loop
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe017.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe017.cs 2008-02-06 23:10:19 UTC (rev 1429)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe017.cs 2008-02-07 19:29:43 UTC (rev 1430)
@@ -1,331 +0,0 @@
-#region License
-/*
-MIT License
-Copyright \xA92003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
-
-using System;
-using System.IO;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Diagnostics.CodeAnalysis;
-
-using SdlDotNet.Core;
-using Tao.OpenGl;
-
-namespace SdlDotNetExamples.NeHe
-{
- /// <summary>
- /// Lesson 17: 2D Texture Font
- /// </summary>
- [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
- public class NeHe017 : NeHe013
- {
- #region Fields
-
- /// <summary>
- /// Lesson Title
- /// </summary>
- public new static string Title
- {
- get
- {
- return "Lesson 17: 2D Texture Font";
- }
- }
-
- #endregion Fields
-
- #region Constructor
-
- /// <summary>
- /// Basic constructor
- /// </summary>
- public NeHe017()
- {
- Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
- this.SetTexture(new int[2]);
- this.SetTextureName(new string[2]);
- // Texture array
- this.GetTextureName()[0] = "NeHe017.Font.bmp";
- this.GetTextureName()[1] = "NeHe017.Bumps.bmp";
- }
-
- #endregion Constructor
-
- #region Lesson Setup
-
- /// <summary>
- /// Initialize OpenGL
- /// </summary>
- protected override void InitGL()
- {
- LoadGLTextures();
-
- // Enable Texture Mapping
- Gl.glEnable(Gl.GL_TEXTURE_2D);
- // Enable Smooth Shading
- Gl.glShadeModel(Gl.GL_SMOOTH);
- // Black Background
- Gl.glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
- // Depth Buffer Setup
- Gl.glClearDepth(1.0f);
- // Enables Depth Testing
- Gl.glEnable(Gl.GL_DEPTH_TEST);
- // The Type Of Depth Testing To Do
- Gl.glDepthFunc(Gl.GL_LEQUAL);
- // Select The Type Of Blending
- Gl.glBlendFunc(Gl.GL_SRC_ALPHA, Gl.GL_ONE);
- // Really Nice Perspective Calculations
- Gl.glHint(Gl.GL_PERSPECTIVE_CORRECTION_HINT, Gl.GL_NICEST);
-
- BuildFont();
- }
-
- /// <summary>
- /// Build Font
- /// </summary>
- protected override void BuildFont()
- {
- // Holds Our X Character Coord
- float cx;
- // Holds Our Y Character Coord
- float cy;
-
- // Creating 256 Display Lists
- this.FontBase = Gl.glGenLists(256);
- // Select Our Font Texture
- Gl.glBindTexture(Gl.GL_TEXTURE_2D, this.GetTexture()[0]);
- // Loop Through All 256 Lists
- for (int loop = 0; loop < 256; loop++)
- {
- // X Position Of Current Character
- cx = (float)(loop % 16) / 16.0f;
- // Y Position Of Current Character
- cy = (float)(loop / 16) / 16.0f;
-
- // Start Building A List
- Gl.glNewList((int)(this.FontBase + loop), Gl.GL_COMPILE);
- // Use A Quad For Each Character
- Gl.glBegin(Gl.GL_QUADS);
- // Texture Coord (Bottom Left)
- Gl.glTexCoord2f(cx, 1 - cy - 0.0625f);
- // Vertex Coord (Bottom Left)
- Gl.glVertex2i(0, 0);
- // Texture Coord (Bottom Right)
- Gl.glTexCoord2f(cx + 0.0625f, 1 - cy - 0.0625f);
- // Vertex Coord (Bottom Right)
- Gl.glVertex2i(16, 0);
- // Texture Coord (Top Right)
- Gl.glTexCoord2f(cx + 0.0625f, 1 - cy);
- // Vertex Coord (Top Right)
- Gl.glVertex2i(16, 16);
- // Texture Coord (Top Left)
- Gl.glTexCoord2f(cx, 1 - cy);
- // Vertex Coord (Top Left)
- Gl.glVertex2i(0, 16);
- // Done Building Our Quad (Character)
- Gl.glEnd();
- // Move To The Right Of The Character
- Gl.glTranslated(10, 0, 0);
- // Done Building The Display List
- Gl.glEndList();
- }
- }
-
- #endregion Lesson Setup
-
- #region Render
-
- /// <summary>
- /// Renders the scene
- /// </summary>
- protected override void DrawGLScene()
- {
- Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT);
- Gl.glLoadIdentity();
- // Select Our Second Texture
- Gl.glBindTexture(Gl.GL_TEXTURE_2D, this.GetTexture()[1]);
- // Move Into The Screen 5 Units
- Gl.glTranslatef(0.0f, 0.0f, -5.0f);
- // Rotate On The Z Axis 45 Degrees (Clockwise)
- Gl.glRotatef(45.0f, 0.0f, 0.0f, 1.0f);
- // Rotate On The X & Y Axis By Cnt1 (Left To Right)
- Gl.glRotatef(this.Cnt1 * 30.0f, 1.0f, 1.0f, 0.0f);
- // Disable Blending Before We Draw In 3D
- Gl.glDisable(Gl.GL_BLEND);
- // Bright White
- Gl.glColor3f(1.0f, 1.0f, 1.0f);
- // Draw Our First Texture Mapped Quad
- Gl.glBegin(Gl.GL_QUADS);
- // First Texture Coord
- Gl.glTexCoord2d(0.0f, 0.0f);
- // First Vertex
- Gl.glVertex2f(-1.0f, 1.0f);
- // Second Texture Coord
- Gl.glTexCoord2d(1.0f, 0.0f);
- // Second Vertex
- Gl.glVertex2f(1.0f, 1.0f);
- // Third Texture Coord
- Gl.glTexCoord2d(1.0f, 1.0f);
- // Third Vertex
- Gl.glVertex2f(1.0f, -1.0f);
- // Fourth Texture Coord
- Gl.glTexCoord2d(0.0f, 1.0f);
- // Fourth Vertex
- Gl.glVertex2f(-1.0f, -1.0f);
- // Done Drawing The First Quad
- Gl.glEnd();
- // Rotate On The X & Y Axis By 90 Degrees (Left To Right)
- Gl.glRotatef(90.0f, 1.0f, 1.0f, 0.0f);
- // Draw Our Second Texture Mapped Quad
- Gl.glBegin(Gl.GL_QUADS);
- // First Texture Coord
- Gl.glTexCoord2d(0.0f, 0.0f);
- // First Vertex
- Gl.glVertex2f(-1.0f, 1.0f);
- // Second Texture Coord
- Gl.glTexCoord2d(1.0f, 0.0f);
- // Second Vertex
- Gl.glVertex2f(1.0f, 1.0f);
- // Third Texture Coord
- Gl.glTexCoord2d(1.0f, 1.0f);
- // Third Vertex
- Gl.glVertex2f(1.0f, -1.0f);
- // Fourth Texture Coord
- Gl.glTexCoord2d(0.0f, 1.0f);
- // Fourth Vertex
- Gl.glVertex2f(-1.0f, -1.0f);
- // Done Drawing Our Second Quad
- Gl.glEnd();
- // Enable Blending
- Gl.glEnable(Gl.GL_BLEND);
- // Reset The View
- Gl.glLoadIdentity();
- // Pulsing Colors Based On Text Position
- Gl.glColor3f(1.0f * (float)Math.Cos(this.Cnt1), 1.0f * (float)Math.Sin(this.Cnt2), 1.0f - 0.5f * (float)Math.Cos(this.Cnt1 + this.Cnt2));
- // Pr(int) Gl.GL Text To The Screen
- GlPrint((int)(280 + 250 * Math.Cos(this.Cnt1)), (int)(235 + 200 * Math.Sin(this.Cnt2)), "NeHe", 0);
-
- Gl.glColor3f(1.0f * (float)(Math.Sin(this.Cnt2)), 1.0f - 0.5f * (float)(Math.Cos(this.Cnt1 + this.Cnt2)), 1.0f * (float)(Math.Cos(this.Cnt1)));
- // Pr(int) Gl.GL Text To The Screen
- GlPrint((int)(280 + 230 * Math.Cos(this.Cnt2)), (int)(235 + 200 * Math.Sin(this.Cnt1)), "OpenGL", 0);
- // Set Color To Blue
- Gl.glColor3f(0.0f, 0.0f, 1.0f);
- GlPrint((int)(240 + 200 * Math.Cos((this.Cnt2 + this.Cnt1) / 5)), 2, "Giuseppe D'Agata", 0);
- // Set Color To White
- Gl.glColor3f(1.0f, 1.0f, 1.0f);
- GlPrint((int)(242 + 200 * Math.Cos((this.Cnt2 + this.Cnt1) / 5)), 2, "Giuseppe D'Agata", 0);
- // Increase The First Counter
- this.Cnt1 += 0.01f;
- this.Cnt2 += 0.0081f;
- }
-
- /// <summary>
- /// Print to screen
- /// </summary>
- /// <param name="displayText">Text to display</param>
- /// <param name="positionX">X position to display the text</param>
- /// <param name="positionY">Y position to display the text</param>
- /// <param name="characterSet"></param>
- [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
- public void GlPrint(int positionX, int positionY, string displayText, int characterSet)
- {
- if (displayText == null)
- {
- displayText = " ";
- }
- if (displayText.Length == 0)
- {
- displayText = " ";
- }
-
- if (characterSet > 1)
- {
- characterSet = 1;
- }
-
- // Select Our Font Texture
- Gl.glBindTexture(Gl.GL_TEXTURE_2D, GetTexture()[0]);
- // Disables Depth Testing
- Gl.glDisable(Gl.GL_DEPTH_TEST);
- // Select The Projection Matrix
- Gl.glMatrixMode(Gl.GL_PROJECTION);
- // Store The Projection Matrix
- Gl.glPushMatrix();
- // Reset The Projection Matrix
- Gl.glLoadIdentity();
- // Set Up An Ortho Screen
- Gl.glOrtho(0, 640, 0, 480, -1, 1);
- // Select The Modelview Matrix
- Gl.glMatrixMode(Gl.GL_MODELVIEW);
- // Store The Modelview Matrix
- Gl.glPushMatrix();
- // Reset The Modelview Matrix
- Gl.glLoadIdentity();
- // Position The Text (0,0 - Bottom Left)
- Gl.glTranslated(positionX, positionY, 0);
- // Choose The Font Set (0 or 1)
- Gl.glListBase(this.FontBase - 32 + (128 * characterSet));
- // Write The Text To The Screen
- Gl.glCallLists(displayText.Length, Gl.GL_UNSIGNED_BYTE, displayText);
- // Select The Projection Matrix
- Gl.glMatrixMode(Gl.GL_PROJECTION);
- // Restore The Old Projection Matrix
- Gl.glPopMatrix();
- // Select The Modelview Matrix
- Gl.glMatrixMode(Gl.GL_MODELVIEW);
- // Restore The Old Projection Matrix
- Gl.glPopMatrix();
- // Enables Depth Testing
- Gl.glEnable(Gl.GL_DEPTH_TEST);
- }
-
- #endregion Render
-
- #region Event Handlers
-
- private void Quit(object sender, QuitEventArgs e)
- {
- KillFont();
- }
-
- #endregion Event Handlers
-
- #region Run Loop
- /// <summary>
- /// Starts lesson
- /// </summary>
- [STAThread]
- public static new void Main()
- {
- NeHe017 t = new NeHe017();
- t.Reshape();
- t.InitGL();
- Events.Run();
- }
-
- #endregion Run Loop
- }
-}
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccAnti.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccAnti.cs 2008-02-06 23:10:19 UTC (rev 1429)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccAnti.cs 2008-02-07 19:29:43 UTC (rev 1430)
@@ -1,306 +0,0 @@
-#region License
-/*
-MIT License
-Copyright \xA92003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
-
-using System;
-using System.Reflection;
-
-using SdlDotNet.Core;
-using SdlDotNet.Graphics;
-using SdlDotNet.Input;
-using Tao.OpenGl;
-using Tao.FreeGlut;
-
-namespace SdlDotNetExamples.RedBook
-{
- /// <summary>
- /// Use the accumulation buffer to do full-scene antialiasing on a scene with
- /// orthographic parallel projection.
- /// </summary>
- /// <remarks>
- /// <para>
- /// Original Author: Silicon Graphics, Inc.
- /// http://www.opengl.org/developers/code/examples/redbook/accanti.c
- /// </para>
- /// <para>
- /// C# Implementation: Randy Ridge
- /// http://www.taoframework.com
- /// </para>
- /// <para>
- /// SDL.NET implementation: David Hudson
- /// http://cs-sdl.sourceforge.net
- /// </para>
- /// </remarks>
- public class RedBookAccAnti
- {
- #region Fields
-
- //Width of screen
- int width = 250;
- //Height of screen
- int height = 250;
-
-
-
-
- private const int ACSIZE = 8;
-
- /// <summary>
- /// Lesson title
- /// </summary>
- public static string Title
- {
- get
- {
- return "AccAnti - Accumulation Buffer";
- }
- }
-
- #endregion Fields
-
- #region Constructors
-
- /// <summary>
- /// Basic constructor
- /// </summary>
- public RedBookAccAnti()
- {
- Initialize();
- }
-
- #endregion Constructors
-
- #region Lesson Setup
- /// <summary>
- /// Initializes methods common to all RedBook lessons
- /// </summary>
- private void Initialize()
- {
- // Sets keyboard events
- Events.KeyboardDown += new EventHandler<KeyboardEventArgs>(this.KeyDown);
- Keyboard.EnableKeyRepeat(150,50);
- // Sets the ticker to update OpenGL Context
- Events.Tick += new EventHandler<TickEventArgs>(this.Tick);
- Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
-// // Sets the resize window event
-// Events.VideoResize += new EventHandler<VideoResizeEventArgs> (this.Resize);
- // Set the Frames per second.
- Events.Fps = 60;
- // Sets Window icon and title
- this.WindowAttributes();
- // Creates SDL.NET Surface to hold an OpenGL scene
- Video.SetVideoMode(width, height, true, true);
- }
-
- /// <summary>
- /// Sets Window icon and caption
- /// </summary>
- private void WindowAttributes()
- {
- Video.WindowIcon();
- Video.WindowCaption =
- "SDL.NET - RedBook " +
- this.GetType().ToString().Substring(26);
- }
-
- /// <summary>
- /// Resizes window
- /// </summary>
- private void Reshape()
- {
- Reshape(this.width, this.height);
- }
-
- /// <summary>
- /// Resizes window
- /// </summary>
- /// <param name="h"></param>
- /// <param name="w"></param>
- private static void Reshape(int w, int h)
- {
- Gl.glViewport(0, 0, w, h);
- Gl.glMatrixMode(Gl.GL_PROJECTION);
- Gl.glLoadIdentity();
- if(w <= h)
- {
- Gl.glOrtho(-2.25, 2.25, -2.25 * h / (float)w, 2.25 * h / (float)w, -10.0, 10.0);
- }
- else
- {
- Gl.glOrtho(-2.25 * w / (float)h, 2.25 * w / (float)h, -2.25, 2.25, -10.0, 10.0);
- }
- Gl.glMatrixMode(Gl.GL_MODELVIEW);
- Gl.glLoadIdentity();
- }
-
- /// <summary>
- /// Initializes the OpenGL system
- /// </summary>
- private static void Init()
- {
-
- float[] materialAmbient = {1.0f, 1.0f, 1.0f, 1.0f};
- float[] materialSpecular = {1.0f, 1.0f, 1.0f, 1.0f};
- float[] lightPosition = {0.0f, 0.0f, 10.0f, 1.0f};
- float[] lightModelAmbient = {0.2f, 0.2f, 0.2f, 1.0f};
-
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_AMBIENT, materialAmbient);
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_SPECULAR, materialSpecular);
- Gl.glMaterialf(Gl.GL_FRONT, Gl.GL_SHININESS, 50.0f);
- Gl.glLightfv(Gl.GL_LIGHT0, Gl.GL_POSITION, lightPosition);
- Gl.glLightModelfv(Gl.GL_LIGHT_MODEL_AMBIENT, lightModelAmbient);
-
- Gl.glEnable(Gl.GL_LIGHTING);
- Gl.glEnable(Gl.GL_LIGHT0);
- Gl.glEnable(Gl.GL_DEPTH_TEST);
- Gl.glShadeModel(Gl.GL_FLAT);
-
- Gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
- Gl.glClearAccum(0.0f, 0.0f, 0.0f, 0.0f);
- }
-
- #endregion Lesson Setup
-
- #region DisplayObjects()
- private static void DisplayObjects()
- {
- float[] torusDiffuse = {0.7f, 0.7f, 0.0f, 1.0f};
- float[] cubeDiffuse = {0.0f, 0.7f, 0.7f, 1.0f};
- float[] sphereDiffuse = {0.7f, 0.0f, 0.7f, 1.0f};
- float[] octaDiffuse = {0.7f, 0.4f, 0.4f, 1.0f};
-
- Gl.glPushMatrix();
- Gl.glRotatef(30.0f, 1.0f, 0.0f, 0.0f);
-
- Gl.glPushMatrix();
- Gl.glTranslatef(-0.80f, 0.35f, 0.0f);
- Gl.glRotatef(100.0f, 1.0f, 0.0f, 0.0f);
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_DIFFUSE, torusDiffuse);
- Glut.glutSolidTorus(0.275f, 0.85f, 16, 16);
- Gl.glPopMatrix();
-
- Gl.glPushMatrix();
- Gl.glTranslatef(-0.75f, -0.50f, 0.0f);
- Gl.glRotatef(45.0f, 0.0f, 0.0f, 1.0f);
- Gl.glRotatef(45.0f, 1.0f, 0.0f, 0.0f);
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_DIFFUSE, cubeDiffuse);
- Glut.glutSolidCube(1.5f);
- Gl.glPopMatrix();
-
- Gl.glPushMatrix();
- Gl.glTranslatef(0.75f, 0.60f, 0.0f);
- Gl.glRotatef(30.0f, 1.0f, 0.0f, 0.0f);
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_DIFFUSE, sphereDiffuse);
- Glut.glutSolidSphere(1.0f, 16, 16);
- Gl.glPopMatrix();
-
- Gl.glPushMatrix();
- Gl.glTranslatef(0.70f, -0.90f, 0.25f);
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_DIFFUSE, octaDiffuse);
- Glut.glutSolidOctahedron();
- Gl.glPopMatrix();
- Gl.glPopMatrix();
- }
- #endregion DisplayObjects()
-
- #region void Display
- /// <summary>
- /// Renders the scene
- /// </summary>
- private static void Display()
- {
- int[] viewport = new int[4];
-
- Gl.glGetIntegerv(Gl.GL_VIEWPORT, viewport);
-
- Gl.glClear(Gl.GL_ACCUM_BUFFER_BIT);
- for(int jitter = 0; jitter < ACSIZE; jitter++)
- {
- Gl.glClear(Gl.GL_COLOR_BUFFER_BIT | Gl.GL_DEPTH_BUFFER_BIT);
- Gl.glPushMatrix();
- // Note that 4.5 is the distance in world space between left and right and bottom
- // and top. This formula converts fractional pixel movement to world coordinates.
- Gl.glTranslatef((Jitter.GetJ8()[jitter].X * 4.5f) / viewport[2], (Jitter.GetJ8()[jitter].Y * 4.5f) / viewport[3], 0.0f);
- DisplayObjects();
- Gl.glPopMatrix();
- Gl.glAccum(Gl.GL_ACCUM, 1.0f / ACSIZE);
- }
- Gl.glAccum(Gl.GL_RETURN, 1.0f);
- Gl.glFlush();
- }
- #endregion void Display
-
- #region Event Handlers
-
- private void KeyDown(object sender, KeyboardEventArgs e)
- {
- switch (e.Key)
- {
- case Key.Escape:
- // Will stop the app loop
- Events.QuitApplication();
- break;
- }
- }
-
- private void Tick(object sender, TickEventArgs e)
- {
- Display();
- Video.GLSwapBuffers();
- }
-
- private void Quit(object sender, QuitEventArgs e)
- {
- Events.QuitApplication();
- }
-
-// private void Resize (object sender, VideoResizeEventArgs e)
-// {
-// Video.SetVideoMode(e.Width, e.Height, true);
-// if (screen.Width != e.Width || screen.Height != e.Height)
-// {
-// //this.Init();
-// this.RedBook t = new RedBook(); t.Reshape();
-// }
-// }
-
- #endregion Event Handlers
-
- #region Run Loop
- /// <summary>
- /// Starts demo
- /// </summary>
- public static void Main()
- {
- RedBookAccAnti t = new RedBookAccAnti();
- t.Reshape();
- Init();
- Events.Run();
- }
-
- #endregion Run Loop
- }
-}
\ No newline at end of file
Deleted: trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccumulationPerspective.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccumulationPerspective.cs 2008-02-06 23:10:19 UTC (rev 1429)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/RedBook/RedBookAccumulationPerspective.cs 2008-02-07 19:29:43 UTC (rev 1430)
@@ -1,381 +0,0 @@
-#region License
-/*
-MIT License
-Copyright \xA92003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
-
-using System;
-using System.Reflection;
-
-using SdlDotNet.Core;
-using SdlDotNet.Graphics;
-using SdlDotNet.Input;
-using Tao.OpenGl;
-using Tao.FreeGlut;
-
-namespace SdlDotNetExamples.RedBook
-{
- /// <summary>
- /// Use the accumulation buffer to do full-scene antialiasing on a scene with
- /// perspective projection, using the special routines accFrustum() and
- /// accPerspective().
- /// </summary>
- /// <remarks>
- /// <para>
- /// Original Author: Silicon Graphics, Inc.
- /// http://www.opengl.org/developers/code/examples/redbook/accanti.c
- /// </para>
- /// <para>
- /// C# Implementation: Randy Ridge
- /// http://www.taoframework.com
- /// </para>
- /// <para>
- /// SDL.NET implementation: David Hudson
- /// http://cs-sdl.sourceforge.net
- /// </para>
- /// </remarks>
- public class RedBookAccumulationPerspective
- {
- #region Fields
-
- //Width of screen
- int width = 250;
- //Height of screen
- int height = 250;
-
-
-
-
- private const int ACSIZE = 8;
-
- /// <summary>
- /// Lesson title
- /// </summary>
- public static string Title
- {
- get
- {
- return "AccPersp - Accumulation Buffer Perspective";
- }
- }
-
- #endregion Fields
-
- #region Constructors
-
- /// <summary>
- /// Basic constructor
- /// </summary>
- public RedBookAccumulationPerspective()
- {
- Initialize();
- }
-
- #endregion Constructors
-
- #region Lesson Setup
- /// <summary>
- /// Initializes methods common to all RedBook lessons
- /// </summary>
- private void Initialize()
- {
- // Sets keyboard events
- Events.KeyboardDown += new EventHandler<KeyboardEventArgs>(this.KeyDown);
- Keyboard.EnableKeyRepeat(150,50);
- // Sets the ticker to update OpenGL Context
- Events.Tick += new EventHandler<TickEventArgs>(this.Tick);
- Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
-// // Sets the resize window event
-// Events.VideoResize += new EventHandler<VideoResizeEventArgs> (this.Resize);
- // Set the Frames per second.
- Events.Fps = 60;
- // Sets Window icon and title
- this.WindowAttributes();
- // Creates SDL.NET Surface to hold an OpenGL scene
- Video.SetVideoMode(width, height, true, true);
- }
-
- /// <summary>
- /// Sets Window icon and caption
- /// </summary>
- private void WindowAttributes()
- {
- Video.WindowIcon();
- Video.WindowCaption =
- "SDL.NET - RedBook " +
- this.GetType().ToString().Substring(26);
- }
-
- /// <summary>
- /// Resizes window
- /// </summary>
- private void Reshape()
- {
- Reshape(this.width, this.height);
- }
-
- /// <summary>
- /// Resizes window
- /// </summary>
- /// <param name="h"></param>
- /// <param name="w"></param>
- private static void Reshape(int w, int h)
- {
- Gl.glViewport(0, 0, w, h);
- Gl.glMatrixMode(Gl.GL_PROJECTION);
- Gl.glLoadIdentity();
- if(w <= h)
- {
- Gl.glOrtho(-2.25, 2.25, -2.25 * h / (float)w, 2.25 * h / (float)w, -10.0, 10.0);
- }
- else
- {
- Gl.glOrtho(-2.25 * w / (float)h, 2.25 * w / (float)h, -2.25, 2.25, -10.0, 10.0);
- }
- Gl.glMatrixMode(Gl.GL_MODELVIEW);
- Gl.glLoadIdentity();
- }
-
- /// <summary>
- /// Initializes the OpenGL system
- /// </summary>
- private static void Init()
- {
-
- float[] materialAmbient = {1.0f, 1.0f, 1.0f, 1.0f};
- float[] materialSpecular = {1.0f, 1.0f, 1.0f, 1.0f};
- float[] lightPosition = {0.0f, 0.0f, 10.0f, 1.0f};
- float[] lightModelAmbient = {0.2f, 0.2f, 0.2f, 1.0f};
-
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_AMBIENT, materialAmbient);
- Gl.glMaterialfv(Gl.GL_FRONT, Gl.GL_SPECULAR, materialSpecular);
- Gl.glMaterialf(Gl.GL_FRONT, Gl.GL_SHININESS, 50.0f);
- Gl.glLightfv(Gl.GL_LIGHT0, Gl.GL_POSITION, lightPosition);
- Gl.glLightModelfv(Gl.GL_LIGHT_MODEL_A...
[truncated message content] |
|
From: <je...@us...> - 2008-02-06 23:10:29
|
Revision: 1429
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1429&view=rev
Author: jendave
Date: 2008-02-06 15:10:19 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
update to latest versions of Tao
Modified Paths:
--------------
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
trunk/SdlDotNet/lib/net-2.0/nunit.framework.dll
Property Changed:
----------------
trunk/SdlDotNet/src/
trunk/SdlDotNet/src/Properties/
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2008-02-06 16:21:16 UTC (rev 1428)
+++ trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2008-02-06 23:10:19 UTC (rev 1429)
@@ -44,7 +44,6 @@
<seealso cref="M:Tao.OpenGl.Gl.IsExtensionSupported(System.String)"/>
<seealso cref="M:Tao.OpenGl.Gl.GetDelegate(System.String,System.Type)"/>
<seealso cref="M:Tao.OpenGl.Gl.ReloadFunctions"/>
- <seealso cref="!:Gl.ReloadFunction"/>
</para>
</remarks>
</member>
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml 2008-02-06 16:21:16 UTC (rev 1428)
+++ trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml 2008-02-06 23:10:19 UTC (rev 1429)
@@ -241,7 +241,7 @@
Indicates whether a device can swap individual layer planes with pixel
formats that include double-buffered overlay or underlay planes.
Otherwise all layer planes are swapped together as a group. When this
- flag is set, <see cref="M:Tao.Platform.Windows.Wgl.wglSwapLayerBuffers(System.IntPtr,System.UInt32)"/> is supported.
+ flag is set, <see cref="M:Tao.Platform.Windows.Wgl.wglSwapLayerBuffers(System.IntPtr,System.Int32)"/> is supported.
</para>
</summary>
</member>
@@ -960,7 +960,7 @@
</summary>
<remarks>The values of <b>GLYPHMETRICSFLOAT</b> are specified as notional units.</remarks>
<seealso cref="T:Tao.Platform.Windows.Gdi.POINTFLOAT"/>
- <seealso cref="!:Wgl.wglUseFontOutlines"/>
+ <seealso cref="M:Tao.Platform.Windows.Wgl.wglUseFontOutlinesA(System.IntPtr,System.Int32,System.Int32,System.Int32,System.Single,System.Single,System.Int32,Tao.Platform.Windows.Gdi.GLYPHMETRICSFLOAT[])"/>
</member>
<member name="F:Tao.Platform.Windows.Gdi.GLYPHMETRICSFLOAT.gmfBlackBoxX">
<summary>
@@ -1324,6 +1324,131 @@
Specifies the vertical (y) coordinate of a point.
</summary>
</member>
+ <member name="T:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.nSize">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.nVersion">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.dwFlags">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.iPixelType">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cColorBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cRedBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cRedShift">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cGreenBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cGreenShift">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cBlueBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cBlueShift">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAlphaBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAlphaShift">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAccumBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAccumRedBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAccumGreenBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAccumBlueBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAccumAlphaBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cDepthBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cStencilBits">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.cAuxBuffers">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.iLayerPlane">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.bReserved">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="F:Tao.Platform.Windows.Gdi.LAYERPLANEDESCRIPTOR.crTransparent">
+ <summary>
+
+ </summary>
+ </member>
<member name="T:Tao.Platform.Windows.IlasmAttribute">
<summary>
Injects supplied MSIL into the method's body.
@@ -3999,7 +4124,7 @@
<summary>
Tries to reload the given OpenGL function (core or extension).
</summary>
- <param name="name">The name of the OpenGL function (i.e. glShaderSource)</param>
+ <param name="function">The name of the OpenGL function (i.e. glShaderSource)</param>
<returns>True if the function was found and reloaded, false otherwise.</returns>
<remarks>
<para>
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/nunit.framework.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/src
___________________________________________________________________
Name: svn:ignore
- SDL.csproj.user
bin
obj
SDL.All.NET.csproj.user
gc.log
SdlDotNet.csproj.user
*.prjx
*.xml
*.swp
*.mdp
*.pidb
*.old
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
*.resources
SdlDotNet.build
+ SDL.csproj.user
bin
obj
SDL.All.NET.csproj.user
gc.log
SdlDotNet.csproj.user
*.prjx
*.xml
*.swp
*.mdp
*.pidb
*.old
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
*.resources
SdlDotNet.build
SdlDotNet.dll
SdlDotNet.dll.mdb
Property changes on: trunk/SdlDotNet/src/Properties
___________________________________________________________________
Name: svn:ignore
+ Resources.resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-06 16:21:24
|
Revision: 1428
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1428&view=rev
Author: jendave
Date: 2008-02-06 08:21:16 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
Update to latest version of Tao
Modified Paths:
--------------
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs
trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs 2008-02-06 16:18:15 UTC (rev 1427)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe013.cs 2008-02-06 16:21:16 UTC (rev 1428)
@@ -178,7 +178,7 @@
IntPtr oldfont = Gdi.SelectObject(hDC, font.ToHfont());
// Selects The Font We Want
- Wgl.wglUseFontBitmaps(hDC, 32, 96, fontBase);
+ Wgl.wglUseFontBitmapsA(hDC, 32, 96, fontBase);
// Builds 96 Characters Starting At Character 32
Gdi.SelectObject(hDC, oldfont);
// Selects The Font We Want
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs 2008-02-06 16:18:15 UTC (rev 1427)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe014.cs 2008-02-06 16:21:16 UTC (rev 1428)
@@ -135,7 +135,7 @@
// Selects The Font We Created
Gdi.SelectObject(this.Hdc, font);
// Select The Current DC
- Wgl.wglUseFontOutlines(
+ Wgl.wglUseFontOutlinesA(
this.Hdc,
// Starting Character
0,
Modified: trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs
===================================================================
--- trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs 2008-02-06 16:18:15 UTC (rev 1427)
+++ trunk/SdlDotNet/examples/SdlDotNetExamples/NeHe/NeHe015.cs 2008-02-06 16:21:16 UTC (rev 1428)
@@ -156,7 +156,7 @@
// Selects The Font We Created
Gdi.SelectObject(this.Hdc, font);
- Wgl.wglUseFontOutlines(
+ Wgl.wglUseFontOutlinesA(
// Select The Current DC
this.Hdc,
// Starting Character
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-06 16:18:27
|
Revision: 1427
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1427&view=rev
Author: jendave
Date: 2008-02-06 08:18:15 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/SdlDotNet/AUTHORS
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
trunk/SdlDotNet/src/Graphics/Surface.cs
Removed Paths:
-------------
trunk/SdlDotNet/.settings/
Modified: trunk/SdlDotNet/AUTHORS
===================================================================
--- trunk/SdlDotNet/AUTHORS 2008-01-16 17:41:34 UTC (rev 1426)
+++ trunk/SdlDotNet/AUTHORS 2008-02-06 16:18:15 UTC (rev 1427)
@@ -1,7 +1,7 @@
The following are the authors and contributors of SDL.NET:
-* SDL.NET by David "[[User:Jendave|Jendave]]" Hudson (je...@ya...)
-* Lots of Code and examples - [[User:Rob Loach|Rob Loach]] (http://www.robloach.net)
+* SDL.NET by David "Jendave" Hudson (je...@ya...)
+* Lots of Code and examples - Rob Loach (http://www.robloach.net)
* Multiline ttf display in Font class - Paul Aspinall (pau...@gm...)
* SdlDotNet.OpenGl reimplementation and many bugfixes - Jonathan Porter AKA BioSlayer (jon...@gm...)
* Lots of bug reports - dogwatch
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2008-01-16 17:41:34 UTC (rev 1426)
+++ trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2008-02-06 16:18:15 UTC (rev 1427)
@@ -86,7 +86,7 @@
<summary>
Tries to reload the given OpenGL function (core or extension).
</summary>
- <param name="name">The name of the OpenGL function (i.e. glShaderSource)</param>
+ <param name="function">The name of the OpenGL function (i.e. glShaderSource)</param>
<returns>True if the function was found and reloaded, false otherwise.</returns>
<remarks>
<para>
@@ -115,7 +115,7 @@
<summary>
Retrieves the entry point for a dynamically exported OpenGL function.
</summary>
- <param name="name">The function string for the OpenGL function (eg. "glNewList")</param>
+ <param name="function">The function string for the OpenGL function (eg. "glNewList")</param>
<returns>
An IntPtr contaning the address for the entry point, or IntPtr.Zero if the specified
OpenGL function is not dynamically exported.
@@ -130,7 +130,6 @@
correct wgl, glx or agl GetAddress function to retrieve the function pointer.
</para>
<see cref="M:System.Runtime.InteropServices.Marshal.GetDelegateForFunctionPointer(System.IntPtr,System.Type)"/>
- <seealso cref="!:Gl.GetDelegateForExtensionMethod"/>
</remarks>
</member>
<member name="M:Tao.OpenGl.Gl.DetectUnixKernel">
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/src/Graphics/Surface.cs
===================================================================
--- trunk/SdlDotNet/src/Graphics/Surface.cs 2008-01-16 17:41:34 UTC (rev 1426)
+++ trunk/SdlDotNet/src/Graphics/Surface.cs 2008-02-06 16:18:15 UTC (rev 1427)
@@ -376,7 +376,7 @@
typeof(Sdl.SDL_Surface));
}
}
-
+ //TODO: Cache this so getpixel/setpixel is faster
internal Sdl.SDL_PixelFormat PixelFormat
{
get
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-01-16 17:41:37
|
Revision: 1426
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1426&view=rev
Author: jendave
Date: 2008-01-16 09:41:34 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
update all libs
Modified Paths:
--------------
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.xml
trunk/SdlDotNet/lib/net-2.0/atk-sharp.dll
trunk/SdlDotNet/lib/net-2.0/gdk-sharp.dll
trunk/SdlDotNet/lib/net-2.0/glade-sharp.dll
trunk/SdlDotNet/lib/net-2.0/glib-sharp.dll
trunk/SdlDotNet/lib/net-2.0/gtk-sharp.dll
trunk/SdlDotNet/lib/net-2.0/nunit.framework.dll
trunk/SdlDotNet/lib/net-2.0/pango-sharp.dll
trunk/SdlDotNet/lib/win32deps/SDL.dll
Added Paths:
-----------
trunk/SdlDotNet/lib/osxdeps/SDL-1.2.13.dmg
Removed Paths:
-------------
trunk/SdlDotNet/lib/osxdeps/SDL-1.2.12.dmg
trunk/SdlDotNet/lib/osxdeps/SDL-devel-1.2.12-extras.dmg
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2007-12-12 00:07:35 UTC (rev 1425)
+++ trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2008-01-16 17:41:34 UTC (rev 1426)
@@ -10,19 +10,19 @@
</summary>
<remarks>
<para>
- Tao.OpenGl.Gl contains all OpenGL enums and functions defined in the 2.1 specification.
+ This class contains all OpenGL enums and functions defined in the 2.1 specification.
The official .spec files can be found at: http://opengl.org/registry/.
</para>
<para>
- Tao.OpenGl.Gl relies on static initialization to obtain the entry points for OpenGL functions.
+ We rely on static initialization to obtain the entry points for OpenGL functions.
Please ensure that a valid OpenGL context has been made current in the pertinent thread <b>before</b>
any OpenGL functions are called (toolkits like GLUT, SDL or GLFW will automatically take care of
- the context initialization process). Without a valid OpenGL context, Tao.OpenGl.Gl will only be able
+ the context initialization process). Without a valid OpenGL context, we will only be able
to retrieve statically exported entry points (typically corresponding to OpenGL version 1.1 under Windows,
1.3 under Linux and 1.4 under Windows Vista), and extension methods will need to be loaded manually.
</para>
<para>
- If you prefer not to rely on static initialisation for the Gl class, you can use the
+ If you prefer to have more control on extension loading, you can use the
ReloadFunctions or ReloadFunction methods to manually force the initialisation of OpenGL entry points.
The ReloadFunctions method should be called whenever you change an existing visual or pixelformat. This
generally happens when you change the color/stencil/depth buffer associated with a window (but probably
@@ -37,73 +37,17 @@
formats.
</para>
<para>
- You may retrieve the entry point for an OpenGL extension using the Gl.GetDelegateForExtensionMethod
- and Gl.GetFunctionPointerForExtensionMethod methods. You may retrieve the entry point for an OpenGL
- function using the Gl.GetDelegateForMethod method. All three methods are cross-platform.
+ You may retrieve the entry point for an OpenGL function using the Gl.GetDelegate method.
</para>
<para>
<see href="http://opengl.org/registry/"/>
- <seealso cref="M:Tao.OpenGl.Gl.IsExtensionSupported(System.String,System.Boolean)"/>
- <seealso cref="M:Tao.OpenGl.Gl.GetDelegateForExtensionMethod(System.String,System.Type)"/>
- <seealso cref="M:Tao.OpenGl.Gl.GetFunctionPointerForExtensionMethod(System.String)"/>
- <seealso cref="M:Tao.OpenGl.Gl.GetDelegateForMethod(System.String,System.Type)"/>
+ <seealso cref="M:Tao.OpenGl.Gl.IsExtensionSupported(System.String)"/>
+ <seealso cref="M:Tao.OpenGl.Gl.GetDelegate(System.String,System.Type)"/>
<seealso cref="M:Tao.OpenGl.Gl.ReloadFunctions"/>
- <seealso cref="M:Tao.OpenGl.Gl.ReloadFunction(System.String)"/>
+ <seealso cref="!:Gl.ReloadFunction"/>
</para>
</remarks>
</member>
- <member name="F:Tao.OpenGl.Gl.GL_NATIVE_LIBRARY">
- <summary>
- Specifies OpenGl's native library archive.
- </summary>
- <remarks>
- Specifies opengl32.dll everywhere; will be mapped via .config for mono.
- </remarks>
- </member>
- <member name="M:Tao.OpenGl.Gl.GetFunctionPointerForExtensionMethod(System.String)">
- <summary>
- Retrieves the entry point for a dynamically exported OpenGL function.
- </summary>
- <param name="name">The function string for the OpenGL function (eg. "glNewList")</param>
- <returns>
- An IntPtr contaning the address for the entry point, or IntPtr.Zero if the specified
- OpenGL function is not dynamically exported.
- </returns>
- <remarks>
- <para>
- The Marshal.GetDelegateForFunctionPointer method can be used to turn the return value
- into a call-able delegate.
- </para>
- <para>
- This function is cross-platform. It determines the underlying platform and uses the
- correct wgl, glx or agl GetAddress function to retrieve the function pointer.
- </para>
- <see cref="M:System.Runtime.InteropServices.Marshal.GetDelegateForFunctionPointer(System.IntPtr,System.Type)"/>
- <seealso cref="M:Tao.OpenGl.Gl.GetDelegateForExtensionMethod(System.String,System.Type)"/>
- </remarks>
- </member>
- <member name="M:Tao.OpenGl.Gl.GetDelegateForExtensionMethod(System.String,System.Type)">
- <summary>
- Creates a System.Delegate that can be used to call a dynamically exported OpenGL function.
- </summary>
- <param name="name">The function string for the OpenGL function (eg. "glNewList")</param>
- <param name="signature">The signature of the OpenGL function.</param>
- <returns>
- A System.Delegate that can be used to call this OpenGL function or null
- if the function is not available in the current OpenGL context.
- </returns>
- </member>
- <member name="M:Tao.OpenGl.Gl.GetDelegateForMethod(System.String,System.Type)">
- <summary>
- Creates a callable delegate for the specified OpenGL function (core or extension), if it exists.
- </summary>
- <param name="methodName">The OpenGL function name (e.g. glVertex3f)</param>
- <param name="signature">The signature of the delegate to return.</param>
- <returns>
- A delegate with the specified signature which can be used to call the specified OpenGL
- function, or null if the function does not exist.
- </returns>
- </member>
<member name="M:Tao.OpenGl.Gl.IsExtensionSupported(System.String)">
<summary>
Determines whether the specified OpenGL extension category is available in
@@ -112,38 +56,33 @@
<param name="name">The string for the OpenGL extension category (eg. "GL_ARB_multitexture")</param>
<returns>True if the specified extension is available, false otherwise.</returns>
</member>
- <member name="M:Tao.OpenGl.Gl.IsExtensionSupported(System.String,System.Boolean)">
+ <member name="M:Tao.OpenGl.Gl.GetDelegate(System.String,System.Type)">
<summary>
- Determines whether the specified OpenGL extension category is available in
- the current OpenGL context.
+ Creates a System.Delegate that can be used to call an OpenGL function, core or extension.
</summary>
- <param name="name">The string for the OpenGL extension category (eg. "GL_ARB_multitexture")</param>
- <param name="useCache">If true, the results will be cached to speed up future results.</param>
- <returns>True if the specified extension is available, false otherwise.</returns>
+ <param name="name">The name of the OpenGL function (eg. "glNewList")</param>
+ <param name="signature">The signature of the OpenGL function.</param>
+ <returns>
+ A System.Delegate that can be used to call this OpenGL function, or null if the specified
+ function name did not correspond to an OpenGL function.
+ </returns>
</member>
- <member name="M:Tao.OpenGl.Gl.ParseAvailableExtensions">
- <summary>
- Builds a cache of the supported extensions to speed up searches.
- </summary>
- </member>
<member name="M:Tao.OpenGl.Gl.ReloadFunctions">
<summary>
- Reloads all OpenGL functions (core and extensions).
+ Loads all OpenGL functions (core and extensions).
</summary>
<remarks>
<para>
- Call this function to reload all OpenGL entry points. This should be done
- whenever you change the pixelformat/visual, or in the case you cannot (or do not want)
- to use the automatic initialisation.
+ This function will be automatically called the first time you use any opengl function. There is
</para>
<para>
- Calling this function before the automatic initialisation has taken place will result
- in the Gl class being initialised twice. This is harmless, but, given the choice,
- the automatic initialisation should be preferred.
+ Call this function manually whenever you need to update OpenGL entry points.
+ This need may arise if you change the pixelformat/visual, or in case you cannot
+ (or do not want) to use the automatic initialization of the GL class.
</para>
</remarks>
</member>
- <member name="M:Tao.OpenGl.Gl.ReloadFunction(System.String)">
+ <member name="M:Tao.OpenGl.Gl.Load(System.String)">
<summary>
Tries to reload the given OpenGL function (core or extension).
</summary>
@@ -160,20 +99,69 @@
you will need, or use ReloadFunctions() to load all available entry points.
</para>
<para>
- This function will return true if the given OpenGL function exists, false otherwise.
- A return value of "true" does not mean that any specific OpenGL function is supported;
- rather it means that the string passed to this function denotes a known OpenGL function.
+ This function returns true if the given OpenGL function is supported, false otherwise.
</para>
<para>
- To query supported extensions use the IsExtensionSupported() function instead.
+ To query for supported extensions use the IsExtensionSupported() function instead.
</para>
</remarks>
</member>
- <member name="T:Tao.OpenGl.Gl.Platform">
+ <member name="M:Tao.OpenGl.Gl.BuildExtensionList">
<summary>
- Enumerates the platforms Tao can run on.
+ Builds a cache of all supported extensions.
</summary>
</member>
+ <member name="M:Tao.OpenGl.Gl.GetAddress(System.String)">
+ <summary>
+ Retrieves the entry point for a dynamically exported OpenGL function.
+ </summary>
+ <param name="name">The function string for the OpenGL function (eg. "glNewList")</param>
+ <returns>
+ An IntPtr contaning the address for the entry point, or IntPtr.Zero if the specified
+ OpenGL function is not dynamically exported.
+ </returns>
+ <remarks>
+ <para>
+ The Marshal.GetDelegateForFunctionPointer method can be used to turn the return value
+ into a call-able delegate.
+ </para>
+ <para>
+ This function is cross-platform. It determines the underlying platform and uses the
+ correct wgl, glx or agl GetAddress function to retrieve the function pointer.
+ </para>
+ <see cref="M:System.Runtime.InteropServices.Marshal.GetDelegateForFunctionPointer(System.IntPtr,System.Type)"/>
+ <seealso cref="!:Gl.GetDelegateForExtensionMethod"/>
+ </remarks>
+ </member>
+ <member name="M:Tao.OpenGl.Gl.DetectUnixKernel">
+ <summary>
+ Executes "uname" which returns a string representing the name of the
+ underlying Unix kernel.
+ </summary>
+ <returns>"Unix", "Linux", "Darwin" or null.</returns>
+ <remarks>Source code from "Mono: A Developer's Notebook"</remarks>
+ </member>
+ <member name="M:Tao.OpenGl.Gl.GetExtensionDelegate(System.String,System.Type)">
+ <summary>
+ Creates a System.Delegate that can be used to call a dynamically exported OpenGL function.
+ </summary>
+ <param name="name">The name of the OpenGL function (eg. "glNewList")</param>
+ <param name="signature">The signature of the OpenGL function.</param>
+ <returns>
+ A System.Delegate that can be used to call this OpenGL function or null
+ if the function is not available in the current OpenGL context.
+ </returns>
+ </member>
+ <member name="T:Tao.OpenGl.Gl.Imports">
+ <summary>
+ Contains DllImports for the core OpenGL functions.
+ </summary>
+ </member>
+ <member name="F:Tao.OpenGl.Gl.Imports.FunctionMap">
+ <summary>
+ Build a string->MethodInfo map to speed up extension loading.
+ </summary>
+ </member>
<member name="T:Tao.OpenGl.OpenGLExtensionImport">
<summary>
@@ -31313,7 +31301,7 @@
</para>
<para>
<b>gluGetString</b> is an initialization routine. Calling it after a
- <see cref="M:Tao.OpenGl.Gl.glNewList(System.Int32,System.Int32)"/> results in undefined behavior.
+ <see cref="M:Tao.OpenGl.Gl.glNewList(System.UInt32,System.Int32)"/> results in undefined behavior.
</para>
<para>
<b>ERRORS</b>
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml 2007-12-12 00:07:35 UTC (rev 1425)
+++ trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.xml 2008-01-16 17:41:34 UTC (rev 1426)
@@ -241,7 +241,7 @@
Indicates whether a device can swap individual layer planes with pixel
formats that include double-buffered overlay or underlay planes.
Otherwise all layer planes are swapped together as a group. When this
- flag is set, <see cref="M:Tao.Platform.Windows.Wgl.wglSwapLayerBuffers(System.IntPtr,System.Int32)"/> is supported.
+ flag is set, <see cref="M:Tao.Platform.Windows.Wgl.wglSwapLayerBuffers(System.IntPtr,System.UInt32)"/> is supported.
</para>
</summary>
</member>
@@ -960,7 +960,7 @@
</summary>
<remarks>The values of <b>GLYPHMETRICSFLOAT</b> are specified as notional units.</remarks>
<seealso cref="T:Tao.Platform.Windows.Gdi.POINTFLOAT"/>
- <seealso cref="M:Tao.Platform.Windows.Wgl.wglUseFontOutlines(System.IntPtr,System.Int32,System.Int32,System.Int32,System.Single,System.Single,System.Int32,Tao.Platform.Windows.Gdi.GLYPHMETRICSFLOAT[])"/>
+ <seealso cref="!:Wgl.wglUseFontOutlines"/>
</member>
<member name="F:Tao.Platform.Windows.Gdi.GLYPHMETRICSFLOAT.gmfBlackBoxX">
<summary>
@@ -3852,4123 +3852,202 @@
<seealso cref="M:Tao.Platform.Windows.User.GetDC(System.IntPtr)"/>
seealso cref="GetWindowDC" />
</member>
- <member name="T:Tao.Platform.Windows.Wgl">
+ <member name="M:Tao.Platform.Windows.User.SetParent(System.IntPtr,System.IntPtr)">
<summary>
- <para>
- WGL binding for .NET, implementing Windows-specific OpenGL functionality.
- </para>
- </summary>
- <remarks>
- <para>
- Binds the wgl functions and definitions in opengl32.dll.
- </para>
- </remarks>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NATIVE_LIBRARY">
- <summary>
- <para>
- Specifies WGL's native library archive.
- </para>
- </summary>
- <remarks>
- <para>
- Specifies opengl32.dll for Windows.
- </para>
- </remarks>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.CALLING_CONVENTION">
- <summary>
- Specifies the calling convention.
- </summary>
- <remarks>
- Specifies <see cref="F:System.Runtime.InteropServices.CallingConvention.StdCall"/>.
- </remarks>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_MAIN_PLANE">
- <summary>
- <para>
- Swaps the front and back buffers of the main plane.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY1">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 1.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY2">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 2.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY3">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 3.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY4">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 4.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY5">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 5.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY6">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 6.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY7">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 7.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY8">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 8.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY9">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 9.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY10">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 10.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY11">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 11.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY12">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 12.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY13">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 13.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY14">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 14.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_OVERLAY15">
- <summary>
- <para>
- Swaps the front and back buffers of the overlay plane 15.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY1">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 1.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY2">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 2.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY3">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 3.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY4">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 4.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY5">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 5.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY6">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 6.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY7">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 7.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY8">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 8.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY9">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 9.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY10">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 10.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY11">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 11.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY12">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 12.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY13">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 13.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY14">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 14.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDERLAY15">
- <summary>
- <para>
- Swaps the front and back buffers of the underlay plane 15.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FONT_LINES">
- <summary>
- <para>
- Fonts with line segments.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FONT_POLYGONS">
- <summary>
- <para>
- Fonts with polygons.
- </para>
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SAMPLE_BUFFERS_3DFX">
- <summary>
</summary>
+ <param name="hWndChild"></param>
+ <param name="hWndNewParent"></param>
+ <returns></returns>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SAMPLES_3DFX">
+ <member name="M:Tao.Platform.Windows.User.FindWindow(System.String,System.String)">
<summary>
</summary>
+ <param name="lpClassName"></param>
+ <param name="lpWindowName"></param>
+ <returns></returns>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FRONT_COLOR_BUFFER_BIT_ARB">
+ <member name="M:Tao.Platform.Windows.User.ShowWindow(System.IntPtr,System.Int32)">
<summary>
</summary>
+ <param name="hWnd"></param>
+ <param name="nCmdShow"></param>
+ <returns></returns>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BACK_COLOR_BUFFER_BIT_ARB">
+ <member name="M:Tao.Platform.Windows.User.SetWindowPos(System.IntPtr,System.IntPtr,System.Int32,System.Int32,System.Int32,System.Int32,System.UInt32)">
<summary>
</summary>
+ <param name="hWnd"></param>
+ <param name="hWndInsertAfter"></param>
+ <param name="X"></param>
+ <param name="Y"></param>
+ <param name="cx"></param>
+ <param name="cy"></param>
+ <param name="uFlags"></param>
+ <returns></returns>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DEPTH_BUFFER_BIT_ARB">
+ <member name="T:Tao.Platform.Windows.User.SHOWWINDOW">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_STENCIL_BUFFER_BIT_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_HIDE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SAMPLE_BUFFERS_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWNORMAL">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SAMPLES_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_NORMAL">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NUMBER_PIXEL_FORMATS_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWMINIMIZED">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DRAW_TO_WINDOW_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWMAXIMIZED">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DRAW_TO_BITMAP_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_MAXIMIZE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCELERATION_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWNOACTIVATE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NEED_PALETTE_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOW">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NEED_SYSTEM_PALETTE_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_MINIMIZE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_LAYER_BUFFERS_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWMINNOACTIVE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_METHOD_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWNA">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NUMBER_OVERLAYS_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_RESTORE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NUMBER_UNDERLAYS_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_SHOWDEFAULT">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_FORCEMINIMIZE">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_RED_VALUE_ARB">
+ <member name="F:Tao.Platform.Windows.User.SHOWWINDOW.SW_MAX">
<summary>
</summary>
</member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_GREEN_VALUE_ARB">
+ <member name="M:Tao.Platform.Windows.Wgl.GetDelegate(System.String,System.Type)">
<summary>
-
+ Creates a System.Delegate that can be used to call an OpenGL function, core or extension.
</summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_BLUE_VALUE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_ALPHA_VALUE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_INDEX_VALUE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SHARE_DEPTH_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SHARE_STENCIL_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SHARE_ACCUM_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SUPPORT_GDI_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SUPPORT_OPENGL_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DOUBLE_BUFFER_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_STEREO_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PIXEL_TYPE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_COLOR_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_RED_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_RED_SHIFT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GREEN_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GREEN_SHIFT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BLUE_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BLUE_SHIFT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ALPHA_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ALPHA_SHIFT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_RED_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_GREEN_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_BLUE_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_ALPHA_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DEPTH_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_STENCIL_BITS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX_BUFFERS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NO_ACCELERATION_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENERIC_ACCELERATION_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FULL_ACCELERATION_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_EXCHANGE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_COPY_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDEFINED_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TYPE_RGBA_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TYPE_COLORINDEX_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ERROR_INVALID_PIXEL_TYPE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DRAW_TO_PBUFFER_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MAX_PBUFFER_PIXELS_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MAX_PBUFFER_WIDTH_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MAX_PBUFFER_HEIGHT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_LARGEST_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_WIDTH_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_HEIGHT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_LOST_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RGB_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RGBA_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_FORMAT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_TARGET_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MIPMAP_TEXTURE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_RGB_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_RGBA_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NO_TEXTURE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_1D_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_2D_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MIPMAP_LEVEL_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_CUBE_MAP_FACE_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FRONT_LEFT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FRONT_RIGHT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BACK_LEFT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BACK_RIGHT_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX0_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX1_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX2_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX3_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX4_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX5_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX6_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX7_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX8_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX9_ARB">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_RGBA_FLOAT_MODE_ATI">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TYPE_RGBA_FLOAT_ATI">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NUMBER_PIXEL_FORMATS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DRAW_TO_WINDOW_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DRAW_TO_BITMAP_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCELERATION_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NEED_PALETTE_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NEED_SYSTEM_PALETTE_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_LAYER_BUFFERS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_METHOD_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NUMBER_OVERLAYS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NUMBER_UNDERLAYS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TRANSPARENT_VALUE_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SHARE_DEPTH_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SHARE_STENCIL_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SHARE_ACCUM_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SUPPORT_GDI_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SUPPORT_OPENGL_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DOUBLE_BUFFER_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_STEREO_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PIXEL_TYPE_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_COLOR_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_RED_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_RED_SHIFT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GREEN_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GREEN_SHIFT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BLUE_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BLUE_SHIFT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ALPHA_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ALPHA_SHIFT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_RED_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_GREEN_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_BLUE_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_ACCUM_ALPHA_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DEPTH_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_STENCIL_BITS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_AUX_BUFFERS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_NO_ACCELERATION_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENERIC_ACCELERATION_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FULL_ACCELERATION_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_EXCHANGE_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_COPY_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SWAP_UNDEFINED_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TYPE_RGBA_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TYPE_COLORINDEX_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DEPTH_FLOAT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SAMPLE_BUFFERS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_SAMPLES_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DRAW_TO_PBUFFER_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MAX_PBUFFER_PIXELS_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MAX_PBUFFER_WIDTH_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_MAX_PBUFFER_HEIGHT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_OPTIMAL_PBUFFER_WIDTH_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_OPTIMAL_PBUFFER_HEIGHT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_LARGEST_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_WIDTH_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_PBUFFER_HEIGHT_EXT">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GAMMA_TABLE_SIZE_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GAMMA_EXCLUDE_DESKTOP_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_MULTIVIEW_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_EDGE_RISING_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_IMAGE_BUFFER_MIN_ACCESS_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_IMAGE_BUFFER_LOCK_I3D">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_DEPTH_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DEPTH_TEXTURE_FORMAT_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_DEPTH_COMPONENT_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_DEPTH_COMPONENT_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_RECTANGLE_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_FLOAT_COMPONENTS_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_FLOAT_R_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_FLOAT_RG_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_FLOAT_RGB_NV">
- <summary>
-
- </summary>
- </member>
- <member name="F:Tao.Platform.Windows.Wgl.WGL_TEXTURE_FLOAT_RGBA_NV">
- <summary>
-
- </summary>
- </member>
- <member name="M:Tao.Platform.Windows.Wgl.wglCopyContext(System.IntPtr,System.IntPtr,System.Int32)">
- <summary>
- <para>
- The <b>wglCopyContext</b> function copies selected groups of rendering
- states from one OpenGL rendering context to another.
- </para>
- </summary>
- <param name="source">
- <para>
- Specifies the source OpenGL rendering context whose state information is to
- ...
[truncated message content] |
|
From: <je...@us...> - 2007-12-12 00:07:37
|
Revision: 1425
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1425&view=rev
Author: jendave
Date: 2007-12-11 16:07:35 -0800 (Tue, 11 Dec 2007)
Log Message:
-----------
Add overlay class. Still needs a lot of work.
Modified Paths:
--------------
trunk/SdlDotNet/src/Graphics/Video.cs
trunk/SdlDotNet/src/SdlDotNet.csproj
Added Paths:
-----------
trunk/SdlDotNet/src/Graphics/Overlay.cs
Added: trunk/SdlDotNet/src/Graphics/Overlay.cs
===================================================================
--- trunk/SdlDotNet/src/Graphics/Overlay.cs (rev 0)
+++ trunk/SdlDotNet/src/Graphics/Overlay.cs 2007-12-12 00:07:35 UTC (rev 1425)
@@ -0,0 +1,251 @@
+#region LICENSE
+/*
+ * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.IO;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+
+using Tao.Sdl;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics.Sprites;
+
+namespace SdlDotNet.Graphics
+{
+ /// <summary>
+ /// Represents an Sdl drawing surface.
+ /// You can create instances of this class with the methods in the Video
+ /// object.
+ /// </summary>
+ public class Overlay : BaseSdlResource
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public short[] PitchesArray
+ {
+ get
+ {
+ short[] pitchesArray = new short[this.OverlayStruct.planes];
+ for (int i = 0; i < this.OverlayStruct.planes; i++)
+ {
+ pitchesArray[i] = Marshal.ReadInt16(this.OverlayStruct.pitches, i * sizeof(Int16));
+ }
+ return pitchesArray;
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ public byte[][] PixelsArray
+ {
+ get
+ {
+ byte[][] pixelsArray = new byte[this.OverlayStruct.planes][];
+ for (int i = 0; i < this.OverlayStruct.planes; i++)
+ {
+ pixelsArray[i] = new byte[PitchesArray[i]];
+ for (int j = 0; j < PitchesArray[i]; j++)
+ {
+ pixelsArray[i][j] = Marshal.ReadByte(this.OverlayStruct.pixels, i * sizeof(byte) + j * sizeof(byte));
+ }
+ }
+ return pixelsArray;
+ }
+ }
+
+ internal Sdl.SDL_Overlay OverlayStruct
+ {
+ get
+ {
+ if (this.disposed)
+ {
+ throw (new ObjectDisposedException(this.ToString()));
+ }
+ GC.KeepAlive(this);
+ return (Sdl.SDL_Overlay)Marshal.PtrToStructure(this.Handle,
+ typeof(Sdl.SDL_Overlay));
+ }
+ }
+ #region Private Fields
+
+ private bool disposed;
+ Surface surface;
+
+ #endregion Private Fields
+
+ #region Constructors and Destructors
+
+ /// <summary>
+ /// Creates a surface with the designated rectangle size.
+ /// </summary>
+ /// <param name="rectangle">Rectangle size of surface</param>
+ /// <param name="surface"></param>
+ public Overlay(Rectangle rectangle, Surface surface)
+ : this(rectangle.Width, rectangle.Height, surface)
+ {
+ }
+
+ /// <summary>
+ /// Create surface of a given width and height
+ /// </summary>
+ /// <param name="width">Width of surface</param>
+ /// <param name="height">Height of surface</param>
+ /// <param name="surface"></param>
+ public Overlay(int width, int height, Surface surface)
+ : this(width, height, OverlayFormats.YV12, surface)
+ {
+ }
+
+ /// <summary>
+ /// Create surface of a given width and height
+ /// </summary>
+ /// <param name="width">Width of surface</param>
+ /// <param name="height">Height of surface</param>
+ /// <param name="display"></param>
+ /// <param name="format"></param>
+ public Overlay(int width, int height, OverlayFormats format, Surface display)
+ {
+ this.surface = display;
+ this.Handle =
+ Sdl.SDL_CreateYUVOverlay(width, height, (int)format, display.Handle);
+ if (this.Handle == IntPtr.Zero)
+ {
+ throw SdlException.Generate();
+ }
+ }
+
+ #endregion Constructors and Destructors
+
+ #region Private Methods
+
+ private static Sdl.SDL_Rect ConvertRecttoSDLRect(
+ System.Drawing.Rectangle rect)
+ {
+ return new Sdl.SDL_Rect(
+ (short)rect.X,
+ (short)rect.Y,
+ (short)rect.Width,
+ (short)rect.Height);
+ }
+
+ #endregion Private Methods
+
+ #region Internal Methods
+
+ internal static Surface FromScreenPtr(IntPtr surfacePtr)
+ {
+ return new Surface(surfacePtr);
+ }
+
+ internal Sdl.SDL_Surface SurfaceStruct
+ {
+ get
+ {
+ if (this.disposed)
+ {
+ throw (new ObjectDisposedException(this.ToString()));
+ }
+ GC.KeepAlive(this);
+ return (Sdl.SDL_Surface)Marshal.PtrToStructure(this.Handle,
+ typeof(Sdl.SDL_Surface));
+ }
+ }
+
+ internal Sdl.SDL_PixelFormat PixelFormat
+ {
+ get
+ {
+ if (this.disposed)
+ {
+ throw (new ObjectDisposedException(this.ToString()));
+ }
+ GC.KeepAlive(this);
+ return (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(this.SurfaceStruct.format,
+ typeof(Sdl.SDL_PixelFormat));
+ }
+ }
+
+ #endregion Internal Methods
+
+ #region Protected Methods
+
+ /// <summary>
+ /// Destroys the surface object and frees its memory
+ /// </summary>
+ /// <param name="disposing">If true, dispose unmanaged objects</param>
+ protected override void Dispose(bool disposing)
+ {
+ try
+ {
+ if (!this.disposed)
+ {
+ if (disposing)
+ {
+ }
+ this.disposed = true;
+ }
+ }
+ finally
+ {
+ base.Dispose(disposing);
+ }
+ }
+
+ /// <summary>
+ /// Closes Surface handle
+ /// </summary>
+ protected override void CloseHandle()
+ {
+ try
+ {
+ if (this.Handle != IntPtr.Zero)
+ {
+ Sdl.SDL_FreeYUVOverlay(this.Handle);
+ this.Handle = IntPtr.Zero;
+ }
+ }
+ catch (NullReferenceException e)
+ {
+ e.ToString();
+ }
+ catch (AccessViolationException e)
+ {
+ Console.WriteLine(e.StackTrace);
+ e.ToString();
+ }
+ finally
+ {
+ this.Handle = IntPtr.Zero;
+ }
+ }
+
+ #endregion Protected Methods
+
+ #region Public Methods
+
+ #endregion Public Methods
+ }
+}
Property changes on: trunk/SdlDotNet/src/Graphics/Overlay.cs
___________________________________________________________________
Name: svn:mime-type
+ text/x-csharp
Name: svn:eol-style
+ native
Modified: trunk/SdlDotNet/src/Graphics/Video.cs
===================================================================
--- trunk/SdlDotNet/src/Graphics/Video.cs 2007-12-02 22:32:34 UTC (rev 1424)
+++ trunk/SdlDotNet/src/Graphics/Video.cs 2007-12-12 00:07:35 UTC (rev 1425)
@@ -183,7 +183,43 @@
#endregion
+ #region OverlayFormats
+
/// <summary>
+ ///
+ /// </summary>
+ [FlagsAttribute]
+ public enum OverlayFormats
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ None = 0,
+ /// <summary>
+ /// Planar mode
+ /// </summary>
+ YV12 = Sdl.SDL_YV12_OVERLAY,
+ /// <summary>
+ /// Planar mode
+ /// </summary>
+ IYUV = Sdl.SDL_IYUV_OVERLAY,
+ /// <summary>
+ /// Packed mode
+ /// </summary>
+ YUY2 = Sdl.SDL_YUY2_OVERLAY,
+ /// <summary>
+ /// Packed mode
+ /// </summary>
+ UYVY = Sdl.SDL_UYVY_OVERLAY,
+ /// <summary>
+ /// Packed mode
+ /// </summary>
+ YVYU = Sdl.SDL_YVYU_OVERLAY
+ }
+
+ #endregion
+
+ /// <summary>
/// Provides methods to set the video mode, create video surfaces,
/// hide and show the mouse cursor,
/// and interact with OpenGL
Modified: trunk/SdlDotNet/src/SdlDotNet.csproj
===================================================================
--- trunk/SdlDotNet/src/SdlDotNet.csproj 2007-12-02 22:32:34 UTC (rev 1424)
+++ trunk/SdlDotNet/src/SdlDotNet.csproj 2007-12-12 00:07:35 UTC (rev 1425)
@@ -96,6 +96,7 @@
<DependentUpon>SurfaceControl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <Compile Include="Graphics\Overlay.cs" />
<Compile Include="Windows\SurfaceControl.cs">
<SubType>Component</SubType>
</Compile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bio...@us...> - 2007-12-02 22:32:38
|
Revision: 1424
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1424&view=rev
Author: bioslayer_
Date: 2007-12-02 14:32:34 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
Added: SurfaceGl.Draw(float,float) overload.
Modified Paths:
--------------
trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs
Modified: trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs
===================================================================
--- trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs 2007-11-15 23:22:36 UTC (rev 1423)
+++ trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs 2007-12-02 22:32:34 UTC (rev 1424)
@@ -656,6 +656,16 @@
/// <summary>
/// Draws the Texture.
/// </summary>
+ /// <param name="locationX">The x offset for the Texture.</param>
+ /// <param name="locationY">The y offset for the Texture.</param>
+ public void Draw(float locationX, float locationY)
+ {
+ Draw(locationX, locationY, surface.Width, surface.Height);
+ }
+
+ /// <summary>
+ /// Draws the Texture.
+ /// </summary>
/// <param name="rectangle">the rectagle where the texture will be drawn.</param>
public void Draw(Rectangle rectangle)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-11-15 23:22:40
|
Revision: 1423
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1423&view=rev
Author: jendave
Date: 2007-11-15 15:22:36 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
remove prebuild. it is very broken for VS2005 and nant when processing Winforms and resources. Add Enomic Eclipse support
Modified Paths:
--------------
trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.Designer.cs
trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.cs
trunk/SdlDotNet/package.xml
Added Paths:
-----------
trunk/SdlDotNet/.project
trunk/SdlDotNet/.settings/
trunk/SdlDotNet/.settings/org.eclipse.ltk.core.refactoring.prefs
trunk/SdlDotNet/.settings/org.eclipse.wst.validation.prefs
trunk/SdlDotNet/.settings/org.emonic.base.prefs
trunk/SdlDotNet/SdlDotNet.build
trunk/SdlDotNet/SdlDotNet.sln
trunk/SdlDotNet/examples/CDPlayer/CDPlayer.csproj
trunk/SdlDotNet/examples/CDPlayer/CDPlayer.exe.build
trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.csproj
trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build
trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.csproj
trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build
trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.csproj
trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.csproj
trunk/SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build
trunk/SdlDotNet/examples/SharpNes/SharpNes.csproj
trunk/SdlDotNet/examples/SharpNes/SharpNes.exe.build
trunk/SdlDotNet/src/SdlDotNet.csproj
trunk/SdlDotNet/src/SdlDotNet.dll.build
trunk/SdlDotNet/tests/Tests.csproj
trunk/SdlDotNet/tests/Tests.dll.build
Removed Paths:
-------------
trunk/SdlDotNet/autotools.bat
trunk/SdlDotNet/autotools.sh
trunk/SdlDotNet/monodev.sh
trunk/SdlDotNet/nantfiles.bat
trunk/SdlDotNet/nantfiles.sh
trunk/SdlDotNet/prebuild
trunk/SdlDotNet/prebuild.xml
trunk/SdlDotNet/scripts/clean.bat
trunk/SdlDotNet/sharpdev2.bat
trunk/SdlDotNet/tools/Prebuild/
trunk/SdlDotNet/vs2005.bat
Property Changed:
----------------
trunk/SdlDotNet/
trunk/SdlDotNet/examples/CDPlayer/
trunk/SdlDotNet/examples/GtkSharp/
trunk/SdlDotNet/examples/OpenGl/
trunk/SdlDotNet/examples/Particles/
trunk/SdlDotNet/examples/SdlDotNetExamples/
trunk/SdlDotNet/examples/SharpNes/
trunk/SdlDotNet/src/
trunk/SdlDotNet/tests/
Property changes on: trunk/SdlDotNet
___________________________________________________________________
Name: svn:ignore
- SDL.csproj.user
bin
obj
SDL.NET.suo
doc
ChangeLog
build
.project
SdlDotNet.suo
SdlDotNet.FxCop
*.cmbx
*.sln
cvs2cl.pl
*.swp
*.mdp
*.mds
*.pidb
SdlDotNet.build
dist
aclocal.m4
autom4te.cache
config.guess
config.log
config.status
config.sub
configure
install-sh
Makefile
missing
Makefile.in
sdldotnet.pc
GuiExample.pc
GuiExample.pc.in
SdlDotNet.OpenGl.pc
SdlDotNet.OpenGl.pc.in
SdlDotNet.Particles.pc
SdlDotNet.Particles.pc.in
SdlDotNet.pc
Tests.pc
Tests.pc.in
configure.ac
Makefile.am
SdlDotNet.pc.in
SdlDotNet.OpenGl.xml
SdlDotNet.Particles.xml
SdlDotNet.xml
config.guess.lnk
config.sub.lnk
install-sh.lnk
missing.lnk
sh.exe.stackdump
SdlDotNet.Gtk.pc.in
SdlDotNet.Gtk.pc
Debug
*.build
*.in
SdlDotNet.GtkSharp.pc
autotools
+ SDL.csproj.user
bin
obj
SDL.NET.suo
doc
ChangeLog
build
SdlDotNet.suo
SdlDotNet.FxCop
*.cmbx
cvs2cl.pl
*.swp
*.mdp
*.mds
*.pidb
dist
aclocal.m4
autom4te.cache
config.guess
config.log
config.status
config.sub
configure
install-sh
Makefile
missing
Makefile.in
sdldotnet.pc
GuiExample.pc
GuiExample.pc.in
SdlDotNet.OpenGl.pc
SdlDotNet.OpenGl.pc.in
SdlDotNet.Particles.pc
SdlDotNet.Particles.pc.in
SdlDotNet.pc
Tests.pc
Tests.pc.in
configure.ac
Makefile.am
SdlDotNet.pc.in
SdlDotNet.OpenGl.xml
SdlDotNet.Particles.xml
SdlDotNet.xml
config.guess.lnk
config.sub.lnk
install-sh.lnk
missing.lnk
sh.exe.stackdump
SdlDotNet.Gtk.pc.in
SdlDotNet.Gtk.pc
Debug
*.in
SdlDotNet.GtkSharp.pc
autotools
Added: trunk/SdlDotNet/.project
===================================================================
--- trunk/SdlDotNet/.project (rev 0)
+++ trunk/SdlDotNet/.project 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>SdlDotNet</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.emonic.base.EMonic_Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.emonic.base.EMonic_Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/SdlDotNet/.settings/org.eclipse.ltk.core.refactoring.prefs
===================================================================
--- trunk/SdlDotNet/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0)
+++ trunk/SdlDotNet/.settings/org.eclipse.ltk.core.refactoring.prefs 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,3 @@
+#Thu Nov 15 13:51:51 PST 2007
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Added: trunk/SdlDotNet/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/SdlDotNet/.settings/org.eclipse.wst.validation.prefs (rev 0)
+++ trunk/SdlDotNet/.settings/org.eclipse.wst.validation.prefs 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,6 @@
+#Thu Nov 15 13:51:51 PST 2007
+DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencesfalse
+eclipse.preferences.version=1
Added: trunk/SdlDotNet/.settings/org.emonic.base.prefs
===================================================================
--- trunk/SdlDotNet/.settings/org.emonic.base.prefs (rev 0)
+++ trunk/SdlDotNet/.settings/org.emonic.base.prefs 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,6 @@
+#Thu Nov 15 13:51:51 PST 2007
+eclipse.preferences.version=1
+org.emonic.base.build.file=package.xml
+org.emonic.base.build.mechanism=nant
+org.emonic.base.project.copyright=(c) all rights reserved
+org.emonic.base.project.defaultNamespace=SdlDotNet
Added: trunk/SdlDotNet/SdlDotNet.build
===================================================================
--- trunk/SdlDotNet/SdlDotNet.build (rev 0)
+++ trunk/SdlDotNet/SdlDotNet.build 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,88 @@
+<?xml version="1.0" ?>
+<project name="SdlDotNet" default="build">
+ <echo message="Using '${nant.settings.currentframework}' Framework"/>
+
+ <property name="bin.dir" value="bin" />
+ <property name="obj.dir" value="obj" />
+ <property name="doc.dir" value="doc" />
+ <property name="project.main.dir" value="${project::get-base-directory()}" />
+
+ <target name="Debug" description="">
+ <property name="project.config" value="Debug" />
+ <property name="build.debug" value="true" />
+ </target>
+
+ <property name="project.config" value="Release" />
+
+ <target name="Release" description="">
+ <property name="project.config" value="Release" />
+ <property name="build.debug" value="false" />
+ </target>
+
+ <target name="net-1.1" description="Sets framework to .NET 1.1">
+ <property name="nant.settings.currentframework" value="net-1.1" />
+ </target>
+
+ <target name="net-2.0" description="Sets framework to .NET 2.0">
+ <property name="nant.settings.currentframework" value="net-2.0" />
+ </target>
+
+ <target name="mono-2.0" description="Sets framework to mono 2.0">
+ <property name="nant.settings.currentframework" value="mono-2.0" />
+ </target>
+
+ <target name="mono-1.0" description="Sets framework to mono 1.0">
+ <property name="nant.settings.currentframework" value="mono-1.0" />
+ </target>
+
+ <target name="init" description="">
+ <call target="${project.config}" />
+ <sysinfo />
+ <echo message="Platform ${sys.os.platform}" />
+ <property name="build.dir" value="${bin.dir}/${project.config}" />
+ </target>
+
+ <target name="clean" description="">
+ <echo message="Deleting all builds from all configurations" />
+ <delete dir="${bin.dir}" failonerror="false" />
+ <delete dir="${obj.dir}" failonerror="false" />
+ <nant buildfile="../SdlDotNet/src/SdlDotNet.dll.build" target="clean" />
+ <nant buildfile="../SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build" target="clean" />
+ <nant buildfile="../SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build" target="clean" />
+ <nant buildfile="../SdlDotNet/examples/CDPlayer/CDPlayer.exe.build" target="clean" />
+ <nant buildfile="../SdlDotNet/tests/Tests.dll.build" target="clean" />
+ <nant buildfile="../SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build" target="clean" />
+ <nant buildfile="../SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build" target="clean" />
+ <nant buildfile="../SdlDotNet/examples/SharpNes/SharpNes.exe.build" target="clean" />
+ </target>
+
+ <target name="build" depends="init" description="">
+ <nant buildfile="../SdlDotNet/src/SdlDotNet.dll.build" target="build" />
+ <nant buildfile="../SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build" target="build" />
+ <nant buildfile="../SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build" target="build" />
+ <nant buildfile="../SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build" target="build" />
+ <nant buildfile="../SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build" target="build" />
+ <nant buildfile="../SdlDotNet/tests/Tests.dll.build" target="build" />
+ <nant buildfile="../SdlDotNet/examples/CDPlayer/CDPlayer.exe.build" target="build" />
+ <nant buildfile="../SdlDotNet/examples/SharpNes/SharpNes.exe.build" target="build" />
+ </target>
+
+ <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
+
+ <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
+
+ <target name="package" depends="clean, doc" description="Builds all" />
+
+ <target name="doc" depends="build-release">
+ <echo message="Generating all documentation from all builds" />
+ <nant buildfile="../SdlDotNet/src/SdlDotNet.dll.build" target="doc" />
+ <nant buildfile="../SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build" target="doc" />
+ <nant buildfile="../SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build" target="doc" />
+ <nant buildfile="../SdlDotNet/examples/CDPlayer/CDPlayer.exe.build" target="doc" />
+ <nant buildfile="../SdlDotNet/tests/Tests.dll.build" target="doc" />
+ <nant buildfile="../SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build" target="doc" />
+ <nant buildfile="../SdlDotNet/examples/SdlDotNetExamples/SdlDotNetExamples.exe.build" target="doc" />
+ <nant buildfile="../SdlDotNet/examples/SharpNes/SharpNes.exe.build" target="doc" />
+ </target>
+
+</project>
Added: trunk/SdlDotNet/SdlDotNet.sln
===================================================================
--- trunk/SdlDotNet/SdlDotNet.sln (rev 0)
+++ trunk/SdlDotNet/SdlDotNet.sln 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,102 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNet", "src\SdlDotNet.csproj", "{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNet.Particles", "examples\Particles\SdlDotNet.Particles.csproj", "{6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNet.GtkSharp", "examples\GtkSharp\SdlDotNet.GtkSharp.csproj", "{48A130BE-E071-41E7-8DC7-CA9579438E02}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDPlayer", "examples\CDPlayer\CDPlayer.csproj", "{9A356993-75C1-43DD-9D2F-E0444573F368}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "tests\Tests.csproj", "{F7B0FBEF-9ED5-474D-AC84-D97FB6C17F35}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNet.OpenGl", "examples\OpenGl\SdlDotNet.OpenGl.csproj", "{7697533B-8996-45E1-BC7E-FA969789FC72}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdlDotNetExamples", "examples\SdlDotNetExamples\SdlDotNetExamples.csproj", "{F6147BF0-9807-4CD9-832E-AD42FC833288}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpNes", "examples\SharpNes\SharpNes.csproj", "{02DD0EDE-12D2-4024-86EF-B9A8C3D25167}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+ ProjectSection(SolutionItems) = preProject
+ prebuild.xml = prebuild.xml
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7B28E1B7-FADB-4D0A-BA54-77E2BE941418}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {48A130BE-E071-41E7-8DC7-CA9579438E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {48A130BE-E071-41E7-8DC7-CA9579438E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {48A130BE-E071-41E7-8DC7-CA9579438E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {48A130BE-E071-41E7-8DC7-CA9579438E02}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9A356993-75C1-43DD-9D2F-E0444573F368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9A356993-75C1-43DD-9D2F-E0444573F368}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9A356993-75C1-43DD-9D2F-E0444573F368}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9A356993-75C1-43DD-9D2F-E0444573F368}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F7B0FBEF-9ED5-474D-AC84-D97FB6C17F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F7B0FBEF-9ED5-474D-AC84-D97FB6C17F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F7B0FBEF-9ED5-474D-AC84-D97FB6C17F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F7B0FBEF-9ED5-474D-AC84-D97FB6C17F35}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7697533B-8996-45E1-BC7E-FA969789FC72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7697533B-8996-45E1-BC7E-FA969789FC72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7697533B-8996-45E1-BC7E-FA969789FC72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7697533B-8996-45E1-BC7E-FA969789FC72}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F6147BF0-9807-4CD9-832E-AD42FC833288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6147BF0-9807-4CD9-832E-AD42FC833288}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F6147BF0-9807-4CD9-832E-AD42FC833288}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F6147BF0-9807-4CD9-832E-AD42FC833288}.Release|Any CPU.Build.0 = Release|Any CPU
+ {02DD0EDE-12D2-4024-86EF-B9A8C3D25167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {02DD0EDE-12D2-4024-86EF-B9A8C3D25167}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {02DD0EDE-12D2-4024-86EF-B9A8C3D25167}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {02DD0EDE-12D2-4024-86EF-B9A8C3D25167}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Deleted: trunk/SdlDotNet/autotools.bat
===================================================================
--- trunk/SdlDotNet/autotools.bat 2007-07-25 21:12:20 UTC (rev 1422)
+++ trunk/SdlDotNet/autotools.bat 2007-11-15 23:22:36 UTC (rev 1423)
@@ -1,3 +0,0 @@
-@rem Generates Makefiles
-@rem for autotools
-.\tools\Prebuild\prebuild.exe /target autotools /file .\prebuild.xml /pause
Deleted: trunk/SdlDotNet/autotools.sh
===================================================================
--- trunk/SdlDotNet/autotools.sh 2007-07-25 21:12:20 UTC (rev 1422)
+++ trunk/SdlDotNet/autotools.sh 2007-11-15 23:22:36 UTC (rev 1423)
@@ -1,2 +0,0 @@
-#!/bin/sh
-./prebuild /target autotools /file ./prebuild.xml /pause
Property changes on: trunk/SdlDotNet/examples/CDPlayer
___________________________________________________________________
Name: svn:ignore
- CDTest.csproj.user
bin
obj
build
*.mdp
CDPlayer.csproj.user
*.prjx
*.xml
*.csproj
*.swp
*.old
CDPlayer.exe.build
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
*.resources
+ CDTest.csproj.user
bin
obj
build
*.mdp
CDPlayer.csproj.user
*.prjx
*.xml
*.swp
*.old
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
*.resources
Added: trunk/SdlDotNet/examples/CDPlayer/CDPlayer.csproj
===================================================================
--- trunk/SdlDotNet/examples/CDPlayer/CDPlayer.csproj (rev 0)
+++ trunk/SdlDotNet/examples/CDPlayer/CDPlayer.csproj 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,121 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{9A356993-75C1-43DD-9D2F-E0444573F368}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>CDPlayer</AssemblyName>
+ <AssemblyOriginatorKeyFile>../../src/SdlDotNet.snk</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SdlDotNetExamples.CDPlayer</RootNamespace>
+ <StartupObject>SdlDotNetExamples.CDPlayer.CDPlayerApp</StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile></DocumentationFile>
+ <DebugSymbols>True</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>False</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile></DocumentationFile>
+ <DebugSymbols>False</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>True</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>1</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ <HintPath>\System.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ <HintPath>\System.Drawing.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Windows.Forms">
+ <Name>System.Windows.Forms</Name>
+ <HintPath>\System.Windows.Forms.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\SdlDotNet.csproj">
+ <Name>SdlDotNet</Name>
+ <Project>{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="App.ico">
+ </EmbeddedResource>
+ <EmbeddedResource Include="CDPlayerApp.resx">
+ <DependentUpon>CDPlayerApp.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <Compile Include="CDPlayerApp.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <SubType>Designer</SubType>
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="BounceSprite.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="CDPlayerApp.Designer.cs">
+ <DependentUpon>CDPlayerApp.cs</DependentUpon>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
Added: trunk/SdlDotNet/examples/CDPlayer/CDPlayer.exe.build
===================================================================
--- trunk/SdlDotNet/examples/CDPlayer/CDPlayer.exe.build (rev 0)
+++ trunk/SdlDotNet/examples/CDPlayer/CDPlayer.exe.build 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="CDPlayer" default="build">
+ <target name="build">
+ <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+ <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+ <copy todir="${project::get-base-directory()}/${build.dir}" flatten="true">
+ <fileset basedir="${project::get-base-directory()}">
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </fileset>
+ </copy>
+ <copy todir="${project::get-base-directory()}/${build.dir}">
+ <fileset basedir=".">
+ </fileset>
+ </copy>
+ <csc target="winexe" debug="${build.debug}" keyfile="../../src/SdlDotNet.snk" unsafe="False" define="DEBUG;TRACE;CODE_ANALYSIS" main="SdlDotNetExamples.CDPlayer.CDPlayerApp" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
+ <resources prefix="SdlDotNetExamples.CDPlayer" dynamicprefix="true" >
+ <include name="App.ico" />
+ <include name="CDPlayerApp.resx" />
+ <include name="Properties/Resources.resx" />
+ </resources>
+ <sources failonempty="true">
+ <include name="CDPlayerApp.cs" />
+ <include name="BounceSprite.cs" />
+ <include name="CDPlayerApp.Designer.cs" />
+ <include name="Properties/AssemblyInfo.cs" />
+ <include name="Properties/Resources.Designer.cs" />
+ </sources>
+ <references basedir="${project::get-base-directory()}">
+ <lib>
+ <include name="${project::get-base-directory()}" />
+ <include name="${project::get-base-directory()}/${build.dir}" />
+ </lib>
+ <include name="System.dll" />
+ <include name="System.Drawing.dll" />
+ <include name="System.Windows.Forms.dll" />
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </references>
+ </csc>
+ </target>
+ <target name="clean">
+ <delete dir="${bin.dir}" failonerror="false" />
+ <delete dir="${obj.dir}" failonerror="false" />
+ </target>
+ <target name="doc" description="Creates documentation.">
+ </target>
+</project>
Modified: trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.Designer.cs
===================================================================
--- trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.Designer.cs 2007-07-25 21:12:20 UTC (rev 1422)
+++ trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.Designer.cs 2007-11-15 23:22:36 UTC (rev 1423)
@@ -137,6 +137,18 @@
this.buttonPrevious.TabIndex = 8;
this.buttonPrevious.Click += new System.EventHandler(this.buttonPrev_Click);
//
+ // surfaceControl
+ //
+ this.surfaceControl.AccessibleDescription = "SdlDotNet SurfaceControl";
+ this.surfaceControl.AccessibleName = "SurfaceControl";
+ this.surfaceControl.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
+ this.surfaceControl.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.surfaceControl.Location = new System.Drawing.Point(0, 0);
+ this.surfaceControl.Name = "surfaceControl";
+ this.surfaceControl.Size = new System.Drawing.Size(348, 226);
+ this.surfaceControl.TabIndex = 0;
+ this.surfaceControl.TabStop = false;
+ //
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -150,20 +162,6 @@
this.panel1.Size = new System.Drawing.Size(348, 226);
this.panel1.TabIndex = 9;
//
- // surfaceControl
- //
- this.surfaceControl.AccessibleDescription = "SdlDotNet SurfaceControl";
- this.surfaceControl.AccessibleName = "SurfaceControl";
- this.surfaceControl.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
- this.surfaceControl.Dock = System.Windows.Forms.DockStyle.Fill;
- this.surfaceControl.Image = ((System.Drawing.Image)(resources.GetObject("surfaceControl.Image")));
- this.surfaceControl.InitialImage = ((System.Drawing.Image)(resources.GetObject("surfaceControl.InitialImage")));
- this.surfaceControl.Location = new System.Drawing.Point(0, 0);
- this.surfaceControl.Name = "surfaceControl";
- this.surfaceControl.Size = new System.Drawing.Size(348, 226);
- this.surfaceControl.TabIndex = 0;
- this.surfaceControl.TabStop = false;
- //
// CDPlayerApp
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
Modified: trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.cs
===================================================================
--- trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.cs 2007-07-25 21:12:20 UTC (rev 1422)
+++ trunk/SdlDotNet/examples/CDPlayer/CDPlayerApp.cs 2007-11-15 23:22:36 UTC (rev 1423)
@@ -344,5 +344,10 @@
private void CDPlayer_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
}
+
+ private void surfaceControl11_Load(object sender, EventArgs e)
+ {
+
+ }
}
}
Property changes on: trunk/SdlDotNet/examples/GtkSharp
___________________________________________________________________
Name: svn:ignore
- bin
obj
SdlDotNet.GtkSharp.csproj
SdlDotNet.GtkSharp.csproj.user
SdlDotNet.GtkSharp.xml
*.mdp
*.build
*.am
+ bin
obj
SdlDotNet.GtkSharp.csproj.user
SdlDotNet.GtkSharp.xml
*.mdp
*.am
Added: trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.csproj
===================================================================
--- trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.csproj (rev 0)
+++ trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.csproj 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,114 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{48A130BE-E071-41E7-8DC7-CA9579438E02}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon></ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>SdlDotNet.GtkSharp</AssemblyName>
+ <AssemblyOriginatorKeyFile>../../src/SdlDotNet.snk</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SdlDotNet.GtkSharp</RootNamespace>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile>SdlDotNet.GtkSharp.xml</DocumentationFile>
+ <DebugSymbols>True</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>False</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile>SdlDotNet.GtkSharp.xml</DocumentationFile>
+ <DebugSymbols>False</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>True</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>1</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ <HintPath>\System.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ <HintPath>\System.Drawing.dll</HintPath>
+ </Reference>
+ <Reference Include="atk-sharp">
+ <Name>atk-sharp</Name>
+ <HintPath>../../lib/net-2.0\atk-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gdk-sharp">
+ <Name>gdk-sharp</Name>
+ <HintPath>../../lib/net-2.0\gdk-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="pango-sharp">
+ <Name>pango-sharp</Name>
+ <HintPath>../../lib/net-2.0\pango-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gtk-sharp">
+ <Name>gtk-sharp</Name>
+ <HintPath>../../lib/net-2.0\gtk-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="glib-sharp">
+ <Name>glib-sharp</Name>
+ <HintPath>../../lib/net-2.0\glib-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\SdlDotNet.csproj">
+ <Name>SdlDotNet</Name>
+ <Project>{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="SurfaceGtk.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
Added: trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build
===================================================================
--- trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build (rev 0)
+++ trunk/SdlDotNet/examples/GtkSharp/SdlDotNet.GtkSharp.dll.build 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,87 @@
+<?xml version="1.0" ?>
+<project name="SdlDotNet.GtkSharp" default="build">
+ <target name="build">
+ <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+ <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+ <copy todir="${project::get-base-directory()}/${build.dir}" flatten="true">
+ <fileset basedir="${project::get-base-directory()}">
+ <include name="../../lib/net-2.0/atk-sharp.dll" />
+ <include name="../../lib/net-2.0/gdk-sharp.dll" />
+ <include name="../../lib/net-2.0/pango-sharp.dll" />
+ <include name="../../lib/net-2.0/gtk-sharp.dll" />
+ <include name="../../lib/net-2.0/glib-sharp.dll" />
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </fileset>
+ </copy>
+ <copy todir="${project::get-base-directory()}/${build.dir}">
+ <fileset basedir=".">
+ </fileset>
+ </copy>
+ <csc target="library" debug="${build.debug}" keyfile="../../src/SdlDotNet.snk" unsafe="False" define="DEBUG;TRACE;CODE_ANALYSIS" main="" doc="${project::get-base-directory()}/${build.dir}/SdlDotNet.GtkSharp.xml" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+ <resources prefix="SdlDotNet.GtkSharp" dynamicprefix="true" >
+ </resources>
+ <sources failonempty="true">
+ <include name="SurfaceGtk.cs" />
+ <include name="Properties/AssemblyInfo.cs" />
+ </sources>
+ <references basedir="${project::get-base-directory()}">
+ <lib>
+ <include name="${project::get-base-directory()}" />
+ <include name="${project::get-base-directory()}/${build.dir}" />
+ </lib>
+ <include name="System.dll" />
+ <include name="System.Drawing.dll" />
+ <include name="../../lib/net-2.0/atk-sharp.dll" />
+ <include name="../../lib/net-2.0/gdk-sharp.dll" />
+ <include name="../../lib/net-2.0/pango-sharp.dll" />
+ <include name="../../lib/net-2.0/gtk-sharp.dll" />
+ <include name="../../lib/net-2.0/glib-sharp.dll" />
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </references>
+ </csc>
+ </target>
+ <target name="clean">
+ <delete dir="${bin.dir}" failonerror="false" />
+ <delete dir="${obj.dir}" failonerror="false" />
+ </target>
+ <target name="doc" description="Creates documentation.">
+ <property name="doc.target" value="" />
+ <if test="${platform::is-unix()}">
+ <property name="doc.target" value="Web" />
+ </if>
+ <ndoc failonerror="false" verbose="true">
+ <assemblies basedir="${project::get-base-directory()}">
+ <include name="${build.dir}/${project::get-name()}.dll" />
+ </assemblies>
+ <summaries basedir="${project::get-base-directory()}">
+ <include name="${build.dir}/${project::get-name()}.xml"/>
+ </summaries>
+ <referencepaths basedir="${project::get-base-directory()}">
+ <include name="${build.dir}" />
+ </referencepaths>
+ <documenters>
+ <documenter name="MSDN">
+ <property name="OutputDirectory" value="${project::get-base-directory()}/${build.dir}/doc/${project::get-name()}" />
+ <property name="OutputTarget" value="${doc.target}" />
+ <property name="HtmlHelpName" value="${project::get-name()}" />
+ <property name="IncludeFavorites" value="False" />
+ <property name="Title" value="${project::get-name()} SDK Documentation" />
+ <property name="SplitTOCs" value="False" />
+ <property name="DefaulTOC" value="" />
+ <property name="ShowVisualBasic" value="True" />
+ <property name="AutoDocumentConstructors" value="True" />
+ <property name="ShowMissingSummaries" value="${build.debug}" />
+ <property name="ShowMissingRemarks" value="${build.debug}" />
+ <property name="ShowMissingParams" value="${build.debug}" />
+ <property name="ShowMissingReturns" value="${build.debug}" />
+ <property name="ShowMissingValues" value="${build.debug}" />
+ <property name="DocumentInternals" value="False" />
+ <property name="DocumentPrivates" value="False" />
+ <property name="DocumentProtected" value="True" />
+ <property name="DocumentEmptyNamespaces" value="${build.debug}" />
+ <property name="IncludeAssemblyVersion" value="True" />
+ </documenter>
+ </documenters>
+ </ndoc>
+ </target>
+</project>
Property changes on: trunk/SdlDotNet/examples/OpenGl
___________________________________________________________________
Name: svn:ignore
- bin
obj
SdlDotNet.OpenGl.csproj.user
SdlDotNet.OpenGl.csproj
SdlDotNet.OpenGl.xml
SdlDotNet.OpenGl.mdp
SdlDotNet.OpenGl.prjx
*.old
SdlDotNet.OpenGl.dll.build
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
+ bin
obj
SdlDotNet.OpenGl.csproj.user
SdlDotNet.OpenGl.xml
SdlDotNet.OpenGl.mdp
SdlDotNet.OpenGl.prjx
*.old
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
Added: trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.csproj
===================================================================
--- trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.csproj (rev 0)
+++ trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.csproj 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,98 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7697533B-8996-45E1-BC7E-FA969789FC72}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon></ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>SdlDotNet.OpenGl</AssemblyName>
+ <AssemblyOriginatorKeyFile>../../src/SdlDotNet.snk</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SdlDotNet.OpenGl</RootNamespace>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile>SdlDotNet.OpenGl.xml</DocumentationFile>
+ <DebugSymbols>True</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>False</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile>SdlDotNet.OpenGl.xml</DocumentationFile>
+ <DebugSymbols>False</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>True</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>1</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ <HintPath>\System.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ <HintPath>\System.Drawing.dll</HintPath>
+ </Reference>
+ <Reference Include="Tao.OpenGl">
+ <Name>Tao.OpenGl</Name>
+ <HintPath>../../lib/net-2.0\Tao.OpenGl.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\SdlDotNet.csproj">
+ <Name>SdlDotNet</Name>
+ <Project>{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="SurfaceGl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
Added: trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build
===================================================================
--- trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build (rev 0)
+++ trunk/SdlDotNet/examples/OpenGl/SdlDotNet.OpenGl.dll.build 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,79 @@
+<?xml version="1.0" ?>
+<project name="SdlDotNet.OpenGl" default="build">
+ <target name="build">
+ <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+ <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+ <copy todir="${project::get-base-directory()}/${build.dir}" flatten="true">
+ <fileset basedir="${project::get-base-directory()}">
+ <include name="../../lib/net-2.0/Tao.OpenGl.dll" />
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </fileset>
+ </copy>
+ <copy todir="${project::get-base-directory()}/${build.dir}">
+ <fileset basedir=".">
+ </fileset>
+ </copy>
+ <csc target="library" debug="${build.debug}" keyfile="../../src/SdlDotNet.snk" unsafe="False" define="DEBUG;TRACE;CODE_ANALYSIS" main="" doc="${project::get-base-directory()}/${build.dir}/SdlDotNet.OpenGl.xml" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+ <resources prefix="SdlDotNet.OpenGl" dynamicprefix="true" >
+ </resources>
+ <sources failonempty="true">
+ <include name="SurfaceGl.cs" />
+ <include name="Properties/AssemblyInfo.cs" />
+ </sources>
+ <references basedir="${project::get-base-directory()}">
+ <lib>
+ <include name="${project::get-base-directory()}" />
+ <include name="${project::get-base-directory()}/${build.dir}" />
+ </lib>
+ <include name="System.dll" />
+ <include name="System.Drawing.dll" />
+ <include name="../../lib/net-2.0/Tao.OpenGl.dll" />
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </references>
+ </csc>
+ </target>
+ <target name="clean">
+ <delete dir="${bin.dir}" failonerror="false" />
+ <delete dir="${obj.dir}" failonerror="false" />
+ </target>
+ <target name="doc" description="Creates documentation.">
+ <property name="doc.target" value="" />
+ <if test="${platform::is-unix()}">
+ <property name="doc.target" value="Web" />
+ </if>
+ <ndoc failonerror="false" verbose="true">
+ <assemblies basedir="${project::get-base-directory()}">
+ <include name="${build.dir}/${project::get-name()}.dll" />
+ </assemblies>
+ <summaries basedir="${project::get-base-directory()}">
+ <include name="${build.dir}/${project::get-name()}.xml"/>
+ </summaries>
+ <referencepaths basedir="${project::get-base-directory()}">
+ <include name="${build.dir}" />
+ </referencepaths>
+ <documenters>
+ <documenter name="MSDN">
+ <property name="OutputDirectory" value="${project::get-base-directory()}/${build.dir}/doc/${project::get-name()}" />
+ <property name="OutputTarget" value="${doc.target}" />
+ <property name="HtmlHelpName" value="${project::get-name()}" />
+ <property name="IncludeFavorites" value="False" />
+ <property name="Title" value="${project::get-name()} SDK Documentation" />
+ <property name="SplitTOCs" value="False" />
+ <property name="DefaulTOC" value="" />
+ <property name="ShowVisualBasic" value="True" />
+ <property name="AutoDocumentConstructors" value="True" />
+ <property name="ShowMissingSummaries" value="${build.debug}" />
+ <property name="ShowMissingRemarks" value="${build.debug}" />
+ <property name="ShowMissingParams" value="${build.debug}" />
+ <property name="ShowMissingReturns" value="${build.debug}" />
+ <property name="ShowMissingValues" value="${build.debug}" />
+ <property name="DocumentInternals" value="False" />
+ <property name="DocumentPrivates" value="False" />
+ <property name="DocumentProtected" value="True" />
+ <property name="DocumentEmptyNamespaces" value="${build.debug}" />
+ <property name="IncludeAssemblyVersion" value="True" />
+ </documenter>
+ </documenters>
+ </ndoc>
+ </target>
+</project>
Property changes on: trunk/SdlDotNet/examples/Particles
___________________________________________________________________
Name: svn:ignore
- SdlDotNet.Particles.xml
obj
SdlDotNet.Particles.csproj
SdlDotNet.Particles.csproj.user
SdlDotNet.Particles.prjx
bin
*.mdp
*.old
SdlDotNet.Particles.dll.build
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
+ SdlDotNet.Particles.xml
obj
SdlDotNet.Particles.csproj.user
SdlDotNet.Particles.prjx
bin
*.mdp
*.old
Makefile
Makefile.am
Makefile.in
Include
Include.am
Include.in
Added: trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.csproj
===================================================================
--- trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.csproj (rev 0)
+++ trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.csproj 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,154 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{6CF5FE4F-7952-41AB-9FD4-3B8CC141BB0E}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon></ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>SdlDotNet.Particles</AssemblyName>
+ <AssemblyOriginatorKeyFile>../../src/SdlDotNet.snk</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SdlDotNet.Particles</RootNamespace>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile>SdlDotNet.Particles.xml</DocumentationFile>
+ <DebugSymbols>True</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>False</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+ <DocumentationFile>SdlDotNet.Particles.xml</DocumentationFile>
+ <DebugSymbols>False</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <Optimize>True</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <RemoveIntegerChecks>False</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <WarningLevel>1</WarningLevel>
+ <NoWarn>1595</NoWarn>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ <HintPath>\System.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ <HintPath>\System.Drawing.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\SdlDotNet.csproj">
+ <Name>SdlDotNet</Name>
+ <Project>{7B28E1B7-FADB-4D0A-BA54-77E2BE941418}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="ParticleSystem.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ParticleSystemCollection.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Emitters\ParticleCircleEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Emitters\ParticleEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Emitters\ParticlePixelEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Emitters\ParticleRectangleEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Emitters\ParticleSpriteEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Emitters\ParticleSurfaceEmitter.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Manipulators\IParticleManipulator.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Manipulators\ParticleBoundary.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Manipulators\ParticleFriction.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Manipulators\ParticleGravity.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Manipulators\ParticleManipulatorCollection.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Manipulators\ParticleVortex.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\BaseParticle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\ParticleCircle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\ParticleCollection.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\ParticlePixel.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\ParticleRectangle.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\ParticleSprite.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Particle\ParticleSurface.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
Added: trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build
===================================================================
--- trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build (rev 0)
+++ trunk/SdlDotNet/examples/Particles/SdlDotNet.Particles.dll.build 2007-11-15 23:22:36 UTC (rev 1423)
@@ -0,0 +1,97 @@
+<?xml version="1.0" ?>
+<project name="SdlDotNet.Particles" default="build">
+ <target name="build">
+ <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+ <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+ <copy todir="${project::get-base-directory()}/${build.dir}" flatten="true">
+ <fileset basedir="${project::get-base-directory()}">
+ <include name="../../src/${build.dir}/SdlDotNet.dll" />
+ </fileset>
+ </copy>
+ <copy todir="${project::get-base-directory()}/${build.dir}">
+ <fileset basedir=".">
+ </fileset>
+ </copy>
+ <csc target="library" debug="${build.debug}" keyfile="../../src/SdlDotNet.snk" unsafe="False" define="DEBUG;TRACE;CODE_ANALYSIS" main="" doc="${project::get-base-directory()}/${build.dir}/SdlDotNet.Particles.xml" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+ <resources prefix="SdlDotNet.Particles" dynamicprefix="true" >
+ </resources>
+ <sources failonempty="true">
+ <include name="ParticleSystem.cs" />
+ <include name="ParticleSystemCollection.cs" />
+ <include name="Emitters/ParticleCircleEmitter.cs" />
+ <include name="Emitters/ParticleEmitter.cs" />
+ <include name="Emitters/ParticlePixelEmitter.cs" />
+ <include name="Emitters/ParticleRectangleEmitter.cs" />
+ <include name="Emitters/ParticleSpriteEmitter.cs" />
+ <include name="Emitters/ParticleSurfaceEmitter.cs" />
+ <include name="Manipulators/IParticleManipulator.cs" />
+ <include name="Manipulators/ParticleBoundary.cs" />
+ <include name="Manipulators/ParticleFriction.cs" />
+ <include name="Manipulators/ParticleGravity.cs" />
+ <include name="Manipulators/ParticleManipulatorCollection.cs" />
+ <include name="Manipulators/ParticleVortex.cs" />
+ <include name="Particle/BaseParticle.cs" />
+ <include name="Particle/ParticleCircle.cs" />
+ <include name="Particle/ParticleCollection.cs" />
+ <include name="Particle/ParticlePixel.cs" />
+ <include name="Particle/ParticleRectangle.cs" />
+ <include name="Particle/ParticleSprite.cs" />
+ <include name="Particle/ParticleSurface.cs" />
+ <include name="Properties/AssemblyInfo.cs" />
+ </sources>
+ <references basedir="${project::get-base-directory()}">
+ <lib>
+ <include name="${project::get-base-directory()}" />
+ <include name="${project::get-base-directory()}/${build.dir}" />
+ </lib>
+ ...
[truncated message content] |
|
From: <je...@us...> - 2007-07-25 21:12:24
|
Revision: 1422
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1422&view=rev
Author: jendave
Date: 2007-07-25 14:12:20 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
update to sdl-1.2.12
Added Paths:
-----------
trunk/SdlDotNet/lib/win32deps/Readme-image.txt
trunk/SdlDotNet/lib/win32deps/Readme-mixer.txt
trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt
Removed Paths:
-------------
trunk/SdlDotNet/lib/win32deps/Readme
Deleted: trunk/SdlDotNet/lib/win32deps/Readme
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme 2007-07-25 21:10:39 UTC (rev 1421)
+++ trunk/SdlDotNet/lib/win32deps/Readme 2007-07-25 21:12:20 UTC (rev 1422)
@@ -1,6 +0,0 @@
-SDL 1.2.9 - latest
-SDL_image 1.2.4 - latest
-SDL_ttf 2.0.7 - latest
-SDL_gfx 2.0.13 - latest
-SDL_mixer 1.2.6 - lastest
-smpeg 0.4.4 - latest, but project appears to be abandoned.
Added: trunk/SdlDotNet/lib/win32deps/Readme-image.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme-image.txt (rev 0)
+++ trunk/SdlDotNet/lib/win32deps/Readme-image.txt 2007-07-25 21:12:20 UTC (rev 1422)
@@ -0,0 +1,7 @@
+Please include this notice with the runtime environment:
+
+This library is distributed under the terms of the GNU LGPL license:
+http://www.gnu.org/copyleft/lesser.html
+
+The source is available from the libraries page at the SDL website:
+http://www.libsdl.org/
Property changes on: trunk/SdlDotNet/lib/win32deps/Readme-image.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/SdlDotNet/lib/win32deps/Readme-mixer.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme-mixer.txt (rev 0)
+++ trunk/SdlDotNet/lib/win32deps/Readme-mixer.txt 2007-07-25 21:12:20 UTC (rev 1422)
@@ -0,0 +1,7 @@
+Please include this notice with the runtime environment:
+
+This library is distributed under the terms of the GNU LGPL license:
+http://www.gnu.org/copyleft/lesser.html
+
+The source is available from the libraries page at the SDL website:
+http://www.libsdl.org/
Property changes on: trunk/SdlDotNet/lib/win32deps/Readme-mixer.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt (rev 0)
+++ trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt 2007-07-25 21:12:20 UTC (rev 1422)
@@ -0,0 +1,7 @@
+Please include this notice with the runtime environment:
+
+This library is distributed under the terms of the GNU LGPL license:
+http://www.gnu.org/copyleft/lesser.html
+
+The source is available from the libraries page at the SDL website:
+http://www.libsdl.org/
Property changes on: trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-07-25 21:10:40
|
Revision: 1421
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1421&view=rev
Author: jendave
Date: 2007-07-25 14:10:39 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
remove old versions
Removed Paths:
-------------
trunk/SdlDotNet/lib/win32deps/Readme-image.txt
trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt
trunk/SdlDotNet/lib/win32deps/readme-mixer.txt
Deleted: trunk/SdlDotNet/lib/win32deps/Readme-image.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme-image.txt 2007-07-25 21:07:30 UTC (rev 1420)
+++ trunk/SdlDotNet/lib/win32deps/Readme-image.txt 2007-07-25 21:10:39 UTC (rev 1421)
@@ -1,7 +0,0 @@
-Please include this notice with the runtime environment:
-
-This library is distributed under the terms of the GNU LGPL license:
-http://www.gnu.org/copyleft/lesser.html
-
-The source is available from the libraries page at the SDL website:
-http://www.libsdl.org/
Deleted: trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt 2007-07-25 21:07:30 UTC (rev 1420)
+++ trunk/SdlDotNet/lib/win32deps/Readme-ttf.txt 2007-07-25 21:10:39 UTC (rev 1421)
@@ -1,7 +0,0 @@
-Please include this notice with the runtime environment:
-
-This library is distributed under the terms of the GNU LGPL license:
-http://www.gnu.org/copyleft/lesser.html
-
-The source is available from the libraries page at the SDL website:
-http://www.libsdl.org/
Deleted: trunk/SdlDotNet/lib/win32deps/readme-mixer.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/readme-mixer.txt 2007-07-25 21:07:30 UTC (rev 1420)
+++ trunk/SdlDotNet/lib/win32deps/readme-mixer.txt 2007-07-25 21:10:39 UTC (rev 1421)
@@ -1,7 +0,0 @@
-Please include this notice with the runtime environment:
-
-This library is distributed under the terms of the GNU LGPL license:
-http://www.gnu.org/copyleft/lesser.html
-
-The source is available from the libraries page at the SDL website:
-http://www.libsdl.org/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-07-25 21:07:31
|
Revision: 1420
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1420&view=rev
Author: jendave
Date: 2007-07-25 14:07:30 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
remove old versions
Removed Paths:
-------------
trunk/SdlDotNet/lib/win32deps/libpng12.dll
trunk/SdlDotNet/lib/win32deps/libtiff.dll
trunk/SdlDotNet/lib/win32deps/ogg.dll
trunk/SdlDotNet/lib/win32deps/vorbis.dll
trunk/SdlDotNet/lib/win32deps/vorbisfile.dll
Deleted: trunk/SdlDotNet/lib/win32deps/libpng12.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/win32deps/libtiff.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/win32deps/ogg.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/win32deps/vorbis.dll
===================================================================
(Binary files differ)
Deleted: trunk/SdlDotNet/lib/win32deps/vorbisfile.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-07-25 21:05:27
|
Revision: 1419
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1419&view=rev
Author: jendave
Date: 2007-07-25 14:05:26 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
update to sdl-1.2.12
Added Paths:
-----------
trunk/SdlDotNet/lib/osxdeps/SDL-1.2.12.dmg
trunk/SdlDotNet/lib/osxdeps/SDL-devel-1.2.12-extras.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_image-1.2.6.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_mixer-1.2.8.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_net-1.2.7.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_ttf-2.0.9.dmg
Removed Paths:
-------------
trunk/SdlDotNet/lib/osxdeps/SDL-1.2.11.dmg
trunk/SdlDotNet/lib/osxdeps/SDL-devel-1.2.11-extras.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_image-1.2.5.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_mixer-1.2.7.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_net-1.2.6.dmg
trunk/SdlDotNet/lib/osxdeps/SDL_ttf-2.0.8.dmg
Deleted: trunk/SdlDotNet/lib/osxdeps/SDL-1.2.11.dmg
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/osxdeps/SDL-1.2.12.dmg
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/osxdeps/SDL-1.2.12.dmg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/SdlDotNet/lib/osxdeps/SDL-devel-1.2.11-extras.dmg
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/osxdeps/SDL-devel-1.2.12-extras.dmg
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/osxdeps/SDL-devel-1.2.12-extras.dmg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/SdlDotNet/lib/osxdeps/SDL_image-1.2.5.dmg
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/osxdeps/SDL_image-1.2.6.dmg
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/osxdeps/SDL_image-1.2.6.dmg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/SdlDotNet/lib/osxdeps/SDL_mixer-1.2.7.dmg
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/osxdeps/SDL_mixer-1.2.8.dmg
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/osxdeps/SDL_mixer-1.2.8.dmg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/SdlDotNet/lib/osxdeps/SDL_net-1.2.6.dmg
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/osxdeps/SDL_net-1.2.7.dmg
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/osxdeps/SDL_net-1.2.7.dmg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/SdlDotNet/lib/osxdeps/SDL_ttf-2.0.8.dmg
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/osxdeps/SDL_ttf-2.0.9.dmg
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/osxdeps/SDL_ttf-2.0.9.dmg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-07-25 21:04:47
|
Revision: 1418
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1418&view=rev
Author: jendave
Date: 2007-07-25 14:04:43 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
update to sdl-1.2.12
Modified Paths:
--------------
trunk/SdlDotNet/lib/win32deps/SDL.dll
trunk/SdlDotNet/lib/win32deps/SDL_image.dll
trunk/SdlDotNet/lib/win32deps/SDL_mixer.dll
trunk/SdlDotNet/lib/win32deps/SDL_net.dll
trunk/SdlDotNet/lib/win32deps/SDL_ttf.dll
trunk/SdlDotNet/lib/win32deps/jpeg.dll
trunk/SdlDotNet/lib/win32deps/smpeg.dll
trunk/SdlDotNet/lib/win32deps/zlib1.dll
Added Paths:
-----------
trunk/SdlDotNet/lib/win32deps/Readme-net.txt
trunk/SdlDotNet/lib/win32deps/libfreetype-6.dll
trunk/SdlDotNet/lib/win32deps/libogg-0.dll
trunk/SdlDotNet/lib/win32deps/libpng12-0.dll
trunk/SdlDotNet/lib/win32deps/libtiff-3.dll
trunk/SdlDotNet/lib/win32deps/libvorbis-0.dll
trunk/SdlDotNet/lib/win32deps/libvorbisfile-3.dll
Added: trunk/SdlDotNet/lib/win32deps/Readme-net.txt
===================================================================
--- trunk/SdlDotNet/lib/win32deps/Readme-net.txt (rev 0)
+++ trunk/SdlDotNet/lib/win32deps/Readme-net.txt 2007-07-25 21:04:43 UTC (rev 1418)
@@ -0,0 +1,7 @@
+Please include this notice with the runtime environment:
+
+This library is distributed under the terms of the GNU LGPL license:
+http://www.gnu.org/copyleft/lesser.html
+
+The source is available from the libraries page at the SDL website:
+http://www.libsdl.org/
Property changes on: trunk/SdlDotNet/lib/win32deps/Readme-net.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/SdlDotNet/lib/win32deps/SDL.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/win32deps/SDL_image.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/win32deps/SDL_mixer.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/win32deps/SDL_net.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/win32deps/SDL_ttf.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/win32deps/jpeg.dll
===================================================================
(Binary files differ)
Added: trunk/SdlDotNet/lib/win32deps/libfreetype-6.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/win32deps/libfreetype-6.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/SdlDotNet/lib/win32deps/libogg-0.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/win32deps/libogg-0.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/SdlDotNet/lib/win32deps/libpng12-0.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/win32deps/libpng12-0.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/SdlDotNet/lib/win32deps/libtiff-3.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/win32deps/libtiff-3.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/SdlDotNet/lib/win32deps/libvorbis-0.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/win32deps/libvorbis-0.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/SdlDotNet/lib/win32deps/libvorbisfile-3.dll
===================================================================
(Binary files differ)
Property changes on: trunk/SdlDotNet/lib/win32deps/libvorbisfile-3.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/SdlDotNet/lib/win32deps/smpeg.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/win32deps/zlib1.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-07-25 18:00:53
|
Revision: 1417
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1417&view=rev
Author: jendave
Date: 2007-07-25 11:00:51 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
update to new dlls
Modified Paths:
--------------
trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
trunk/SdlDotNet/src/Windows/SurfaceControl.cs
trunk/SdlDotNet/tools/Prebuild/prebuild.exe
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.FreeGlut.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml
===================================================================
--- trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2007-07-05 21:22:49 UTC (rev 1416)
+++ trunk/SdlDotNet/lib/net-2.0/Tao.OpenGl.xml 2007-07-25 18:00:51 UTC (rev 1417)
@@ -95,11 +95,14 @@
</member>
<member name="M:Tao.OpenGl.Gl.GetDelegateForMethod(System.String,System.Type)">
<summary>
-
+ Creates a callable delegate for the specified OpenGL function (core or extension), if it exists.
</summary>
- <param name="methodName"></param>
- <param name="signature"></param>
- <returns></returns>
+ <param name="methodName">The OpenGL function name (e.g. glVertex3f)</param>
+ <param name="signature">The signature of the delegate to return.</param>
+ <returns>
+ A delegate with the specified signature which can be used to call the specified OpenGL
+ function, or null if the function does not exist.
+ </returns>
</member>
<member name="M:Tao.OpenGl.Gl.IsExtensionSupported(System.String)">
<summary>
@@ -135,8 +138,8 @@
</para>
<para>
Calling this function before the automatic initialisation has taken place will result
- in the Gl class being initialised twice. This is harmless, but given the automatic
- initialisation should be preferred.
+ in the Gl class being initialised twice. This is harmless, but, given the choice,
+ the automatic initialisation should be preferred.
</para>
</remarks>
</member>
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Platform.Windows.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/lib/net-2.0/Tao.Sdl.dll
===================================================================
(Binary files differ)
Modified: trunk/SdlDotNet/src/Windows/SurfaceControl.cs
===================================================================
--- trunk/SdlDotNet/src/Windows/SurfaceControl.cs 2007-07-05 21:22:49 UTC (rev 1416)
+++ trunk/SdlDotNet/src/Windows/SurfaceControl.cs 2007-07-25 18:00:51 UTC (rev 1417)
@@ -231,10 +231,17 @@
/// that contains the event data.</param>
protected override void OnKeyDown(KeyEventArgs e)
{
- if (!this.DesignMode)
+ try
{
- SdlDotNet.Core.Events.Add(new KeyboardEventArgs((SdlDotNet.Input.Key)Enum.Parse(typeof(SdlDotNet.Input.Key), e.KeyCode.ToString()), (ModifierKeys)e.Modifiers, true));
+ if (!this.DesignMode)
+ {
+ SdlDotNet.Core.Events.Add(new KeyboardEventArgs((SdlDotNet.Input.Key)Enum.Parse(typeof(SdlDotNet.Input.Key), e.KeyCode.ToString()), (ModifierKeys)e.Modifiers, true));
+ }
}
+ catch (ArgumentException ex)
+ {
+ ex.ToString();
+ }
base.OnKeyDown(e);
}
@@ -248,10 +255,17 @@
/// that contains the event data.</param>
protected override void OnKeyUp(KeyEventArgs e)
{
- if (!this.DesignMode)
+ try
{
- SdlDotNet.Core.Events.Add(new KeyboardEventArgs((SdlDotNet.Input.Key)Enum.Parse(typeof(SdlDotNet.Input.Key), e.KeyCode.ToString()), (ModifierKeys)e.Modifiers, false));
+ if (!this.DesignMode)
+ {
+ SdlDotNet.Core.Events.Add(new KeyboardEventArgs((SdlDotNet.Input.Key)Enum.Parse(typeof(SdlDotNet.Input.Key), e.KeyCode.ToString()), (ModifierKeys)e.Modifiers, false));
+ }
}
+ catch (ArgumentException ex)
+ {
+ ex.ToString();
+ }
base.OnKeyUp(e);
}
Modified: trunk/SdlDotNet/tools/Prebuild/prebuild.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-07-05 21:23:18
|
Revision: 1416
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1416&view=rev
Author: jendave
Date: 2007-07-05 14:22:49 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Fix high fps bug
Modified Paths:
--------------
trunk/SdlDotNet/src/Core/Events.cs
Modified: trunk/SdlDotNet/src/Core/Events.cs
===================================================================
--- trunk/SdlDotNet/src/Core/Events.cs 2007-06-06 22:30:15 UTC (rev 1415)
+++ trunk/SdlDotNet/src/Core/Events.cs 2007-07-05 21:22:49 UTC (rev 1416)
@@ -1224,13 +1224,13 @@
}
set
{
- if (value < 1)
+ if (value == 0)
{
targetFps = 1;
}
- else if (value > 800)
+ else if (value > 100000 || value == -1)
{
- targetFps = 800;
+ targetFps = 100000;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-06-06 22:30:18
|
Revision: 1415
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1415&view=rev
Author: jendave
Date: 2007-06-06 15:30:15 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
removed editing
Modified Paths:
--------------
trunk/Mezzanine/MezzanineLib/World/Editing.cs
trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj
Removed Paths:
-------------
trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
Modified: trunk/Mezzanine/MezzanineLib/World/Editing.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/World/Editing.cs 2007-06-06 22:06:28 UTC (rev 1414)
+++ trunk/Mezzanine/MezzanineLib/World/Editing.cs 2007-06-06 22:30:15 UTC (rev 1415)
@@ -58,5 +58,467 @@
public static int lasttex = 0;
public const int MAXARCHVERT = 50;
public static bool archvinit = false;
+
+ //// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
+ //
+ //#include "cube.h"
+ //#using <mscorlib.dll>
+ //using namespace MezzanineLib;
+ //using namespace MezzanineLib::World;
+ //
+ //// the current selection, used by almost all editing commands
+ //// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
+ //
+ //block sel =
+ //{
+ // variable("selx", 0, 0, 4096, &sel.x, NULL, false),
+ // variable("sely", 0, 0, 4096, &sel.y, NULL, false),
+ // variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
+ // variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
+ //};
+ //
+ //#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
+ //int curedittex[] = { -1, -1, -1 };
+ //sqr rtex;
+ //
+ //VAR(editing,0,0,1);
+ //
+ //void toggleedit()
+ //{
+ // if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
+ // if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
+ // GameInit::EditMode = !GameInit::EditMode;
+ // if(!GameInit::EditMode)
+ // {
+ // settagareas(); // reset triggers to allow quick playtesting
+ // entinmap(player1); // find spawn closest to current floating pos
+ // }
+ // else
+ // {
+ // resettagareas(); // clear trigger areas to allow them to be edited
+ // player1->health = 100;
+ // if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
+ // projreset();
+ // };
+ // SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
+ // Editing::selset = false;
+ // editing = GameInit::EditMode;
+ //};
+ //
+ //COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
+ //
+ //void correctsel() // ensures above invariant
+ //{
+ // Editing::selset = !OUTBORD(sel.x, sel.y);
+ // int bsize = GameInit::SSize-GameInit::MinBord;
+ // if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
+ // if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
+ // if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
+ //};
+ //
+ //bool noteditmode()
+ //{
+ // correctsel();
+ // if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
+ // return !GameInit::EditMode;
+ //};
+ //
+ //bool noselection()
+ //{
+ // if(!Editing::selset) conoutf("no selection");
+ // return !Editing::selset;
+ //};
+ //
+ //#define EDITSEL if(noteditmode() || noselection()) return;
+ //#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
+ //#define EDITMP if(noteditmode() || multiplayer()) return;
+ //
+ //void selectpos(int x, int y, int xs, int ys)
+ //{
+ // block s = { x, y, xs, ys };
+ // sel = s;
+ // Editing::selh = 0;
+ // correctsel();
+ //};
+ //
+ //void makesel()
+ //{
+ // block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
+ // sel = s;
+ // Editing::selh = max(Editing::lasth,Editing::ch);
+ // correctsel();
+ // if(Editing::selset) rtex = *S(sel.x, sel.y);
+ //};
+ //
+ //VAR(flrceil,0,0,2);
+ //
+ //float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
+ //{
+ // return !flrceil //z-s->floor<s->ceil-z
+ // ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
+ // : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
+ //};
+ //
+ //void cursorupdate() // called every frame from hud
+ //{
+ // flrceil = ((int)(player1->pitch>=0))*2;
+ //
+ // volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
+ // volatile float y = worldpos.y;
+ // volatile float z = worldpos.z;
+ //
+ // Editing::cx = (int)x;
+ // Editing::cy = (int)y;
+ //
+ // if(OUTBORD(Editing::cx, Editing::cy)) return;
+ // sqr *s = S(Editing::cx,Editing::cy);
+ //
+ // if(fabs(sheight(s,s,z)-z)>1) // selected wall
+ // {
+ // x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
+ // y += y>player1->o.y ? 0.5f : -0.5f;
+ //
+ // Editing::cx = (int)x;
+ // Editing::cy = (int)y;
+ //
+ // if(OUTBORD(Editing::cx, Editing::cy)) return;
+ // };
+ //
+ // if(Editing::dragging) makesel();
+ //
+ // const int GRIDSIZE = 5;
+ // const float GRIDW = 0.5f;
+ // const float GRID8 = 2.0f;
+ // const float GRIDS = 2.0f;
+ // const int GRIDM = 0x7;
+ //
+ // // render editing grid
+ //
+ // for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
+ // {
+ // if(OUTBORD(ix, iy)) continue;
+ // sqr *s = S(ix,iy);
+ // if(SOLID(s)) continue;
+ // float h1 = sheight(s, s, z);
+ // float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
+ // float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
+ // float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
+ // if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
+ // else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
+ // else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
+ // block b = { ix, iy, 1, 1 };
+ // box(b, h1, h2, h3, h4);
+ // Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
+ // if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
+ // if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
+ // if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
+ // if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
+ // };
+ //
+ // if(!SOLID(s))
+ // {
+ // float ih = sheight(s, s, z);
+ // Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
+ // block b = { Editing::cx, Editing::cy, 1, 1 };
+ // box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
+ // Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
+ // Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
+ // Editing::ch = (int)ih;
+ // };
+ //
+ // if(Editing::selset)
+ // {
+ // Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
+ // box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
+ // };
+ //};
+ //
+ //vector<block *> undos; // unlimited undo
+ //VARP(undomegs, 0, 1, 10); // bounded by n megs
+ //
+ //void pruneundos(int maxremain) // bound memory
+ //{
+ // int t = 0;
+ // loopvrev(undos)
+ // {
+ // t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
+ // if(t>maxremain) free(undos.remove(i));
+ // };
+ //};
+ //
+ //void makeundo()
+ //{
+ // undos.add(blockcopy(sel));
+ // pruneundos(undomegs<<20);
+ //};
+ //
+ //void editundo()
+ //{
+ // EDITMP;
+ // if(undos.empty()) { conoutf("nothing more to undo"); return; };
+ // block *p = undos.pop();
+ // blockpaste(*p);
+ // free(p);
+ //};
+ //
+ //block *copybuf = NULL;
+ //
+ //void copy()
+ //{
+ // EDITSELMP;
+ // if(copybuf) free(copybuf);
+ // copybuf = blockcopy(sel);
+ //};
+ //
+ //void paste()
+ //{
+ // EDITMP;
+ // if(!copybuf) { conoutf("nothing to paste"); return; };
+ // sel.xs = copybuf->xs;
+ // sel.ys = copybuf->ys;
+ // correctsel();
+ // if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
+ // makeundo();
+ // copybuf->x = sel.x;
+ // copybuf->y = sel.y;
+ // blockpaste(*copybuf);
+ //};
+ //
+ //void tofronttex() // maintain most recently used of the texture lists when applying texture
+ //{
+ // loopi(3)
+ // {
+ // int c = curedittex[i];
+ // if(c>=0)
+ // {
+ // uchar *p = hdr.texlists[i];
+ // int t = p[c];
+ // for(int a = c-1; a>=0; a--) p[a+1] = p[a];
+ // p[0] = t;
+ // curedittex[i] = -1;
+ // };
+ // };
+ //};
+ //
+ //void editdrag(bool isdown)
+ //{
+ // if(Editing::dragging = isdown)
+ // {
+ // Editing::lastx = Editing::cx;
+ // Editing::lasty = Editing::cy;
+ // Editing::lasth = Editing::ch;
+ // Editing::selset = false;
+ // tofronttex();
+ // };
+ // makesel();
+ //};
+ //
+ //// the core editing function. all the *xy functions perform the core operations
+ //// and are also called directly from the network, the function below it is strictly
+ //// triggered locally. They all have very similar structure.
+ //
+ //void editheightxy(bool isfloor, int amount, block &sel)
+ //{
+ // loopselxy(if(isfloor)
+ // {
+ // s->floor += amount;
+ // if(s->floor>=s->ceil) s->floor = s->ceil-1;
+ // }
+ // else
+ // {
+ // s->ceil += amount;
+ // if(s->ceil<=s->floor) s->ceil = s->floor+1;
+ // });
+ //};
+ //
+ //void editheight(int flr, int amount)
+ //{
+ // EDITSEL;
+ // bool isfloor = flr==0;
+ // editheightxy(isfloor, amount, sel);
+ // addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
+ //};
+ //
+ //COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
+ //
+ //void edittexxy(int type, int t, block &sel)
+ //{
+ // loopselxy(switch(type)
+ // {
+ // case 0: s->ftex = t; break;
+ // case 1: s->wtex = t; break;
+ // case 2: s->ctex = t; break;
+ // case 3: s->utex = t; break;
+ // });
+ //};
+ //
+ //void edittex(int type, int dir)
+ //{
+ // EDITSEL;
+ // if(type<0 || type>3) return;
+ // if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
+ // int atype = type==3 ? 1 : type;
+ // int i = curedittex[atype];
+ // i = i<0 ? 0 : i+dir;
+ // curedittex[atype] = i = min(max(i, 0), 255);
+ // int t = Editing::lasttex = hdr.texlists[atype][i];
+ // edittexxy(type, t, sel);
+ // addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
+ //};
+ //
+ //void replace()
+ //{
+ // EDITSELMP;
+ // loop(x,GameInit::SSize) loop(y,GameInit::SSize)
+ // {
+ // sqr *s = S(x, y);
+ // switch(Editing::lasttype)
+ // {
+ // case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
+ // case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
+ // case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
+ // case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
+ // };
+ // };
+ // block b = { 0, 0, GameInit::SSize, GameInit::SSize };
+ // remip(b);
+ //};
+ //
+ //void edittypexy(int type, block &sel)
+ //{
+ // loopselxy(s->type = type);
+ //};
+ //
+ //void edittype(int type)
+ //{
+ // EDITSEL;
+ // if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
+ // || sel.x&~-sel.xs || sel.y&~-sel.ys))
+ // { conoutf("corner selection must be power of 2 aligned"); return; };
+ // edittypexy(type, sel);
+ // addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
+ //};
+ //
+ //void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
+ //void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
+ //void corner() { edittype(BlockTypes::CORNER); };
+ //
+ //COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
+ //COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
+ //COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
+ //
+ //void editequalisexy(bool isfloor, block &sel)
+ //{
+ // int low = 127, hi = -128;
+ // loopselxy(
+ // {
+ // if(s->floor<low) low = s->floor;
+ // if(s->ceil>hi) hi = s->ceil;
+ // });
+ // loopselxy(
+ // {
+ // if(isfloor) s->floor = low; else s->ceil = hi;
+ // if(s->floor>=s->ceil) s->floor = s->ceil-1;
+ // });
+ //};
+ //
+ //void equalize(int flr)
+ //{
+ // bool isfloor = flr==0;
+ // EDITSEL;
+ // editequalisexy(isfloor, sel);
+ // addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
+ //};
+ //
+ //COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
+ //
+ //void setvdeltaxy(int delta, block &sel)
+ //{
+ // loopselxy(s->vdelta = max(s->vdelta+delta, 0));
+ // remipmore(sel);
+ //};
+ //
+ //void setvdelta(int delta)
+ //{
+ // EDITSEL;
+ // setvdeltaxy(delta, sel);
+ // addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
+ //};
+ //
+ //int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
+ //
+ //void archvertex(int span, int vert, int delta)
+ //{
+ // if(!Editing::archvinit)
+ // {
+ // Editing::archvinit = true;
+ // loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
+ // };
+ // if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
+ // archverts[span][vert] = delta;
+ //};
+ //
+ //void arch(int sidedelta, int _a)
+ //{
+ // EDITSELMP;
+ // sel.xs++;
+ // sel.ys++;
+ // if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
+ // if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
+ // loopselxy(s->vdelta =
+ // sel.xs>sel.ys
+ // ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
+ // : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
+ // remipmore(sel);
+ //};
+ //
+ //void slope(int xd, int yd)
+ //{
+ // EDITSELMP;
+ // int off = 0;
+ // if(xd<0) off -= xd*sel.xs;
+ // if(yd<0) off -= yd*sel.ys;
+ // sel.xs++;
+ // sel.ys++;
+ // loopselxy(s->vdelta = xd*x+yd*y+off);
+ // remipmore(sel);
+ //};
+ //
+ //
+ //VARF(fullbright, 0, 0, 1,
+ // if(fullbright)
+ // {
+ // if(noteditmode()) return;
+ // loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
+ // };
+ //);
+ //
+ //void edittag(int tag)
+ //{
+ // EDITSELMP;
+ // loopselxy(s->tag = tag);
+ //};
+ //
+ //void newent(char *what, char *a1, char *a2, char *a3, char *a4)
+ //{
+ // EDITSEL;
+ // newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
+ //};
+ //
+ //COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
+ //COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
+ //COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
+ //COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
+ //COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
+ //COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
+ //COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
+ //COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
+ //
+ //
+
}
}
Modified: trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj 2007-06-06 22:06:28 UTC (rev 1414)
+++ trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj 2007-06-06 22:30:15 UTC (rev 1415)
@@ -1084,34 +1084,6 @@
Name="world"
>
<File
- RelativePath=".\src\editing.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Profile|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\src\world.cpp"
>
<FileConfiguration
Deleted: trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-06 22:06:28 UTC (rev 1414)
+++ trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-06 22:30:15 UTC (rev 1415)
@@ -1,460 +0,0 @@
-//// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
-//
-//#include "cube.h"
-//#using <mscorlib.dll>
-//using namespace MezzanineLib;
-//using namespace MezzanineLib::World;
-//
-//// the current selection, used by almost all editing commands
-//// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
-//
-//block sel =
-//{
-// variable("selx", 0, 0, 4096, &sel.x, NULL, false),
-// variable("sely", 0, 0, 4096, &sel.y, NULL, false),
-// variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
-// variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
-//};
-//
-//#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
-//int curedittex[] = { -1, -1, -1 };
-//sqr rtex;
-//
-//VAR(editing,0,0,1);
-//
-//void toggleedit()
-//{
-// if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
-// if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
-// GameInit::EditMode = !GameInit::EditMode;
-// if(!GameInit::EditMode)
-// {
-// settagareas(); // reset triggers to allow quick playtesting
-// entinmap(player1); // find spawn closest to current floating pos
-// }
-// else
-// {
-// resettagareas(); // clear trigger areas to allow them to be edited
-// player1->health = 100;
-// if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
-// projreset();
-// };
-// SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
-// Editing::selset = false;
-// editing = GameInit::EditMode;
-//};
-//
-//COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
-//
-//void correctsel() // ensures above invariant
-//{
-// Editing::selset = !OUTBORD(sel.x, sel.y);
-// int bsize = GameInit::SSize-GameInit::MinBord;
-// if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
-// if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
-// if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
-//};
-//
-//bool noteditmode()
-//{
-// correctsel();
-// if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
-// return !GameInit::EditMode;
-//};
-//
-//bool noselection()
-//{
-// if(!Editing::selset) conoutf("no selection");
-// return !Editing::selset;
-//};
-//
-//#define EDITSEL if(noteditmode() || noselection()) return;
-//#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
-//#define EDITMP if(noteditmode() || multiplayer()) return;
-//
-//void selectpos(int x, int y, int xs, int ys)
-//{
-// block s = { x, y, xs, ys };
-// sel = s;
-// Editing::selh = 0;
-// correctsel();
-//};
-//
-//void makesel()
-//{
-// block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
-// sel = s;
-// Editing::selh = max(Editing::lasth,Editing::ch);
-// correctsel();
-// if(Editing::selset) rtex = *S(sel.x, sel.y);
-//};
-//
-//VAR(flrceil,0,0,2);
-//
-//float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
-//{
-// return !flrceil //z-s->floor<s->ceil-z
-// ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
-// : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
-//};
-//
-//void cursorupdate() // called every frame from hud
-//{
-// flrceil = ((int)(player1->pitch>=0))*2;
-//
-// volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
-// volatile float y = worldpos.y;
-// volatile float z = worldpos.z;
-//
-// Editing::cx = (int)x;
-// Editing::cy = (int)y;
-//
-// if(OUTBORD(Editing::cx, Editing::cy)) return;
-// sqr *s = S(Editing::cx,Editing::cy);
-//
-// if(fabs(sheight(s,s,z)-z)>1) // selected wall
-// {
-// x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
-// y += y>player1->o.y ? 0.5f : -0.5f;
-//
-// Editing::cx = (int)x;
-// Editing::cy = (int)y;
-//
-// if(OUTBORD(Editing::cx, Editing::cy)) return;
-// };
-//
-// if(Editing::dragging) makesel();
-//
-// const int GRIDSIZE = 5;
-// const float GRIDW = 0.5f;
-// const float GRID8 = 2.0f;
-// const float GRIDS = 2.0f;
-// const int GRIDM = 0x7;
-//
-// // render editing grid
-//
-// for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
-// {
-// if(OUTBORD(ix, iy)) continue;
-// sqr *s = S(ix,iy);
-// if(SOLID(s)) continue;
-// float h1 = sheight(s, s, z);
-// float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
-// float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
-// float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
-// if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
-// else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
-// else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
-// block b = { ix, iy, 1, 1 };
-// box(b, h1, h2, h3, h4);
-// Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
-// if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
-// if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
-// if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
-// if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
-// };
-//
-// if(!SOLID(s))
-// {
-// float ih = sheight(s, s, z);
-// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
-// block b = { Editing::cx, Editing::cy, 1, 1 };
-// box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
-// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
-// Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
-// Editing::ch = (int)ih;
-// };
-//
-// if(Editing::selset)
-// {
-// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
-// box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
-// };
-//};
-//
-//vector<block *> undos; // unlimited undo
-//VARP(undomegs, 0, 1, 10); // bounded by n megs
-//
-//void pruneundos(int maxremain) // bound memory
-//{
-// int t = 0;
-// loopvrev(undos)
-// {
-// t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
-// if(t>maxremain) free(undos.remove(i));
-// };
-//};
-//
-//void makeundo()
-//{
-// undos.add(blockcopy(sel));
-// pruneundos(undomegs<<20);
-//};
-//
-//void editundo()
-//{
-// EDITMP;
-// if(undos.empty()) { conoutf("nothing more to undo"); return; };
-// block *p = undos.pop();
-// blockpaste(*p);
-// free(p);
-//};
-//
-//block *copybuf = NULL;
-//
-//void copy()
-//{
-// EDITSELMP;
-// if(copybuf) free(copybuf);
-// copybuf = blockcopy(sel);
-//};
-//
-//void paste()
-//{
-// EDITMP;
-// if(!copybuf) { conoutf("nothing to paste"); return; };
-// sel.xs = copybuf->xs;
-// sel.ys = copybuf->ys;
-// correctsel();
-// if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
-// makeundo();
-// copybuf->x = sel.x;
-// copybuf->y = sel.y;
-// blockpaste(*copybuf);
-//};
-//
-//void tofronttex() // maintain most recently used of the texture lists when applying texture
-//{
-// loopi(3)
-// {
-// int c = curedittex[i];
-// if(c>=0)
-// {
-// uchar *p = hdr.texlists[i];
-// int t = p[c];
-// for(int a = c-1; a>=0; a--) p[a+1] = p[a];
-// p[0] = t;
-// curedittex[i] = -1;
-// };
-// };
-//};
-//
-//void editdrag(bool isdown)
-//{
-// if(Editing::dragging = isdown)
-// {
-// Editing::lastx = Editing::cx;
-// Editing::lasty = Editing::cy;
-// Editing::lasth = Editing::ch;
-// Editing::selset = false;
-// tofronttex();
-// };
-// makesel();
-//};
-//
-//// the core editing function. all the *xy functions perform the core operations
-//// and are also called directly from the network, the function below it is strictly
-//// triggered locally. They all have very similar structure.
-//
-//void editheightxy(bool isfloor, int amount, block &sel)
-//{
-// loopselxy(if(isfloor)
-// {
-// s->floor += amount;
-// if(s->floor>=s->ceil) s->floor = s->ceil-1;
-// }
-// else
-// {
-// s->ceil += amount;
-// if(s->ceil<=s->floor) s->ceil = s->floor+1;
-// });
-//};
-//
-//void editheight(int flr, int amount)
-//{
-// EDITSEL;
-// bool isfloor = flr==0;
-// editheightxy(isfloor, amount, sel);
-// addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
-//};
-//
-//COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
-//
-//void edittexxy(int type, int t, block &sel)
-//{
-// loopselxy(switch(type)
-// {
-// case 0: s->ftex = t; break;
-// case 1: s->wtex = t; break;
-// case 2: s->ctex = t; break;
-// case 3: s->utex = t; break;
-// });
-//};
-//
-//void edittex(int type, int dir)
-//{
-// EDITSEL;
-// if(type<0 || type>3) return;
-// if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
-// int atype = type==3 ? 1 : type;
-// int i = curedittex[atype];
-// i = i<0 ? 0 : i+dir;
-// curedittex[atype] = i = min(max(i, 0), 255);
-// int t = Editing::lasttex = hdr.texlists[atype][i];
-// edittexxy(type, t, sel);
-// addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
-//};
-//
-//void replace()
-//{
-// EDITSELMP;
-// loop(x,GameInit::SSize) loop(y,GameInit::SSize)
-// {
-// sqr *s = S(x, y);
-// switch(Editing::lasttype)
-// {
-// case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
-// case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
-// case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
-// case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
-// };
-// };
-// block b = { 0, 0, GameInit::SSize, GameInit::SSize };
-// remip(b);
-//};
-//
-//void edittypexy(int type, block &sel)
-//{
-// loopselxy(s->type = type);
-//};
-//
-//void edittype(int type)
-//{
-// EDITSEL;
-// if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
-// || sel.x&~-sel.xs || sel.y&~-sel.ys))
-// { conoutf("corner selection must be power of 2 aligned"); return; };
-// edittypexy(type, sel);
-// addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
-//};
-//
-//void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
-//void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
-//void corner() { edittype(BlockTypes::CORNER); };
-//
-//COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
-//COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
-//COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
-//
-//void editequalisexy(bool isfloor, block &sel)
-//{
-// int low = 127, hi = -128;
-// loopselxy(
-// {
-// if(s->floor<low) low = s->floor;
-// if(s->ceil>hi) hi = s->ceil;
-// });
-// loopselxy(
-// {
-// if(isfloor) s->floor = low; else s->ceil = hi;
-// if(s->floor>=s->ceil) s->floor = s->ceil-1;
-// });
-//};
-//
-//void equalize(int flr)
-//{
-// bool isfloor = flr==0;
-// EDITSEL;
-// editequalisexy(isfloor, sel);
-// addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
-//};
-//
-//COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
-//
-//void setvdeltaxy(int delta, block &sel)
-//{
-// loopselxy(s->vdelta = max(s->vdelta+delta, 0));
-// remipmore(sel);
-//};
-//
-//void setvdelta(int delta)
-//{
-// EDITSEL;
-// setvdeltaxy(delta, sel);
-// addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
-//};
-//
-//int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
-//
-//void archvertex(int span, int vert, int delta)
-//{
-// if(!Editing::archvinit)
-// {
-// Editing::archvinit = true;
-// loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
-// };
-// if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
-// archverts[span][vert] = delta;
-//};
-//
-//void arch(int sidedelta, int _a)
-//{
-// EDITSELMP;
-// sel.xs++;
-// sel.ys++;
-// if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
-// if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
-// loopselxy(s->vdelta =
-// sel.xs>sel.ys
-// ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
-// : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
-// remipmore(sel);
-//};
-//
-//void slope(int xd, int yd)
-//{
-// EDITSELMP;
-// int off = 0;
-// if(xd<0) off -= xd*sel.xs;
-// if(yd<0) off -= yd*sel.ys;
-// sel.xs++;
-// sel.ys++;
-// loopselxy(s->vdelta = xd*x+yd*y+off);
-// remipmore(sel);
-//};
-//
-//
-//VARF(fullbright, 0, 0, 1,
-// if(fullbright)
-// {
-// if(noteditmode()) return;
-// loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
-// };
-//);
-//
-//void edittag(int tag)
-//{
-// EDITSELMP;
-// loopselxy(s->tag = tag);
-//};
-//
-//void newent(char *what, char *a1, char *a2, char *a3, char *a4)
-//{
-// EDITSEL;
-// newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
-//};
-//
-//COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
-//COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
-//COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
-//COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
-//COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
-//COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
-//COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
-//COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
-//
-//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-06-06 22:06:31
|
Revision: 1414
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1414&view=rev
Author: jendave
Date: 2007-06-06 15:06:28 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
removed editing functionality
Modified Paths:
--------------
trunk/Mezzanine/MezzanineLib/Game/Monster.cs
trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp
trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp
trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
trunk/Mezzanine/MezzanineManagedLib/src/protos.h
trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp
trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp
trunk/Mezzanine/MezzanineManagedLib/src/world.cpp
trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp
trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp
Modified: trunk/Mezzanine/MezzanineLib/Game/Monster.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/Game/Monster.cs 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineLib/Game/Monster.cs 2007-06-06 22:06:28 UTC (rev 1414)
@@ -40,17 +40,27 @@
namespace MezzanineLib.Game
{
- /// <summary>
- ///
- /// </summary>
- public sealed class Monster
- {
- public static int nextmonster;
- public static int spawnremain;
- public static int numkilled;
- public static int monstertotal;
- public static int mtimestart;
- public const int TOTMFREQ = 13;
- public const int NUMMONSTERTYPES = 8;
- }
+ /// <summary>
+ ///
+ /// </summary>
+ public sealed class Monster
+ {
+ public static int nextmonster;
+ public static int spawnremain;
+ public static int numkilled;
+ public static int monstertotal;
+ public static int mtimestart;
+ public const int TOTMFREQ = 13;
+ public const int NUMMONSTERTYPES = 8;
+
+ //public static void endsp(bool allkilled)
+ //{
+ // conoutf(allkilled ? "you have cleared the map!" : "you reached the exit!");
+ // conoutf("score: %d kills in %d seconds", Monster.numkilled, (GameInit.LastMillis - Monster.mtimestart) / 1000);
+ // Monster.monstertotal = 0;
+ // startintermission();
+ //}
+ }
+
+
}
Modified: trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -306,7 +306,7 @@
void attack(bool on)
{
if(ClientGame::intermission) return;
- if(GameInit::EditMode) editdrag(on);
+ //if(GameInit::EditMode) editdrag(on);
else if(player1->attacking = on) respawn();
};
@@ -434,7 +434,7 @@
loopv(players) if(players[i]) players[i]->frags = 0;
resetspawns();
strcpy_s(getclientmap(), name);
- if(GameInit::EditMode) toggleedit();
+ //if(GameInit::EditMode) toggleedit();
setvar("gamespeed", 100);
//setvar("fog", 180);
//setvar("fogcolour", 0x8099B3);
Modified: trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -281,11 +281,11 @@
block b = { x, y, xs, ys };
switch(type)
{
- case NetworkMessages::SV_EDITH: editheightxy(v!=0, getint(p), b); break;
- case NetworkMessages::SV_EDITT: edittexxy(v, getint(p), b); break;
- case NetworkMessages::SV_EDITS: edittypexy(v, b); break;
- case NetworkMessages::SV_EDITD: setvdeltaxy(v, b); break;
- case NetworkMessages::SV_EDITE: editequalisexy(v!=0, b); break;
+ //case NetworkMessages::SV_EDITH: editheightxy(v!=0, getint(p), b); break;
+ //case NetworkMessages::SV_EDITT: edittexxy(v, getint(p), b); break;
+ //case NetworkMessages::SV_EDITS: edittypexy(v, b); break;
+ //case NetworkMessages::SV_EDITD: setvdeltaxy(v, b); break;
+ //case NetworkMessages::SV_EDITE: editequalisexy(v!=0, b); break;
};
break;
};
Modified: trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -1,460 +1,460 @@
-// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
-
-#include "cube.h"
-#using <mscorlib.dll>
-using namespace MezzanineLib;
-using namespace MezzanineLib::World;
-
-// the current selection, used by almost all editing commands
-// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
-
-block sel =
-{
- variable("selx", 0, 0, 4096, &sel.x, NULL, false),
- variable("sely", 0, 0, 4096, &sel.y, NULL, false),
- variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
- variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
-};
-
-#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
-int curedittex[] = { -1, -1, -1 };
-sqr rtex;
-
-VAR(editing,0,0,1);
-
-void toggleedit()
-{
- if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
- if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
- GameInit::EditMode = !GameInit::EditMode;
- if(!GameInit::EditMode)
- {
- settagareas(); // reset triggers to allow quick playtesting
- entinmap(player1); // find spawn closest to current floating pos
- }
- else
- {
- resettagareas(); // clear trigger areas to allow them to be edited
- player1->health = 100;
- if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
- projreset();
- };
- SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
- Editing::selset = false;
- editing = GameInit::EditMode;
-};
-
-COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
-
-void correctsel() // ensures above invariant
-{
- Editing::selset = !OUTBORD(sel.x, sel.y);
- int bsize = GameInit::SSize-GameInit::MinBord;
- if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
- if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
- if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
-};
-
-bool noteditmode()
-{
- correctsel();
- if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
- return !GameInit::EditMode;
-};
-
-bool noselection()
-{
- if(!Editing::selset) conoutf("no selection");
- return !Editing::selset;
-};
-
-#define EDITSEL if(noteditmode() || noselection()) return;
-#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
-#define EDITMP if(noteditmode() || multiplayer()) return;
-
-void selectpos(int x, int y, int xs, int ys)
-{
- block s = { x, y, xs, ys };
- sel = s;
- Editing::selh = 0;
- correctsel();
-};
-
-void makesel()
-{
- block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
- sel = s;
- Editing::selh = max(Editing::lasth,Editing::ch);
- correctsel();
- if(Editing::selset) rtex = *S(sel.x, sel.y);
-};
-
-VAR(flrceil,0,0,2);
-
-float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
-{
- return !flrceil //z-s->floor<s->ceil-z
- ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
- : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
-};
-
-void cursorupdate() // called every frame from hud
-{
- flrceil = ((int)(player1->pitch>=0))*2;
-
- volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
- volatile float y = worldpos.y;
- volatile float z = worldpos.z;
-
- Editing::cx = (int)x;
- Editing::cy = (int)y;
-
- if(OUTBORD(Editing::cx, Editing::cy)) return;
- sqr *s = S(Editing::cx,Editing::cy);
-
- if(fabs(sheight(s,s,z)-z)>1) // selected wall
- {
- x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
- y += y>player1->o.y ? 0.5f : -0.5f;
-
- Editing::cx = (int)x;
- Editing::cy = (int)y;
-
- if(OUTBORD(Editing::cx, Editing::cy)) return;
- };
-
- if(Editing::dragging) makesel();
-
- const int GRIDSIZE = 5;
- const float GRIDW = 0.5f;
- const float GRID8 = 2.0f;
- const float GRIDS = 2.0f;
- const int GRIDM = 0x7;
-
- // render editing grid
-
- for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
- {
- if(OUTBORD(ix, iy)) continue;
- sqr *s = S(ix,iy);
- if(SOLID(s)) continue;
- float h1 = sheight(s, s, z);
- float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
- float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
- float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
- if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
- else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
- else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
- block b = { ix, iy, 1, 1 };
- box(b, h1, h2, h3, h4);
- Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
- if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
- if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
- if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
- if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
- };
-
- if(!SOLID(s))
- {
- float ih = sheight(s, s, z);
- Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
- block b = { Editing::cx, Editing::cy, 1, 1 };
- box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
- Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
- Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
- Editing::ch = (int)ih;
- };
-
- if(Editing::selset)
- {
- Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
- box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
- };
-};
-
-vector<block *> undos; // unlimited undo
-VARP(undomegs, 0, 1, 10); // bounded by n megs
-
-void pruneundos(int maxremain) // bound memory
-{
- int t = 0;
- loopvrev(undos)
- {
- t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
- if(t>maxremain) free(undos.remove(i));
- };
-};
-
-void makeundo()
-{
- undos.add(blockcopy(sel));
- pruneundos(undomegs<<20);
-};
-
-void editundo()
-{
- EDITMP;
- if(undos.empty()) { conoutf("nothing more to undo"); return; };
- block *p = undos.pop();
- blockpaste(*p);
- free(p);
-};
-
-block *copybuf = NULL;
-
-void copy()
-{
- EDITSELMP;
- if(copybuf) free(copybuf);
- copybuf = blockcopy(sel);
-};
-
-void paste()
-{
- EDITMP;
- if(!copybuf) { conoutf("nothing to paste"); return; };
- sel.xs = copybuf->xs;
- sel.ys = copybuf->ys;
- correctsel();
- if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
- makeundo();
- copybuf->x = sel.x;
- copybuf->y = sel.y;
- blockpaste(*copybuf);
-};
-
-void tofronttex() // maintain most recently used of the texture lists when applying texture
-{
- loopi(3)
- {
- int c = curedittex[i];
- if(c>=0)
- {
- uchar *p = hdr.texlists[i];
- int t = p[c];
- for(int a = c-1; a>=0; a--) p[a+1] = p[a];
- p[0] = t;
- curedittex[i] = -1;
- };
- };
-};
-
-void editdrag(bool isdown)
-{
- if(Editing::dragging = isdown)
- {
- Editing::lastx = Editing::cx;
- Editing::lasty = Editing::cy;
- Editing::lasth = Editing::ch;
- Editing::selset = false;
- tofronttex();
- };
- makesel();
-};
-
-// the core editing function. all the *xy functions perform the core operations
-// and are also called directly from the network, the function below it is strictly
-// triggered locally. They all have very similar structure.
-
-void editheightxy(bool isfloor, int amount, block &sel)
-{
- loopselxy(if(isfloor)
- {
- s->floor += amount;
- if(s->floor>=s->ceil) s->floor = s->ceil-1;
- }
- else
- {
- s->ceil += amount;
- if(s->ceil<=s->floor) s->ceil = s->floor+1;
- });
-};
-
-void editheight(int flr, int amount)
-{
- EDITSEL;
- bool isfloor = flr==0;
- editheightxy(isfloor, amount, sel);
- addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
-};
-
-COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
-
-void edittexxy(int type, int t, block &sel)
-{
- loopselxy(switch(type)
- {
- case 0: s->ftex = t; break;
- case 1: s->wtex = t; break;
- case 2: s->ctex = t; break;
- case 3: s->utex = t; break;
- });
-};
-
-void edittex(int type, int dir)
-{
- EDITSEL;
- if(type<0 || type>3) return;
- if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
- int atype = type==3 ? 1 : type;
- int i = curedittex[atype];
- i = i<0 ? 0 : i+dir;
- curedittex[atype] = i = min(max(i, 0), 255);
- int t = Editing::lasttex = hdr.texlists[atype][i];
- edittexxy(type, t, sel);
- addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
-};
-
-void replace()
-{
- EDITSELMP;
- loop(x,GameInit::SSize) loop(y,GameInit::SSize)
- {
- sqr *s = S(x, y);
- switch(Editing::lasttype)
- {
- case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
- case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
- case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
- case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
- };
- };
- block b = { 0, 0, GameInit::SSize, GameInit::SSize };
- remip(b);
-};
-
-void edittypexy(int type, block &sel)
-{
- loopselxy(s->type = type);
-};
-
-void edittype(int type)
-{
- EDITSEL;
- if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
- || sel.x&~-sel.xs || sel.y&~-sel.ys))
- { conoutf("corner selection must be power of 2 aligned"); return; };
- edittypexy(type, sel);
- addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
-};
-
-void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
-void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
-void corner() { edittype(BlockTypes::CORNER); };
-
-COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
-COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
-COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
-
-void editequalisexy(bool isfloor, block &sel)
-{
- int low = 127, hi = -128;
- loopselxy(
- {
- if(s->floor<low) low = s->floor;
- if(s->ceil>hi) hi = s->ceil;
- });
- loopselxy(
- {
- if(isfloor) s->floor = low; else s->ceil = hi;
- if(s->floor>=s->ceil) s->floor = s->ceil-1;
- });
-};
-
-void equalize(int flr)
-{
- bool isfloor = flr==0;
- EDITSEL;
- editequalisexy(isfloor, sel);
- addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
-};
-
-COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
-
-void setvdeltaxy(int delta, block &sel)
-{
- loopselxy(s->vdelta = max(s->vdelta+delta, 0));
- remipmore(sel);
-};
-
-void setvdelta(int delta)
-{
- EDITSEL;
- setvdeltaxy(delta, sel);
- addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
-};
-
-int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
-
-void archvertex(int span, int vert, int delta)
-{
- if(!Editing::archvinit)
- {
- Editing::archvinit = true;
- loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
- };
- if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
- archverts[span][vert] = delta;
-};
-
-void arch(int sidedelta, int _a)
-{
- EDITSELMP;
- sel.xs++;
- sel.ys++;
- if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
- if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
- loopselxy(s->vdelta =
- sel.xs>sel.ys
- ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
- : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
- remipmore(sel);
-};
-
-void slope(int xd, int yd)
-{
- EDITSELMP;
- int off = 0;
- if(xd<0) off -= xd*sel.xs;
- if(yd<0) off -= yd*sel.ys;
- sel.xs++;
- sel.ys++;
- loopselxy(s->vdelta = xd*x+yd*y+off);
- remipmore(sel);
-};
-
-
-VARF(fullbright, 0, 0, 1,
- if(fullbright)
- {
- if(noteditmode()) return;
- loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
- };
-);
-
-void edittag(int tag)
-{
- EDITSELMP;
- loopselxy(s->tag = tag);
-};
-
-void newent(char *what, char *a1, char *a2, char *a3, char *a4)
-{
- EDITSEL;
- newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
-};
-
-COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
-COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
-COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
-COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
-COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
-COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
-COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
-COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
-COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
-COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
-COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
-COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
-
-
+//// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
+//
+//#include "cube.h"
+//#using <mscorlib.dll>
+//using namespace MezzanineLib;
+//using namespace MezzanineLib::World;
+//
+//// the current selection, used by almost all editing commands
+//// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
+//
+//block sel =
+//{
+// variable("selx", 0, 0, 4096, &sel.x, NULL, false),
+// variable("sely", 0, 0, 4096, &sel.y, NULL, false),
+// variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
+// variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
+//};
+//
+//#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
+//int curedittex[] = { -1, -1, -1 };
+//sqr rtex;
+//
+//VAR(editing,0,0,1);
+//
+//void toggleedit()
+//{
+// if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
+// if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
+// GameInit::EditMode = !GameInit::EditMode;
+// if(!GameInit::EditMode)
+// {
+// settagareas(); // reset triggers to allow quick playtesting
+// entinmap(player1); // find spawn closest to current floating pos
+// }
+// else
+// {
+// resettagareas(); // clear trigger areas to allow them to be edited
+// player1->health = 100;
+// if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
+// projreset();
+// };
+// SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
+// Editing::selset = false;
+// editing = GameInit::EditMode;
+//};
+//
+//COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
+//
+//void correctsel() // ensures above invariant
+//{
+// Editing::selset = !OUTBORD(sel.x, sel.y);
+// int bsize = GameInit::SSize-GameInit::MinBord;
+// if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
+// if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
+// if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
+//};
+//
+//bool noteditmode()
+//{
+// correctsel();
+// if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
+// return !GameInit::EditMode;
+//};
+//
+//bool noselection()
+//{
+// if(!Editing::selset) conoutf("no selection");
+// return !Editing::selset;
+//};
+//
+//#define EDITSEL if(noteditmode() || noselection()) return;
+//#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
+//#define EDITMP if(noteditmode() || multiplayer()) return;
+//
+//void selectpos(int x, int y, int xs, int ys)
+//{
+// block s = { x, y, xs, ys };
+// sel = s;
+// Editing::selh = 0;
+// correctsel();
+//};
+//
+//void makesel()
+//{
+// block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
+// sel = s;
+// Editing::selh = max(Editing::lasth,Editing::ch);
+// correctsel();
+// if(Editing::selset) rtex = *S(sel.x, sel.y);
+//};
+//
+//VAR(flrceil,0,0,2);
+//
+//float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
+//{
+// return !flrceil //z-s->floor<s->ceil-z
+// ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
+// : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
+//};
+//
+//void cursorupdate() // called every frame from hud
+//{
+// flrceil = ((int)(player1->pitch>=0))*2;
+//
+// volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
+// volatile float y = worldpos.y;
+// volatile float z = worldpos.z;
+//
+// Editing::cx = (int)x;
+// Editing::cy = (int)y;
+//
+// if(OUTBORD(Editing::cx, Editing::cy)) return;
+// sqr *s = S(Editing::cx,Editing::cy);
+//
+// if(fabs(sheight(s,s,z)-z)>1) // selected wall
+// {
+// x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
+// y += y>player1->o.y ? 0.5f : -0.5f;
+//
+// Editing::cx = (int)x;
+// Editing::cy = (int)y;
+//
+// if(OUTBORD(Editing::cx, Editing::cy)) return;
+// };
+//
+// if(Editing::dragging) makesel();
+//
+// const int GRIDSIZE = 5;
+// const float GRIDW = 0.5f;
+// const float GRID8 = 2.0f;
+// const float GRIDS = 2.0f;
+// const int GRIDM = 0x7;
+//
+// // render editing grid
+//
+// for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
+// {
+// if(OUTBORD(ix, iy)) continue;
+// sqr *s = S(ix,iy);
+// if(SOLID(s)) continue;
+// float h1 = sheight(s, s, z);
+// float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
+// float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
+// float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
+// if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
+// else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
+// else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
+// block b = { ix, iy, 1, 1 };
+// box(b, h1, h2, h3, h4);
+// Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
+// if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
+// if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
+// if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
+// if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
+// };
+//
+// if(!SOLID(s))
+// {
+// float ih = sheight(s, s, z);
+// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
+// block b = { Editing::cx, Editing::cy, 1, 1 };
+// box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
+// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
+// Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
+// Editing::ch = (int)ih;
+// };
+//
+// if(Editing::selset)
+// {
+// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
+// box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
+// };
+//};
+//
+//vector<block *> undos; // unlimited undo
+//VARP(undomegs, 0, 1, 10); // bounded by n megs
+//
+//void pruneundos(int maxremain) // bound memory
+//{
+// int t = 0;
+// loopvrev(undos)
+// {
+// t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
+// if(t>maxremain) free(undos.remove(i));
+// };
+//};
+//
+//void makeundo()
+//{
+// undos.add(blockcopy(sel));
+// pruneundos(undomegs<<20);
+//};
+//
+//void editundo()
+//{
+// EDITMP;
+// if(undos.empty()) { conoutf("nothing more to undo"); return; };
+// block *p = undos.pop();
+// blockpaste(*p);
+// free(p);
+//};
+//
+//block *copybuf = NULL;
+//
+//void copy()
+//{
+// EDITSELMP;
+// if(copybuf) free(copybuf);
+// copybuf = blockcopy(sel);
+//};
+//
+//void paste()
+//{
+// EDITMP;
+// if(!copybuf) { conoutf("nothing to paste"); return; };
+// sel.xs = copybuf->xs;
+// sel.ys = copybuf->ys;
+// correctsel();
+// if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
+// makeundo();
+// copybuf->x = sel.x;
+// copybuf->y = sel.y;
+// blockpaste(*copybuf);
+//};
+//
+//void tofronttex() // maintain most recently used of the texture lists when applying texture
+//{
+// loopi(3)
+// {
+// int c = curedittex[i];
+// if(c>=0)
+// {
+// uchar *p = hdr.texlists[i];
+// int t = p[c];
+// for(int a = c-1; a>=0; a--) p[a+1] = p[a];
+// p[0] = t;
+// curedittex[i] = -1;
+// };
+// };
+//};
+//
+//void editdrag(bool isdown)
+//{
+// if(Editing::dragging = isdown)
+// {
+// Editing::lastx = Editing::cx;
+// Editing::lasty = Editing::cy;
+// Editing::lasth = Editing::ch;
+// Editing::selset = false;
+// tofronttex();
+// };
+// makesel();
+//};
+//
+//// the core editing function. all the *xy functions perform the core operations
+//// and are also called directly from the network, the function below it is strictly
+//// triggered locally. They all have very similar structure.
+//
+//void editheightxy(bool isfloor, int amount, block &sel)
+//{
+// loopselxy(if(isfloor)
+// {
+// s->floor += amount;
+// if(s->floor>=s->ceil) s->floor = s->ceil-1;
+// }
+// else
+// {
+// s->ceil += amount;
+// if(s->ceil<=s->floor) s->ceil = s->floor+1;
+// });
+//};
+//
+//void editheight(int flr, int amount)
+//{
+// EDITSEL;
+// bool isfloor = flr==0;
+// editheightxy(isfloor, amount, sel);
+// addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
+//};
+//
+//COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
+//
+//void edittexxy(int type, int t, block &sel)
+//{
+// loopselxy(switch(type)
+// {
+// case 0: s->ftex = t; break;
+// case 1: s->wtex = t; break;
+// case 2: s->ctex = t; break;
+// case 3: s->utex = t; break;
+// });
+//};
+//
+//void edittex(int type, int dir)
+//{
+// EDITSEL;
+// if(type<0 || type>3) return;
+// if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
+// int atype = type==3 ? 1 : type;
+// int i = curedittex[atype];
+// i = i<0 ? 0 : i+dir;
+// curedittex[atype] = i = min(max(i, 0), 255);
+// int t = Editing::lasttex = hdr.texlists[atype][i];
+// edittexxy(type, t, sel);
+// addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
+//};
+//
+//void replace()
+//{
+// EDITSELMP;
+// loop(x,GameInit::SSize) loop(y,GameInit::SSize)
+// {
+// sqr *s = S(x, y);
+// switch(Editing::lasttype)
+// {
+// case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
+// case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
+// case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
+// case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
+// };
+// };
+// block b = { 0, 0, GameInit::SSize, GameInit::SSize };
+// remip(b);
+//};
+//
+//void edittypexy(int type, block &sel)
+//{
+// loopselxy(s->type = type);
+//};
+//
+//void edittype(int type)
+//{
+// EDITSEL;
+// if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
+// || sel.x&~-sel.xs || sel.y&~-sel.ys))
+// { conoutf("corner selection must be power of 2 aligned"); return; };
+// edittypexy(type, sel);
+// addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
+//};
+//
+//void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
+//void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
+//void corner() { edittype(BlockTypes::CORNER); };
+//
+//COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
+//COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
+//COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
+//
+//void editequalisexy(bool isfloor, block &sel)
+//{
+// int low = 127, hi = -128;
+// loopselxy(
+// {
+// if(s->floor<low) low = s->floor;
+// if(s->ceil>hi) hi = s->ceil;
+// });
+// loopselxy(
+// {
+// if(isfloor) s->floor = low; else s->ceil = hi;
+// if(s->floor>=s->ceil) s->floor = s->ceil-1;
+// });
+//};
+//
+//void equalize(int flr)
+//{
+// bool isfloor = flr==0;
+// EDITSEL;
+// editequalisexy(isfloor, sel);
+// addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
+//};
+//
+//COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
+//
+//void setvdeltaxy(int delta, block &sel)
+//{
+// loopselxy(s->vdelta = max(s->vdelta+delta, 0));
+// remipmore(sel);
+//};
+//
+//void setvdelta(int delta)
+//{
+// EDITSEL;
+// setvdeltaxy(delta, sel);
+// addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
+//};
+//
+//int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
+//
+//void archvertex(int span, int vert, int delta)
+//{
+// if(!Editing::archvinit)
+// {
+// Editing::archvinit = true;
+// loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
+// };
+// if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
+// archverts[span][vert] = delta;
+//};
+//
+//void arch(int sidedelta, int _a)
+//{
+// EDITSELMP;
+// sel.xs++;
+// sel.ys++;
+// if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
+// if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
+// loopselxy(s->vdelta =
+// sel.xs>sel.ys
+// ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
+// : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
+// remipmore(sel);
+//};
+//
+//void slope(int xd, int yd)
+//{
+// EDITSELMP;
+// int off = 0;
+// if(xd<0) off -= xd*sel.xs;
+// if(yd<0) off -= yd*sel.ys;
+// sel.xs++;
+// sel.ys++;
+// loopselxy(s->vdelta = xd*x+yd*y+off);
+// remipmore(sel);
+//};
+//
+//
+//VARF(fullbright, 0, 0, 1,
+// if(fullbright)
+// {
+// if(noteditmode()) return;
+// loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
+// };
+//);
+//
+//void edittag(int tag)
+//{
+// EDITSELMP;
+// loopselxy(s->tag = tag);
+//};
+//
+//void newent(char *what, char *a1, char *a2, char *a3, char *a4)
+//{
+// EDITSEL;
+// newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
+//};
+//
+//COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
+//COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
+//COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
+//COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
+//COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
+//COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
+//COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
+//COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
+//
+//
Modified: trunk/Mezzanine/MezzanineManagedLib/src/protos.h
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/protos.h 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/protos.h 2007-06-06 22:06:28 UTC (rev 1414)
@@ -133,16 +133,16 @@
extern DECLSPEC int CDECL text_width(char *str);
// editing
-extern DECLSPEC void CDECL cursorupdate();
-extern DECLSPEC void CDECL toggleedit();
-extern DECLSPEC void CDECL editdrag(bool isdown);
-extern DECLSPEC void CDECL setvdeltaxy(int delta, block &sel);
-extern DECLSPEC void CDECL editequalisexy(bool isfloor, block &sel);
-extern DECLSPEC void CDECL edittypexy(int type, block &sel);
-extern DECLSPEC void CDECL edittexxy(int type, int t, block &sel);
-extern DECLSPEC void CDECL editheightxy(bool isfloor, int amount, block &sel);
-extern DECLSPEC bool CDECL noteditmode();
-extern DECLSPEC void CDECL pruneundos(int maxremain = 0);
+//extern DECLSPEC void CDECL cursorupdate();
+//extern DECLSPEC void CDECL toggleedit();
+//extern DECLSPEC void CDECL editdrag(bool isdown);
+//extern DECLSPEC void CDECL setvdeltaxy(int delta, block &sel);
+//extern DECLSPEC void CDECL editequalisexy(bool isfloor, block &sel);
+//extern DECLSPEC void CDECL edittypexy(int type, block &sel);
+//extern DECLSPEC void CDECL edittexxy(int type, int t, block &sel);
+//extern DECLSPEC void CDECL editheightxy(bool isfloor, int amount, block &sel);
+//extern DECLSPEC bool CDECL noteditmode();
+//extern DECLSPEC void CDECL pruneundos(int maxremain = 0);
// renderextras
extern DECLSPEC void CDECL box(block &b, float z1, float z2, float z3, float z4);
Modified: trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -254,7 +254,7 @@
};
VAR(watersubdiv, 1, 4, 64);
-VARF(waterlevel, -128, -128, 127, if(!noteditmode()) hdr.waterlevel = waterlevel);
+VARF(waterlevel, -128, -128, 127, /*if(!noteditmode()) hdr.waterlevel = waterlevel*/);
inline void vertw(int v1, float v2, int v3, sqr *c, float t1, float t2, float t)
{
Modified: trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -166,7 +166,7 @@
{
if(cursordepth==1.0f) worldpos = player1->o;
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- cursorupdate();
+ //cursorupdate();
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
};
Modified: trunk/Mezzanine/MezzanineManagedLib/src/world.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/world.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/world.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -165,8 +165,9 @@
int closestent() // used for delent and edit mode ent display
{
- if(noteditmode()) return -1;
- int best;
+ return -1;
+ //if(noteditmode()) return -1;
+ /*int best;
float bdist = 99999;
loopv(ents)
{
@@ -180,7 +181,7 @@
bdist = dist;
};
};
- return bdist==99999 ? -1 : best;
+ return bdist==99999 ? -1 : best; */
};
void entproperty(int prop, int amount)
@@ -238,13 +239,14 @@
void clearents(char *name)
{
int type = MezzanineLib::World::World::FindType(name);
- if(noteditmode() || multiplayer()) return;
- loopv(ents)
+ return;
+ //if(noteditmode() || multiplayer()) return;
+ /*loopv(ents)
{
entity &e = ents[i];
if(e.type==type) e.type = StaticEntity::NOTUSED;
};
- if(type==StaticEntity::LIGHT) calclight();
+ if(type==StaticEntity::LIGHT) calclight();*/
};
COMMAND(clearents, Support::FunctionSignatures::ARG_1STR);
@@ -298,9 +300,10 @@
void empty_world(int factor, bool force) // main empty world creation routine, if passed factor -1 will enlarge old world by 1
{
- if(!force && noteditmode()) return;
+ //if(!force && noteditmode()) return;
+ if(!force) return;
cleardlights();
- pruneundos();
+ //pruneundos();
sqr *oldworld = world;
bool copy = false;
if(oldworld && factor<0) { factor = GameInit::SFactor+1; copy = true; };
@@ -347,7 +350,7 @@
loopk(3) loopi(256) hdr.texlists[k][i] = i;
ents.setsize(0);
block b = { 8, 8, GameInit::SSize-16, GameInit::SSize-16 };
- edittypexy(BlockTypes::SPACE, b);
+ //edittypexy(BlockTypes::SPACE, b);
};
calclight();
@@ -355,8 +358,8 @@
if(oldworld)
{
free(oldworld);
- toggleedit();
- execute("fullbright 1");
+ //toggleedit();
+ //execute("fullbright 1");
};
};
Modified: trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -213,7 +213,7 @@
{
stopifrecording();
cleardlights();
- pruneundos();
+ //pruneundos();
setnames(mname);
gzFile f = gzopen(cgzname, "rb9");
if(!f) { conoutf("could not read map %s", cgzname); return; };
Modified: trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -155,7 +155,7 @@
block b = { 1, 1, GameInit::SSize-2, GameInit::SSize-2 };
postlightarea(b);
- setvar("fullbright", 0);
+ //setvar("fullbright", 0);
};
VARP(dynlight, 0, 16, 32);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-06-04 22:26:04
|
Revision: 1413
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1413&view=rev
Author: jendave
Date: 2007-06-04 15:25:48 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
fix build for linux
Modified Paths:
--------------
trunk/scsharp/package.xml
Modified: trunk/scsharp/package.xml
===================================================================
--- trunk/scsharp/package.xml 2007-06-04 21:36:51 UTC (rev 1412)
+++ trunk/scsharp/package.xml 2007-06-04 22:25:48 UTC (rev 1413)
@@ -96,18 +96,18 @@
<fileset basedir="${project::get-base-directory()}/${src.dir}/SCSharp/${bin.dir}/${project.config}">
<include name="**/*.exe" />
<include name="**/*.config" />
- <include name="**/*.sh" />
<include name="**/*.chm" />
<include name="**/*.dll"/>
<include name="**/*.xml"/>
+ <exclude name="**/${native.sdl}.dll.config"/>
</fileset>
</copy>
- <copy todir="${dist.dir}/${string::to-lower(project::get-name())}-${project.version}" flatten="true">
- <fileset basedir="${project::get-base-directory()}/${src.dir}/SCSharp">
- <include name="**/*.sh" />
- </fileset>
- </copy>
<if test="${platform::is-unix() and not is-osx}">
+ <copy todir="${dist.dir}/${string::to-lower(project::get-name())}-${project.version}" flatten="true">
+ <fileset basedir="${project::get-base-directory()}/${src.dir}/SCSharp">
+ <include name="**/*.sh" />
+ </fileset>
+ </copy>
<copy todir="${dist.dir}/${string::to-lower(project::get-name())}-${project.version}">
<fileset basedir="${project::get-base-directory()}/${lib.dir}/net-2.0">
<include name="${native.sdl}.dll.config"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-06-04 21:36:54
|
Revision: 1412
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1412&view=rev
Author: jendave
Date: 2007-06-04 14:36:51 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
FXCop changes
Modified Paths:
--------------
trunk/SdlDotNet/examples/OpenGl/Properties/AssemblyInfo.cs
trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs
Modified: trunk/SdlDotNet/examples/OpenGl/Properties/AssemblyInfo.cs
===================================================================
--- trunk/SdlDotNet/examples/OpenGl/Properties/AssemblyInfo.cs 2007-06-02 00:31:11 UTC (rev 1411)
+++ trunk/SdlDotNet/examples/OpenGl/Properties/AssemblyInfo.cs 2007-06-04 21:36:51 UTC (rev 1412)
@@ -91,5 +91,6 @@
[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.SkipVerification)]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.UnmanagedCode)]
[assembly: AssemblyDelaySign(false)]
-[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Justification = "Few type is fine")]
[module: SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Scope = "namespace", Target = "SdlDotNet.OpenGl")]
+
+[module: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "SdlDotNet.OpenGl")]
Modified: trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs
===================================================================
--- trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs 2007-06-02 00:31:11 UTC (rev 1411)
+++ trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs 2007-06-04 21:36:51 UTC (rev 1412)
@@ -58,12 +58,16 @@
public enum MinifyingOption : int
{
/// <summary>
+ ///
+ /// </summary>
+ None = 0,
+ /// <summary>
/// Returns the value of the texture element
/// that is nearest (in Manhattan distance)
/// to the center of the pixel being
/// textured.
/// </summary>
- GL_NEAREST = Gl.GL_NEAREST,
+ Nearest = Gl.GL_NEAREST,
/// <summary>
/// Returns the weighted average of the four
/// texture elements that are closest to the
@@ -73,7 +77,7 @@
/// GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T,
/// and on the exact mapping.
/// </summary>
- GL_LINEAR = Gl.GL_LINEAR,
+ Linear = Gl.GL_LINEAR,
/// <summary>
/// Chooses the mipmap that most closely
/// matches the size of the pixel being
@@ -82,7 +86,7 @@
/// to the center of the pixel) to produce a
/// texture value.
/// </summary>
- GL_NEAREST_MIPMAP_NEAREST = Gl.GL_NEAREST_MIPMAP_NEAREST,
+ NearestMipMapNearest = Gl.GL_NEAREST_MIPMAP_NEAREST,
/// <summary>
/// Chooses the mipmap that most closely
/// matches the size of the pixel being
@@ -92,7 +96,7 @@
/// to the center of the pixel) to produce a
/// texture value.
/// </summary>
- GL_LINEAR_MIPMAP_NEAREST = Gl.GL_LINEAR_MIPMAP_NEAREST,
+ LinearMipMapNearest = Gl.GL_LINEAR_MIPMAP_NEAREST,
/// <summary>
/// Chooses the two mipmaps that most
/// closely match the size of the pixel
@@ -103,7 +107,7 @@
/// final texture value is a weighted
/// average of those two values.
/// </summary>
- GL_NEAREST_MIPMAP_LINEAR = Gl.GL_NEAREST_MIPMAP_LINEAR,
+ NearestMipMapLinear = Gl.GL_NEAREST_MIPMAP_LINEAR,
/// <summary>
/// Chooses the two mipmaps that most
/// closely match the size of the pixel
@@ -115,7 +119,7 @@
/// final texture value is a weighted
/// average of those two values.
/// </summary>
- GL_LINEAR_MIPMAP_LINEAR = Gl.GL_LINEAR_MIPMAP_LINEAR
+ LinearMipMapLinear = Gl.GL_LINEAR_MIPMAP_LINEAR
}
/// <summary>
/// The texture magnification function is used when
@@ -132,12 +136,16 @@
public enum MagnificationOption : int
{
/// <summary>
+ ///
+ /// </summary>
+ None = 0,
+ /// <summary>
/// Returns the value of the texture element
/// that is nearest (in Manhattan distance)
/// to the center of the pixel being
/// textured.
/// </summary>
- GL_NEAREST = Gl.GL_NEAREST,
+ Nearest = Gl.GL_NEAREST,
/// <summary>
/// Returns the weighted average of the four
/// texture elements that are closest to the
@@ -147,7 +155,7 @@
/// GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T,
/// and on the exact mapping.
/// </summary>
- GL_LINEAR = Gl.GL_LINEAR
+ Linear = Gl.GL_LINEAR
}
/// <summary>
/// The wrap parameter for a texture coordinate
@@ -155,17 +163,21 @@
public enum WrapOption : int
{
/// <summary>
+ ///
+ /// </summary>
+ None = 0,
+ /// <summary>
/// Causes texture coordinates to be clamped to the range [0,1] and
/// is useful for preventing wrapping artifacts when
/// mapping a single image onto an object.
/// </summary>
- GL_CLAMP = Gl.GL_CLAMP,
+ Clamp = Gl.GL_CLAMP,
/// <summary>
/// Causes texture coordinates to loop around so to remain in the
/// range [0,1] where 1.5 would be .5. this is useful for repeating
/// a texture for a tiled floor.
/// </summary>
- GL_REPEAT = Gl.GL_REPEAT
+ Repeat = Gl.GL_REPEAT
}
/// <summary>
@@ -230,7 +242,7 @@
private static bool IsMipMap(MinifyingOption option)
{
- return option != MinifyingOption.GL_LINEAR && option != MinifyingOption.GL_NEAREST;
+ return option != MinifyingOption.Linear && option != MinifyingOption.Nearest;
}
#endregion
@@ -246,8 +258,8 @@
bool needRefresh;
bool needSetOptions;
- MinifyingOption minFilter;
- MagnificationOption magFilter;
+ MinifyingOption minifyingFilter;
+ MagnificationOption magnificationFilter;
WrapOption wrapS;
WrapOption wrapT;
#endregion
@@ -276,10 +288,10 @@
this.textureHeight = -1;
this.widthRatio = -1;
this.heightRatio = -1;
- this.minFilter = MinifyingOption.GL_LINEAR;
- this.magFilter = MagnificationOption.GL_LINEAR;
- this.wrapS = WrapOption.GL_REPEAT;
- this.wrapT = WrapOption.GL_REPEAT;
+ this.minifyingFilter = MinifyingOption.Linear;
+ this.magnificationFilter = MagnificationOption.Linear;
+ this.wrapS = WrapOption.Repeat;
+ this.wrapT = WrapOption.Repeat;
}
#endregion
@@ -386,12 +398,12 @@
/// </summary>
public MinifyingOption MinFilter
{
- get { return minFilter; }
+ get { return minifyingFilter; }
set
{
- if (minFilter != value)
+ if (minifyingFilter != value)
{
- if (IsMipMap(minFilter) ^ IsMipMap(value))
+ if (IsMipMap(minifyingFilter) ^ IsMipMap(value))
{
needRefresh = true;
}
@@ -399,7 +411,7 @@
{
needSetOptions = true;
}
- minFilter = value;
+ minifyingFilter = value;
}
}
}
@@ -417,14 +429,14 @@
/// smooth. The initial value of GL_TEXTURE_MAG_FILTER
/// is GL_LINEAR.
/// </summary>
- public MagnificationOption MagFilter
+ public MagnificationOption MagnificationFilter
{
- get { return magFilter; }
+ get { return magnificationFilter; }
set
{
- if (magFilter != value)
+ if (magnificationFilter != value)
{
- magFilter = value;
+ magnificationFilter = value;
needSetOptions = true;
}
}
@@ -503,8 +515,8 @@
private void BindOptions()
{
Gl.glBindTexture(Gl.GL_TEXTURE_2D, textureId);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, (int)minFilter);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, (int)magFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, (int)minifyingFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, (int)magnificationFilter);
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_S, (int)wrapS);
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_T, (int)wrapT);
needSetOptions = false;
@@ -558,7 +570,7 @@
/// </summary>
public void Refresh()
{
- Refresh(this.surface, this.isFlipped, this.minFilter, this.magFilter, this.wrapS, this.wrapT);
+ Refresh(this.surface, this.isFlipped, this.minifyingFilter, this.magnificationFilter, this.wrapS, this.wrapT);
}
/// <summary>
@@ -568,7 +580,7 @@
/// <param name="isFlipped">States if the surface should be flipped when moved into the OpenGl Texture.</param>
public void Refresh(Surface surface, bool isFlipped)
{
- Refresh(surface, isFlipped, this.minFilter, this.magFilter, this.wrapS, this.wrapT);
+ Refresh(surface, isFlipped, this.minifyingFilter, this.magnificationFilter, this.wrapS, this.wrapT);
}
/// <summary>
@@ -576,11 +588,11 @@
/// </summary>
/// <param name="surface">The surface to load from.</param>
/// <param name="isFlipped">States if the surface should be flipped when moved into the OpenGl Texture.</param>
- /// <param name="minFilter">"The openGl filter used for minifying"</param>
- /// <param name="magFilter">"The openGl filter used for magnification"</param>
+ /// <param name="minifyingFilter">"The openGl filter used for minifying"</param>
+ /// <param name="magnificationFilter">"The openGl filter used for magnification"</param>
/// <param name="wrapS">The wrap parameter for texture coordinate S</param>
/// <param name="wrapT">The wrap parameter for texture coordinate T</param>
- public void Refresh(Surface surface, bool isFlipped, MinifyingOption minFilter, MagnificationOption magFilter, WrapOption wrapS, WrapOption wrapT)
+ public void Refresh(Surface surface, bool isFlipped, MinifyingOption minifyingFilter, MagnificationOption magnificationFilter, WrapOption wrapS, WrapOption wrapT)
{
if (surface == null) { throw new ArgumentNullException("surface"); }
this.surface = surface;
@@ -594,23 +606,23 @@
this.textureWidth = textureSurface.Width;
this.textureHeight = textureSurface.Height;
this.isFlipped = isFlipped;
- this.minFilter = minFilter;
- this.magFilter = magFilter;
+ this.minifyingFilter = minifyingFilter;
+ this.magnificationFilter = magnificationFilter;
this.wrapS = wrapS;
this.wrapT = wrapT;
this.widthRatio = (float)surface.Width / textureWidth;
this.heightRatio = (float)surface.Height / textureHeight;
Gl.glBindTexture(Gl.GL_TEXTURE_2D, textureId);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, (int)minFilter);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, (int)magFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, (int)minifyingFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, (int)magnificationFilter);
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_S, (int)wrapS);
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_T, (int)wrapT);
- if (minFilter == MinifyingOption.GL_LINEAR || minFilter == MinifyingOption.GL_NEAREST)
+ if (minifyingFilter == MinifyingOption.Linear || minifyingFilter == MinifyingOption.Nearest)
{
Gl.glTexImage2D(Gl.GL_TEXTURE_2D, 0, textureSurface.BytesPerPixel, textureWidth, textureHeight, 0, Gl.GL_RGBA, Gl.GL_UNSIGNED_BYTE, textureSurface.Pixels);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bio...@us...> - 2007-06-02 00:31:21
|
Revision: 1411
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1411&view=rev
Author: bioslayer_
Date: 2007-06-01 17:31:11 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Added: Some more options and overloads to SurfaceGl.
Modified Paths:
--------------
trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs
Modified: trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs
===================================================================
--- trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs 2007-06-01 08:00:35 UTC (rev 1410)
+++ trunk/SdlDotNet/examples/OpenGl/SurfaceGl.cs 2007-06-02 00:31:11 UTC (rev 1411)
@@ -31,6 +31,144 @@
namespace SdlDotNet.OpenGl
{
/// <summary>
+ /// The texture minifying function is used whenever
+ /// the pixel being textured maps to an area greater
+ /// than one texture element. There are six defined
+ /// minifying functions. Two of them use the nearest
+ /// one or nearest four texture elements to compute
+ /// the texture value. The other four use mipmaps.
+ ///
+ /// A mipmap is an ordered set of arrays representing
+ /// the same image at progressively lower resolutions.
+ /// If the texture has dimensions 2nx2m, there are
+ /// max(n,m)+1 mipmaps. The first mipmap is the
+ /// original texture, with dimensions 2nx2m. Each
+ /// subsequent mipmap has dimensions 2k-1x2l-1, where
+ /// 2kx2l are the dimensions of the previous mipmap,
+ /// until either k=0 or l=0. At that point,
+ /// subsequent mipmaps have dimension 1x2l-1 or 2k-1x1
+ /// until the final mipmap, which has dimension 1x1.
+ /// To define the mipmaps, call glTexImage1D,
+ /// glTexImage2D, glCopyTexImage1D, or
+ /// glCopyTexImage2D with the level argument
+ /// indicating the order of the mipmaps. Level 0 is
+ /// the original texture; level max(n,m) is the final
+ /// 1x1 mipmap.
+ /// </summary>
+ public enum MinifyingOption : int
+ {
+ /// <summary>
+ /// Returns the value of the texture element
+ /// that is nearest (in Manhattan distance)
+ /// to the center of the pixel being
+ /// textured.
+ /// </summary>
+ GL_NEAREST = Gl.GL_NEAREST,
+ /// <summary>
+ /// Returns the weighted average of the four
+ /// texture elements that are closest to the
+ /// center of the pixel being textured.
+ /// These can include border texture
+ /// elements, depending on the values of
+ /// GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T,
+ /// and on the exact mapping.
+ /// </summary>
+ GL_LINEAR = Gl.GL_LINEAR,
+ /// <summary>
+ /// Chooses the mipmap that most closely
+ /// matches the size of the pixel being
+ /// textured and uses the GL_NEAREST
+ /// criterion (the texture element nearest
+ /// to the center of the pixel) to produce a
+ /// texture value.
+ /// </summary>
+ GL_NEAREST_MIPMAP_NEAREST = Gl.GL_NEAREST_MIPMAP_NEAREST,
+ /// <summary>
+ /// Chooses the mipmap that most closely
+ /// matches the size of the pixel being
+ /// textured and uses the GL_LINEAR
+ /// criterion (a weighted average of the
+ /// four texture elements that are closest
+ /// to the center of the pixel) to produce a
+ /// texture value.
+ /// </summary>
+ GL_LINEAR_MIPMAP_NEAREST = Gl.GL_LINEAR_MIPMAP_NEAREST,
+ /// <summary>
+ /// Chooses the two mipmaps that most
+ /// closely match the size of the pixel
+ /// being textured and uses the GL_NEAREST
+ /// criterion (the texture element nearest
+ /// to the center of the pixel) to produce a
+ /// texture value from each mipmap. The
+ /// final texture value is a weighted
+ /// average of those two values.
+ /// </summary>
+ GL_NEAREST_MIPMAP_LINEAR = Gl.GL_NEAREST_MIPMAP_LINEAR,
+ /// <summary>
+ /// Chooses the two mipmaps that most
+ /// closely match the size of the pixel
+ /// being textured and uses the GL_LINEAR
+ /// criterion (a weighted average of the
+ /// four texture elements that are closest
+ /// to the center of the pixel) to produce a
+ /// texture value from each mipmap. The
+ /// final texture value is a weighted
+ /// average of those two values.
+ /// </summary>
+ GL_LINEAR_MIPMAP_LINEAR = Gl.GL_LINEAR_MIPMAP_LINEAR
+ }
+ /// <summary>
+ /// The texture magnification function is used when
+ /// the pixel being textured maps to an area less than
+ /// or equal to one texture element. It sets the
+ /// texture magnification function to either
+ /// GL_NEAREST or GL_LINEAR. GL_NEAREST is
+ /// generally faster than GL_LINEAR, but it can
+ /// produce textured images with sharper edges because
+ /// the transition between texture elements is not as
+ /// smooth. The initial value of GL_TEXTURE_MAG_FILTER
+ /// is GL_LINEAR.
+ /// </summary>
+ public enum MagnificationOption : int
+ {
+ /// <summary>
+ /// Returns the value of the texture element
+ /// that is nearest (in Manhattan distance)
+ /// to the center of the pixel being
+ /// textured.
+ /// </summary>
+ GL_NEAREST = Gl.GL_NEAREST,
+ /// <summary>
+ /// Returns the weighted average of the four
+ /// texture elements that are closest to the
+ /// center of the pixel being textured.
+ /// These can include border texture
+ /// elements, depending on the values of
+ /// GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T,
+ /// and on the exact mapping.
+ /// </summary>
+ GL_LINEAR = Gl.GL_LINEAR
+ }
+ /// <summary>
+ /// The wrap parameter for a texture coordinate
+ /// </summary>
+ public enum WrapOption : int
+ {
+ /// <summary>
+ /// Causes texture coordinates to be clamped to the range [0,1] and
+ /// is useful for preventing wrapping artifacts when
+ /// mapping a single image onto an object.
+ /// </summary>
+ GL_CLAMP = Gl.GL_CLAMP,
+ /// <summary>
+ /// Causes texture coordinates to loop around so to remain in the
+ /// range [0,1] where 1.5 would be .5. this is useful for repeating
+ /// a texture for a tiled floor.
+ /// </summary>
+ GL_REPEAT = Gl.GL_REPEAT
+ }
+
+ /// <summary>
/// Loads a Surface into a OpenGl Texture.
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase", Justification = "Correct Spelling")]
@@ -90,6 +228,11 @@
}
}
+ private static bool IsMipMap(MinifyingOption option)
+ {
+ return option != MinifyingOption.GL_LINEAR && option != MinifyingOption.GL_NEAREST;
+ }
+
#endregion
#region Fields
@@ -101,6 +244,12 @@
float widthRatio;
float heightRatio;
+ bool needRefresh;
+ bool needSetOptions;
+ MinifyingOption minFilter;
+ MagnificationOption magFilter;
+ WrapOption wrapS;
+ WrapOption wrapT;
#endregion
#region Constructors
@@ -116,17 +265,21 @@
/// Creates a new Instance of SurfaceGl.
/// </summary>
/// <param name="surface">The surface to be copied into a OpenGl Texture.</param>
- /// <param name="flipSurface">States if the surface should be flipped when copied into a OpenGl Texture.</param>
- public SurfaceGl(Surface surface, bool flipSurface)
+ /// <param name="isFlipped">States if the surface should be flipped when copied into a OpenGl Texture.</param>
+ public SurfaceGl(Surface surface, bool isFlipped)
{
if (surface == null) { throw new ArgumentNullException("surface"); }
this.surface = surface;
- this.isFlipped = flipSurface;
+ this.isFlipped = isFlipped;
this.textureId = -1;
this.textureWidth = -1;
this.textureHeight = -1;
this.widthRatio = -1;
this.heightRatio = -1;
+ this.minFilter = MinifyingOption.GL_LINEAR;
+ this.magFilter = MagnificationOption.GL_LINEAR;
+ this.wrapS = WrapOption.GL_REPEAT;
+ this.wrapT = WrapOption.GL_REPEAT;
}
#endregion
@@ -144,7 +297,7 @@
if (surface != value)
{
surface = value;
- Refresh();
+ needRefresh = true;
}
}
}
@@ -199,31 +352,173 @@
{
if (isFlipped ^ value)
{
- Refresh(surface, value);
+ isFlipped = value;
+ needRefresh = true;
}
}
}
+ /// <summary>
+ /// Gets and Sets
+ /// The texture minifying function is used whenever
+ /// the pixel being textured maps to an area greater
+ /// than one texture element. There are six defined
+ /// minifying functions. Two of them use the nearest
+ /// one or nearest four texture elements to compute
+ /// the texture value. The other four use mipmaps.
+ ///
+ /// A mipmap is an ordered set of arrays representing
+ /// the same image at progressively lower resolutions.
+ /// If the texture has dimensions 2nx2m, there are
+ /// max(n,m)+1 mipmaps. The first mipmap is the
+ /// original texture, with dimensions 2nx2m. Each
+ /// subsequent mipmap has dimensions 2k-1x2l-1, where
+ /// 2kx2l are the dimensions of the previous mipmap,
+ /// until either k=0 or l=0. At that point,
+ /// subsequent mipmaps have dimension 1x2l-1 or 2k-1x1
+ /// until the final mipmap, which has dimension 1x1.
+ /// To define the mipmaps, call glTexImage1D,
+ /// glTexImage2D, glCopyTexImage1D, or
+ /// glCopyTexImage2D with the level argument
+ /// indicating the order of the mipmaps. Level 0 is
+ /// the original texture; level max(n,m) is the final
+ /// 1x1 mipmap.
+ /// </summary>
+ public MinifyingOption MinFilter
+ {
+ get { return minFilter; }
+ set
+ {
+ if (minFilter != value)
+ {
+ if (IsMipMap(minFilter) ^ IsMipMap(value))
+ {
+ needRefresh = true;
+ }
+ else
+ {
+ needSetOptions = true;
+ }
+ minFilter = value;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets and Sets
+ /// The texture magnification function is used when
+ /// the pixel being textured maps to an area less than
+ /// or equal to one texture element. It sets the
+ /// texture magnification function to either
+ /// GL_NEAREST or GL_LINEAR. GL_NEAREST is
+ /// generally faster than GL_LINEAR, but it can
+ /// produce textured images with sharper edges because
+ /// the transition between texture elements is not as
+ /// smooth. The initial value of GL_TEXTURE_MAG_FILTER
+ /// is GL_LINEAR.
+ /// </summary>
+ public MagnificationOption MagFilter
+ {
+ get { return magFilter; }
+ set
+ {
+ if (magFilter != value)
+ {
+ magFilter = value;
+ needSetOptions = true;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets and Sets
+ /// The wrap parameter for texture coordinate s
+ /// to either GL_CLAMP or GL_REPEAT. GL_CLAMP causes
+ /// s coordinates to be clamped to the range [0,1] and
+ /// is useful for preventing wrapping artifacts when
+ /// mapping a single image onto an object. GL_REPEAT
+ /// causes the integer part of the s coordinate to be
+ /// ignored; the GL uses only the fractional part,
+ /// thereby creating a repeating pattern. Border
+ /// texture elements are accessed only if wrapping is
+ /// set to GL_CLAMP. Initially, GL_TEXTURE_WRAP_S is
+ /// set to GL_REPEAT.
+ /// </summary>
+ public WrapOption WrapS
+ {
+ get { return wrapS; }
+ set
+ {
+ if (wrapS != value)
+ {
+ wrapS = value;
+ needSetOptions = true;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets and Sets
+ /// The wrap parameter for texture coordinate t
+ /// to either GL_CLAMP or GL_REPEAT. GL_CLAMP causes
+ /// t coordinates to be clamped to the range [0,1] and
+ /// is useful for preventing wrapping artifacts when
+ /// mapping a single image onto an object. GL_REPEAT
+ /// causes the integer part of the s coordinate to be
+ /// ignored; the GL uses only the fractional part,
+ /// thereby creating a repeating pattern. Border
+ /// texture elements are accessed only if wrapping is
+ /// set to GL_CLAMP. Initially, GL_TEXTURE_WRAP_T is
+ /// set to GL_REPEAT.
+ /// </summary>
+ public WrapOption WrapT
+ {
+ get { return wrapT; }
+ set
+ {
+ if (wrapT != value)
+ {
+ wrapT = value;
+ needSetOptions = true;
+ }
+ }
+ }
+
#endregion
#region Methods
+
private void Check()
{
- if (textureId <= 0)
+ if (needRefresh || textureId <= 0)
{
Refresh();
}
+ else if (needSetOptions)
+ {
+ BindOptions();
+ }
}
- private Surface TransformSurface(bool flipSurface)
+ private void BindOptions()
{
+ Gl.glBindTexture(Gl.GL_TEXTURE_2D, textureId);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, (int)minFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, (int)magFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_S, (int)wrapS);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_T, (int)wrapT);
+ needSetOptions = false;
+ }
+
+ private Surface TransformSurface(bool isFlipped)
+ {
byte alpha = surface.Alpha;
Surface textureSurface2 = null;
surface.Alpha = 0;
try
{
Surface textureSurface = surface;
- if (flipSurface)
+ if (isFlipped)
{
textureSurface = textureSurface.CreateFlippedVerticalSurface();
textureSurface2 = textureSurface;
@@ -234,7 +529,7 @@
finally
{
surface.Alpha = alpha;
- if (flipSurface)
+ if (isFlipped)
{
textureSurface2.Dispose();
}
@@ -263,20 +558,34 @@
/// </summary>
public void Refresh()
{
- Refresh(surface, isFlipped);
+ Refresh(this.surface, this.isFlipped, this.minFilter, this.magFilter, this.wrapS, this.wrapT);
}
/// <summary>
/// Reloads the OpenGl Texture from the Surface.
/// </summary>
/// <param name="surface">The surface to load from.</param>
- /// <param name="flipSurface">States if the surface should be flipped when moved into the OpenGl Texture.</param>
- public void Refresh(Surface surface, bool flipSurface)
+ /// <param name="isFlipped">States if the surface should be flipped when moved into the OpenGl Texture.</param>
+ public void Refresh(Surface surface, bool isFlipped)
{
+ Refresh(surface, isFlipped, this.minFilter, this.magFilter, this.wrapS, this.wrapT);
+ }
+
+ /// <summary>
+ /// Reloads the OpenGl Texture from the Surface.
+ /// </summary>
+ /// <param name="surface">The surface to load from.</param>
+ /// <param name="isFlipped">States if the surface should be flipped when moved into the OpenGl Texture.</param>
+ /// <param name="minFilter">"The openGl filter used for minifying"</param>
+ /// <param name="magFilter">"The openGl filter used for magnification"</param>
+ /// <param name="wrapS">The wrap parameter for texture coordinate S</param>
+ /// <param name="wrapT">The wrap parameter for texture coordinate T</param>
+ public void Refresh(Surface surface, bool isFlipped, MinifyingOption minFilter, MagnificationOption magFilter, WrapOption wrapS, WrapOption wrapT)
+ {
if (surface == null) { throw new ArgumentNullException("surface"); }
this.surface = surface;
this.Delete();
- using (Surface textureSurface = TransformSurface(flipSurface))
+ using (Surface textureSurface = TransformSurface(isFlipped))
{
int[] textures = new int[1];
Gl.glGenTextures(1, textures);
@@ -284,14 +593,34 @@
this.textureWidth = textureSurface.Width;
this.textureHeight = textureSurface.Height;
- this.isFlipped = flipSurface;
+ this.isFlipped = isFlipped;
+ this.minFilter = minFilter;
+ this.magFilter = magFilter;
+ this.wrapS = wrapS;
+ this.wrapT = wrapT;
this.widthRatio = (float)surface.Width / textureWidth;
this.heightRatio = (float)surface.Height / textureHeight;
Gl.glBindTexture(Gl.GL_TEXTURE_2D, textureId);
- Gl.glTexImage2D(Gl.GL_TEXTURE_2D, 0, textureSurface.BytesPerPixel, textureWidth, textureHeight, 0, Gl.GL_RGBA, Gl.GL_UNSIGNED_BYTE, textureSurface.Pixels);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, Gl.GL_LINEAR);
- Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, Gl.GL_LINEAR);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MIN_FILTER, (int)minFilter);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAG_FILTER, (int)magFilter);
+
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_S, (int)wrapS);
+ Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_WRAP_T, (int)wrapT);
+
+
+
+ if (minFilter == MinifyingOption.GL_LINEAR || minFilter == MinifyingOption.GL_NEAREST)
+ {
+ Gl.glTexImage2D(Gl.GL_TEXTURE_2D, 0, textureSurface.BytesPerPixel, textureWidth, textureHeight, 0, Gl.GL_RGBA, Gl.GL_UNSIGNED_BYTE, textureSurface.Pixels);
+ }
+ else
+ {
+ Glu.gluBuild2DMipmaps(Gl.GL_TEXTURE_2D, textureSurface.BytesPerPixel, textureWidth, textureHeight, Gl.GL_RGBA, Gl.GL_UNSIGNED_BYTE, textureSurface.Pixels);
+ }
+
+ needRefresh = false;
+ needSetOptions = false;
}
}
@@ -300,7 +629,7 @@
/// </summary>
public void Draw()
{
- this.Draw(0,0);
+ this.Draw(0, 0, surface.Width, surface.Height);
}
/// <summary>
@@ -309,15 +638,26 @@
/// <param name="location">The offset for the Texture.</param>
public void Draw(Point location)
{
- Draw(location.X, location.Y);
+ Draw(location.X, location.Y,surface.Width,surface.Height);
}
+
+ /// <summary>
+ /// Draws the Texture.
+ /// </summary>
+ /// <param name="rectangle">the rectagle where the texture will be drawn.</param>
+ public void Draw(Rectangle rectangle)
+ {
+ Draw(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
+ }
/// <summary>
/// Draws the Texture.
/// </summary>
/// <param name="locationX">The x offset for the Texture.</param>
/// <param name="locationY">The y offset for the Texture.</param>
- public void Draw(float locationX, float locationY)
+ /// <param name="width">The width fo the area where the Texture will be drawn.</param>
+ /// <param name="height">The height fo the area where the Texture will be drawn.</param>
+ public void Draw(float locationX, float locationY, float width, float height)
{
Check();
Gl.glBindTexture(Gl.GL_TEXTURE_2D, this.textureId);
@@ -325,11 +665,11 @@
Gl.glTexCoord2f(0, heightRatio);
Gl.glVertex2f(locationX, locationY);
Gl.glTexCoord2f(widthRatio, heightRatio);
- Gl.glVertex2f(locationX + surface.Width, locationY);
+ Gl.glVertex2f(locationX + width, locationY);
Gl.glTexCoord2f(widthRatio, 0);
- Gl.glVertex2f(locationX + surface.Width, locationY + surface.Height);
+ Gl.glVertex2f(locationX + width, locationY + height);
Gl.glTexCoord2f(0, 0);
- Gl.glVertex2f(locationX, locationY + surface.Height);
+ Gl.glVertex2f(locationX, locationY + height);
Gl.glEnd();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
