Merge pull request #6 from RetroView/input-stubs

Added input device stubs

include/CInputDeferredRelay.hpp

@@ -0,0 +1,6 @@
+#ifndef CINPUTDEFERREDRELAY_HPP
+#define CINPUTDEFERREDRELAY_HPP
+
+#include "IInputWaiter.hpp"
+
+#endif // CINPUTDEFERREDRELAY_HPP

include/CInputRelay.hpp

@@ -0,0 +1,11 @@
+#ifndef CINPUTRELAY_HPP
+#define CINPUTRELAY_HPP
+
+#include "IInputWaiter.hpp"
+
+class CInputRelay : IInputWaiter
+{
+    
+};
+
+#endif // CINPUTRELAY_HPP

include/CQtOpenGLWindow.hpp

@@ -0,0 +1,36 @@
+#ifndef CQTOPENGLWINDOW_HPP
+#define CQTOPENGLWINDOW_HPP
+
+#include <QWindow>
+#include <QOpenGLFunctions>
+#include <ISurface.hpp>
+
+class CQtOpenGLWindow : public QWindow, ISurface
+{
+    Q_OBJECT
+public:
+    explicit CQtOpenGLWindow(QWindow *parent = 0);
+    CQtOpenGLWindow();
+    
+    virtual void render();
+    
+    virtual void initialize();
+    
+    
+    public slots:
+    void renderLater();
+    void renderNow();
+    
+protected:
+    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    
+    void exposeEvent(QExposeEvent *event) Q_DECL_OVERRIDE;
+    
+private:
+    bool m_update_pending;
+    bool m_animating;
+    
+    QOpenGLContext *m_context;
+};
+
+#endif // CQTOPENGLWINDOW_HPP

include/IInputWaiter.hpp

@@ -0,0 +1,9 @@
+#ifndef IINPUTWAITER_HPP
+#define IINPUTWAITER_HPP
+
+class IInputWaiter
+{
+    
+};
+
+#endif // IINPUTWAITER_HPP

include/inputdev/CCafeProPad.hpp

@@ -0,0 +1,5 @@
+#ifndef CCAFEPROPAD_HPP
+#define CCAFEPROPAD_HPP
+
+
+#endif // CCAFEPROPAD_HPP

include/inputdev/CDeviceFinder.hpp

@@ -0,0 +1,5 @@
+#ifndef CDEVICEFINDER_HPP
+#define CDEVICEFINDER_HPP
+
+
+#endif // CDEVICEFINDER_HPP

include/inputdev/CDolphinSmashAdapter.hpp

@@ -0,0 +1,5 @@
+#ifndef CDOLPHINSMASHADAPTER_HPP
+#define CDOLPHINSMASHADAPTER_HPP
+
+
+#endif // CDOLPHINSMASHADAPTER_HPP

include/inputdev/CDualshockPad.hpp

@@ -0,0 +1,5 @@
+#ifndef CDUALSHOCKPAD_HPP
+#define CDUALSHOCKPAD_HPP
+
+
+#endif // CDUALSHOCKPAD_HPP

include/inputdev/CGenericPad.hpp

@@ -0,0 +1,5 @@
+#ifndef CGENERICPAD_HPP
+#define CGENERICPAD_HPP
+
+
+#endif // CGENERICPAD_HPP

include/inputdev/CRevolutionPad.hpp

@@ -0,0 +1,5 @@
+#ifndef CREVOLUTIONPAD_HPP
+#define CREVOLUTIONPAD_HPP
+
+
+#endif // CREVOLUTIONPAD_HPP

libBoo.pri

@@ -4,7 +4,18 @@ HEADERS += \
     $$PWD/include/boo.hpp \
     $$PWD/include/IGraphicsContext.hpp \
     $$PWD/include/ISurface.hpp \
