Browse Source

ifdef some Win32 InputCore stuff for plDrawable.

Darryl Pogue 13 years ago
parent
commit
6f5643debd
  1. 7
      Sources/Plasma/NucleusLib/pnInputCore/plOSMsg.h
  2. 6
      Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp
  3. 7
      Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h

7
Sources/Plasma/NucleusLib/pnInputCore/plOSMsg.h

@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
// for Win32: // for Win32:
#ifdef HS_BUILD_FOR_WIN32
enum plOSMsg enum plOSMsg
{ {
@ -71,6 +72,12 @@ enum plOSMsg
CHAR_MSG = WM_CHAR, CHAR_MSG = WM_CHAR,
}; };
#else
enum plOSMsg { };
#endif
// //
// generic structure that we can use to describe // generic structure that we can use to describe

6
Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp

@ -432,18 +432,18 @@ hsBool plVisLOSMgr::CursorCheck(plVisHit& hit)
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
static plSceneObject* marker = nil; static plSceneObject* marker = nil;
static plPipeline* pipe = nil; static plPipeline* fPipe = nil;
void VisLOSHackBegin(plPipeline* p, plSceneObject* m) void VisLOSHackBegin(plPipeline* p, plSceneObject* m)
{ {
marker = m; marker = m;
pipe = p; fPipe = p;
} }
void VisLOSHackPulse() void VisLOSHackPulse()
{ {
if( !pipe ) if( !fPipe )
return; return;
plVisHit hit; plVisHit hit;

7
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h

@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsWindows.h" #include "hsWindows.h"
#include "hsWindowHndl.h"
//#include "pnInputCore/plControlDefinition.h" //#include "pnInputCore/plControlDefinition.h"
#include "pnInputCore/plOSMsg.h" #include "pnInputCore/plOSMsg.h"
#include "pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
@ -75,7 +76,7 @@ public:
void SetFlags(UInt32 f) { fFlags = f; } void SetFlags(UInt32 f) { fFlags = f; }
virtual void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, hsBool bKeyRepeat, wchar_t c = nil) {;} virtual void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, hsBool bKeyRepeat, wchar_t c = nil) {;}
virtual void HandleMouseEvent(plOSMsg message, plMouseState state) {;} virtual void HandleMouseEvent(plOSMsg message, plMouseState state) {;}
virtual void HandleWindowActivate(bool bActive, HWND hWnd) {;} virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd) {;}
virtual hsBool MsgReceive(plMessage* msg) {return false;} virtual hsBool MsgReceive(plMessage* msg) {return false;}
virtual void Shutdown() {;} virtual void Shutdown() {;}
@ -116,7 +117,7 @@ public:
const char* GetInputName() { return "keyboard"; } const char* GetInputName() { return "keyboard"; }
void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, hsBool bKeyRepeat, wchar_t c = nil); void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, hsBool bKeyRepeat, wchar_t c = nil);
virtual void HandleWindowActivate(bool bActive, HWND hWnd); virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd);
virtual hsBool IsCapsLockKeyOn(); virtual hsBool IsCapsLockKeyOn();
virtual void Shutdown(); virtual void Shutdown();
@ -159,7 +160,7 @@ public:
~plMouseDevice(); ~plMouseDevice();
const char* GetInputName() { return "mouse"; } const char* GetInputName() { return "mouse"; }
void HandleWindowActivate(bool bActive, HWND hWnd); void HandleWindowActivate(bool bActive, hsWindowHndl hWnd);
hsBool HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); } hsBool HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); }
void SetControlFlag(int f) void SetControlFlag(int f)

Loading…
Cancel
Save