Commit graph

456 commits

Author SHA1 Message Date
the_fiddler 1586dfa7b8 Renamed MouseButtons to MouseButtonsBox (clashed with Windows.Forms.MouseButtons)
Used full namespace in anonymous delegate declaration.
2008-01-06 10:56:10 +00:00
the_fiddler 59cbd7661d Disabled from ExampleLauncher. 2008-01-06 02:35:32 +00:00
the_fiddler fd888e0fdf Bumped version number. 2008-01-06 02:19:08 +00:00
the_fiddler 95119bfb38 Fixed data marshaling to winforms thread. 2008-01-06 02:18:58 +00:00
the_fiddler 6553940157 Updated according to the new enums. 2008-01-04 20:55:52 +00:00
the_fiddler 9228f5ab9d Updated according to the new enums. 2008-01-04 20:55:33 +00:00
the_fiddler b51c6f5163 Fixed cross-threading calls into Windows.Forms, using delegates and BeginInvoke(). 2008-01-04 20:55:15 +00:00
the_fiddler 0c709c618f Updated T08_VBO and T10_GLSL_Cube to use the more specific, updated enums. 2008-01-02 01:01:40 +00:00
the_fiddler 107951c4d1 Hooks for garbage-collectable OpenGL resources.
the [...]GLNative classes now use GLContext instead of the platform-specific [...]GLContext implementations.
Updated the IGLContext interface with functions to query the current context.
2007-12-09 18:15:51 +00:00
the_fiddler e2a515429b Added ITextPrinter.Begin()/End() functions to speed up font rendering. Updated Fonts and Text examples. 2007-11-12 07:36:34 +00:00
the_fiddler 02fcd2fc80 Added MathSpeed.cs test. 2007-11-11 23:25:41 +00:00
the_fiddler 91c0baf678 Final touches before release. 2007-11-11 21:48:00 +00:00
the_fiddler 3822655209 Fixed loading of Bitmap on Linux (invalid path separator). 2007-11-11 20:09:18 +00:00
the_fiddler e0ec0b2035 glControl1_Resize event was not fired. 2007-11-11 19:39:09 +00:00
the_fiddler 7be851a68a Added ExampleAttribute to all examples. Improved Textures example. Modified several other examples. 2007-11-11 18:44:10 +00:00
the_fiddler c72890769a Added example data. 2007-11-11 18:43:16 +00:00
the_fiddler b9e51c4db8 Initial check-in. 2007-11-10 23:31:30 +00:00
the_fiddler 3085f9ab95 Changed background color to SteelBlue. Added ExampleAttribute. 2007-11-10 23:31:01 +00:00
the_fiddler c74f9a677b Change enum in GL.TexParameter from All to more specific type. 2007-11-10 23:30:14 +00:00
the_fiddler aa66b14d98 Updated licensing information. 2007-11-10 23:29:45 +00:00
the_fiddler 7c187e705e Added SansSerif font. 2007-11-08 16:43:03 +00:00
the_fiddler 04585824dc Added documentation. 2007-11-08 16:42:30 +00:00
the_fiddler c45c390ede Tests text rendering and layout code. 2007-11-06 21:02:27 +00:00
the_fiddler afd70b2e25 Changed implementation. Now tests font rendering on different sizes. 2007-11-06 21:02:01 +00:00
the_fiddler 72eebfa51c Tried to implement some things, but it's broken. 2007-11-06 21:01:35 +00:00
the_fiddler 9a435c6194 Removed an unused variable warning. 2007-11-04 16:49:19 +00:00
the_fiddler 501da27b1a 2007-11-04 15:33:43 +00:00
the_fiddler 70c5a90312 Updated to use the new math classes. 2007-11-04 15:32:52 +00:00
the_fiddler 75cd2b0994 Updated to follow the new naming conventions. Fonts tutorial is broken. 2007-11-04 15:32:24 +00:00
the_fiddler d1663fcd6d Updated to match latest TextureFont revision. 2007-11-01 23:24:32 +00:00
the_fiddler a98f46524e Updated font rendering code. 2007-10-26 15:55:24 +00:00
the_fiddler bf95f9c3c6 Temporarily removed font rendering. 2007-10-26 15:55:07 +00:00
the_fiddler 32d854cae9 Platform neutral path separator. 2007-10-21 15:46:00 +00:00
the_fiddler 1fa4641781 Example Data directory. 2007-10-20 14:20:09 +00:00
the_fiddler 225385b5c5 Example Data directory. 2007-10-20 14:19:25 +00:00
the_fiddler ea52ac2b38 Bumped version number to 0.3.13.x 2007-10-20 14:18:24 +00:00
the_fiddler eb31744ad0 Example now reads the poem from Data\Poem.txt instead from an embedded resource. 2007-10-20 13:41:39 +00:00
the_fiddler 35c1e7ae3b Delete Resources.resx because it wouldn't play nice with Prebuild.exe. I should report the problem to Prebuild and add it in back in the future - resources are rather nice. 2007-10-20 13:40:24 +00:00
the_fiddler a78449d6f2 Added ordering information. 2007-10-20 10:54:40 +00:00
the_fiddler d41d741d2f Added Resources class to Examples. 2007-10-20 10:35:32 +00:00
the_fiddler 97e145c2a9 Simplified ExampleLauncher. Better naming scheme. 2007-10-20 10:34:29 +00:00
the_fiddler 73474632db Added Fonts example (Tutorial 6) that showcases the use of the TextureFont class. 2007-10-20 10:32:52 +00:00
the_fiddler 3416fc515d Cleaned up and simplified the ExampleLauncher reflection functions. Can now launch "console" examples (which utilize neither GameWindow nor Windows.Forms). Better naming scheme for loaded examples. 2007-10-20 10:29:39 +00:00
the_fiddler 765cff1142 Deleted obsolete tests. 2007-10-17 21:14:36 +00:00
the_fiddler ac515347d0 Added ability to launch console applications. 2007-10-17 11:33:11 +00:00
the_fiddler 6c4372edbc Improved Call Performance test. It now outputs to the console / log file, and provides much better results. 2007-10-17 11:32:36 +00:00
the_fiddler fcfc35dc18 Fixed build (changes to GLControl). 2007-10-15 11:16:53 +00:00
the_fiddler e257702212 Removed Fullscreen property (fixes build issue). 2007-10-15 11:13:51 +00:00
the_fiddler f71bb87fe1 Removed the glControl.CreateControl() calls. 2007-10-05 07:46:56 +00:00
the_fiddler de5df88e8c Deleted obsolete examples. 2007-09-30 14:11:46 +00:00
the_fiddler 50733e421d Now uses disposable pattern when launching GameWindows and Forms. 2007-09-30 12:38:40 +00:00
the_fiddler cccb14446a Updated to use the new Shapes.Cube interface. 2007-09-30 12:36:41 +00:00
the_fiddler 53bd24ac16 Added some debug information. Updated to use the new Shapes.Cube interface. 2007-09-30 12:35:35 +00:00
the_fiddler 6341ced26c Fixed memory corruption issue with (Cube's vertices were being moved by the GC). I think. 2007-09-30 12:34:20 +00:00
the_fiddler ff5ded2c01 Correct class names. 2007-09-27 01:14:09 +00:00
the_fiddler 437bf7946b Added UnLoad event handler. 2007-09-26 23:31:53 +00:00
the_fiddler 87a23b654c OnLoad event updated to better demonstrate its usage. 2007-09-26 23:15:18 +00:00
the_fiddler c04b64e5a0 Rewrote from scratch, using direct OpenGL methods. Added OnUnload override to cleanup resources. 2007-09-26 23:14:50 +00:00
the_fiddler b57681889d Bumped version numbers. 2007-09-26 16:49:10 +00:00
the_fiddler 93e704c1f4 Renamed T02 and T04 examples. 2007-09-26 16:37:24 +00:00
the_fiddler e0a1404d15 Added IsoSphere.cs which creates a sphere Shape using theta ad phi coordinates. 2007-09-26 16:14:32 +00:00
the_fiddler 66b32a88e4 Local light for nicer looks :) 2007-09-26 16:12:59 +00:00
the_fiddler 3aea3487fb Added general documentation to Tutorials. 2007-09-26 15:39:32 +00:00
the_fiddler 9563ec3a29 Added Shape.cs and Plane.cs, for use in Examples. Shape is an abstract class that is parent to all shapes, and Plane derives from Shape, implementing a configurable plane (with vertex, normal, index and texcoord arrays). 2007-09-26 12:00:29 +00:00
the_fiddler dc9d6a6cc6 Bumped version number. 2007-09-26 11:48:11 +00:00
the_fiddler ea3173a5c1 Updated all examples. Added documentation and generally cleaned them up. 2007-09-26 11:47:30 +00:00
the_fiddler 2750081048 Vector and example updates. 2007-09-25 21:11:16 +00:00
the_fiddler 2b7d11d68b Disabled test - InputDriver does not work with Mono's Linux Winforms yet. 2007-09-25 15:47:39 +00:00
the_fiddler 0e862bcfdf Bumped version numbers. 2007-09-24 19:58:45 +00:00
the_fiddler edbdadf34b W03_Extensions now uses the Application.Idle event to load extensions instead of the OnLoad event. Fixes flickering problems. 2007-09-24 19:57:37 +00:00
the_fiddler 8cfee01131 Start of T04_Lighting example. Slight updates to T10_GLSL_Cube. Updates to ExampleLauncher exception handling. 2007-09-23 13:38:03 +00:00
the_fiddler dfe1d7c335 Updated update and render frequencies for all examples. 2007-09-23 12:49:38 +00:00
the_fiddler 794f4d4eb4 Added GameWindow.SwapBuffers(). Fixed T02_Vertex_Array_Cube to 60Hz. 2007-09-23 12:37:07 +00:00
the_fiddler 57b72e71e1 Added constant and variable time-step update logic to GameWindow. Updated examples to use the new GameWindow UpdateFrame and RenderFrame events. 2007-09-23 12:09:42 +00:00
the_fiddler bb2b3f8eae Added timing information to UpdateFrame.
Removed T02_Resizable_Window.cs and added T02_Vertex_Array_Cube.cs
Added Shapes/Cube.cs to Examples.
2007-09-22 22:01:43 +00:00
the_fiddler 7bf2e84373 Fixed build. 2007-09-22 15:07:28 +00:00
the_fiddler b2ac1d4c61 Updated BindStreamWriter to better handle endlines. Reverted WinRawInput to standard reads. 2007-09-22 14:59:33 +00:00
the_fiddler 1c8b77cd1b Windows raw input now works. 2007-09-22 13:13:17 +00:00
the_fiddler 1f366057a2 Added license to S04. 2007-09-21 23:36:59 +00:00
the_fiddler 11261553ea Removed Move event from IMouse (too inefficient). Polled input only.
S04 now polls for the mouse position.
Keyboard now handles events generated from code and not from physical devices.
2007-09-21 22:49:42 +00:00
the_fiddler 626c6324ca Corrected Windows.API.RawMouse class. Mouse input now works! 2007-09-21 22:39:16 +00:00
the_fiddler 2e987c7d2d Updated Input Logger example. Better handling of mice. 2007-09-21 21:30:18 +00:00
the_fiddler 93fc9ce367 Added S04: Input Logger test. 2007-09-21 20:45:47 +00:00
the_fiddler b22af8fd84 Added licensing information. Added Close() call on failed initialization of W01_First_Window. Moved GLContext to OpenTK namespace. 2007-09-09 16:07:39 +00:00
the_fiddler a28c46cdc0 Improved documentation for DummyGLContext and Dummy.
Disabled S02_RawInput_Logger for updating.
Added WindowInfo.cs
2007-09-09 11:53:25 +00:00
the_fiddler 287e4dca8a Updated W03_Extensions example (background loading of extensions). 2007-09-05 13:35:40 +00:00
the_fiddler 41c225a15a Improved GL loading speed.
Added background worker thread to W03_Extensions.
Added debug output to failed WinGLContext.MakeCurrent() calls.
Removed object field from Windows.MSG struct.
2007-09-03 21:47:34 +00:00
the_fiddler a435ee6077 Synced 0.3.11 to trunk. 2007-09-02 23:40:50 +00:00
the_fiddler 7b4cff49f2 Adding asynchronous extension loading. 2007-09-02 23:26:12 +00:00
the_fiddler e87ce1e5f1 Updated Documentation and version numbers for release. 2007-09-02 23:13:28 +00:00
the_fiddler c610a8b707 T04_Lit_Cube not ready yet. 2007-09-02 22:52:56 +00:00
the_fiddler cc23dac7a8 Merged with Bind. Added GLU bindings. Corrected OpenGL overload trimming. 2007-09-02 22:52:00 +00:00
the_fiddler 5783528f10 Bumped version number. 2007-09-02 13:36:54 +00:00
the_fiddler 6fb1fe1e1b Updated T10_GLSL_Cube to remove NRE exception on Mono 1.2.x.
Added debug info to the GL.LoadAll function.
Added W03_Extensions.cs example.
2007-09-02 13:34:44 +00:00
the_fiddler e160c0fac2 T10_GLSL_Cube now really exits when OpenGL 2.0 support is not available.
The ExampleLauncer example TextBox is now docked inside the parent form.
Bumped version numbers.
2007-09-02 08:25:10 +00:00
the_fiddler f8b21b1dcd Added System.Drawing.Color overload to GL.ClearColor.
Updated W01 and W02 examples to use this overload.
Removed 'Paint' message from W01 Paint event.
2007-09-02 08:08:12 +00:00
the_fiddler 9b257a97e9 Trunk now compiles again. 2007-09-02 00:53:24 +00:00
the_fiddler 9120a732ea Merged with bind branch: updated GL.cs wrappers, Glx and Glu implementation suppoort files, faster Bind. 2007-09-02 00:40:43 +00:00
the_fiddler e8ec478237 Updated examples to reflect namespace change of DisplayMode and ColorMode.
Renamed T03_RotatingCube.cs to T03_Immediate_Mode_Cube.cs.
Renamed T07_DisplayLists_Cube.cs to T07_Display_Lists_Flower.cs.
Renamed Cube.cs to W02_Immediate_Mode_Cube.cs
Updated colors in T10_GLSL_Cube and T03_Immediate_Mode_Cube
Add S03_Stack_Imbalance.cs test.
Add T01_Simple_Window.cs and T02_Resizable_Window.cs tutorials.
2007-09-02 00:07:40 +00:00
the_fiddler ac4bde2a2d Moved ColorDepth and DisplayMode to the /OpenTK directory (where under /OpenTK/Platform).
Renamed ColorDepth to ColorMode, to avoid clash with System.Windows.Forms.ColorDepth
Updated examples to use the new namespace for DisplayMode and ColorMode.
2007-09-02 00:04:34 +00:00
the_fiddler 034c4f6a50 Example names are now more readable (ExampleLauncher.Load())
ExampleLauncher behavior is now more consistent when launching GameWindow and WinForm examples. The launcher becomes invisible, and the launched examples exist in the same thread as the launcher.
Better documentation for IExample.cs
2007-09-02 00:02:10 +00:00
the_fiddler b2459933b2 Corrected bug affecting the GL.Load and Wgl.Load functions, where the delegates where not retrieved by the GetFields call. 2007-08-22 16:13:41 +00:00
the_fiddler 0dbf3c04b2 Added IDisposable to all input drivers.
Updated Cube.cs to use System.Drawing.Colors.
Improved DefRawInputProc in windows API.cs
2007-08-22 00:30:16 +00:00
the_fiddler fcc621c9e5 Added AdjustWindowRect to Windows.API. The client are in WinGLNative is now correctly specified. 2007-08-21 12:04:01 +00:00
the_fiddler 0b5a0b4e1f Improved X11GLControl compatibility - now sets a safe DisplayMode.
Added utility that control's whether xplatui should throw exceptions on X11 errors.
2007-08-21 10:48:32 +00:00
the_fiddler 7b1d590819 Improved GLControl event handling on initialization sequence (Resize event is now raised after loading the GL class).
Improved WinForms.Cube example to hook the GLControl events instead of the parent Form's ones.
Improved Debug output in X11GLContext and X11GLControl
2007-08-20 14:12:57 +00:00
the_fiddler c689f50a21 Added KeyDown and KeyUp events to IKeyboard and Keyboard.
Improved input logger test to hook on the aforementioned events.
Removed Debug printing of keys in OpenTK.Input.Keyboard.
Beautified X11Keyboard.cs
Added experimental code to handle X11 keyboard events (not used yet).
2007-08-20 13:45:04 +00:00
the_fiddler ffe8ce7795 Merged with bind branch. 2007-08-20 12:25:48 +00:00
the_fiddler 9295a44c60 2007-08-20 10:46:37 +00:00
the_fiddler ac2a2f9a70 Improved opengl overload trimming. 2007-08-10 20:16:05 +00:00
the_fiddler 3833030a9a Improved shutdown sequence in WinGLNative and GameWindow 2007-08-10 16:55:24 +00:00
the_fiddler e220f3a71a Updated Build.exe to correctly generate sharpdev and sharpdev2 projects.
Removed some unused variables.
Added licensing information.
2007-08-10 09:27:13 +00:00
the_fiddler ee05b9e5c1 Debugging X11GLControl crash on MakeCurrent. 2007-08-09 12:06:09 +00:00
the_fiddler 4497fcfc1b Debugging crash on X11 32bits. 2007-08-07 20:32:26 +00:00
the_fiddler 8e88fd9393 Keyboard handling now plays well with normal event handling on X11.
One more issue to go: GLControl on X11 throws when calling MakeCurrent.
2007-08-06 12:13:50 +00:00
the_fiddler dac140a36d Corrected S02_RawInput_Logger crash by creating a render window. 2007-08-06 11:26:58 +00:00
the_fiddler e6950a6128 Added Create and Destroy events to NativeGLWindow. 2007-08-06 11:22:18 +00:00
the_fiddler 22d4f1b3ce Renamed OpenTK.Input.Keys to OpenTK.Input.Key.
Added keymap to X11/X11Keyboard.cs (not complete).
Added GetKeyboardMapping(), DisplayFlags() and XKey enum to OpenTK.Platform.X11.API.cs
2007-08-05 16:04:39 +00:00
the_fiddler 95d5db5347 Removed exceptions from Fullscreen properties. 2007-08-05 13:51:07 +00:00
the_fiddler 23403362e9 Added IWindowInfo.cs, X11/WindowInfo.cs and Windows/WindowInfo.cs, which hold information regarding a platform specific window object.
Updated everything to not use raw window handles, but rather WindowInfo objects.
Added code that (hopefully) creates an invisible input window for X11.
2007-08-05 13:42:31 +00:00
the_fiddler a4f53e294f Corrected T10_GLSL_Cube.cs build errors. 2007-08-04 23:44:41 +00:00
the_fiddler 09bd00885c Merged with gl3 branch. Resolved conflicts. Added IMouseDriver.cs 2007-08-04 23:39:56 +00:00
the_fiddler d423f6e94c Renamed InputDevices.cs to InputDriver.cs.
Added IMouseDriver.cs and WinRawMouse.
2007-08-04 13:28:16 +00:00
the_fiddler c16968c06c Updated T10_GLSL_Cube to explicitly create a render window.
Added input driver to W01_First_Window. Works perfectly!
Added a debug message to GameWindow.cs, when accessing the opengl Context before creating a render window (this forces render window creation).
2007-08-04 12:17:30 +00:00
the_fiddler 4ceea208ac Bumped version numbers.
WinRawInput now correctly subclasses WinGLNative or WinGLControl. WinRawKeyboard now correctly responds to events.
Removed T10_GLSL_Cube.cs which was erroneously moved outside the Examples/Tutorial directory.
Updated INativeWindow, IGameWindow and IGLControl interfaces.
Updated examples to use the new GameWindow interface.
Added documentation to GameWindow.
Improved GameWindow error handling. More defensive programming.
2007-08-04 12:09:58 +00:00
the_fiddler 672a82983a Major updates to keyboard input. The infrastructure (drivers etc) is ready. Windows raw input works (now implementing multiple devices). The examples need updating for the new input methods.
Updated the ExampleLauncher to not process exceptions. Updated the IExample interface to contain the Launch method. Updated examples and the ExampleLauncher according to the IExample interface.
Synced with gl3 branch.
2007-08-03 00:14:31 +00:00
the_fiddler d5022b1b56 Sycned with gl3 branch. 2007-08-01 21:14:39 +00:00
the_fiddler c373f6c063 Sycned with gl3 branch. 2007-08-01 09:32:49 +00:00
the_fiddler c51a0b7a6a Added Windows.API.VirtualKeys enum.
Started VirtualKeus --> OpenTK.Input.Keys keymap .
Removed Keyboard.Key set property.
2007-07-31 21:50:29 +00:00
the_fiddler c038496fda Added debug messages to ExampleLauncher. 2007-07-27 12:06:32 +00:00
the_fiddler 28b4630f04 IKeyboard interface. Updated Keyboard.cs and the examples to use the new interface.
Major additions to Windows.API: Implemented all functions and structures for Raw Input.
2007-07-26 22:56:55 +00:00
the_fiddler 3d23105b0d 'Merged' windowing branch. Ugly, but it seems to have worked. 2007-07-23 00:15:18 +00:00
the_fiddler 8cecdb3fa8 Deleted trunk - could not merge windowing branch. 2007-07-23 00:01:30 +00:00
the_fiddler 0672510275 Updated information in preparation of release. 2007-07-01 11:30:55 +00:00
the_fiddler a68b57f3d2 Synced OpenTK.OpenGL.Bind and OpenTK.OpenGL.GL to latest Tao beta (2.1.3.6 and 2.1.0.7 respectively).
Added Enums.GLenum which contains all OpenGL enumerants. Functions with GLenum parameters now do not take ints but Enums.GLenum.

