Make joystick activation optional, so that Irrlicht doesn't consume all...

Make joystick activation optional, so that Irrlicht doesn't consume all joystick events.  This allows us to pass joystick enumeration data to the user app.  Revert example 04 to just do key movement, but have it show framerate independent movement.  Add a new 19.MouseAndJoystick example.  Tested with Win32 and Linux devices, and with the SDL device on Windows and Linux.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1717 dfc29bdd-3216-0410-991c-e03cc46cb475

examples/04.Movement/main.cpp

@@ -2,8 +2,11 @@
 
 This Tutorial shows how to move and animate SceneNodes. The
 basic concept of SceneNodeAnimators is shown as well as manual
-movement of nodes using the keyboard and (optionally) the first
-connected joystick/joypad.
+movement of nodes using the keyboard.  We'll demonstrate framerate
+independent movement, which means moving by an amount dependent
+on the duration of the last run of the Irrlicht loop.
+
+Example 19.MouseAndJoystick shows how to handle those kinds of input.
 
 As always, I include the header files, use the irr namespace,
 and tell the linker to link with the .lib file.
@@ -26,8 +29,6 @@ irr::IEventReceiver object. There is only one method to override:
 irr::IEventReceiver::OnEvent(). This method will be called by the engine once
 when an event happens. What we really want to know is whether a key is being
 held down, and so we will remember the current state of each key.
-If we receive a joystick event for the first joystick (joystick 0) we will
-remember both the data, and the fact that we received it.
 */
 class MyEventReceiver : public IEventReceiver
 {
@@ -39,17 +40,6 @@ public:
 		if (event.EventType == irr::EET_KEY_INPUT_EVENT)
 			KeyIsDown[event.KeyInput.Key] = event.KeyInput.PressedDown;
 
-		// The state of each connected joystick is sent to us
-		// once every run() of the Irrlicht device.  Store the
-		// state of the first joystick, ignoring other joysticks.
-		// This is currently only supported on Windows and Linux.
-		if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT
-			&& event.JoystickEvent.Joystick == 0)
-		{
-			NewJoystickDataAvailable = true;
-			JoystickData = event.JoystickEvent;
-		}
-
 		return false;
 	}
 
@@ -59,31 +49,15 @@ public:
 		return KeyIsDown[keyCode];
 	}
 	
-	bool IsNewJoystickDataAvailable(void) const
-	{
-		return NewJoystickDataAvailable;
-	}
-
-	const SEvent::SJoystickEvent & GetJoystickData(void) const
-	{
-		NewJoystickDataAvailable = false;
-		return JoystickData;
-	}
-
 	MyEventReceiver()
 	{
 		for (u32 i=0; i<KEY_KEY_CODES_COUNT; ++i)
 			KeyIsDown[i] = false;
-
-		NewJoystickDataAvailable = false;
 	}
 
 private:
 	// We use this array to store the current state of each key
 	bool KeyIsDown[KEY_KEY_CODES_COUNT];
-
-	SEvent::SJoystickEvent JoystickData;
-	mutable bool NewJoystickDataAvailable;
 };
 
 
@@ -132,7 +106,7 @@ int main()
 	scene::ISceneManager* smgr = device->getSceneManager();
 
 	/*
-	Create the node which will be moved with the 'W' and 'S' key. We create a
+	Create the node which will be moved with the WSAD keys. We create a
 	sphere node, which is a built-in geometry primitive. We place the node
 	at (0,0,30) and assign a texture to it to let it look a little bit more
 	interesting. Because we have no dynamic lights in this scene we disable
@@ -237,87 +211,35 @@ int main()
 	*/
 	int lastFPS = -1;
 
