Added ContextSettings to the window library.

Also changed an exception type in Context.

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1602 4e206d99-4929-0410-ac5d-dfc041789085

ruby/sfml-window/window/Context.cpp

@@ -66,7 +66,7 @@ static VALUE Context_SetActive( VALUE self, VALUE anArgument )
 			object->SetActive( false );
 			break;
 		default:
-			rb_raise( rb_eRuntimeError, "expected true or false" );
+			rb_raise( rb_eTypeError, "expected true or false" );
 	}
 	return Qnil;
 }

ruby/sfml-window/window/ContextSettings.cpp

@@ -0,0 +1,226 @@
+/* rbSFML - Copyright (c) 2010 Henrik Valter Vogelius Hansson - groogy@groogy.se
+ * This software is provided 'as-is', without any express or
+ * implied warranty. In no event will the authors be held
+ * liable for any damages arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute
+ * it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented;
+ *    you must not claim that you wrote the original software.
+ *    If you use this software in a product, an acknowledgment
+ *    in the product documentation would be appreciated but
+ *    is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such,
+ *    and must not be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any
+ *    source distribution.
+ */
+ 
+#include "ContextSettings.hpp"
+#include "main.hpp"
+#include <SFML/Window/ContextSettings.hpp>
+#include <iostream>
+
+/* ContextSettings allows to define several advanced settings of the OpenGL 
+ * context attached to a window.
+ *
+ * All these settings have no impact on the regular SFML rendering 
+ * (graphics module) -- except the anti-aliasing level, so you may need to use 
+ * this structure only if you're using SFML as a windowing system for custom 
+ * OpenGL rendering.
+ *
+ * The DepthBits and StencilBits members define the number of bits per pixel 
+ * requested for the (respectively) depth and stencil buffers.
+ *
+ * AntialiasingLevel represents the requested number of multisampling levels 
+ * for anti-aliasing.
+ *
+ * MajorVersion and MinorVersion define the version of the OpenGL context that 
+ * you want. Only versions greater or equal to 3.0 are relevant; versions 
+ * lesser than 3.0 are all handled the same way (i.e. you can use any version 
+ * < 3.0 if you don't want an OpenGL 3 context).
+ *
+ * Please note that these values are only a hint. No failure will be reported 
+ * if one or more of these values are not supported by the system; instead, 
+ * SFML will try to find the closest valid match. You can then retrieve the 
+ * settings that the window actually used to create its context, with 
+ * Window::GetSettings().
+ */
+VALUE globalContextSettingsClass;
+
+/* Free a heap allocated object 
+ * Not accessible trough ruby directly!
+ */
+static void ContextSettings_Free( sf::ContextSettings *anObject )
+{
+	delete anObject;
+}
+
+static VALUE ContextSettings_GetDepth( VALUE self )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->DepthBits );
+}
+
+static VALUE ContextSettings_SetDepth( VALUE self, VALUE aValue )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->DepthBits = NUM2UINT( aValue ) );
+}
+
+static VALUE ContextSettings_GetStencil( VALUE self )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->StencilBits );
+}
+
+static VALUE ContextSettings_SetStencil( VALUE self, VALUE aValue )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->StencilBits = NUM2UINT( aValue ) );
+}
+
+static VALUE ContextSettings_GetAntialiasing( VALUE self )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->AntialiasingLevel );
+}
+
+static VALUE ContextSettings_SetAntialiasing( VALUE self, VALUE aValue )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->AntialiasingLevel = NUM2UINT( aValue ) );
+}
+
+static VALUE ContextSettings_GetMajorVersion( VALUE self )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->MajorVersion );
+}
+
+static VALUE ContextSettings_SetMajorVersion( VALUE self, VALUE aValue )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->MajorVersion = NUM2UINT( aValue ) );
+}
+
+static VALUE ContextSettings_GetMinorVersion( VALUE self )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->MinorVersion );
+}
+
+static VALUE ContextSettings_SetMinorVersion( VALUE self, VALUE aValue )
+{
+	sf::ContextSettings *object = NULL;
+	Data_Get_Struct( self, sf::ContextSettings, object );
+	return INT2FIX( object->MinorVersion = NUM2UINT( aValue ) );
+}
+
+static VALUE ContextSettings_New( VALUE aKlass, VALUE someArgs )
+{
+	long arrayLength = RARRAY_LEN( someArgs );	
+	sf::ContextSettings *object = NULL;
+	if( arrayLength == 0 )
+	{
+		object = new sf::ContextSettings();
+	}
+	else if( arrayLength == 1 )
+	{
+		VALUE arg1 = rb_ary_entry( someArgs, 0 );
+		object = new sf::ContextSettings( NUM2UINT( arg1 ) );
+	}
+	else if( arrayLength == 2 )
+	{
+		VALUE arg1 = rb_ary_entry( someArgs, 0 );
+		VALUE arg2 = rb_ary_entry( someArgs, 1 );
+		object = new sf::ContextSettings( NUM2UINT( arg1 ), NUM2UINT( arg2 ) );
+	}
+	
+	else if( arrayLength == 3 )
+	{
+		VALUE arg1 = rb_ary_entry( someArgs, 0 );
+		VALUE arg2 = rb_ary_entry( someArgs, 1 );
+		VALUE arg3 = rb_ary_entry( someArgs, 2 );
+		object = new sf::ContextSettings( NUM2UINT( arg1 ), NUM2UINT( arg2 ), NUM2UINT( arg3 ) );
+	}
+	else if( arrayLength == 4 )
+	{
+		VALUE arg1 = rb_ary_entry( someArgs, 0 );
+		VALUE arg2 = rb_ary_entry( someArgs, 1 );
+		VALUE arg3 = rb_ary_entry( someArgs, 2 );
+		VALUE arg4 = rb_ary_entry( someArgs, 3 );
+		object = new sf::ContextSettings( NUM2UINT( arg1 ), NUM2UINT( arg2 ), NUM2UINT( arg3 ), NUM2UINT( arg4 ) );
+	}
+	else if( arrayLength == 5 )
+	{
+		VALUE arg1 = rb_ary_entry( someArgs, 0 );
+		VALUE arg2 = rb_ary_entry( someArgs, 1 );
+		VALUE arg3 = rb_ary_entry( someArgs, 2 );
+		VALUE arg4 = rb_ary_entry( someArgs, 3 );
+		VALUE arg5 = rb_ary_entry( someArgs, 4 );
+		object = new sf::ContextSettings( NUM2UINT( arg1 ), NUM2UINT( arg2 ), NUM2UINT( arg3 ), NUM2UINT( arg4 ), NUM2UINT( arg5 ) );
+	}
+	else
+	{
+		rb_raise( rb_eArgError, "Expected 0..5 arguments but was given %ld", arrayLength );
+		return Qnil;
+	}
+	 
+	VALUE rbData = Data_Wrap_Struct( aKlass, 0, ContextSettings_Free, object );
+	rb_obj_call_init( rbData, 0, 0 );
+	return rbData;
+}
+
+void Init_ContextSettings( void )
+{
+	globalContextSettingsClass = rb_define_class_under( GetNamespace(), "ContextSettings", rb_cObject );
+	
+	// Class methods
+	rb_define_singleton_method( globalContextSettingsClass, "new", FUNCPTR( ContextSettings_New ), -2 );
+	
+	// Instance methods
+	rb_define_method( globalContextSettingsClass, "depthBits", FUNCPTR( ContextSettings_GetDepth ), 0 );
+	rb_define_method( globalContextSettingsClass, "depthBits=", FUNCPTR( ContextSettings_SetDepth ), 1 );
+	
+	rb_define_method( globalContextSettingsClass, "stencilBits", FUNCPTR( ContextSettings_GetStencil ), 0 );
+	rb_define_method( globalContextSettingsClass, "stencilBits=", FUNCPTR( ContextSettings_SetStencil ), 1 );
+	
+	rb_define_method( globalContextSettingsClass, "antialiasingLevel", FUNCPTR( ContextSettings_GetAntialiasing ), 0 );
+	rb_define_method( globalContextSettingsClass, "antialiasingLevel=", FUNCPTR( ContextSettings_SetAntialiasing ), 1 );
+	
+	rb_define_method( globalContextSettingsClass, "majorVersion", FUNCPTR( ContextSettings_GetMajorVersion ), 0 );
+	rb_define_method( globalContextSettingsClass, "majorVersion=", FUNCPTR( ContextSettings_SetMajorVersion ), 1 );
+	
+	rb_define_method( globalContextSettingsClass, "minorVersion", FUNCPTR( ContextSettings_GetMinorVersion ), 0 );
+	rb_define_method( globalContextSettingsClass, "minorVersion=", FUNCPTR( ContextSettings_SetMinorVersion ), 1 );
+	
+	// Aliases
+	rb_define_alias( globalContextSettingsClass, "depth", "depthBits" );
+	rb_define_alias( globalContextSettingsClass, "depth=", "depthBits=" );
+	
+	rb_define_alias( globalContextSettingsClass, "stencil", "stencilBits" );
+	rb_define_alias( globalContextSettingsClass, "stencil=", "stencilBits=" );
+	
+	rb_define_alias( globalContextSettingsClass, "antialiasing", "antialiasingLevel" );
+	rb_define_alias( globalContextSettingsClass, "antialiasing=", "antialiasingLevel=" );
+	
+	rb_define_alias( globalContextSettingsClass, "major", "majorVersion" );
+	rb_define_alias( globalContextSettingsClass, "major=", "majorVersion=" );
+	
+	rb_define_alias( globalContextSettingsClass, "minor", "minorVersion" );
+	rb_define_alias( globalContextSettingsClass, "minor=", "minorVersion=" );
+}