-    $$PWD/include/IRetraceWaiter.hpp
+    $$PWD/include/CSurface.hpp \
+    $$PWD/include/IRetraceWaiter.hpp \
+    $$PWD/include/IInputWaiter.hpp \
+    $$PWD/include/CInputRelay.hpp \
+    $$PWD/include/CInputDeferredRelay.hpp \
+    $$PWD/include/inputdev/CDolphinSmashAdapter.hpp \
+    $$PWD/include/inputdev/CRevolutionPad.hpp \
+    $$PWD/include/inputdev/CCafeProPad.hpp \
+    $$PWD/include/inputdev/CDualshockPad.hpp \
+    $$PWD/include/inputdev/CGenericPad.hpp \
+    $$PWD/include/inputdev/CDeviceFinder.hpp \
+    $$PWD/src/inputdev/IHIDDevice.hpp
 
 unix:!macx:HEADERS += \
     $$PWD/include/x11/CGLXContext.hpp
@@ -17,18 +28,29 @@ win32:HEADERS += \
 
 SOURCES += \
     $$PWD/src/CSurface.cpp \
-    $$PWD/src/CRetraceWaiter.cpp
+    $$PWD/src/CRetraceWaiter.cpp \
+    $$PWD/src/CInputRelay.cpp \
+    $$PWD/src/CInputDeferredRelay.cpp \
+    $$PWD/src/inputdev/CDolphinSmashAdapter.cpp \
+    $$PWD/src/inputdev/CRevolutionPad.cpp \
+    $$PWD/src/inputdev/CCafeProPad.cpp \
+    $$PWD/src/inputdev/CDualshockPad.cpp \
+    $$PWD/src/inputdev/CGenericPad.cpp \
+    $$PWD/src/inputdev/CDeviceFinder.cpp
 
 unix:!macx:SOURCES += \
-    $$PWD/src/x11/CGLXContext.cpp
+    $$PWD/src/x11/CGLXContext.cpp \
+    $$PWD/src/inputdev/CHIDDeviceUdev.cpp
 
 macx:SOURCES += \
     $$PWD/src/mac/CCGLContext.cpp
 
 macx:OBJECTIVE_SOURCES += \
-    $$PWD/src/mac/CCGLCocoaView.mm
+    $$PWD/src/mac/CCGLCocoaView.mm \
+    $$PWD/src/inputdev/CHIDDeviceIOKit.mm
 
 win32:SOURCES += \
-    $$PWD/src/win/CWGLContext.cpp
+    $$PWD/src/win/CWGLContext.cpp \
+    $$PWD/src/inputdev/CHIDDeviceWin32.cpp
 
 INCLUDEPATH += $$PWD/include

src/CInputDeferredRelay.cpp

@@ -0,0 +1 @@
+#include "CInputDeferredRelay.hpp"

src/CInputRelay.cpp

@@ -0,0 +1 @@
+#include "CInputRelay.hpp"

src/CQtOpenGLWindow.cpp

@@ -0,0 +1,3 @@
+#include "CQtOpenGLWindow.hpp"
+
+

src/inputdev/CCafeProPad.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CDeviceFinder.cpp

@@ -0,0 +1,9 @@
+/*
+ *  CDeviceFinder.cpp
+ *  libBoo
+ *
+ *  Created on 04/19/2015.
+ *
+ */
+
+#include <stdio.h>

src/inputdev/CDolphinSmashAdapter.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CDualshockPad.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CGenericPad.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CHIDDeviceIOKit.mm

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CHIDDeviceUdev.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CHIDDeviceWin32.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/CRevolutionPad.cpp

@@ -0,0 +1 @@
+#include "IHIDDevice.hpp"

src/inputdev/IHIDDevice.hpp

@@ -0,0 +1,5 @@
+#ifndef IHIDDEVICE_HPP
+#define IHIDDEVICE_HPP
+
+
+#endif // IHIDDEVICE_HPP

src/mac/CCGLContext.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 
 CCGLContext::CCGLContext()
-    : m_majVersion(3),
+    : m_minVersion(3),
-      m_minVersion(3)
+      m_majVersion(3)
 {
     std::cout << "Hello from CGL" << std::endl;
 }
@@ -58,3 +58,4 @@ int CCGLContext::blueDepth() const
 {
     return -1;
 }
+#endif