-	while(device->run())
-	{
-		f32 moveHorizontal = 0.f; // Range is -1.f for full left to +1.f for full right
-		f32 moveVertical = 0.f; // -1.f for full down to +1.f for full up.
+	// In order to do framerate independent movement, we have to know
+	// how long it was since the last frame
+	u32 then = device->getTimer()->getTime();
 
-		if(receiver.IsNewJoystickDataAvailable())
-		{
-			const SEvent::SJoystickEvent & joystickData 
-				= receiver.GetJoystickData();
-
-			// Use the analog range of the axes, and a 5% dead zone
-			moveHorizontal = 
-				(f32)joystickData.Axis[SEvent::SJoystickEvent::AXIS_X] / 32767.f;
-			if(fabs(moveHorizontal) < 0.05f)
-				moveHorizontal = 0.f;
-
-			// The Y axis has its origin at the top and goes +ve downwards,
-			// but we want to reverse those directions for our movement.
-			moveVertical = 
-				(f32)joystickData.Axis[SEvent::SJoystickEvent::AXIS_Y] / -32767.f;
-			if(fabs(moveVertical) < 0.05f)
-				moveVertical = 0.f;
-
-			// The explicit POV hat info is only currently supported on Windows; 
-			// on Linux the POV hat info is sent as two axes instead.
-			const u16 povDegrees = joystickData.POV / 100;
-			if(povDegrees < 360)
-			{
-				if(povDegrees > 0 && povDegrees < 180)
-					moveHorizontal = 1.f;
-				else if(povDegrees > 180)
-					moveHorizontal = -1.f;
-
-				if(povDegrees > 90 && povDegrees < 270)
-					moveVertical = -1.f;
-				else if(povDegrees > 270 || povDegrees < 90)
-					moveVertical = +1.f;
-			}
+	// This is the movemen speed in units per second.
+	const f32 MOVEMENT_SPEED = 5.f;
 
-			char diagnosticsText[256];
-
-			sprintf(diagnosticsText, "X=%d Y=%d Z=%d R=%d U=%d V=%d POV=%d Buttons: ",
-					joystickData.Axis[SEvent::SJoystickEvent::AXIS_X],
-					joystickData.Axis[SEvent::SJoystickEvent::AXIS_Y],
-					joystickData.Axis[SEvent::SJoystickEvent::AXIS_Z],
-					joystickData.Axis[SEvent::SJoystickEvent::AXIS_R],
-					joystickData.Axis[SEvent::SJoystickEvent::AXIS_U],
-					joystickData.Axis[SEvent::SJoystickEvent::AXIS_V],
-					joystickData.POV);
-
-			for(u32 button = 0;
-				button < SEvent::SJoystickEvent::NUMBER_OF_BUTTONS;
-				++button)
-				if(joystickData.IsButtonPressed(button))
+	while(device->run())
 	{
-					char buttonText[4];
-					sprintf(buttonText, "%d ", button);
-					strcat(diagnosticsText, buttonText);
-				}
+		// Work out a frame delta time.
+		const u32 now = device->getTimer()->getTime();
+		const f32 frameDeltaTime = (f32)(now - then) / 1000.f; // Time in seconds
+		then = now;
 
-			diagnostics->setText(core::stringw(diagnosticsText).c_str());
-		}
-
-		/* Check if keys W,S,A or S are being held down, and move the
-		sphere node accordingly.
-		*/
-		if(receiver.IsKeyDown(irr::KEY_KEY_A))
-			moveHorizontal = -1.f;
-		else if(receiver.IsKeyDown(irr::KEY_KEY_D))
-			moveHorizontal = +1.f;
+		/* Check if keys W, S, A or D are being held down, and move the
+		sphere node around respectively. */
+		core::vector3df nodePosition = node->getPosition();
 
 		if(receiver.IsKeyDown(irr::KEY_KEY_W))
-			moveVertical = +1.f;
+			nodePosition.Y += MOVEMENT_SPEED * frameDeltaTime;
 		else if(receiver.IsKeyDown(irr::KEY_KEY_S))
-			moveVertical = -1.f;
+			nodePosition.Y -= MOVEMENT_SPEED * frameDeltaTime;
+
+		if(receiver.IsKeyDown(irr::KEY_KEY_A))
+			nodePosition.X -= MOVEMENT_SPEED * frameDeltaTime;
+		else if(receiver.IsKeyDown(irr::KEY_KEY_D))
+			nodePosition.X += MOVEMENT_SPEED * frameDeltaTime;
 
-		// Now do the actual movement
-		core::vector3df v = node->getPosition();
-		v.X += moveHorizontal * 0.02f;
-		v.Y += moveVertical * 0.02f;
-		node->setPosition(v);
+		node->setPosition(nodePosition);
 
 		driver->beginScene(true, true, video::SColor(255,113,113,133));
 

examples/19.MouseAndJoystick/Makefile

+# Makefile for Irrlicht Examples
+# It's usually sufficient to change just the target name and source file list
+# and be sure that CXX is set to a valid compiler
+Target = 19.MouseAndJoystick
+Sources = main.cpp
+
+# general compiler settings
+CPPFLAGS = -I../../include -I/usr/X11R6/include
+#CXXFLAGS = -O3 -ffast-math
+CXXFLAGS = -g -Wall
+
+#default target is Linux
+all: all_linux
+
+ifeq ($(HOSTTYPE), x86_64)
+LIBSELECT=64
+endif
+
+# target specific settings
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
+all_linux clean_linux: SYSTEM=Linux
+all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+all_win32 clean_win32: SYSTEM=Win32-gcc
+all_win32 clean_win32: SUF=.exe
+# name of the binary - only valid for targets which set SYSTEM
+DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
+
+all_linux all_win32:
+	$(warning Building...)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS)
+
+clean: clean_linux clean_win32
+	$(warning Cleaning...)
+
+clean_linux clean_win32:
+	@$(RM) $(DESTPATH)
+
+.PHONY: all all_win32 clean clean_linux clean_win32

examples/19.MouseAndJoystick/MouseAndJoystick.dsp

