gosu 0.9.2 → 0.10.0

data/src/Graphics/Texture.cpp

@@ -10,27 +10,27 @@ namespace Gosu
     bool undocumentedRetrofication = false;
 }
 
-Gosu::Texture::Texture(unsigned size)
-: allocator(size, size)
+Gosu::Texture::Texture(unsigned size, bool retro)
+: allocator_(size, size), retro_(retro)
 {
     ensureCurrentContext();
     
     // Create texture name.
-    glGenTextures(1, &name);
-    if (name == static_cast<GLuint>(-1))
+    glGenTextures(1, &texName_);
+    if (texName_ == static_cast<GLuint>(-1))
         throw std::runtime_error("Couldn't create OpenGL texture");
    
     // Create empty texture.
-    glBindTexture(GL_TEXTURE_2D, name);
+    glBindTexture(GL_TEXTURE_2D, texName_);
 #ifdef GOSU_IS_OPENGLES
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, allocator.width(), allocator.height(), 0,
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, allocator_.width(), allocator_.height(), 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, 0);
 #else
-    glTexImage2D(GL_TEXTURE_2D, 0, 4, allocator.width(), allocator.height(), 0,
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, allocator_.width(), allocator_.height(), 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, 0);
 #endif
     
-    if (undocumentedRetrofication)
+    if (retro || undocumentedRetrofication)
     {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -54,17 +54,22 @@ Gosu::Texture::~Texture()
 {
     ensureCurrentContext();
     
-    glDeleteTextures(1, &name);
+    glDeleteTextures(1, &texName_);
 }
 
 unsigned Gosu::Texture::size() const
 {
-    return allocator.width(); // == height
+    return allocator_.width(); // == height
 }
 
 GLuint Gosu::Texture::texName() const
 {
-    return name;
+    return texName_;
+}
+
+bool Gosu::Texture::retro() const
+{
+    return retro_;
 }
 
 GOSU_UNIQUE_PTR<Gosu::TexChunk>
@@ -73,7 +78,7 @@ GOSU_UNIQUE_PTR<Gosu::TexChunk>
     GOSU_UNIQUE_PTR<Gosu::TexChunk> result;
     
     BlockAllocator::Block block;
-    if (!allocator.alloc(bmp.width(), bmp.height(), block))
+    if (!allocator_.alloc(bmp.width(), bmp.height(), block))
         return result;
     
     result.reset(new TexChunk(ptr, block.left + padding, block.top + padding,
@@ -81,7 +86,7 @@ GOSU_UNIQUE_PTR<Gosu::TexChunk>
     
     ensureCurrentContext();
     
-    glBindTexture(GL_TEXTURE_2D, name);
+    glBindTexture(GL_TEXTURE_2D, texName_);
     glTexSubImage2D(GL_TEXTURE_2D, 0, block.left, block.top, block.width, block.height,
                  Color::GL_FORMAT, GL_UNSIGNED_BYTE, bmp.data());
 
@@ -90,12 +95,12 @@ GOSU_UNIQUE_PTR<Gosu::TexChunk>
 
 void Gosu::Texture::block(unsigned x, unsigned y, unsigned width, unsigned height)
 {
-    allocator.block(x, y, width, height);
+    allocator_.block(x, y, width, height);
 }
 
 void Gosu::Texture::free(unsigned x, unsigned y, unsigned width, unsigned height)
 {
-    allocator.free(x, y, width, height);
+    allocator_.free(x, y, width, height);
 }
 
 Gosu::Bitmap Gosu::Texture::toBitmap(unsigned x, unsigned y, unsigned width, unsigned height) const
@@ -106,7 +111,7 @@ Gosu::Bitmap Gosu::Texture::toBitmap(unsigned x, unsigned y, unsigned width, uns
     ensureCurrentContext();
     
     Gosu::Bitmap fullTexture(size(), size());
-    glBindTexture(GL_TEXTURE_2D, name);
+    glBindTexture(GL_TEXTURE_2D, texName());
     glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, fullTexture.data());
     Gosu::Bitmap bitmap(width, height);
     bitmap.insert(fullTexture, -int(x), -int(y));

data/src/Graphics/Texture.hpp

@@ -1,5 +1,5 @@
-#ifndef GOSUIMPL_GRAPHICS_TEXTURE_HPP
-#define GOSUIMPL_GRAPHICS_TEXTURE_HPP
+#ifndef GOSU_SRC_GRAPHICS_TEXTURE_HPP
+#define GOSU_SRC_GRAPHICS_TEXTURE_HPP
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Bitmap.hpp>
@@ -13,14 +13,16 @@ namespace Gosu
 {
     class Texture
     {
-        BlockAllocator allocator;
-        GLuint name;
+        BlockAllocator allocator_;
+        GLuint texName_;
+        bool retro_;
 
     public:
-        Texture(unsigned size);
+        Texture(unsigned size, bool retro);
         ~Texture();
         unsigned size() const;
         GLuint texName() const;
+        bool retro() const;
         GOSU_UNIQUE_PTR<TexChunk>
             tryAlloc(std::tr1::shared_ptr<Texture> ptr, const Bitmap& bmp, unsigned padding);
         void block(unsigned x, unsigned y, unsigned width, unsigned height);

data/src/Graphics/TransformStack.hpp

@@ -1,5 +1,5 @@
-#ifndef GOSUIMPL_GRAPHICS_TRANSFORMSTACK_HPP
-#define GOSUIMPL_GRAPHICS_TRANSFORMSTACK_HPP
+#ifndef GOSU_SRC_GRAPHICS_TRANSFORMSTACK_HPP
+#define GOSU_SRC_GRAPHICS_TRANSFORMSTACK_HPP
 
 #include "Common.hpp"
 #include <cassert>

data/src/Iconv.hpp

@@ -1,5 +1,5 @@
-#ifndef GOSUIMPL_ICONV_HPP
-#define GOSUIMPL_ICONV_HPP
+#ifndef GOSU_SRC_ICONV_HPP
+#define GOSU_SRC_ICONV_HPP
 
 #include <Gosu/Platform.hpp>
 

data/src/Input/Input.cpp

@@ -2,7 +2,7 @@
 #include <Gosu/TextInput.hpp>
 #include <Gosu/TR1.hpp>
 #include <Gosu/Utility.hpp>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <cwctype>
 #include <cstdlib>
 #include <algorithm>
@@ -381,6 +381,8 @@ void Gosu::Input::setMousePosition(double x, double y)
     SDL_WarpMouseInWindow(pimpl->window,
         (x - pimpl->mouseOffsetX) / pimpl->mouseFactorX,
         (y - pimpl->mouseOffsetY) / pimpl->mouseFactorY);
+    
+    pimpl->updateMousePosition();
 }
 
 void Gosu::Input::setMouseFactors(double factorX, double factorY,

data/src/Input/{InputTouch.mm → InputUIKit.mm}

@@ -1,8 +1,7 @@
 #include <Gosu/Input.hpp>
 #include <Gosu/TextInput.hpp>
 
-#include "MacUtility.hpp"
-#include "AccelerometerReader.hpp"
+#include "AppleUtility.hpp"
 #import <UIKit/UIKit.h>
 
 struct Gosu::TextInput::Impl {};
@@ -20,7 +19,7 @@ struct Gosu::Input::Impl
     float factorX, factorY;
     float updateInterval;
     
-    ObjRef<NSMutableSet> currentTouchesSet;
+    ObjCRef<NSMutableSet> currentTouchesSet;
     std::auto_ptr<Gosu::Touches> currentTouchesVector;
     
     Touch translateTouch(UITouch* uiTouch)
@@ -30,15 +29,6 @@ struct Gosu::Input::Impl
         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(void* view, float updateInterval)
@@ -57,17 +47,33 @@ Gosu::Input::~Input()
 
 void Gosu::Input::feedTouchEvent(int type, void* touches)
 {
-    NSSet* uiTouches = (NSSet*)touches;
+    NSSet *uiTouches = (NSSet *)touches;
     
     pimpl->currentTouchesVector.reset();
-    std::tr1::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));
+    
+    std::tr1::function<void (Touch)>* callback = nullptr;
+    
+    if (type == 0) {
+        [pimpl->currentTouchesSet.get() unionSet:uiTouches];
+        callback = &onTouchBegan;
+    }
+    else if (type == 1) {
+        callback = &onTouchMoved;
+    }
+    else if (type == 2) {
+        [pimpl->currentTouchesSet.get() minusSet:uiTouches];
+        callback = &onTouchEnded;
+    }
+    else if (type == 3) {
+        [pimpl->currentTouchesSet.get() minusSet:uiTouches];
+        callback = &onTouchCancelled;
+    }
+    
+    if (callback && *callback) {
+        for (UITouch *uiTouch in uiTouches) {
+            (*callback)(pimpl->translateTouch(uiTouch));
+        }
+    }
 }
 
 wchar_t Gosu::Input::idToChar(Button btn)
@@ -80,7 +86,7 @@ Gosu::Button Gosu::Input::charToId(wchar_t ch)
     return noButton;
 }
         
-bool Gosu::Input::down(Button btn) const
+bool Gosu::Input::down(Button btn)
 {
     return false;
 }
@@ -120,17 +126,17 @@ const Gosu::Touches& Gosu::Input::currentTouches() const
 
 double Gosu::Input::accelerometerX() const
 {
-    return pimpl->acceleration(0);
+    return 0;
 }
 
 double Gosu::Input::accelerometerY() const
 {
-    return pimpl->acceleration(1);
+    return 0;
 }
 
 double Gosu::Input::accelerometerZ() const
 {
-    return pimpl->acceleration(2);
+    return 0;
 }
 
 void Gosu::Input::update()
@@ -138,7 +144,7 @@ void Gosu::Input::update()
     // Check for dead touches and remove from vector if
     // necessary
 
-    ObjRef<NSMutableSet> deadTouches;
+    ObjCRef<NSMutableSet> deadTouches;
 
     for (UITouch* touch in pimpl->currentTouchesSet.obj())
     {

data/src/Input/TextInput.cpp

@@ -1,7 +1,7 @@
 #include <Gosu/TextInput.hpp>
 #include <Gosu/Input.hpp>
 #include <Gosu/Utility.hpp>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <cwctype>
 
 struct Gosu::TextInput::Impl

data/src/Text/FormattedString.hpp

@@ -1,5 +1,5 @@
-#ifndef GOSUIMPL_GRAPHICS_TEXTFORMATTING
-#define GOSUIMPL_GRAPHICS_TEXTFORMATTING
+#ifndef GOSU_SRC_GRAPHICS_TEXTFORMATTING
+#define GOSU_SRC_GRAPHICS_TEXTFORMATTING
 
 #include <Gosu/Color.hpp>
 #include <Gosu/Utility.hpp>

data/src/Text/TextApple.mm

@@ -6,7 +6,7 @@
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/Utility.hpp>
 #include <Gosu/Math.hpp>
-#include "../MacUtility.hpp"
+#include "../AppleUtility.hpp"
 #include <map>
 #include <cmath>
 using namespace std;
@@ -22,7 +22,7 @@ typedef NSFont OSXFont;
 
 namespace
 {
-    using Gosu::ObjRef;
+    using Gosu::ObjCRef;
     using Gosu::CFRef;
 
     // If a font is a filename, loads the font and returns its family name that can be used
@@ -81,7 +81,7 @@ namespace
         OSXFont* result = usedFonts[make_pair(fontName, make_pair(fontFlags, height))];
         if (!result)
         {
-            ObjRef<NSString> name([[NSString alloc] initWithUTF8String: Gosu::wstringToUTF8(fontName).c_str()]);
+            ObjCRef<NSString> name([[NSString alloc] initWithUTF8String: Gosu::wstringToUTF8(fontName).c_str()]);
             #ifdef GOSU_IS_IPHONE
             result = [OSXFont fontWithName: name.obj() size: height];
             #else
@@ -120,7 +120,7 @@ namespace
                 nil];
         if (fontFlags & Gosu::ffUnderline)
         {
-            Gosu::ObjRef<NSNumber> underline([[NSNumber alloc] initWithInt:NSUnderlineStyleSingle]);
+            Gosu::ObjCRef<NSNumber> underline([[NSNumber alloc] initWithInt:NSUnderlineStyleSingle]);
             [dict setValue: underline.obj() forKey:NSUnderlineStyleAttributeName];
         }
         return dict;
@@ -138,9 +138,9 @@ unsigned Gosu::textWidth(const wstring& text,
     
     // This will, of course, compute a too large size; fontHeight is in pixels,
     // the method expects point.
-    ObjRef<NSString> string([[NSString alloc] initWithUTF8String: wstringToUTF8(text).c_str()]);
+    ObjCRef<NSString> string([[NSString alloc] initWithUTF8String: wstringToUTF8(text).c_str()]);
     #ifndef GOSU_IS_IPHONE
-    ObjRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
+    ObjCRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
     NSSize size = [string.obj() sizeWithAttributes: attributes.get()];
     #else
     CGSize size = [string.obj() sizeWithFont: font];
@@ -158,11 +158,11 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
         throw std::invalid_argument("the argument to drawText cannot contain line breaks");
     
     OSXFont* font = getFont(fontName, fontFlags, fontHeight);
-    ObjRef<NSString> string([[NSString alloc] initWithUTF8String: wstringToUTF8(text).c_str()]);
+    ObjCRef<NSString> string([[NSString alloc] initWithUTF8String: wstringToUTF8(text).c_str()]);
 
     // This will, of course, compute a too large size; fontHeight is in pixels, the method expects point.
     #ifndef GOSU_IS_IPHONE
-    ObjRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
+    ObjCRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
     NSSize size = [string.obj() sizeWithAttributes: attributes.get()];
     #else
     CGSize size = [string.obj() sizeWithFont: font];

data/src/Text/TextMac.cpp

@@ -8,7 +8,7 @@
 #include <Gosu/Math.hpp>
 #include <Gosu/Utility.hpp>
 #include <Gosu/IO.hpp>
-#include "../MacUtility.hpp"
+#include "../AppleUtility.hpp"
 #include <cmath>
 #include <stdexcept>
 #include <map>

data/src/Text/TextUnix.cpp

@@ -5,7 +5,7 @@
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #include <glib.h>
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
 
 #include <string>
 #include <cstring>

data/src/UIKit/GosuAppDelegate.h

@@ -0,0 +1,8 @@
+#import <UIKit/UIKit.h>
+
+
+@interface GosuAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (nonatomic, strong) UIWindow *window;
+
+@end

data/src/UIKit/GosuAppDelegate.mm

@@ -0,0 +1,24 @@
+#import "GosuAppDelegate.h"
+#import <Gosu/Gosu.hpp>
+
+
+@implementation GosuAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    self.window = (UIWindow *)windowInstance().UIWindow();
+    [self.window makeKeyAndVisible];
+    
+    return YES;
+}
+
+@end
+
+
+int main(int argc, char *argv[])
+{
+    @autoreleasepool {
+        Gosu::useResourceDirectory();
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([GosuAppDelegate class]));
+    }
+}

data/src/UIKit/GosuGLView.h

@@ -0,0 +1,8 @@
+#import <UIKit/UIKit.h>
+
+
+@interface GosuGLView : UIView
+
+- (void)redrawGL:(void (^)())code;
+
+@end

data/src/UIKit/GosuGLView.mm

@@ -0,0 +1,130 @@
+#import "GosuGLView.h"
+
+#import <QuartzCore/QuartzCore.h>
+#import <OpenGLES/EAGLDrawable.h>
+#import <OpenGLES/EAGL.h>
+#import <OpenGLES/ES1/gl.h>
+#import <OpenGLES/ES1/glext.h>
+
+
+static EAGLContext __weak *globalContext;
+
+
+namespace Gosu
+{
+    void ensureCurrentContext()
+    {
+        [EAGLContext setCurrentContext:globalContext];
+    }
+    
+    int clipRectBaseFactor()
+    {
+        static int result = [UIScreen mainScreen].scale;
+        return result;
+    }
+}
+
+
+@implementation GosuGLView
+{
+    EAGLContext *_context;
+    
+    GLint _backingWidth;
+    GLint _backingHeight;
+
+    GLuint _viewRenderbuffer;
+    GLuint _viewFramebuffer;
+}
+    
++ (Class)layerClass
+{
+    return [CAEAGLLayer class];
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    if ((self = [super initWithFrame:frame])) {
+        [self initializeGosuGLView];
+    }
+    
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    if ((self = [super initWithCoder:aDecoder])) {
+        [self initializeGosuGLView];
+    }
+    
+    return self;
+}
+
+- (void)initializeGosuGLView
+{
+    CAEAGLLayer *layer = (CAEAGLLayer *)self.layer;
+    layer.opaque = YES;
+    
+    globalContext = _context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
+    [EAGLContext setCurrentContext:_context];
+    
+    self.exclusiveTouch = YES;
+    self.multipleTouchEnabled = YES;
+}
+
+- (void)dealloc
+{
+    [EAGLContext setCurrentContext:nil];
+    [_context release];
+    [super dealloc];
+}
+
+- (void)redrawGL:(void (^)())code
+{
+    [EAGLContext setCurrentContext:_context];
+    
+    glBindFramebufferOES(GL_FRAMEBUFFER_OES, _viewFramebuffer);
+    
+    glViewport(0, 0, _backingWidth, _backingHeight);
+    
+    if (code) {
+        code();
+    }
+    
+    glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
+    
+    [_context presentRenderbuffer:GL_RENDERBUFFER_OES];
+}
+
+- (void)layoutSubviews
+{
+    [EAGLContext setCurrentContext:_context];
+    [self destroyFramebuffer];
+    self.contentScaleFactor = Gosu::clipRectBaseFactor();
+    [self 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];
+    glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, _viewRenderbuffer);
+    
+    glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &_backingWidth);
+    glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &_backingHeight);
+    
+    return (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) == GL_FRAMEBUFFER_COMPLETE_OES);
+}
+
+- (void)destroyFramebuffer
+{
+    glDeleteFramebuffersOES(1, &_viewFramebuffer);
+    _viewFramebuffer = 0;
+    glDeleteRenderbuffersOES(1, &_viewRenderbuffer);
+    _viewRenderbuffer = 0;
+}
+
+@end