gosu 0.7.22 → 0.7.23

data/GosuImpl/Graphics/Transform.cpp

@@ -47,7 +47,7 @@ Gosu::scale(double factor)
 }
 
 Gosu::Transform
-Gosu::scale(double factorX, double factorY)
+Gosu::scale(double factorX, double factorY, double aroundX, double aroundY)
 {
     Gosu::Transform result = {
         factorX, 0,       0, 0,
@@ -55,5 +55,7 @@ Gosu::scale(double factorX, double factorY)
         0,       0,       1, 0,
         0,       0,       0, 1
     };
+    if (aroundX != 0 || aroundY != 0)
+        result = multiply(multiply(translate(-aroundX, -aroundY), result), translate(aroundX, aroundY));
     return result;
 }

data/GosuImpl/Input/AccelerometerReader.hpp

@@ -0,0 +1,10 @@
+#include <UIKit/UIKit.h>
+
+typedef UIAccelerationValue Acceleration[3];
+
+@interface AccelerometerReader : NSObject {
+    Acceleration acceleration;
+}
+-(AccelerometerReader*)initWithUpdateInterval:(float)updateInterval;
+-(const Acceleration&)acceleration;
+@end

data/GosuImpl/Input/AccelerometerReader.mm

@@ -0,0 +1,31 @@
+// Thanks for inspiration to Phil Cooper-King.
+// This is adapted from his MIT-licensed Gosu fork
+// on GitHub.
+
+#import <GosuImpl/Input/AccelerometerReader.hpp>
+
+@implementation AccelerometerReader
+- (AccelerometerReader*)initWithUpdateInterval: (float)updateInterval
+{
+    if (self = [super init])
+    {
+        [[UIAccelerometer sharedAccelerometer] setUpdateInterval: updateInterval];
+        [[UIAccelerometer sharedAccelerometer] setDelegate:self];
+        acceleration[0] = acceleration[1] = acceleration[2] = 0.0f;
+    }
+    return self;
+}
+
+- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)uiAccel
+{
+    float factor = 0.3f;
+    acceleration[0] = (uiAccel.x * factor) + (acceleration[0] * (1 - factor));
+    acceleration[1] = (uiAccel.y * factor) + (acceleration[1] * (1 - factor));
+    acceleration[2] = (uiAccel.z * factor) + (acceleration[2] * (1 - factor));
+}
+
+- (const Acceleration&)acceleration
+{
+    return acceleration;
+}
+@end

data/GosuImpl/InputMac.mm

@@ -2,6 +2,7 @@
 #import <Carbon/Carbon.h>
 #include <Gosu/Input.hpp>
 #include <Gosu/TextInput.hpp>
+#include <GosuImpl/MacUtility.hpp>
 #include <Gosu/Utility.hpp>
 #include <IOKit/hidsystem/IOLLEvent.h>
 #include <boost/array.hpp>
@@ -20,7 +21,6 @@
 #include <IOKit/IOCFPlugIn.h>
 #include <stdexcept>
 #include <vector>
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
 // USB Gamepad code, likely to be moved somewhere else later.