+# Microsoft Developer Studio Project File - Name="MouseAndJoystick" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=MouseAndJoystick - Win32 Debug
+!MESSAGE Dies ist kein g�s Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "MouseAndJoystick.mak".
+!MESSAGE 
+!MESSAGE Sie k�n beim Ausf�von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "MouseAndJoystick.mak" CFG="MouseAndJoystick - Win32 Debug"
+!MESSAGE 
+!MESSAGE F� Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "MouseAndJoystick - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
+!MESSAGE "MouseAndJoystick - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "MouseAndJoystick - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0xc07 /d "NDEBUG"
+# ADD RSC /l 0xc07 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\bin\Win32-VisualStudio\MouseAndJoystick.exe" /libpath:"..\..\lib\Win32-visualstudio"
+
+!ELSEIF  "$(CFG)" == "MouseAndJoystick - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0xc07 /d "_DEBUG"
+# ADD RSC /l 0xc07 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin\Win32-VisualStudio\MouseAndJoystick.exe" /pdbtype:sept /libpath:"..\..\lib\Win32-visualstudio"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "MouseAndJoystick - Win32 Release"
+# Name "MouseAndJoystick - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# End Target
+# End Project

examples/19.MouseAndJoystick/MouseAndJoystick.dsw

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELSCHT WERDEN!
+
+###############################################################################
+
+Project: "MouseAndJoystick"=".\MouseAndJoystick.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

examples/19.MouseAndJoystick/MouseAndJoystick.sln

