gosu 0.7.33 → 0.7.35

data/GosuImpl/Graphics/Texture.cpp

@@ -62,19 +62,20 @@ GLuint Gosu::Texture::texName() const
 
 std::auto_ptr<Gosu::TexChunk>
     Gosu::Texture::tryAlloc(Graphics& graphics, Transforms& transforms,
-        DrawOpQueueStack& queues, boost::shared_ptr<Texture> ptr, const Bitmap& bmp, unsigned padding)
+        DrawOpQueueStack& queues, std::tr1::shared_ptr<Texture> ptr,
+        const Bitmap& bmp, unsigned padding)
 {
     std::auto_ptr<Gosu::TexChunk> result;
     
-    boost::optional<BlockAllocator::Block> block = allocator.alloc(bmp.width(), bmp.height());
-    if (!block)
+    BlockAllocator::Block block;
+    if (!allocator.alloc(bmp.width(), bmp.height(), block))
         return result;
     
-    result.reset(new TexChunk(graphics, transforms, queues, ptr, block->left + padding, block->top + padding,
-                              block->width - 2 * padding, block->height - 2 * padding, padding));
+    result.reset(new TexChunk(graphics, transforms, queues, ptr, block.left + padding, block.top + padding,
+                              block.width - 2 * padding, block.height - 2 * padding, padding));
     
     glBindTexture(GL_TEXTURE_2D, name);
-    glTexSubImage2D(GL_TEXTURE_2D, 0, block->left, block->top, block->width, block->height,
+    glTexSubImage2D(GL_TEXTURE_2D, 0, block.left, block.top, block.width, block.height,
                  Color::GL_FORMAT, GL_UNSIGNED_BYTE, bmp.data());
 
     num += 1;

data/GosuImpl/Graphics/Texture.hpp

@@ -3,11 +3,10 @@
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Bitmap.hpp>
+#include <Gosu/TR1.hpp>
 #include <GosuImpl/Graphics/Common.hpp>
 #include <GosuImpl/Graphics/TexChunk.hpp>
 #include <GosuImpl/Graphics/BlockAllocator.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace Gosu
@@ -24,8 +23,8 @@ namespace Gosu
         unsigned size() const;
         GLuint texName() const;
         std::auto_ptr<TexChunk> 
-            tryAlloc(Graphics& graphics, Transforms& transforms, DrawOpQueueStack& queues, boost::shared_ptr<Texture> ptr,
-                const Bitmap& bmp, unsigned padding);
+            tryAlloc(Graphics& graphics, Transforms& transforms, DrawOpQueueStack& queues,
+                std::tr1::shared_ptr<Texture> ptr, const Bitmap& bmp, unsigned padding);
         void free(unsigned x, unsigned y);
         Gosu::Bitmap toBitmap(unsigned x, unsigned y, unsigned width, unsigned height) const;
     };

data/GosuImpl/InputMac.mm

@@ -3,10 +3,9 @@
 #include <Gosu/Input.hpp>
 #include <Gosu/TextInput.hpp>
 #include <GosuImpl/MacUtility.hpp>
+#include <Gosu/TR1.hpp>
 #include <Gosu/Utility.hpp>
 #include <IOKit/hidsystem/IOLLEvent.h>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
 #include <map>
 #include <string>
 #include <vector>
@@ -21,14 +20,13 @@
 #include <IOKit/IOCFPlugIn.h>
 #include <stdexcept>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 // USB Gamepad code, likely to be moved somewhere else later.
 // This is Frankencode until the Input redesign happens.
 namespace {
     using namespace std;
     using namespace Gosu;
-    using boost::shared_ptr;
+    using tr1::shared_ptr;
     
     template<typename Negatable>
     void checkTrue(Negatable cond, const char* message = "work")
@@ -42,9 +40,12 @@ namespace {
         checkTrue(val == kIOReturnSuccess, message);
     }
     
-    class IOScope : boost::noncopyable
+    class IOScope
     {
         io_object_t ref;
+        
+        IOScope(const IOScope&);
+        IOScope& operator=(const IOScope&);
     public:
         IOScope(io_object_t ref)
         :   ref(ref)
@@ -325,11 +326,10 @@ namespace {
             return devices.at(i);
         }
 
-        boost::array<bool, gpNum> poll()
+        std::tr1::array<bool, gpNum> poll()
         {
-            boost::array<bool, gpNum> result;
-            result.assign(false);
-        
+            std::tr1::array<bool, gpNum> result = { false };
+            
             IOHIDEventStruct event;
             for (int dev = 0; dev < devices.size(); ++dev)
             {
@@ -429,7 +429,7 @@ namespace Gosu
 namespace {
     const unsigned numScancodes = 128;
     
-    boost::array<wchar_t, numScancodes> idChars;
+    std::tr1::array<wchar_t, numScancodes> idChars = { 0 };
     std::map<wchar_t, unsigned> charIds;
     
     void initCharTranslation()
@@ -439,8 +439,6 @@ namespace {
             return;
         initializedCharData = true;
         
-        idChars.assign(0);
-
 #ifdef __LP64__
         CFRef<TISInputSourceRef> is(TISCopyCurrentKeyboardLayoutInputSource());
         CFRef<CFDataRef> UCHR(
@@ -507,7 +505,7 @@ namespace {
 #endif
     }
 	 
-    boost::array<bool, Gosu::numButtons> buttonStates;
+    std::tr1::array<bool, Gosu::numButtons> buttonStates = { false };
 }
 
 struct Gosu::Input::Impl
@@ -575,7 +573,6 @@ Gosu::Input::Input(void* window)
 : pimpl(new Impl(*this))
 {
     pimpl->window = static_cast<NSWindow*>(window);
-    buttonStates.assign(false);
     initCharTranslation();
 }
 
@@ -733,7 +730,7 @@ void Gosu::Input::update()
     pimpl->queue.clear();
     
     static System sys;
-    boost::array<bool, gpNum> gpState = sys.poll();
+    std::tr1::array<bool, gpNum> gpState = sys.poll();
     for (unsigned i = 0; i < gpNum; ++i)
     {
         if (buttonStates[i + gpRangeBegin] != gpState[i])

data/GosuImpl/InputTouch.mm

@@ -20,7 +20,7 @@ struct Gosu::Input::Impl {
     float updateInterval;
     
     ObjRef<NSMutableSet> currentTouchesSet;
-    boost::scoped_ptr<Gosu::Touches> currentTouchesVector;
+    std::auto_ptr<Gosu::Touches> currentTouchesVector;
     
     Touch translateTouch(UITouch* uiTouch)
     {
@@ -66,7 +66,7 @@ void Gosu::Input::feedTouchEvent(int type, void* touches)
     NSSet* uiTouches = (NSSet*)touches;
     
     pimpl->currentTouchesVector.reset();
-    boost::function<void (Touch)>* f = &onTouchMoved;
+    std::tr1::function<void (Touch)>* f = &onTouchMoved;
     if (type == 0)
         [pimpl->currentTouchesSet.get() unionSet: uiTouches], f = &onTouchBegan;
     else if (type == 2)
@@ -106,7 +106,7 @@ void Gosu::Input::setMouseFactors(double factorX, double factorY) {
 
 const Gosu::Touches& Gosu::Input::currentTouches() const
 {
-    if (!pimpl->currentTouchesVector)
+    if (!pimpl->currentTouchesVector.get())
     {
         pimpl->currentTouchesVector.reset(new Gosu::Touches);
         for (UITouch* uiTouch in pimpl->currentTouchesSet.obj())

data/GosuImpl/InputWin.cpp

@@ -1,8 +1,7 @@
 #include <Gosu/Input.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
 #include <Gosu/WinUtility.hpp>
-#include <boost/array.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cwchar>
 #include <iomanip>
 #include <sstream>
@@ -15,7 +14,7 @@
 #include <dinput.h>
 
 namespace {
-	boost::array<bool, Gosu::numButtons> buttons;
+    std::tr1::array<bool, Gosu::numButtons> buttons;
 }
 
 struct Gosu::Input::Impl
@@ -24,14 +23,14 @@ struct Gosu::Input::Impl
     Impl() : textInput(0) {}
 
     HWND window;
-    boost::shared_ptr<IDirectInput8> input;
+    std::tr1::shared_ptr<IDirectInput8> input;
 
-    typedef boost::shared_ptr<IDirectInputDevice8> Device;
+    typedef std::tr1::shared_ptr<IDirectInputDevice8> Device;
     Device keyboard, mouse;
     std::vector<Device> gamepads;
 
     double mouseX, mouseY;
-	double mouseFactorX, mouseFactorY;
+    double mouseFactorX, mouseFactorY;
     bool swapMouse;
 
     struct EventInfo
@@ -132,156 +131,147 @@ struct Gosu::Input::Impl
         return DIENUM_CONTINUE;
     }
 
-	void updateMousePos()
-	{
-		POINT pos;
-		if (!::GetCursorPos(&pos))
-			return;
+    void updateMousePos()
+    {
+        POINT pos;
+        if (!::GetCursorPos(&pos))
+            return;
 
-		Win::check(::ScreenToClient(window, &pos));
+        Win::check(::ScreenToClient(window, &pos));
 
-		mouseX = pos.x;
-		mouseY = pos.y;
-	}
+        mouseX = pos.x;
+        mouseY = pos.y;
+    }
 
-	void updateButtons(bool collectEvents)
-	{
-		DIDEVICEOBJECTDATA data[inputBufferSize];
-		DWORD inOut;
-		HRESULT hr;
+    void updateButtons(bool collectEvents)
+    {
+        DIDEVICEOBJECTDATA data[inputBufferSize];
+        DWORD inOut;
+        HRESULT hr;
         
         RECT rect;
         ::GetClientRect(window, &rect);
         bool ignoreClicks = mouseX < 0 || mouseX > rect.right || mouseY < 0 || mouseY > rect.bottom;
 
-		inOut = inputBufferSize;
-		hr = mouse->GetDeviceData(sizeof data[0], data, &inOut, 0);
-		switch(hr)
-		{
-			case DI_OK:
-			case DI_BUFFEROVERFLOW:
-			{
-				// Everything's ok: Update buttons and fire events.
-				for (unsigned i = 0; i < inOut; ++i)
-				{
-					bool down = (data[i].dwData & 0x80) != 0 && !ignoreClicks;
-	                    
-					switch (data[i].dwOfs)
-					{
-						case DIMOFS_BUTTON0:
-						{
-							unsigned id = swapMouse ? msRight : msLeft;
-							setButton(id, down, collectEvents);
-							break;
-						}
-						case DIMOFS_BUTTON1:
-						{
-							unsigned id = swapMouse ? msLeft : msRight;
-							setButton(id, down, collectEvents);
-							break;
-						}
-						case DIMOFS_BUTTON2:
-						{
-							setButton(msMiddle, down, collectEvents);
-							break;
-						}
-						case DIMOFS_Z:
-						{
-							if (!collectEvents || data[i].dwData == 0)
-								break;
-
-							EventInfo event;
-							event.action = EventInfo::buttonDown;
-							if (int(data[i].dwData) < 0)
-								event.id = msWheelDown;
-							else
-								event.id = msWheelUp;
-							events.push_back(event);
-                            event.action = EventInfo::buttonUp;
-                            events.push_back(event);
-							break;
-						}
-					}
-				}
-				break;
-			}
-
-			case DIERR_NOTACQUIRED:
-			case DIERR_INPUTLOST:
-			{
-				// Cannot fetch new events: Release all buttons.
-				for (unsigned id = msRangeBegin; id < msRangeEnd; ++id)
-					setButton(id, false, collectEvents);
-				mouse->Acquire();
-				break;
-			}
-		}
+        inOut = inputBufferSize;
+        hr = mouse->GetDeviceData(sizeof data[0], data, &inOut, 0);
+        switch(hr)
+        {
+            case DI_OK:
+            case DI_BUFFEROVERFLOW:
+            {
+                // Everything's ok: Update buttons and fire events.
+                for (unsigned i = 0; i < inOut; ++i)
+                {
+                    bool down = (data[i].dwData & 0x80) != 0 && !ignoreClicks;
+                    
+                    // No switch statement here because it breaks compilation with MinGW.
+                    if (data[i].dwOfs == DIMOFS_BUTTON0)
+                    {
+                        unsigned id = swapMouse ? msRight : msLeft;
+                        setButton(id, down, collectEvents);
+                    }
+                    else if (data[i].dwOfs == DIMOFS_BUTTON1)
+                    {
+                        unsigned id = swapMouse ? msLeft : msRight;
+                        setButton(id, down, collectEvents);
+                    }
+                    else if (data[i].dwOfs == DIMOFS_BUTTON2)
+                    {
+                        setButton(msMiddle, down, collectEvents);
+                    }
+                    else if (data[i].dwOfs == DIMOFS_Z &&
+                        collectEvents && data[i].dwData)
+                    {
+                        EventInfo event;
+                        event.action = EventInfo::buttonDown;
+                        if (int(data[i].dwData) < 0)
+                            event.id = msWheelDown;
+                        else
+                            event.id = msWheelUp;
+                        events.push_back(event);
+                        event.action = EventInfo::buttonUp;
+                        events.push_back(event);
+                    }
+                }
+                break;
+            }
+
+            case DIERR_NOTACQUIRED:
+            case DIERR_INPUTLOST:
+            {
+                // Cannot fetch new events: Release all buttons.
+                for (unsigned id = msRangeBegin; id < msRangeEnd; ++id)
+                    setButton(id, false, collectEvents);
+                mouse->Acquire();
+                break;
+            }
+        }
         
         keyboard:
 
-		inOut = inputBufferSize;
-		hr = keyboard->GetDeviceData(sizeof data[0], data, &inOut, 0);
-		switch (hr)
-		{
-			case DI_OK:
-			case DI_BUFFEROVERFLOW:
-			{
-				for (unsigned i = 0; i < inOut; ++i)
-					forceButton(data[i].dwOfs, (data[i].dwData & 0x80) != 0, collectEvents);
-				break;
-			}
-
-			case DIERR_NOTACQUIRED:
-			case DIERR_INPUTLOST:
-			{
-				for (unsigned id = kbRangeBegin; id < kbRangeEnd; ++id)
-					setButton(id, false, collectEvents);
-				keyboard->Acquire();
-				break;
-			}
-		}
-
-		boost::array<bool, gpNum> gpBuffer;
-		gpBuffer.assign(false);
-		for (unsigned gp = 0; gp < gamepads.size(); ++gp)
-		{
-			gamepads[gp]->Poll();
-
-			DIJOYSTATE joy;
-			hr = gamepads[gp]->GetDeviceState(sizeof joy, &joy);
-			switch (hr)
-			{
-				case DI_OK:
-				{
-					if (joy.lX < -stickThreshold)
-						gpBuffer[gpLeft - gpRangeBegin] = true;
-					else if (joy.lX > stickThreshold)
-						gpBuffer[gpRight - gpRangeBegin] = true;
-
-					if (joy.lY < -stickThreshold)
-						gpBuffer[gpUp - gpRangeBegin] = true;
-					else if (joy.lY > stickThreshold)
-						gpBuffer[gpDown - gpRangeBegin] = true;
-
-					for (unsigned id = gpButton0; id < gpRangeEnd; ++id)
-						if (joy.rgbButtons[id - gpButton0])
-                    		gpBuffer[id - gpRangeBegin] = true;
-					
-					break;
-				}
-
-				case DIERR_NOTACQUIRED:
-				case DIERR_INPUTLOST:
-				{
-					gamepads[gp]->Acquire();
-
-					break;
-				}
-			}
-		}
-		for (unsigned id = gpRangeBegin; id < gpRangeEnd; ++id)
-			setButton(id, gpBuffer[id - gpRangeBegin], collectEvents);
-	}
+        inOut = inputBufferSize;
+        hr = keyboard->GetDeviceData(sizeof data[0], data, &inOut, 0);
+        switch (hr)
+        {
+            case DI_OK:
+            case DI_BUFFEROVERFLOW:
+            {
+                for (unsigned i = 0; i < inOut; ++i)
+                    forceButton(data[i].dwOfs, (data[i].dwData & 0x80) != 0, collectEvents);
+                break;
+            }
+
+            case DIERR_NOTACQUIRED:
+            case DIERR_INPUTLOST:
+            {
+                for (unsigned id = kbRangeBegin; id < kbRangeEnd; ++id)
+                    setButton(id, false, collectEvents);
+                keyboard->Acquire();
+                break;
+            }
+        }
+
+        std::tr1::array<bool, gpNum> gpBuffer = { false };
+        for (unsigned gp = 0; gp < gamepads.size(); ++gp)
+        {
+            gamepads[gp]->Poll();
+            
+            DIJOYSTATE joy;
+            hr = gamepads[gp]->GetDeviceState(sizeof joy, &joy);
+            switch (hr)
+            {
+                case DI_OK:
+                {
+                    if (joy.lX < -stickThreshold)
+                        gpBuffer[gpLeft - gpRangeBegin] = true;
+                    else if (joy.lX > stickThreshold)
+                        gpBuffer[gpRight - gpRangeBegin] = true;
+
+                    if (joy.lY < -stickThreshold)
+                        gpBuffer[gpUp - gpRangeBegin] = true;
+                    else if (joy.lY > stickThreshold)
+                        gpBuffer[gpDown - gpRangeBegin] = true;
+
+                    for (unsigned id = gpButton0; id < gpRangeEnd; ++id)
+                        if (joy.rgbButtons[id - gpButton0])
+                            gpBuffer[id - gpRangeBegin] = true;
+                    
+                    break;
+                }
+
+                case DIERR_NOTACQUIRED:
+                case DIERR_INPUTLOST:
+                {
+                    gamepads[gp]->Acquire();
+
+                    break;
+                }
+            }
+        }
+        for (unsigned id = gpRangeBegin; id < gpRangeEnd; ++id)
+            setButton(id, gpBuffer[id - gpRangeBegin], collectEvents);
+    }
 };
 
 Gosu::Input::Input(HWND window)
@@ -355,7 +345,7 @@ Gosu::Input::Input(HWND window)
 
     // Get into a usable default state.
 
-	pimpl->mouseX = pimpl->mouseY = 0;
+    pimpl->mouseX = pimpl->mouseY = 0;
     pimpl->updateMousePos();
     buttons.assign(false);
 }
@@ -372,7 +362,7 @@ Gosu::Button Gosu::Input::charToId(wchar_t ch)
     if (HIBYTE(vkey) == static_cast<unsigned char>(-1) &&
         LOBYTE(vkey) == static_cast<unsigned char>(-1))
     {
-		return noButton;
+        return noButton;
     }
 
     // Key needs special modifier keys?
@@ -385,7 +375,7 @@ Gosu::Button Gosu::Input::charToId(wchar_t ch)
 
 wchar_t Gosu::Input::idToChar(Gosu::Button btn)
 {
-	// Only translate keyboard ids.
+    // Only translate keyboard ids.
     if (btn.id() > 255)
         return 0;
 
@@ -397,16 +387,16 @@ wchar_t Gosu::Input::idToChar(Gosu::Button btn)
     // (Three elements so too-long names will make GKNT return 3 and we'll know.)
     wchar_t buf[3];
     if (::GetKeyNameText(btn.id() << 16, buf, 3) == 1)
-		return /*std::*/towlower(buf[0]);
+        return /*std::*/towlower(buf[0]);
 
     return 0;
 }
 
 bool Gosu::Input::down(Button btn) const
 {
-	// The invalid button is never pressed (but can be passed to this function).
-	if (btn == noButton || btn.id() >= numButtons)
-		return false;
+    // The invalid button is never pressed (but can be passed to this function).
+    if (btn == noButton || btn.id() >= numButtons)
+        return false;
     
     return buttons.at(btn.id());
 }
@@ -423,16 +413,16 @@ double Gosu::Input::mouseY() const
 
 void Gosu::Input::setMousePosition(double x, double y)
 {
-	POINT pos = { x / pimpl->mouseFactorX, y / pimpl->mouseFactorY };
-	::ClientToScreen(pimpl->window, &pos);
-	::SetCursorPos(pos.x, pos.y);
-	pimpl->updateMousePos();
+    POINT pos = { x / pimpl->mouseFactorX, y / pimpl->mouseFactorY };
+    ::ClientToScreen(pimpl->window, &pos);
+    ::SetCursorPos(pos.x, pos.y);
+    pimpl->updateMousePos();
 }
 
 void Gosu::Input::setMouseFactors(double factorX, double factorY)
 {
-	pimpl->mouseFactorX = factorX;
-	pimpl->mouseFactorY = factorY;
+    pimpl->mouseFactorX = factorX;
+    pimpl->mouseFactorY = factorY;
 }
 
 const Gosu::Touches& Gosu::Input::currentTouches() const
@@ -460,7 +450,7 @@ void Gosu::Input::update()
 {
     pimpl->updateMousePos();
     pimpl->updateButtons(true);
-	Impl::Events events;
+    Impl::Events events;
     events.swap(pimpl->events);
     for (unsigned i = 0; i < events.size(); ++i)
     {