@@ -29,23 +29,7 @@ namespace {
     using namespace std;
     using namespace Gosu;
     using boost::shared_ptr;
-
-    class CFScope : boost::noncopyable
-    {
-        CFTypeRef ref;
-    public:
-        CFScope(CFTypeRef ref) : ref(ref) {}
-        ~CFScope() { CFRelease(ref); }
-    };
-
-    class IOScope : boost::noncopyable
-    {
-        io_object_t ref;
-    public:
-        IOScope(io_object_t ref) : ref(ref) {}
-        ~IOScope() { IOObjectRelease(ref); }
-    };
-
+    
     template<typename Negatable>
     void checkTrue(Negatable cond, const char* message = "work")
     {
@@ -57,6 +41,21 @@ namespace {
     {
         checkTrue(val == kIOReturnSuccess, message);
     }
+    
+    class IOScope : boost::noncopyable
+    {
+        io_object_t ref;
+    public:
+        IOScope(io_object_t ref)
+        :   ref(ref)
+        {
+        }
+        
+        ~IOScope()
+        {
+            IOObjectRelease(ref);
+        }
+    };
 
     string getDictString(CFMutableDictionaryRef dict, CFStringRef key, const char* what)
     {
@@ -130,7 +129,7 @@ namespace {
         Button(CFMutableDictionaryRef dict)
         {
             cookie = (IOHIDElementCookie)getDictSInt32(dict, CFSTR(kIOHIDElementCookieKey),
-                "element cookie");
+                "get an element cookie");
         }
     };
 
@@ -272,15 +271,22 @@ namespace {
                 kCFAllocatorDefault, kNilOptions);
             if (!properties)
                 return;
-            CFScope guard(properties);
+            CFRef<> guard(properties);
             
             if (!isDeviceInteresting(properties))
                 return;
             
             Device newDevice;
             newDevice.interface = getDeviceInterface(object);
-            newDevice.name = getDictString(properties, CFSTR(kIOHIDProductKey),
-                "a product name");
+            try
+            {
+                newDevice.name = getDictString(properties, CFSTR(kIOHIDProductKey),
+                    "get a product name");
+            }
+            catch (const runtime_error&)
+            {
+                newDevice.name = "unnamed device";
+            }
             addElementCollection(newDevice, properties);
             devices.push_back(newDevice);
         }
@@ -622,7 +628,7 @@ Gosu::Button Gosu::Input::charToId(wchar_t ch)
 
 bool Gosu::Input::down(Gosu::Button btn) const
 {
-    if (btn == noButton)
+    if (btn == noButton || btn.id() >= numButtons)
         return false;
 
     return buttonStates.at(btn.id());
@@ -640,7 +646,7 @@ double Gosu::Input::mouseY() const
 
 void Gosu::Input::setMousePosition(double x, double y)
 {
-    NSPoint mousePos = NSMakePoint(x, y);
+    NSPoint mousePos = NSMakePoint(x / pimpl->mouseFactorX, y / pimpl->mouseFactorY);
     if (pimpl->window)
     {
         mousePos.y = [[pimpl->window contentView] frame].size.height - mousePos.y;
@@ -660,6 +666,27 @@ void Gosu::Input::setMouseFactors(double factorX, double factorY)
     pimpl->mouseFactorY = factorY;
 }
 
+const Gosu::Touches& Gosu::Input::currentTouches() const
+{
+    static Gosu::Touches none;
+    return none;
+}
+
+double Gosu::Input::accelerometerX() const
+{
+    return 0.0;
+}
+
+double Gosu::Input::accelerometerY() const
+{
+    return 0.0;
+}
+
+double Gosu::Input::accelerometerZ() const
+{
+    return 0.0;
+}
+
 void Gosu::Input::update()
 {
     pimpl->refreshMousePosition();

data/GosuImpl/InputTouch.mm

@@ -1,6 +1,11 @@
 #include <Gosu/Input.hpp>
 #include <Gosu/TextInput.hpp>
 
+#import <GosuImpl/MacUtility.hpp>
+#import <GosuImpl/Orientation.hpp>
+#import <GosuImpl/Graphics/GosuView.hpp>
+#import <GosuImpl/Input/AccelerometerReader.hpp>
+
 struct Gosu::TextInput::Impl {};
 Gosu::TextInput::TextInput() {}
 Gosu::TextInput::~TextInput() {}
@@ -10,14 +15,67 @@ unsigned Gosu::TextInput::caretPos() const { return 0; }
 unsigned Gosu::TextInput::selectionStart() const { return 0; }
 
 struct Gosu::Input::Impl {
+    GosuView* view;
+    float factorX, factorY;
+    float updateInterval;
+    
+    ObjRef<NSMutableSet> currentTouchesSet;
+    boost::scoped_ptr<Gosu::Touches> currentTouchesVector;
+    
+    Touch translateTouch(UITouch* uiTouch)
+    {
+        CGPoint point = [uiTouch locationInView: view];
+        Touch touch = { uiTouch, point.y, point.x };
+        switch (currentOrientation())
+        {
+        case orLandscapeLeft:
+            touch.y = [view bounds].size.width - touch.y;
+            break;
+        default:
+            touch.x = [view bounds].size.height - touch.x;
+            break;
+        }
+        touch.x *= factorX, touch.y *= factorY;
+        return touch;
+    }
+    
+    ObjRef<AccelerometerReader> accelerometerReader;
+    
+    float acceleration(int index)
+    {
+        if (accelerometerReader.get() == 0)
+            accelerometerReader.reset([[AccelerometerReader alloc] initWithUpdateInterval: updateInterval]);
+        return [accelerometerReader.obj() acceleration][index];
+    }
 };
 
-Gosu::Input::Input() {
+Gosu::Input::Input(void* view, float updateInterval)
+: pimpl(new Impl)
+{
+    pimpl->view = (GosuView*)view;
+    pimpl->updateInterval = updateInterval;
+    pimpl->currentTouchesSet.reset([[NSMutableSet alloc] init]);
+    setMouseFactors(1, 1);
 }
 
 Gosu::Input::~Input() {
 }
 
+void Gosu::Input::feedTouchEvent(int type, void* touches)
+{
+    NSSet* uiTouches = (NSSet*)touches;
+    
+    pimpl->currentTouchesVector.reset();
+    boost::function<void (Touch)>* f = &onTouchMoved;
+    if (type == 0)
+        [pimpl->currentTouchesSet.get() unionSet: uiTouches], f = &onTouchBegan;
+    else if (type == 2)
+        [pimpl->currentTouchesSet.get() minusSet: uiTouches], f = &onTouchEnded;
+    for (UITouch* uiTouch in uiTouches)
+        if (*f)
+            (*f)(pimpl->translateTouch(uiTouch));        
+}
+
 wchar_t Gosu::Input::idToChar(Button btn) {
     return 0;
 }
@@ -42,9 +100,62 @@ void Gosu::Input::setMousePosition(double x, double y) {
 }
 
 void Gosu::Input::setMouseFactors(double factorX, double factorY) {
+    pimpl->factorX = factorX;
+    pimpl->factorY = factorY;
+}
+
+const Gosu::Touches& Gosu::Input::currentTouches() const
+{
+    if (!pimpl->currentTouchesVector)
+    {
+        pimpl->currentTouchesVector.reset(new Gosu::Touches);
+        for (UITouch* uiTouch in pimpl->currentTouchesSet.obj())
+            pimpl->currentTouchesVector->push_back(pimpl->translateTouch(uiTouch));
+    }
+    return *pimpl->currentTouchesVector;
+}
+
+double Gosu::Input::accelerometerX() const {
+    return pimpl->acceleration(0);
+}
+
+double Gosu::Input::accelerometerY() const {
+    return pimpl->acceleration(1);
+}
+
+double Gosu::Input::accelerometerZ() const {
+    return pimpl->acceleration(2);
 }
 
 void Gosu::Input::update() {
+    // Check for dead touches and remove from vector if
+    // necessary
+
+    ObjRef<NSMutableSet> deadTouches;
+
+    for (UITouch* touch in pimpl->currentTouchesSet.obj())
+    {
+        UITouchPhase phase = [touch phase];
+        if (phase == UITouchPhaseBegan ||
+            phase == UITouchPhaseMoved ||
+            phase == UITouchPhaseStationary)
+            continue;
+            
+        // Something was deleted, we will need the set.
+        if (!deadTouches.get())
+            deadTouches.reset([[NSMutableSet alloc] init]);
+        [deadTouches.obj() addObject:touch];
+    }
+    
+    // Has something been deleted?
+    if (deadTouches.get())
+    {
+        pimpl->currentTouchesVector.reset();
+        [pimpl->currentTouchesSet.obj() minusSet: deadTouches.obj()];
+        for (UITouch* uiTouch in deadTouches.obj())
+            if (onTouchEnded)
+                onTouchEnded(pimpl->translateTouch(uiTouch));
+    }
 }
 
 Gosu::TextInput* Gosu::Input::textInput() const {

data/GosuImpl/InputWin.cpp

@@ -135,7 +135,9 @@ struct Gosu::Input::Impl
 	void updateMousePos()
 	{
 		POINT pos;
-		Win::check(::GetCursorPos(&pos));
+		if (!::GetCursorPos(&pos))
+			return;
+
 		Win::check(::ScreenToClient(window, &pos));
 
 		mouseX = pos.x;
@@ -353,6 +355,7 @@ Gosu::Input::Input(HWND window)
 
     // Get into a usable default state.
 
+	pimpl->mouseX = pimpl->mouseY = 0;
     pimpl->updateMousePos();
     buttons.assign(false);
 }
@@ -402,9 +405,9 @@ wchar_t Gosu::Input::idToChar(Gosu::Button btn)
 bool Gosu::Input::down(Button btn) const
 {
 	// The invalid button is never pressed (but can be passed to this function).
-	if (btn == noButton)
+	if (btn == noButton || btn.id() >= numButtons)
 		return false;
-
+    
     return buttons.at(btn.id());
 }
 
@@ -432,6 +435,27 @@ void Gosu::Input::setMouseFactors(double factorX, double factorY)
 	pimpl->mouseFactorY = factorY;
 }
 
+const Gosu::Touches& Gosu::Input::currentTouches() const
+{
+    static Gosu::Touches none;
+    return none;
+}
+
+double Gosu::Input::accelerometerX() const
+{
+    return 0.0;
+}
+
+double Gosu::Input::accelerometerY() const
+{
+    return 0.0;
+}
+
+double Gosu::Input::accelerometerZ() const
+{
+    return 0.0;
+}
+
 void Gosu::Input::update()
 {
     pimpl->updateMousePos();

data/GosuImpl/InputX.cpp

@@ -107,6 +107,27 @@ void Gosu::Input::setMouseFactors(double factorX, double factorY)
     pimpl->mouseFactorY = factorY;
 }
 
+const Gosu::Touches& Gosu::Input::currentTouches() const
+{
+    static Gosu::Touches none;
+    return none;
+}
+
+double Gosu::Input::accelerometerX() const
+{
+    return 0.0;
+}
+
+double Gosu::Input::accelerometerY() const
+{
+    return 0.0;
+}
+
+double Gosu::Input::accelerometerZ() const
+{
+    return 0.0;
+}
+
 void Gosu::Input::update()
 {
     for (unsigned int i = 0; i < pimpl->eventList.size(); i++)

data/GosuImpl/MacUtility.hpp

@@ -86,4 +86,37 @@ namespace Gosu
 }
 #endif
 
+namespace Gosu
+{
+    template<typename CFRefType = CFTypeRef>
+    class CFRef : boost::noncopyable
+    {
+        CFRefType ref;
+
+    public:
+        explicit CFRef(CFRefType ref)
+        :   ref(ref)
+        {
+        }
+        
+        CFRef()
+        {
+            if (ref)
+                CFRelease(ref);
+        }
+        
+        CFRefType get()
+        {
+            return ref;
+        }
+        
+        CFRefType obj()
+        {
+            if (!ref)
+                throw std::logic_error("CF reference invalid (null)");
+            return ref;
+        }
+    };
+}
+
 #endif