+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseAndJoystick", "MouseAndJoystick.vcproj", "{1A16BBE1-A49B-4406-8883-681E6EA8702C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{1A16BBE1-A49B-4406-8883-681E6EA8702C}.Debug.ActiveCfg = Debug|Win32
+		{1A16BBE1-A49B-4406-8883-681E6EA8702C}.Debug.Build.0 = Debug|Win32
+		{1A16BBE1-A49B-4406-8883-681E6EA8702C}.Release.ActiveCfg = Release|Win32
+		{1A16BBE1-A49B-4406-8883-681E6EA8702C}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

examples/19.MouseAndJoystick/MouseAndJoystick.vcproj

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="19.MouseAndJoystick"
+	ProjectGUID="{735B050B-1AC5-4602-B0BE-D2D2B5893E94}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/MouseAndJoystick.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\Win32-VisualStudio\19.MouseAndJoystick.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/MouseAndJoystick.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/MouseAndJoystick.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/MouseAndJoystick.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\Win32-VisualStudio\19.MouseAndJoystick.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
+				ProgramDatabaseFile=".\Release/MouseAndJoystick.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/MouseAndJoystick.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="main.cpp">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+					BasicRuntimeChecks="3"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

examples/19.MouseAndJoystick/MouseAndJoystick_vc8.vcproj

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="19.MouseAndJoystick_vc8"
+	ProjectGUID="{7BDBB7E8-E0C9-4A0D-83C1-D389D6140FEF}"
+	RootNamespace="MouseAndJoystick_vc8"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/MouseAndJoystick.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/MouseAndJoystick.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\Win32-VisualStudio\19.MouseAndJoystick.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/MouseAndJoystick.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/MouseAndJoystick.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/MouseAndJoystick.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\Win32-VisualStudio\19.MouseAndJoystick.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
+				ProgramDatabaseFile=".\Release/MouseAndJoystick.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="main.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+					BasicRuntimeChecks="3"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

examples/19.MouseAndJoystick/MouseAndJoystick_vc9.vcproj

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="19.MouseAndJoystick_vc9"
+	ProjectGUID="{FE853A36-E0D1-4AC5-A792-B643E70D2953}"
+	RootNamespace="MouseAndJoystick_vc9"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/MouseAndJoystick.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/MouseAndJoystick.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\Win32-VisualStudio\19.MouseAndJoystick.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/MouseAndJoystick.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/MouseAndJoystick.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/MouseAndJoystick.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\bin\Win32-VisualStudio\19.MouseAndJoystick.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
+				ProgramDatabaseFile=".\Release/MouseAndJoystick.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="main.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+					BasicRuntimeChecks="3"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

examples/19.MouseAndJoystick/example.cbp

+<?xml version="1.0"?>
+<!DOCTYPE CodeBlocks_project_file>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="1"/>
+	<Project>
+		<Option title="Irrlicht Example 04 MouseAndJoystick"/>
+		<Option makefile="Makefile"/>
+		<Option makefile_is_custom="0"/>
+		<Option compiler="0"/>
+		<Build>
+			<Target title="default">
+				<Option output="..\..\bin\Win32-gcc\19.MouseAndJoystick.exe"/>
+				<Option working_dir="."/>
+				<Option object_output=".objs"/>
+				<Option deps_output=".deps"/>
+				<Option type="1"/>
+				<Option compiler="0"/>
+				<Option projectResourceIncludeDirsRelation="1"/>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\include"/>
+		</Compiler>
+		<Linker>
+			<Add option="../../lib/Win32-gcc/libIrrlicht.a"/>
+		</Linker>
+		<Unit filename="main.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+	</Project>
+</CodeBlocks_project_file>

examples/19.MouseAndJoystick/example.dev

+[Project]
+FileName=example.dev
+Name=Irrlicht Example 04 MouseAndJoystick
+UnitCount=1
+Type=1
+Ver=1
+ObjFiles=
+Includes=..\..\include
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Compiler=
+CppCompiler=
+Linker=../../lib/Win32-gcc/libIrrlicht.a_@@_
+IsCpp=1
+Icon=
+ExeOutput=../../bin/Win32-gcc
+ObjectOutput=obj
+OverrideOutput=1
+OverrideOutputName=19.MouseAndJoystick.exe
+HostApplication=
+Folders=
+CommandLine=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000000
+UseCustomMakefile=0
+CustomMakefile=
+
+[Unit1]
+FileName=main.cpp
+CompileCpp=1
+Folder=Projekt1
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Irrlicht Engine example compiled using DevCpp and gcc
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
+

examples/19.MouseAndJoystick/main.cpp

+/** Example 019 Mouse and Joystick
+
+This tutorial builds on example 04.Movement which showed how to
+handle keyboard events in Irrlicht.  Here we'll handle mouse events
+and joystick events, if you have a joystick connected and a device
+that supports joysticks.  These are currently Windows, Linux and SDL
+devices.
+*/
+
+#ifdef _MSC_VER
+// We'll define this to stop MSVC complaining about sprintf().
+#define _CRT_SECURE_NO_WARNINGS
+#pragma comment(lib, "Irrlicht.lib")
+#endif
+
+#include <irrlicht.h>
+#include <iostream>
+
+using namespace irr;
+
+/*
+Just as we did in example 04.Movement, we'll store the latest state of the
+mouse and the first joystick, updating them as we receive events.
+*/
+class MyEventReceiver : public IEventReceiver
+{
+public:
+	// We'll create a struct to record info on the mouse state
+	struct SMouseState
+	{
+		core::position2di Position;
+		bool LeftButtonDown;
+		SMouseState() : LeftButtonDown(false) { }
+	} MouseState;
+
+	// This is the one method that we have to implement
+	virtual bool OnEvent(const SEvent& event)
+	{
+		// Remember the mouse state
+		if (event.EventType == irr::EET_MOUSE_INPUT_EVENT)
+		{
+			switch(event.MouseInput.Event)
+			{
+			case EMIE_LMOUSE_PRESSED_DOWN:
+				MouseState.LeftButtonDown = true;
+				break;
+
+			case EMIE_LMOUSE_LEFT_UP:
+				MouseState.LeftButtonDown = false;
+				break;
+
+			case EMIE_MOUSE_MOVED:
+				MouseState.Position.X = event.MouseInput.X;
+				MouseState.Position.Y = event.MouseInput.Y;
+				break;
+
+			default:
+				// We won't use the wheel
+				break;
+			}
+		}
+
+		// The state of each connected joystick is sent to us
+		// once every run() of the Irrlicht device.  Store the
+		// state of the first joystick, ignoring other joysticks.
+		// This is currently only supported on Windows and Linux.
+		if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT
+			&& event.JoystickEvent.Joystick == 0)
+		{
+			JoystickState = event.JoystickEvent;
+		}
+
+		return false;
+	}
+
+	const SEvent::SJoystickEvent & GetJoystickState(void) const
+	{
+		return JoystickState;
+	}
+
+	const SMouseState & GetMouseState(void) const
+	{
+		return MouseState;
+	}
+
+
+	MyEventReceiver()
+	{
+	}
+
+private:
+	SEvent::SJoystickEvent JoystickState;
+};
+
+
+/*
+The event receiver for keeping the pressed keys is ready, the actual responses
+will be made inside the render loop, right before drawing the scene. So lets
+just create an irr::IrrlichtDevice and the scene node we want to move. We also
+create some other additional scene nodes, to show that there are also some
+different possibilities to move and animate scene nodes.
+*/
+int main()
+{
+	// let user select driver type
+
+	video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9;
+
+	printf("Please select the driver you want for this example:\n"\
+		" (a) Direct3D 9.0c\n (b) Direct3D 8.1\n (c) OpenGL 1.5\n"\
+		" (d) Software Renderer\n (e) Burning's Software Renderer\n"\
+		" (f) NullDevice\n (otherKey) exit\n\n");
+
+	char i;
+	std::cin >> i;
+
+	switch(i)
+	{
+		case 'a': driverType = video::EDT_DIRECT3D9;break;
+		case 'b': driverType = video::EDT_DIRECT3D8;break;
+		case 'c': driverType = video::EDT_OPENGL;   break;
+		case 'd': driverType = video::EDT_SOFTWARE; break;
+		case 'e': driverType = video::EDT_BURNINGSVIDEO;break;
+		case 'f': driverType = video::EDT_NULL;     break;
+		default: return 0;
+	}	
+
+	// create device
+	MyEventReceiver receiver;
+
+	IrrlichtDevice* device = createDevice(driverType,
+			core::dimension2d<s32>(640, 480), 16, false, false, false, &receiver);
+
+	if (device == 0)
+		return 1; // could not create selected driver.
+
+
+	core::array<SJoystickInfo> joystickInfo;
+	if(device->activateJoysticks(joystickInfo))
+	{
+		std::cout << "Joystick support is enabled and " << joystickInfo.size() << " joystick(s) are present." << std::endl;
+
+		for(u32 joystick = 0; joystick < joystickInfo.size(); ++joystick)
+		{
+			std::cout << "Joystick " << joystick << ":" << std::endl;
+			std::cout << "\tName: '" << joystickInfo[joystick].Name.c_str() << "'" << std::endl;
+			std::cout << "\tAxes: " << joystickInfo[joystick].Axes << std::endl;
+			std::cout << "\tButtons: " << joystickInfo[joystick].Buttons << std::endl;
+
+			std::cout << "\tHat is: ";
+
+			switch(joystickInfo[joystick].PovHat)
+			{
+			case SJoystickInfo::POV_HAT_PRESENT:
+				std::cout << "present" << std::endl;
+				break;
+
+			case SJoystickInfo::POV_HAT_ABSENT:
+				std::cout << "absent" << std::endl;
+				break;
+
+			case SJoystickInfo::POV_HAT_UNKNOWN:
+			default:
+				std::cout << "unknown" << std::endl;
+				break;
+			}
+		}
+	}
+	else
+	{
+		std::cout << "Joystick support is not enabled." << std::endl;
+	}
+
+	video::IVideoDriver* driver = device->getVideoDriver();
+	scene::ISceneManager* smgr = device->getSceneManager();
+
+	/*
+	We'll create an arrow mesh and move it around either with the joystick axis/hat,
+	or make it follow the mouse pointer. */
+	scene::ISceneNode * node = smgr->addMeshSceneNode(smgr->addArrowMesh("Arrow", video::SColor(255, 255, 0, 0), video::SColor(255, 0, 255, 0)));
+	node->setMaterialFlag(video::EMF_LIGHTING, false);
+
+	scene::ICameraSceneNode * camera = smgr->addCameraSceneNode();
+	camera->setPosition(core::vector3df(0, 0, -10));
+
+	// As in example 04, we'll use framerate independent movement.
+	u32 then = device->getTimer()->getTime();
+	const f32 MOVEMENT_SPEED = 5.f;
+
+	while(device->run())
+	{
+		// Work out a frame delta time.
+		const u32 now = device->getTimer()->getTime();
+		const f32 frameDeltaTime = (f32)(now - then) / 1000.f; // Time in seconds
+		then = now;
+
+		bool movedWithJoystick = false;
+		core::vector3df nodePosition = node->getPosition();
+
+		if(joystickInfo.size() > 0)
+		{
+			f32 moveHorizontal = 0.f; // Range is -1.f for full left to +1.f for full right
+			f32 moveVertical = 0.f; // -1.f for full down to +1.f for full up.
+
+			const SEvent::SJoystickEvent & joystickData = receiver.GetJoystickState();
+
+			// Use the analog range of the axes, and a 5% dead zone
+			moveHorizontal = 
+				(f32)joystickData.Axis[SEvent::SJoystickEvent::AXIS_X] / 32767.f;
+			if(fabs(moveHorizontal) < 0.05f)
+				moveHorizontal = 0.f;
+
+			moveVertical = 
+				(f32)joystickData.Axis[SEvent::SJoystickEvent::AXIS_Y] / -32767.f;
+			if(fabs(moveVertical) < 0.05f)
+				moveVertical = 0.f;
+
+			// POV hat info is only currently supported on Windows, but the value is
+			// guaranteed to be 65535 if it's not supported, so we can check its range.
+			const u16 povDegrees = joystickData.POV / 100;
+			if(povDegrees < 360)
+			{
+				if(povDegrees > 0 && povDegrees < 180)
+					moveHorizontal = 1.f;
+				else if(povDegrees > 180)
+					moveHorizontal = -1.f;
+
+				if(povDegrees > 90 && povDegrees < 270)
+					moveVertical = -1.f;
+				else if(povDegrees > 270 || povDegrees < 90)
+					moveVertical = +1.f;
+			}
+
+			if(!core::equals(moveHorizontal, 0.f) || !core::equals(moveVertical, 0.f))
+			{
+				nodePosition.X += MOVEMENT_SPEED * frameDeltaTime * moveHorizontal;
+				nodePosition.Y += MOVEMENT_SPEED * frameDeltaTime * moveVertical;
+				movedWithJoystick = true;
+			}
+		}
+
+		// If the arrow node isn't being moved with the joystick, then have it follow the mouse cursor.
+		if(!movedWithJoystick)
+		{
+			// Create a ray through the mouse cursor.
+			core::line3df ray = smgr->getSceneCollisionManager()->getRayFromScreenCoordinates(
+				receiver.GetMouseState().Position, camera);
+
+			// And intersect the ray with a plane around the node facing towards the camera.
+			core::plane3df plane(nodePosition, core::vector3df(0, 0, -1));
+			core::vector3df mousePosition;
+			if(plane.getIntersectionWithLine(ray.start, ray.getVector(), mousePosition))
+			{
+				// We now have a mouse position in 3d space; move towards it.
+				core::vector3df toMousePosition(mousePosition - nodePosition);
+				const f32 availableMovement = MOVEMENT_SPEED * frameDeltaTime;
+
+				if(toMousePosition.getLength() <= availableMovement)
+					nodePosition = mousePosition; // Jump to the final position
+				else
+					nodePosition += toMousePosition.normalize() * availableMovement; // Move towards it
+			}
+		}
+
+		node->setPosition(nodePosition);
+		
+		// Turn lighting on and off depending on whether the left mouse button is down.
+		if(receiver.GetMouseState().LeftButtonDown)
+			node->setMaterialFlag(video::EMF_LIGHTING, true);
+		else
+			node->setMaterialFlag(video::EMF_LIGHTING, false);
+
+		driver->beginScene(true, true, video::SColor(255,113,113,133));
+		smgr->drawAll(); // draw the 3d scene
+		driver->endScene();
+	}
+
+	/*
+	In the end, delete the Irrlicht device.
+	*/
+	device->drop();
+	
+	return 0;
+}