ruby/sfml-window/window/ContextSettings.hpp

@@ -0,0 +1,31 @@
+/* rbSFML - Copyright (c) 2010 Henrik Valter Vogelius Hansson - groogy@groogy.se
+ * This software is provided 'as-is', without any express or
+ * implied warranty. In no event will the authors be held
+ * liable for any damages arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute
+ * it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented;
+ *    you must not claim that you wrote the original software.
+ *    If you use this software in a product, an acknowledgment
+ *    in the product documentation would be appreciated but
+ *    is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such,
+ *    and must not be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any
+ *    source distribution.
+ */
+
+#ifndef SFML_RUBYEXT_CONTEXT_SETTINGS_HEADER_
+#define SFML_RUBYEXT_CONTEXT_SETTINGS_HEADER_
+
+#include "ruby.h"
+
+// Ruby initiation function
+void Init_ContextSettings( void );
+
+#endif // SFML_RUBYEXT_CONTEXT_SETTINGS_HEADER_

ruby/sfml-window/window/main.cpp

@@ -22,6 +22,7 @@
  
 #include "main.hpp"
 #include "Context.hpp"
+#include "ContextSettings.hpp"
 
 VALUE globalSFMLNamespace;
 
@@ -35,4 +36,5 @@ void Init_window( void )
 	globalSFMLNamespace = rb_define_module( "SFML" );
 	rb_define_const(globalSFMLNamespace, "WindowLoaded", Qtrue);
 	Init_Context();
+	Init_ContextSettings();
 }