Added ref/out overloads.
2007-07-01 10:54:46 +00:00
the_fiddler 35cda11953 Updated naming. 2007-04-24 12:17:48 +00:00
the_fiddler 5422dc407e OpenTK.Examples.OpenGL.Basic.Lesson01 renamed to OpenTK.Examples.OpenGL.Basic.001-Cube 2007-04-21 15:34:41 +00:00
the_fiddler a24f8934b1 Folder strucure and project naming updates. Added "System" reference for OpenTK.OpenGL.Bind 2007-04-21 15:33:02 +00:00
the_fiddler 99f7f2aad3 Updated using directives for examples (added "using Enums = OpenTK.OpenGL.Enums"). Added some documentation and regions. 2007-04-20 19:06:17 +00:00
the_fiddler 24c3a6b290 2006-11-05 11:50:08 +00:00
the_fiddler cd32a6db54 2006-11-02 21:40:36 +00:00
the_fiddler fdd693a4f1 Framework:
Updates to mode switching under windows plus a little refactoring.
2006-10-17 19:34:49 +00:00
the_fiddler f0f03d58db Updates to fullscreen toggling for windows.
Added the ColorDepth, ZDepth and StencilDepth properties to the Framework.

Merged Context creation for windows into a single file.
2006-10-15 23:31:37 +00:00
the_fiddler 17b411e2ec Directory structure updates (more to come)
Updated OpenTK.OpenGL.Bind (0.7.7)