examples/BuildAllExamples_v7.sln

@@ -74,6 +74,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16.Quake3MapShader", "16.Qu
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "19.MouseAndJoystick", "19.MouseAndJoystick\MouseAndJoystick.vcproj", "{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug

examples/BuildAllExamples_v8.sln

@@ -40,6 +40,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_vc8", "Demo\Demo_vc8.v
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quake3MapShader_vc8", "16.Quake3MapShader\Quake3MapShader_vc8.vcproj", "{EB3B38EA-5CE7-4983-845B-880661E69D09}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "19.MouseAndJoystick_vc8", "19.MouseAndJoystick\MouseAndJoystick_vc8.vcproj", "{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32

examples/BuildAllExamples_v9.sln

 
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01.HelloWorld_vc9", "01.HelloWorld\HelloWorld_vc9.vcproj", "{5AD4C95C-BA38-4692-BA4B-8C25A86208F9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
@@ -90,6 +90,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16.Quake3MapShader_vc9", "1
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "18.SplitScreen_vc9", "18.SplitScreen\SplitScreen_vc9.vcproj", "{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "19.MouseAndJoystick_vc9", "19.MouseAndJoystick\MouseAndJoystick_vc9.vcproj", "{FE853A36-E0D1-4AC5-A792-B643E70D2953}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -172,6 +174,9 @@ Global
 		{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.Build.0 = Debug|Win32
 		{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Release|Win32.ActiveCfg = Release|Win32
 		{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Release|Win32.Build.0 = Release|Win32
+		{FE853A36-E0D1-4AC5-A792-B643E70D2953}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FE853A36-E0D1-4AC5-A792-B643E70D2953}.Debug|Win32.Build.0 = Debug|Win32
+		{FE853A36-E0D1-4AC5-A792-B643E70D2953}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

include/IEventReceiver.h

@@ -8,6 +8,7 @@
 #include "ILogger.h"
 #include "position2d.h"
 #include "Keycodes.h"
+#include "irrString.h"
 
 namespace irr
 {
@@ -241,10 +242,12 @@ struct SEvent
 
 	//! A joystick event.
 	/** Unlike other events, joystick events represent the result of polling 
-	 * each connected joystick once per run() of the device. If 
-	 * _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ is defined, an event of this type 
-	 * will be generated once per joystick per device run() regardless of 
-	 * whether the state of the joystick has actually changed. */
+	 * each connected joystick once per run() of the device. Joystick events will
+	 * not be generated by default.  If joystick support is available for the 
+	 * active device, _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ is defined, and 
+	 * @ref IrrlichtDevice::activateJoysticks() has been called, an event of 
+	 * this type will be generated once per joystick per @ref IrrlichtDevice::run() 
+	 * regardless of whether the state of the joystick has actually changed. */
 	struct SJoystickEvent
 	{
 		enum
@@ -349,6 +352,43 @@ public:
 };
 
 
+//! Information on a joystick, returned from @ref IrrlichtDevice::activateJoysticks()
+struct SJoystickInfo
+{
+	//! The ID of the joystick
+	/** This is an internal Irrlicht index; it does not map directly
+	 * to any particular hardware joystick. It corresponds to the 
+	 * @ref SJoystickEvent Joystick ID. */
+	u8				Joystick;
+
+	//! The name that the joystick uses to identify itself.
+	core::stringc	Name;
+
+	//! The number of buttons that the joystick has.
+	u32				Buttons;
+
+	//! The number of axes that the joystick has, i.e. X, Y, Z, R, U, V.
+	/** Note: with a Linux device, the POV hat (if any) will use two axes. These
+	 *  will be included in this count. */
+	u32				Axes;
+
+	//! An indication of whether the joystick has a POV hat.
+	/** A Windows device will identify the presence or absence or the POV hat.  A
+	 *  Linux device cannot, and will always return POV_HAT_UNKNOWN. */
+	enum
+	{
+		//! A hat is definitely present.
+		POV_HAT_PRESENT,
+
+		//! A hat is definitely not present.
+		POV_HAT_ABSENT,
+
+		//! The presence or absence of a hat cannot be determined.
+		POV_HAT_UNKNOWN
+	} PovHat;
+}; // struct SJoystickInfo
+
+
 } // end namespace irr
 
 #endif

include/IrrlichtDevice.h

@@ -207,6 +207,16 @@ namespace irr
 		mode.
 		\param resize Flag whether the window should be resizeable. */
 		virtual void setResizeAble(bool resize=false) = 0;
+
+		//! Activate any joysticks, and generate events for them.
+		/** Irrlicht contains support for joysticks, but does not generate joystick events by default,
+		as this would consume joystick info that 3rd party libraries might rely on. Call this method to 
+		activate joystick support in Irrlicht and to receive @ref SJoystickEvent events.
+		\param joystickInfo On return, this will contain an array of each joystick that was found and activated.
+		\return true if joysticks are supported on this device and _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+				is defined, false if joysticks are not supported or support is compiled out.
+		*/
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) = 0;
 	};
 
 } // end namespace irr

