gosu 0.7.48 → 0.7.49

data/GosuImpl/Graphics/BlockAllocator.hpp

@@ -2,13 +2,14 @@
 #define GOSUIMPL_BLOCKALLOCATOR_HPP
 
 #include <memory>
+#include <Gosu/Platform.hpp>
 
 namespace Gosu
 {
     class BlockAllocator
     {
         struct Impl;
-        const std::auto_ptr<Impl> pimpl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
 
     public:
         struct Block

data/GosuImpl/Graphics/Color.cpp

@@ -125,14 +125,14 @@ Gosu::Color Gosu::multiply(Color a, Color b)
                  round(a.blue()  * b.blue()  / 255.0));
 }
 
-const Gosu::Color Gosu::Color::NONE    = 0x00000000;
-const Gosu::Color Gosu::Color::BLACK   = 0xff000000;
-const Gosu::Color Gosu::Color::GRAY    = 0xff808080;
-const Gosu::Color Gosu::Color::WHITE   = 0xffffffff;
-const Gosu::Color Gosu::Color::AQUA    = 0xff00ffff;
-const Gosu::Color Gosu::Color::RED     = 0xffff0000;
-const Gosu::Color Gosu::Color::GREEN   = 0xff00ff00;
-const Gosu::Color Gosu::Color::BLUE    = 0xff0000ff;
-const Gosu::Color Gosu::Color::YELLOW  = 0xffffff00;
-const Gosu::Color Gosu::Color::FUCHSIA = 0xffff00ff;
-const Gosu::Color Gosu::Color::CYAN    = 0xff00ffff;
+const Gosu::Color Gosu::Color::NONE      (0x00000000);
+const Gosu::Color Gosu::Color::BLACK     (0xff000000);
+const Gosu::Color Gosu::Color::GRAY      (0xff808080);
+const Gosu::Color Gosu::Color::WHITE     (0xffffffff);
+const Gosu::Color Gosu::Color::AQUA      (0xff00ffff);
+const Gosu::Color Gosu::Color::RED       (0xffff0000);
+const Gosu::Color Gosu::Color::GREEN     (0xff00ff00);
+const Gosu::Color Gosu::Color::BLUE      (0xff0000ff);
+const Gosu::Color Gosu::Color::YELLOW    (0xffffff00);
+const Gosu::Color Gosu::Color::FUCHSIA   (0xffff00ff);
+const Gosu::Color Gosu::Color::CYAN      (0xff00ffff);

data/GosuImpl/Graphics/DrawOpQueue.hpp

@@ -73,8 +73,6 @@ public:
         double physHeight = std::abs(top - bottom);
 
         // Adjust for OpenGL having the wrong idea of where y=0 is.
-        // TODO: This should really happen *right before* setting up
-        // the glScissor.
         physY = screenHeight - physY - physHeight;
 
         clipRectStack.beginClipping(physX, physY, physWidth, physHeight);

data/GosuImpl/Graphics/Font.cpp

@@ -20,11 +20,11 @@ struct Gosu::Font::Impl
     // the first plane will ever be touched.
     struct CharInfo
     {
-        auto_ptr<Image> image;
+        GOSU_UNIQUE_PTR<Image> image;
         double factor;
     };
     typedef tr1::array<CharInfo, 65536> Plane;
-    auto_ptr<Plane> planes[16][ffCombinations];
+    GOSU_UNIQUE_PTR<Plane> planes[16][ffCombinations];
     
     map<wstring, tr1::shared_ptr<Image> > entityCache;
     

data/GosuImpl/Graphics/GosuView.hpp

@@ -2,7 +2,6 @@
 #import <OpenGLES/EAGL.h>
 #import <OpenGLES/ES1/gl.h>
 #import <OpenGLES/ES1/glext.h>
-#import <Gosu/Window.hpp>
 
 // UIViewController subclass that creates a GosuView and helps it manage rotation.
 
@@ -11,21 +10,6 @@
 
 // UIView subclass that contains a CAEAGLLayer.
 
-@interface GosuView : UIView {
-    
-@private
-    /* The pixel dimensions of the backbuffer */
-    GLint backingWidth;
-    GLint backingHeight;
-    
-    EAGLContext *context;
-    
-    /* OpenGL names for the renderbuffer and framebuffers used to render to this view */
-    GLuint viewRenderbuffer, viewFramebuffer;
-    
-    NSMutableSet* currentTouches;
-    Gosu::Touches* currentTouchesVector;
-}
-
+@interface GosuView : UIView
 - (void)drawView;
 @end

