mirror of https://github.com/OpenMW/openmw.git
Rip out OIS, fill the holes with SDL goodness. WIP.
Jordan Milne
12 years ago
parent
e31cd1c805
commit
884d3ea4d8
@ -0,0 +1,70 @@
|
||||
#include "sdlinputwrapper.hpp"
|
||||
#include <SDL2/SDL.h>
|
||||
|
||||
namespace MWInput
|
||||
{
|
||||
MWSDLInputWrapper::MWSDLInputWrapper(Ogre::RenderWindow *window) :
|
||||
mWindow(window), mStarted(false), mSDLWindow(NULL)
|
||||
{
|
||||
_start();
|
||||
}
|
||||
|
||||
MWSDLInputWrapper::~MWSDLInputWrapper()
|
||||
{
|
||||
SDL_DestroyWindow(mSDLWindow);
|
||||
mSDLWindow = NULL;
|
||||
SDL_Quit();
|
||||
}
|
||||
|
||||
void MWSDLInputWrapper::capture()
|
||||
{
|
||||
_start();
|
||||
|
||||
SDL_Event evt;
|
||||
while(SDL_PollEvent(&evt))
|
||||
{
|
||||
switch(evt.type)
|
||||
{
|
||||
case SDL_MOUSEMOTION:
|
||||
mMouseListener->mouseMoved(ICS::MWSDLMouseMotionEvent(evt.motion));
|
||||
break;
|
||||
case SDL_MOUSEWHEEL:
|
||||
mMouseListener->mouseMoved(ICS::MWSDLMouseMotionEvent(evt.wheel));
|
||||
break;
|
||||
case SDL_MOUSEBUTTONDOWN:
|
||||
mMouseListener->mousePressed(evt.button, evt.button.button);
|
||||
break;
|
||||
case SDL_MOUSEBUTTONUP:
|
||||
mMouseListener->mouseReleased(evt.button, evt.button.button);
|
||||
break;
|
||||
|
||||
case SDL_KEYDOWN:
|
||||
mKeyboardListener->keyPressed(evt.key);
|
||||
break;
|
||||
case SDL_KEYUP:
|
||||
mKeyboardListener->keyReleased(evt.key);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool MWSDLInputWrapper::isModifierHeld(int mod)
|
||||
{
|
||||
return SDL_GetModState() & mod;
|
||||
}
|
||||
|
||||
void MWSDLInputWrapper::_start()
|
||||
{
|
||||
Uint32 flags = SDL_INIT_VIDEO;
|
||||
if(SDL_WasInit(flags) == 0)
|
||||
{
|
||||
//get the HWND from ogre's renderwindow
|
||||
size_t windowHnd;
|
||||
mWindow->getCustomAttribute("WINDOW", &windowHnd);
|
||||
|
||||
//just use that one for input
|
||||
SDL_Init(flags);
|
||||
mSDLWindow = SDL_CreateWindowFrom((void*)windowHnd);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
#ifndef _MWINPUT_SDLINPUTWRAPPER_H
|
||||
#define _MWINPUT_SDLINPUTWRAPPER_H
|
||||
|
||||
#include "SDL2/SDL_events.h"
|
||||
#include <extern/oics/OISCompat.h>
|
||||
#include <OGRE/OgreRenderWindow.h>
|
||||
|
||||
|
||||
namespace MWInput
|
||||
{
|
||||
class MWSDLInputWrapper
|
||||
{
|
||||
public:
|
||||
MWSDLInputWrapper(Ogre::RenderWindow* window);
|
||||
~MWSDLInputWrapper();
|
||||
|
||||
void setMouseEventCallback(ICS::MWSDLMouseListener* listen) { mMouseListener = listen; }
|
||||
void setKeyboardEventCallback(ICS::MWSDLKeyListener* listen) { mKeyboardListener = listen; }
|
||||
|
||||
void capture();
|
||||
bool isModifierHeld(int mod);
|
||||
|
||||
private:
|
||||
ICS::MWSDLMouseListener* mMouseListener;
|
||||
ICS::MWSDLKeyListener* mKeyboardListener;
|
||||
Ogre::RenderWindow* mWindow;
|
||||
SDL_Window* mSDLWindow;
|
||||
|
||||
bool mStarted;
|
||||
void _start();
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,180 @@
|
||||
# Locate SDL2 library
|
||||
# This module defines
|
||||
# SDL2_LIBRARY, the name of the library to link against
|
||||
# SDL2_FOUND, if false, do not try to link to SDL2
|
||||
# SDL2_INCLUDE_DIR, where to find SDL.h
|
||||
#
|
||||
# This module responds to the the flag:
|
||||
# SDL2_BUILDING_LIBRARY
|
||||
# If this is defined, then no SDL2_main will be linked in because
|
||||
# only applications need main().
|
||||
# Otherwise, it is assumed you are building an application and this
|
||||
# module will attempt to locate and set the the proper link flags
|
||||
# as part of the returned SDL2_LIBRARY variable.
|
||||
#
|
||||
# Don't forget to include SDL2main.h and SDL2main.m your project for the
|
||||
# OS X framework based version. (Other versions link to -lSDL2main which
|
||||
# this module will try to find on your behalf.) Also for OS X, this
|
||||
# module will automatically add the -framework Cocoa on your behalf.
|
||||
#
|
||||
#
|
||||
# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
|
||||
# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
|
||||
# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
|
||||
# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
|
||||
# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
|
||||
# as appropriate. These values are used to generate the final SDL2_LIBRARY
|
||||
# variable, but when these values are unset, SDL2_LIBRARY does not get created.
|
||||
#
|
||||
#
|
||||
# $SDL2DIR is an environment variable that would
|
||||
# correspond to the ./configure --prefix=$SDL2DIR
|
||||
# used in building SDL2.
|
||||
# l.e.galup 9-20-02
|
||||
#
|
||||
# Modified by Eric Wing.
|
||||
# Added code to assist with automated building by using environmental variables
|
||||
# and providing a more controlled/consistent search behavior.
|
||||
# Added new modifications to recognize OS X frameworks and
|
||||
# additional Unix paths (FreeBSD, etc).
|
||||
# Also corrected the header search path to follow "proper" SDL2 guidelines.
|
||||
# Added a search for SDL2main which is needed by some platforms.
|
||||
# Added a search for threads which is needed by some platforms.
|
||||
# Added needed compile switches for MinGW.
|
||||
#
|
||||
# On OSX, this will prefer the Framework version (if found) over others.
|
||||
# People will have to manually change the cache values of
|
||||
# SDL2_LIBRARY to override this selection or set the CMake environment
|
||||
# CMAKE_INCLUDE_PATH to modify the search paths.
|
||||
#
|
||||
# Note that the header path has changed from SDL2/SDL.h to just SDL.h
|
||||
# This needed to change because "proper" SDL2 convention
|
||||
# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
|
||||
# reasons because not all systems place things in SDL2/ (see FreeBSD).
|
||||
#
|
||||
# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
|
||||
# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
|
||||
# was not created for redistribution, and exists temporarily pending official
|
||||
# SDL2 CMake modules.
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2003-2009 Kitware, Inc.
|
||||
#
|
||||
# Distributed under the OSI-approved BSD License (the "License");
|
||||
# see accompanying file Copyright.txt for details.
|
||||
#
|
||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
# See the License for more information.
|
||||
#=============================================================================
|
||||
# (To distribute this file outside of CMake, substitute the full
|
||||
# License text for the above reference.)
|
||||
|
||||
FIND_PATH(SDL2_INCLUDE_DIR SDL.h
|
||||
HINTS
|
||||
$ENV{SDL2DIR}
|
||||
PATH_SUFFIXES include/SDL2 include
|
||||
PATHS
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
/usr/local/include/SDL2
|
||||
/usr/include/SDL2
|
||||
/sw # Fink
|
||||
/opt/local # DarwinPorts
|
||||
/opt/csw # Blastwave
|
||||
/opt
|
||||
)
|
||||
#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
|
||||
|
||||
FIND_LIBRARY(SDL2_LIBRARY_TEMP
|
||||
NAMES SDL2
|
||||
HINTS
|
||||
$ENV{SDL2DIR}
|
||||
PATH_SUFFIXES lib64 lib
|
||||
PATHS
|
||||
/sw
|
||||
/opt/local
|
||||
/opt/csw
|
||||
/opt
|
||||
)
|
||||
|
||||
#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
|
||||
|
||||
IF(NOT SDL2_BUILDING_LIBRARY)
|
||||
IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
|
||||
# Non-OS X framework versions expect you to also dynamically link to
|
||||
# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
|
||||
# seem to provide SDL2main for compatibility even though they don't
|
||||
# necessarily need it.
|
||||
FIND_LIBRARY(SDL2MAIN_LIBRARY
|
||||
NAMES SDL2main
|
||||
HINTS
|
||||
$ENV{SDL2DIR}
|
||||
PATH_SUFFIXES lib64 lib
|
||||
PATHS
|
||||
/sw
|
||||
/opt/local
|
||||
/opt/csw
|
||||
/opt
|
||||
)
|
||||
ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
|
||||
ENDIF(NOT SDL2_BUILDING_LIBRARY)
|
||||
|
||||
# SDL2 may require threads on your system.
|
||||
# The Apple build may not need an explicit flag because one of the
|
||||
# frameworks may already provide it.
|
||||
# But for non-OSX systems, I will use the CMake Threads package.
|
||||
IF(NOT APPLE)
|
||||
FIND_PACKAGE(Threads)
|
||||
ENDIF(NOT APPLE)
|
||||
|
||||
# MinGW needs an additional library, mwindows
|
||||
# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
|
||||
# (Actually on second look, I think it only needs one of the m* libraries.)
|
||||
IF(MINGW)
|
||||
SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
|
||||
ENDIF(MINGW)
|
||||
|
||||
SET(SDL2_FOUND "NO")
|
||||
IF(SDL2_LIBRARY_TEMP)
|
||||
# For SDL2main
|
||||
IF(NOT SDL2_BUILDING_LIBRARY)
|
||||
IF(SDL2MAIN_LIBRARY)
|
||||
SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
|
||||
ENDIF(SDL2MAIN_LIBRARY)
|
||||
ENDIF(NOT SDL2_BUILDING_LIBRARY)
|
||||
|
||||
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
|
||||
# CMake doesn't display the -framework Cocoa string in the UI even
|
||||
# though it actually is there if I modify a pre-used variable.
|
||||
# I think it has something to do with the CACHE STRING.
|
||||
# So I use a temporary variable until the end so I can set the
|
||||
# "real" variable in one-shot.
|
||||
IF(APPLE)
|
||||
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
|
||||
ENDIF(APPLE)
|
||||
|
||||
# For threads, as mentioned Apple doesn't need this.
|
||||
# In fact, there seems to be a problem if I used the Threads package
|
||||
# and try using this line, so I'm just skipping it entirely for OS X.
|
||||
IF(NOT APPLE)
|
||||
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
|
||||
ENDIF(NOT APPLE)
|
||||
|
||||
# For MinGW library
|
||||
IF(MINGW)
|
||||
SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
|
||||
ENDIF(MINGW)
|
||||
|
||||
# Set the final string here so the GUI reflects the final state.
|
||||
SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
|
||||
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
|
||||
SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
|
||||
|
||||
SET(SDL2_FOUND "YES")
|
||||
ENDIF(SDL2_LIBRARY_TEMP)
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
|
||||
REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
|
||||
@ -0,0 +1,90 @@
|
||||
#ifndef _OIS_SDL_COMPAT_H
|
||||
#define _OIS_SDL_COMPAT_H
|
||||
|
||||
#include <SDL2/SDL_events.h>
|
||||
#include <SDL2/SDL_types.h>
|
||||
|
||||
//TODO: Remove this. Right now we want to remain as close to OIS as possible
|
||||
//So we can easily test the SDL backend
|
||||
|
||||
////////////
|
||||
// Events //
|
||||
////////////
|
||||
|
||||
namespace ICS {
|
||||
|
||||
/** Extended mouse event struct where we treat the wheel like an axis, like everyone expects */
|
||||
struct MWSDLMouseMotionEvent : SDL_MouseMotionEvent {
|
||||
|
||||
Sint16 zrel;
|
||||
|
||||
MWSDLMouseMotionEvent()
|
||||
{
|
||||
x = 0;
|
||||
y = 0;
|
||||
xrel = 0;
|
||||
yrel = 0;
|
||||
state = 0;
|
||||
zrel = 0;
|
||||
}
|
||||
|
||||
MWSDLMouseMotionEvent( const SDL_MouseMotionEvent& evt) :
|
||||
MWSDLMouseMotionEvent()
|
||||
{
|
||||
x = evt.x;
|
||||
y = evt.y;
|
||||
xrel = evt.xrel;
|
||||
yrel = evt.yrel;
|
||||
state = evt.state;
|
||||
}
|
||||
|
||||
MWSDLMouseMotionEvent (const SDL_MouseWheelEvent& evt) :
|
||||
MWSDLMouseMotionEvent()
|
||||
{
|
||||
zrel = evt.y;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
///////////////
|
||||
// Listeners //
|
||||
///////////////
|
||||
|
||||
class MWSDLMouseListener
|
||||
{
|
||||
public:
|
||||
virtual ~MWSDLMouseListener() {}
|
||||
virtual bool mouseMoved( const MWSDLMouseMotionEvent &arg ) = 0;
|
||||
virtual bool mousePressed( const SDL_MouseButtonEvent &arg, Uint8 id ) = 0;
|
||||
virtual bool mouseReleased( const SDL_MouseButtonEvent &arg, Uint8 id ) = 0;
|
||||
};
|
||||
|
||||
class MWSDLKeyListener
|
||||
{
|
||||
public:
|
||||
virtual ~MWSDLKeyListener() {}
|
||||
virtual bool keyPressed(const SDL_KeyboardEvent &arg) = 0;
|
||||
virtual bool keyReleased(const SDL_KeyboardEvent &arg) = 0;
|
||||
};
|
||||
|
||||
class MWSDLJoyStickListener
|
||||
{
|
||||
public:
|
||||
virtual ~MWSDLJoyStickListener() {}
|
||||
/** @remarks Joystick button down event */
|
||||
virtual bool buttonPressed( const SDL_JoyButtonEvent &evt, int button ) = 0;
|
||||
|
||||
/** @remarks Joystick button up event */
|
||||
virtual bool buttonReleased( const SDL_JoyButtonEvent &evt, int button ) = 0;
|
||||
|
||||
/** @remarks Joystick axis moved event */
|
||||
virtual bool axisMoved( const SDL_JoyAxisEvent &arg, int axis ) = 0;
|
||||
|
||||
//-- Not so common control events, so are not required --//
|
||||
|
||||
//! Joystick Event, and povID
|
||||
virtual bool povMoved( const SDL_JoyHatEvent &arg, int index) {return true;}
|
||||
};
|
||||
|
||||
}
|
||||
#endif
|
||||
Loading…
Reference in New Issue