source/Irrlicht/CIrrDeviceLinux.cpp

@@ -106,8 +106,6 @@ CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters& param)
 		return;
 
 	createGUIAndScene();
-
-	initialiseJoysticks(); 
 }
 
 
@@ -1344,10 +1342,12 @@ void CIrrDeviceLinux::createKeyMap()
 #endif
 }
 
-
-void CIrrDeviceLinux::initialiseJoysticks()
+bool CIrrDeviceLinux::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
 {
 #if defined (_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+
+	joystickInfo.clear();
+
 	u32 joystick;
 	for(joystick = 0; joystick < 32; ++joystick)
 	{
@@ -1355,6 +1355,7 @@ void CIrrDeviceLinux::initialiseJoysticks()
 		core::stringc devName = "/dev/js";
 		devName += joystick;
 
+		SJoystickInfo returnInfo;
 		JoystickInfo info;
 
 		info.fd = open(devName.c_str(), O_RDONLY);
@@ -1373,14 +1374,6 @@ void CIrrDeviceLinux::initialiseJoysticks()
 		ioctl( info.fd, JSIOCGAXES, &(info.axes) );
 		ioctl( info.fd, JSIOCGBUTTONS, &(info.buttons) );
 
-		char logString[256];
-		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons, '",
-			joystick, info.axes, info.buttons);
-
-		ioctl( info.fd, JSIOCGNAME(80), logString + strlen(logString));
-		(void)strcat(logString, "'");
-		os::Printer::log(logString, ELL_INFORMATION);
-
 		fcntl( info.fd, F_SETFL, O_NONBLOCK );
 
 		(void)memset(&info.persistentData, 0, sizeof(info.persistentData));
@@ -1392,8 +1385,32 @@ void CIrrDeviceLinux::initialiseJoysticks()
 		info.persistentData.JoystickEvent.POV = 65535;
 
 		ActiveJoysticks.push_back(info);
+
+		returnInfo.Joystick = joystick;
+		returnInfo.PovHat = SJoystickInfo::POV_HAT_UNKNOWN;
+		returnInfo.Axes = info.axes;
+		returnInfo.Buttons = info.buttons;
+
+		char name[80];
+		ioctl( info.fd, JSIOCGNAME(80), name);
+		returnInfo.Name = name;
+	
+		joystickInfo.push_back(returnInfo);
+	}
+
+	for(joystick = 0; joystick < joystickInfo.size(); ++joystick)
+	{
+		char logString[256];
+		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
+			joystick, joystickInfo[joystick].Axes, 
+			joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
 	}