data/GosuImpl/Graphics/GosuView.mm

@@ -3,6 +3,7 @@
 #import <UIKit/UIKit.h>
 
 #import <Gosu/Graphics.hpp>
+#import <Gosu/Window.hpp>
 #import "Common.hpp"
 #import "GosuView.hpp"
 
@@ -31,38 +32,62 @@ int Gosu::clipRectBaseFactor()
 
 // A controller to allow for autorotation.
 @implementation GosuViewController
-- (void)loadView {
+- (BOOL)prefersStatusBarHidden
+{
+    return YES;
+}
+
+- (void)loadView
+{
     self.view = [[GosuView alloc] init];
 }
 
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return NO;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskLandscape;
 }
 
-- (void)didReceiveMemoryWarning {
+- (BOOL)shouldAutorotate
+{
+    return YES;
+}
+
+- (void)didReceiveMemoryWarning
+{
     windowInstance().releaseMemory();
 }
 @end
 
 // A class extension to declare private methods
 @interface GosuView ()
-
-@property (nonatomic, retain) EAGLContext *context;
-
-- (BOOL) createFramebuffer;
-- (void) destroyFramebuffer;
-
+@property (nonatomic, strong) EAGLContext *context;
 @end
 
 @implementation GosuView
+{
+    // The pixel dimensions of the backbuffer
+    GLint backingWidth;
+    GLint backingHeight;
 
-@synthesize context;
+    // OpenGL names for the renderbuffer and framebuffers used to render to this view
+    GLuint viewRenderbuffer, viewFramebuffer;
 
-+ (Class)layerClass {
+    NSMutableSet* currentTouches;
+    Gosu::Touches* currentTouchesVector;
+}
+    
++ (Class)layerClass
+{
     return [CAEAGLLayer class];
 }
 
-- (id)init {
+- (id)init
+{
     if ((self = [super initWithFrame: [[UIScreen mainScreen] bounds]])) {
         CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
         
@@ -71,9 +96,9 @@ int Gosu::clipRectBaseFactor()
                                         [NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking,
                                         kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];*/
         
-        context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
+        self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
         
-        if (!context || ![EAGLContext setCurrentContext:context]) {
+        if (!self.context || ![EAGLContext setCurrentContext:self.context]) {
             [self release];
             return nil;
         }
@@ -81,13 +106,14 @@ int Gosu::clipRectBaseFactor()
     return self;
 }
 
-- (void)drawView {
+- (void)drawView
+{
     if (not windowInstance().needsRedraw())
         return;
     
     Gosu::FPS::registerFrame();
     
-    [EAGLContext setCurrentContext:context];
+    [EAGLContext setCurrentContext:self.context];
     glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
     glViewport(0, 0, backingWidth, backingHeight);
     
@@ -97,11 +123,12 @@ int Gosu::clipRectBaseFactor()
     }
     
     glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
-    [context presentRenderbuffer:GL_RENDERBUFFER_OES];
+    [self.context presentRenderbuffer:GL_RENDERBUFFER_OES];
 }
 
-- (void)layoutSubviews {
-    [EAGLContext setCurrentContext:context];
+- (void)layoutSubviews
+{
+    [EAGLContext setCurrentContext:self.context];
     [self destroyFramebuffer];
     if ([self respondsToSelector:@selector(contentScaleFactor)])
         self.contentScaleFactor = Gosu::clipRectBaseFactor();
@@ -109,13 +136,14 @@ int Gosu::clipRectBaseFactor()
     [self drawView];
 }
 
-- (BOOL)createFramebuffer {
+- (BOOL)createFramebuffer
+{
     glGenFramebuffersOES(1, &viewFramebuffer);
     glGenRenderbuffersOES(1, &viewRenderbuffer);
     
     glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
     glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
-    [context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.layer];
+    [self.context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.layer];
     glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, viewRenderbuffer);
     
     glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
@@ -129,43 +157,51 @@ int Gosu::clipRectBaseFactor()
     return YES;
 }
 
-- (void)destroyFramebuffer {
+- (void)destroyFramebuffer
+{
     glDeleteFramebuffersOES(1, &viewFramebuffer);
     viewFramebuffer = 0;
     glDeleteRenderbuffersOES(1, &viewRenderbuffer);
     viewRenderbuffer = 0;
 }
 
-- (void)dealloc {
+- (void)dealloc
+{
     delete currentTouchesVector;
     [currentTouches release];
     [EAGLContext setCurrentContext:nil];
-    [context release];
+    [self.context release];
     [super dealloc];
 }
 
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {    
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
     windowInstance().input().feedTouchEvent(0, touches);
 }
 
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
     windowInstance().input().feedTouchEvent(1, touches);
 }
 
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
     windowInstance().input().feedTouchEvent(2, touches);
 }
 
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
     // TODO: Should be differentiated on the Gosu side.
-    [self touchesEnded: touches withEvent: event];
+    [self touchesEnded:touches withEvent:event];
 }
 
-- (BOOL)isMultipleTouchEnabled {
+- (BOOL)isMultipleTouchEnabled
+{
     return YES;
 }
 
-- (BOOL)isExclusiveTouch {
+- (BOOL)isExclusiveTouch
+{
     return YES;
 }
 

data/GosuImpl/Graphics/Graphics.cpp

@@ -8,17 +8,10 @@
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/Image.hpp>
 #include <Gosu/Platform.hpp>
-#if 0
-#include <thread>
-#endif
 #include <cmath>
 #include <algorithm>
 #include <limits>
 
-#ifdef GOSU_IS_IPHONE
-#include "../Orientation.hpp"
-#endif
-
 struct Gosu::Graphics::Impl
 {
     unsigned virtWidth, virtHeight;
@@ -27,35 +20,6 @@ struct Gosu::Graphics::Impl
     DrawOpQueueStack queues;
     typedef std::vector<std::tr1::shared_ptr<Texture> > Textures;
     Textures textures;
-    
-#if 0
-    std::mutex texMutex;
-#endif
-
-#ifdef GOSU_IS_IPHONE
-    Transform transformForOrientation(Orientation orientation)
-    {
-        Transform result;
-        switch (orientation)
-        {
-        case orLandscapeLeft:
-            result = translate(physWidth, 0);
-            result = multiply(rotate(90), result);
-            result = multiply(scale(1.0 * physHeight / virtWidth, 1.0 * physWidth / virtHeight), result);
-            return result;
-        default:
-            result = translate(0, physHeight);
-            result = multiply(rotate(-90), result);
-            result = multiply(scale(1.0 * physHeight / virtWidth, 1.0 * physWidth / virtHeight), result);
-            return result;
-        }
-    }
-    
-    void updateBaseTransform()
-    {
-        queues.front().setBaseTransform(transformForOrientation(currentOrientation()));
-    }
-#endif
 };
 
 Gosu::Graphics::Graphics(unsigned physWidth, unsigned physHeight, bool fullscreen)
@@ -65,9 +29,6 @@ Gosu::Graphics::Graphics(unsigned physWidth, unsigned physHeight, bool fullscree
     pimpl->physHeight = physHeight;
     pimpl->virtWidth  = physWidth;
     pimpl->virtHeight = physHeight;
-    #ifdef GOSU_IS_IPHONE
-    std::swap(pimpl->virtWidth, pimpl->virtHeight);
-    #endif
     pimpl->fullscreen = fullscreen;
     
     // Should be merged into RenderState altogether.
@@ -115,12 +76,9 @@ void Gosu::Graphics::setResolution(unsigned virtualWidth, unsigned virtualHeight
         throw std::invalid_argument("Invalid virtual resolution.");
     
     pimpl->virtWidth = virtualWidth, pimpl->virtHeight = virtualHeight;
-    #ifndef GOSU_IS_IPHONE
-    // on the iPhone, updateCurrentTransform will handle this (yuck)
-    Transform baseTransform = scale(1.0 / virtualWidth  * pimpl->physWidth,
-                                    1.0 / virtualHeight * pimpl->physHeight);
-    pimpl->queues.front().setBaseTransform(baseTransform);
-    #endif
+    double scaleX = 1.0 / virtualWidth * pimpl->physWidth;
+    double scaleY = 1.0 / virtualHeight * pimpl->physHeight;
+    pimpl->queues.front().setBaseTransform(scale(scaleX, scaleY));
 }
 
 bool Gosu::Graphics::begin(Gosu::Color clearWithColor)
@@ -131,9 +89,6 @@ bool Gosu::Graphics::begin(Gosu::Color clearWithColor)
     // Clear leftover transforms, clip rects etc.
     pimpl->queues.front().reset();
     
-    #ifdef GOSU_IS_IPHONE
-    pimpl->updateBaseTransform();
-    #endif
     glClearColor(clearWithColor.red() / 255.f, clearWithColor.green() / 255.f,
         clearWithColor.blue() / 255.f, clearWithColor.alpha() / 255.f);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -253,12 +208,12 @@ void Gosu::Graphics::beginRecording()
     pimpl->queues.resize(pimpl->queues.size() + 1);
 }
 
-std::auto_ptr<Gosu::ImageData> Gosu::Graphics::endRecording(int width, int height)
+GOSU_UNIQUE_PTR<Gosu::ImageData> Gosu::Graphics::endRecording(int width, int height)
 {
     if (pimpl->queues.size() == 1)
         throw std::logic_error("No macro recording in progress that can be captured");
     
-    std::auto_ptr<ImageData> result(new Macro(*this, pimpl->queues.back(), width, height));
+    GOSU_UNIQUE_PTR<ImageData> result(new Macro(*this, pimpl->queues.back(), width, height));
     pimpl->queues.pop_back();
     return result;
 }
@@ -326,7 +281,7 @@ void Gosu::Graphics::drawQuad(double x1, double y1, Color c1,
     pimpl->queues.back().scheduleDrawOp(op);
 }
 
-std::auto_ptr<Gosu::ImageData> Gosu::Graphics::createImage(
+GOSU_UNIQUE_PTR<Gosu::ImageData> Gosu::Graphics::createImage(
     const Bitmap& src, unsigned srcX, unsigned srcY,
     unsigned srcWidth, unsigned srcHeight, unsigned borderFlags)
 {
@@ -341,7 +296,7 @@ std::auto_ptr<Gosu::ImageData> Gosu::Graphics::createImage(
         srcWidth >= 64)
     {
         std::tr1::shared_ptr<Texture> texture(new Texture(srcWidth));
-        std::auto_ptr<ImageData> data;
+        GOSU_UNIQUE_PTR<ImageData> data;
         
         // Use the source bitmap directly if the source area completely covers
         // it.
@@ -360,7 +315,7 @@ std::auto_ptr<Gosu::ImageData> Gosu::Graphics::createImage(
         
         if (!data.get())
             throw std::logic_error("Internal texture block allocation error");
-        return data;
+        return GOSU_MOVE_UNIQUE_PTR(data);
     }
     
     // Too large to fit on a single texture. 
@@ -368,27 +323,23 @@ std::auto_ptr<Gosu::ImageData> Gosu::Graphics::createImage(
     {
         Bitmap bmp(srcWidth, srcHeight);
         bmp.insert(src, 0, 0, srcX, srcY, srcWidth, srcHeight);
-        std::auto_ptr<ImageData> lidi;
+        GOSU_UNIQUE_PTR<ImageData> lidi;
         lidi.reset(new LargeImageData(*this, bmp, maxSize - 2, maxSize - 2, borderFlags));
-        return lidi;
+        return GOSU_MOVE_UNIQUE_PTR(lidi);
     }
     
     Bitmap bmp;
     applyBorderFlags(bmp, src, srcX, srcY, srcWidth, srcHeight, borderFlags);
 
-#if 0
-    std::mutex::scoped_lock lock(pimpl->texMutex);
-#endif
-    
     // Try to put the bitmap into one of the already allocated textures.
     for (Impl::Textures::iterator i = pimpl->textures.begin(); i != pimpl->textures.end(); ++i)
     {
         std::tr1::shared_ptr<Texture> texture(*i);
         
-        std::auto_ptr<ImageData> data;
+        GOSU_UNIQUE_PTR<ImageData> data;
         data = texture->tryAlloc(*this, pimpl->queues, texture, bmp, 1);
         if (data.get())
-            return data;
+            return GOSU_MOVE_UNIQUE_PTR(data);
     }
     
     // All textures are full: Create a new one.
@@ -397,10 +348,10 @@ std::auto_ptr<Gosu::ImageData> Gosu::Graphics::createImage(
     texture.reset(new Texture(maxSize));
     pimpl->textures.push_back(texture);
     
-    std::auto_ptr<ImageData> data;
+    GOSU_UNIQUE_PTR<ImageData> data;
     data = texture->tryAlloc(*this, pimpl->queues, texture, bmp, 1);
     if (!data.get())
         throw std::logic_error("Internal texture block allocation error");
 
-    return data;
+    return GOSU_MOVE_UNIQUE_PTR(data);
 }