Split GL enums, core and extensions to different files. Extension support is missing for the time being.

Updated the framework implementation and namespace.
2006-10-15 20:28:57 +00:00
the_fiddler f34436f131 Placed the Framework into a new project (with corresponding project folder). 2006-10-11 22:10:29 +00:00
the_fiddler 8cd76686d0 Preparatory work for linux support (added basic X and GLX bindings)
Major update to OpenTK.OpenGL.Bind.
Updated OpenGL specs to 2.1 (were 2.0)
2006-10-11 21:42:22 +00:00
the_fiddler 3319e79696 OpenTK.OpenGL.Bind 0.7.5.1 -> 0.7.5.2 (out char[] -> StringBuilder)
Updated the GLSL.Lesson01 example.
Full Mono support under Windows.
Api.Message and Api.PeekMessage updates (no longer crashes in release mode).
2006-10-09 23:58:30 +00:00
the_fiddler 71e3074bea 2006-10-09 22:35:25 +00:00
the_fiddler d9b0ac6e5c Added GLForm.cs (base class for cross-platform windowing control)
Temporarily removed all examples apart from GLSL.Lesson01 which has been updated to use the GLForm class.
Minor updates to OpenTK.OpenGL.Bind
2006-10-08 21:22:50 +00:00
the_fiddler fdb625da0f 2006-10-08 18:26:43 +00:00
the_fiddler ab0b91c51e 2006-09-30 20:10:10 +00:00
the_fiddler 4489091678 2006-09-30 20:04:12 +00:00
the_fiddler 37834b1ff6 Added the GLSL example.
More function signatures use enums now (according to their category), instead of ints. Must check.
More
2006-09-30 19:58:51 +00:00
the_fiddler 2b3aeeb7ae 2006-09-28 22:12:46 +00:00
the_fiddler 22fa16be89 2006-09-28 22:07:53 +00:00
the_fiddler 3a5dff7e16 2006-09-24 14:04:39 +00:00