+
+	return true;
 #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	return false;
 }
 
 

source/Irrlicht/CIrrDeviceLinux.h

@@ -90,6 +90,9 @@ namespace irr
 		//! Sets if the window should be resizeable in windowed mode.
 		virtual void setResizeAble(bool resize=false);
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 	private:
 
 		//! create the driver
@@ -99,7 +102,6 @@ namespace irr
 
 		void createKeyMap();
 
-		void initialiseJoysticks();
 		void pollJoysticks(); 
 
 		//! Implementation of the linux cursor control

source/Irrlicht/CIrrDeviceSDL.cpp

@@ -19,6 +19,10 @@
 #include "SIrrCreationParameters.h"
 #include <SDL/SDL_syswm.h>
 
+#ifdef _MSC_VER
+#pragma comment(lib, "SDL.lib")
+#endif // _MSC_VER
+
 namespace irr
 {
 	namespace video
@@ -92,22 +96,6 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
 		createWindow();
 	}
 
-#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
-	// we can name up to 256 different joysticks
-	const int numJoysticks = core::min_(SDL_NumJoysticks(), 256);
-	Joysticks.reallocate(numJoysticks);
-	for (int i=0; i<numJoysticks; ++i)
-	{
-		Joysticks.push_back(SDL_JoystickOpen(i));
-		char logString[256];
-		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
-			i, SDL_JoystickNumAxes(Joysticks[i]),
-			SDL_JoystickNumButtons(Joysticks[i]),
-			SDL_JoystickName(i));
-		os::Printer::log(logString, ELL_INFORMATION);
-	}
-#endif
-
 	// create cursor control
 	CursorControl = new CCursorControl(this);
 
@@ -398,6 +386,11 @@ bool CIrrDeviceSDL::run()
 						break;
 				}
 			}
+			else
+			{
+				joyevent.JoystickEvent.POV=65535;
+			}
+			
 			// we map the number directly
 			joyevent.JoystickEvent.Joystick=static_cast<u8>(i);
 			// now post the event
@@ -409,6 +402,50 @@ bool CIrrDeviceSDL::run()
 	return !Close;
 }
 
+//! Activate any joysticks, and generate events for them.
+bool CIrrDeviceSDL::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	joystickInfo.clear();
+
+	// we can name up to 256 different joysticks
+	const int numJoysticks = core::min_(SDL_NumJoysticks(), 256);
+	Joysticks.reallocate(numJoysticks);
+	joystickInfo.reallocate(numJoysticks);
+
+	int joystick = 0;
+	for (; joystick<numJoysticks; ++joystick)
+	{
+		Joysticks.push_back(SDL_JoystickOpen(joystick));
+		SJoystickInfo info;
+
+		info.Joystick = joystick;
+		info.Axes = SDL_JoystickNumAxes(Joysticks[joystick]);
+		info.Buttons = SDL_JoystickNumButtons(Joysticks[joystick]);
+		info.Name = SDL_JoystickName(joystick);
+		info.PovHat = (SDL_JoystickNumHats(Joysticks[joystick]) > 0)
+						? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
+
+		joystickInfo.push_back(info);
+	}
+
+	for(joystick = 0; joystick < (int)joystickInfo.size(); ++joystick)
+	{
+		char logString[256];
+		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
+		 joystick, joystickInfo[joystick].Axes,
+   joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	return false;
+}
+
+
 
 //! pause execution temporarily
 void CIrrDeviceSDL::yield()

source/Irrlicht/CIrrDeviceSDL.h

@@ -67,6 +67,9 @@ namespace irr
 		//! Sets if the window should be resizeable in windowed mode.
 		virtual void setResizeAble(bool resize=false);
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 		//! Implementation of the linux cursor control
 		class CCursorControl : public gui::ICursorControl
 		{

source/Irrlicht/CIrrDeviceStub.cpp

@@ -251,6 +251,11 @@ video::ECOLOR_FORMAT CIrrDeviceStub::getColorFormat() const
 	return video::ECF_R5G6B5;
 }
 
+//! No-op in this implementation
+bool CIrrDeviceStub::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
+{
+	return false;
+}
 
 } // end namespace irr
 

source/Irrlicht/CIrrDeviceStub.h

@@ -107,6 +107,9 @@ namespace irr
 		//! get color format of the current window
 		virtual video::ECOLOR_FORMAT getColorFormat() const;
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 	protected:
 
 		void createGUIAndScene();

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -402,8 +402,6 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
 	// set this as active window
 	SetActiveWindow(HWnd);
 	SetForegroundWindow(HWnd);
-
-	initialiseJoysticks(); 
 }
 
 
@@ -964,17 +962,25 @@ void CIrrDeviceWin32::setResizeAble(bool resize)
 }
 
 
-void CIrrDeviceWin32::initialiseJoysticks()
+bool CIrrDeviceWin32::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
 {
 #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	joystickInfo.clear();
+	ActiveJoysticks.clear();
+
 	const u32 numberOfJoysticks = ::joyGetNumDevs();
 	JOYINFOEX info;
 	info.dwSize = sizeof(info);
 	info.dwFlags = JOY_RETURNALL;
 
 	JoystickInfo activeJoystick;
+	SJoystickInfo returnInfo;
+
+	joystickInfo.reallocate(numberOfJoysticks);
+	ActiveJoysticks.reallocate(numberOfJoysticks);
 
-	for(u32 joystick = 0; joystick < numberOfJoysticks; ++joystick)
+	u32 joystick = 0;
+	for(; joystick < numberOfJoysticks; ++joystick)
 	{
 		if(JOYERR_NOERROR == joyGetPosEx(joystick, &info)
 			&&
@@ -985,14 +991,30 @@ void CIrrDeviceWin32::initialiseJoysticks()
 			activeJoystick.Index = joystick;
 			ActiveJoysticks.push_back(activeJoystick);
 
+			returnInfo.Joystick = joystick;
+			returnInfo.Axes = activeJoystick.Caps.wNumAxes;
+			returnInfo.Buttons = activeJoystick.Caps.wNumButtons;
+			returnInfo.Name = activeJoystick.Caps.szPname;
+			returnInfo.PovHat = ((activeJoystick.Caps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV)
+								? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
+
+			joystickInfo.push_back(returnInfo);
+		}
+	}
+
+	for(joystick = 0; joystick < joystickInfo.size(); ++joystick)
+	{
 		char logString[256];
 		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
-				joystick, activeJoystick.Caps.wNumAxes, activeJoystick.Caps.wNumButtons,
-				activeJoystick.Caps.szPname);
+			joystick, joystickInfo[joystick].Axes, 
+			joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
 		os::Printer::log(logString, ELL_INFORMATION);
 	}
-	}
+
+	return true;
 #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	return false;
 }
 
 void CIrrDeviceWin32::pollJoysticks()

source/Irrlicht/CIrrDeviceWin32.h

@@ -68,6 +68,9 @@ namespace irr
 		//! Sets if the window should be resizeable in windowed mode.
 		virtual void setResizeAble(bool resize=false);
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 		//! Implementation of the win32 cursor control
 		class CCursorControl : public gui::ICursorControl
 		{
@@ -245,7 +248,6 @@ namespace irr
 
 		void resizeIfNecessary();
 
-		void initialiseJoysticks();
 		void pollJoysticks(); 
 
 		HWND HWnd;