gosu 0.7.11 → 0.7.12

data/GosuImpl/AudioSDL.cpp

@@ -50,6 +50,12 @@ Gosu::Audio::~Audio() {
   mixerInitialized = false;
 }
 
+bool Gosu::SampleInstance::alive() const
+{
+    return !noSound && channelRegistry[handle] == extra &&
+        Mix_Playing(handle) == 1;
+}
+
 Gosu::SampleInstance::SampleInstance(int handle, int extra)
 : handle(handle), extra(extra)
 {
@@ -57,26 +63,42 @@ Gosu::SampleInstance::SampleInstance(int handle, int extra)
 
 bool Gosu::SampleInstance::playing() const
 {
-    return !noSound && channelRegistry[handle] == extra &&
-        Mix_Playing(handle) == 1;
+    return alive() && !Mix_Paused(handle);
+}
+
+void Gosu::SampleInstance::resume()
+{
+    if (alive())
+        Mix_Resume(handle);
+}
+
+void Gosu::SampleInstance::pause()
+{
+    if (alive())
+        Mix_Pause(handle);
+}
+
+bool Gosu::SampleInstance::paused() const
+{
+    return alive() && Mix_Paused(handle);
 }
 
 void Gosu::SampleInstance::stop()
 {
-    if (playing())
+    if (alive())
         Mix_HaltChannel(handle);
 }
 
 void Gosu::SampleInstance::changeVolume(double volume)
 {
-    if (playing())
+    if (alive())
         Mix_Volume(handle, clamp<int>(volume * 255, 0, 255));
 }
 
 void Gosu::SampleInstance::changePan(double pan)
 {
     int rightPan = clamp<int>(pan * 127, 0, 127);
-    if (playing())
+    if (alive())
         Mix_SetPanning(handle, 254 - rightPan, rightPan);
 }
 
@@ -125,10 +147,11 @@ Gosu::Sample::Sample(Audio& audio, Reader reader) {
 Gosu::Sample::~Sample() {
 }
 
-Gosu::SampleInstance Gosu::Sample::play(double volume, double speed) const {
+Gosu::SampleInstance Gosu::Sample::play(double volume, double speed,
+    bool looping) const {
   int channel;
   
-  if (noSound || (channel = Mix_PlayChannel(-1, data->rep, 0)) == -1)
+  if (noSound || (channel = Mix_PlayChannel(-1, data->rep, looping ? -1 : 0)) == -1)
     return SampleInstance(-1, -1);
 
   int extra = ++channelRegistry[channel];
@@ -144,10 +167,10 @@ Gosu::SampleInstance Gosu::Sample::play(double volume, double speed) const {
 }
 
 Gosu::SampleInstance Gosu::Sample::playPan(double pan, double volume,
-    double speed) const {
+    double speed, bool looping) const {
   int channel;
   
-  if (noSound || (channel = Mix_PlayChannel(-1, data->rep, 0)) == -1)
+  if (noSound || (channel = Mix_PlayChannel(-1, data->rep, looping ? -1 : 0)) == -1)
     return SampleInstance(-1, -1);
 
   int extra = ++channelRegistry[channel];
@@ -215,30 +238,48 @@ Gosu::Song::~Song() {
   stop();
 }
 
-void Gosu::Song::play() {
+Gosu::Song* Gosu::Song::currentSong() {
+  return curSong;
+}
+
+void Gosu::Song::play(bool looping) {
   if (noSound)
     return;
 
-  if (curSong)
-    curSong->stop();
-  
-  assert(curSong == 0);
+  if (curSong && curSong != this)
+  {
+      curSong->stop();
+      assert(curSong == 0);
+  }
 
-  if (Mix_PlayMusic(data->music, 0) < 0)
+  if (Mix_PausedMusic())
+    Mix_ResumeMusic();
+  if (!playing() && Mix_PlayMusic(data->music, looping ? -1 : 0) < 0)
     throwLastSDLError();
-  curSong = this;
   changeVolume(data->volume);
+  curSong = this;
+}
+
+void Gosu::Song::pause()
+{
+    if (curSong == this)
+        Mix_PauseMusic();
+}
+
+bool Gosu::Song::paused() const
+{
+    return curSong == this && Mix_PausedMusic();
 }
 
 void Gosu::Song::stop() {
-  if (playing()) {
+  if (curSong == this) {
     Mix_HaltMusic();
     curSong = 0;
   }
 }
 
 bool Gosu::Song::playing() const {
-  return curSong == this;
+  return curSong == this && !paused();
 }
 
 double Gosu::Song::volume() const {
@@ -252,4 +293,3 @@ void Gosu::Song::changeVolume(double volume) {
     Mix_VolumeMusic(trunc(data->volume * MIX_MAX_VOLUME));
 }
 
-

data/GosuImpl/Graphics/BitmapUtils.cpp

@@ -1,7 +1,9 @@
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/IO.hpp>
+#include <Gosu/Platform.hpp>
 
+#ifndef GOSU_IS_IPHONE
 Gosu::Bitmap Gosu::quickLoadBitmap(const std::wstring& filename)
 {
 	Buffer buf;
@@ -19,6 +21,7 @@ Gosu::Bitmap Gosu::quickLoadBitmap(const std::wstring& filename)
         loadFromPNG(bmp, buf.frontReader());
 	return bmp;
 }
+#endif
 
 void Gosu::applyBorderFlags(Bitmap& dest, const Bitmap& source,
     unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,

data/GosuImpl/Graphics/Common.hpp

@@ -1,10 +1,15 @@
 #ifndef GOSUIMPL_GRAPHICS_COMMON_HPP
 #define GOSUIMPL_GRAPHICS_COMMON_HPP
 
-#ifdef WIN32
+#include <Gosu/Platform.hpp>
+
+#if defined(GOSU_IS_WIN)
 #include <windows.h>
-#endif
-#ifdef __APPLE__
+#include <GL/gl.h>
+#elif defined(GOSU_IS_IPHONE)
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#elif defined(GOSU_IS_MAC)
 #include <OpenGL/gl.h>
 #else
 #include <GL/gl.h>

data/GosuImpl/Graphics/DrawOp.hpp

@@ -5,6 +5,7 @@
 #include <Gosu/Color.hpp>
 #include <GosuImpl/Graphics/Common.hpp>
 #include <GosuImpl/Graphics/TexChunk.hpp>
+#include <boost/cstdint.hpp>
 #include <set>
 
 namespace Gosu
@@ -30,6 +31,7 @@ namespace Gosu
 
         DrawOp() { clipWidth = 0xffffffff; usedVertices = 0; chunk = 0; }
         
+#ifndef GOSU_IS_IPHONE
         void perform() const
         {
             if (clipWidth != 0xffffffff)
@@ -59,7 +61,7 @@ namespace Gosu
             double left, top, right, bottom;
             if (chunk)
                 chunk->getCoords(left, top, right, bottom);
-
+            
             for (unsigned i = 0; i < usedVertices; i++)
             {
                 glColor4f(vertices[i].c.red() / 255.0, vertices[i].c.green() / 255.0,
@@ -82,19 +84,78 @@ namespace Gosu
                     }
                 glVertex2d(vertices[i].x, vertices[i].y);
             }
-
+            
             glEnd();
-
+            
             if (chunk)
                 glDisable(GL_TEXTURE_2D);
-
+            
             if (clipWidth != 0xffffffff)
                 glDisable(GL_SCISSOR_TEST);
         }
+#else
+        void perform() const
+        {
+            static GLfloat spriteVertices[8];
+            static GLfloat spriteTexcoords[8];
+            static boost::uint32_t spriteColors[40];
+            
+            // iPhone specific setup
+            static bool isSetup = false;
+            if (!isSetup)
+            {
+                // Sets up pointers and enables states needed for using vertex arrays and textures
+                glVertexPointer(2, GL_FLOAT, 0, spriteVertices);
+                glEnableClientState(GL_VERTEX_ARRAY);
+                glTexCoordPointer(2, GL_FLOAT, 0, spriteTexcoords);
+                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                glColorPointer(4, GL_UNSIGNED_BYTE, 0, spriteColors);
+                glEnableClientState(GL_COLOR_ARRAY);
+                
+                isSetup = true;
+            }
+            
+            if (mode == amAdditive)
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            else
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            
+            if (chunk)
+            {
+                glEnable(GL_TEXTURE_2D);
+                glBindTexture(GL_TEXTURE_2D, chunk->texName());
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                
+                double left, top, right, bottom;
+                chunk->getCoords(left, top, right, bottom);
+                spriteTexcoords[0] = left, spriteTexcoords[1] = top;
+                spriteTexcoords[2] = right, spriteTexcoords[3] = top;
+                spriteTexcoords[4] = left, spriteTexcoords[5] = bottom;
+                spriteTexcoords[6] = right, spriteTexcoords[7] = bottom;
+            }
+            
+            for (int i = 0; i < usedVertices; ++i)
+            {
+                spriteVertices[i*2] = vertices[i].x;
+                spriteVertices[i*2+1] = vertices[i].y;
+                spriteColors[i] = vertices[i].c.abgr();
+            }
+                
+            if (usedVertices == 2)
+                glDrawArrays(GL_LINES, 0, 2);
+            else if (usedVertices == 3)
+                glDrawArrays(GL_TRIANGLE_STRIP, 0, 3);
+            else if (usedVertices == 4)
+                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+                        
+            if (chunk)
+                glDisable(GL_TEXTURE_2D);
+        }
+#endif
         
         bool operator<(const DrawOp& other) const
         {
-            return z < other.z; // optimization starts TODAY
+            return z < other.z;
         }
     };
 
@@ -109,10 +170,9 @@ namespace Gosu
         : clipWidth(0xffffffff)
         {
         }
-    
+        
         void addDrawOp(DrawOp op, ZPos z)
         {
-            op.z = z;
             if (clipWidth != 0xffffffff)
             {
                 op.clipX = clipX;
@@ -120,6 +180,9 @@ namespace Gosu
                 op.clipWidth = clipWidth;
                 op.clipHeight = clipHeight;
             }
+            if (z == zImmediate)
+                return op.perform();
+            op.z = z;
             set.insert(op);
         }
         

data/GosuImpl/Graphics/Graphics.cpp

@@ -34,14 +34,22 @@ Gosu::Graphics::Graphics(unsigned physWidth, unsigned physHeight, bool fullscree
     pimpl->physHeight = pimpl->virtHeight = physHeight;
     pimpl->factorX = pimpl->factorY = 1.0;
     pimpl->fullscreen = fullscreen;
-
+    
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
     glViewport(0, 0, pimpl->physWidth, pimpl->physHeight);
+    #ifdef GOSU_IS_IPHONE
+    glOrthof(0, pimpl->virtWidth, pimpl->virtHeight, 0, -1, 1);
+    #else
     glOrtho(0, pimpl->virtWidth, pimpl->virtHeight, 0, -1, 1);
-
+    #endif
+    
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
+    #ifdef GOSU_IS_IPHONE
+    glTranslatef(physWidth, 0, 0);
+    glRotatef(90, 0, 0, 1);
+    #endif
 
     glEnable(GL_BLEND);
 }
@@ -93,8 +101,10 @@ void Gosu::Graphics::setResolution(unsigned virtualWidth, unsigned virtualHeight
 
 bool Gosu::Graphics::begin(Gosu::Color clearWithColor)
 {
+#ifndef GOSU_IS_IPHONE
     // Flush leftover clippings
     endClipping();
+#endif
 
     glClearColor(clearWithColor.red()/255.0,
                  clearWithColor.green()/255.0,
@@ -130,13 +140,20 @@ void Gosu::Graphics::end()
 
 void Gosu::Graphics::beginGL()
 {
+#ifdef GOSU_IS_IPHONE
+    throw std::logic_error("Custom OpenGL is unsupported on the iPhone");
+#else
     pimpl->queue.performDrawOps();
     glPushAttrib(GL_ALL_ATTRIB_BITS);
     glDisable(GL_BLEND);
+#endif
 }
 
 void Gosu::Graphics::endGL()
 {
+#ifdef GOSU_IS_IPHONE
+    throw std::logic_error("Custom OpenGL is unsupported on the iPhone");
+#else
     glPopAttrib();
 
     // Restore matrices.
@@ -149,10 +166,14 @@ void Gosu::Graphics::endGL()
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
     glEnable(GL_BLEND);
+#endif
 }
 
 void Gosu::Graphics::beginClipping(int x, int y, unsigned width, unsigned height)
 {
+#ifdef GOSU_IS_IPHONE
+    throw std::logic_error("Clipping is unsupported on the iPhone");
+#else
     // In doubt, make the clipping region smaller than requested.
     
     int physX = static_cast<int>(std::ceil(x * factorX()));
@@ -161,11 +182,16 @@ void Gosu::Graphics::beginClipping(int x, int y, unsigned width, unsigned height
     unsigned physHeight = static_cast<unsigned>(height * factorY());
 
     pimpl->queue.beginClipping(physX, physY, physWidth, physHeight);
+#endif
 }
 
 void Gosu::Graphics::endClipping()
 {
+#ifdef GOSU_IS_IPHONE
+    throw std::logic_error("Clipping is unsupported on the iPhone");
+#else
     pimpl->queue.endClipping();
+#endif
 }
 
 void Gosu::Graphics::drawLine(double x1, double y1, Color c1,
@@ -231,8 +257,14 @@ void Gosu::Graphics::drawQuad(double x1, double y1, Color c1,
     op.usedVertices = 4;
     op.vertices[0] = DrawOp::Vertex(x1, y1, c1);
     op.vertices[1] = DrawOp::Vertex(x2, y2, c2);
+// TODO: Should be harmonized
+#ifdef GOSU_IS_IPHONE
+    op.vertices[2] = DrawOp::Vertex(x3, y3, c3);
+    op.vertices[3] = DrawOp::Vertex(x4, y4, c4);
+#else
     op.vertices[3] = DrawOp::Vertex(x3, y3, c3);
     op.vertices[2] = DrawOp::Vertex(x4, y4, c4);
+#endif
 
     pimpl->queue.addDrawOp(op, z);
 }

data/GosuImpl/Graphics/TexChunk.cpp

@@ -59,11 +59,17 @@ void Gosu::TexChunk::draw(double x1, double y1, Color c1,
     newDrawOp.usedVertices = 4;
     newDrawOp.vertices[0] = DrawOp::Vertex(x1, y1, c1);
     newDrawOp.vertices[1] = DrawOp::Vertex(x2, y2, c2);
+// TODO: Should be harmonized
+#ifdef GOSU_IS_IPHONE
+    newDrawOp.vertices[2] = DrawOp::Vertex(x3, y3, c3);
+    newDrawOp.vertices[3] = DrawOp::Vertex(x4, y4, c4);
+#else
     newDrawOp.vertices[3] = DrawOp::Vertex(x3, y3, c3);
     newDrawOp.vertices[2] = DrawOp::Vertex(x4, y4, c4);
+#endif
     newDrawOp.chunk = this;
     newDrawOp.mode = mode;
-
+    
     queue->addDrawOp(newDrawOp, z);
 }
 

data/GosuImpl/Graphics/Texture.cpp

@@ -4,9 +4,17 @@
 #include <Gosu/Platform.hpp>
 #include <stdexcept>
 
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+
 // TODO: Not threadsafe.
 unsigned Gosu::Texture::maxTextureSize()
 {
+#if defined(GOSU_IS_MAC)
+    // Includes the iPhone
+    return 1024;
+#else
     const static unsigned MIN_SIZE = 256, MAX_SIZE = 1024;
 
     static unsigned size = 0;
@@ -17,12 +25,17 @@ unsigned Gosu::Texture::maxTextureSize()
         do
         {
             size *= 2;
-            glTexImage2D(GL_PROXY_TEXTURE_2D, 0, 4, size * 2, size * 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+            #ifdef GOSU_IS_IPHONE
+            glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, size * 2, size * 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+            #else
+            glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_BGRA, size * 2, size * 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+            #endif
             glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width); 
         } while (width != 0 && size < MAX_SIZE);
     }
-        
+    
     return size;
+#endif
 }
 
 Gosu::Texture::Texture(unsigned size)
@@ -35,8 +48,13 @@ Gosu::Texture::Texture(unsigned size)
    
     // Create empty texture.
     glBindTexture(GL_TEXTURE_2D, name);
+#ifndef GOSU_IS_IPHONE
     glTexImage2D(GL_TEXTURE_2D, 0, 4, allocator.width(), allocator.height(), 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, 0);
+#else
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, allocator.width(), allocator.height(), 0,
+                 GL_RGBA, GL_UNSIGNED_BYTE, 0);
+#endif
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 }
 
@@ -70,8 +88,8 @@ std::auto_ptr<Gosu::TexChunk>
     
     result.reset(new TexChunk(graphics, queue, ptr, block->left + padding, block->top + padding,
                               block->width - 2 * padding, block->height - 2 * padding, padding));
-                              
-    #ifdef __BIG_ENDIAN__
+    
+#if defined(__BIG_ENDIAN__)
     std::vector<unsigned> pixelData(srcWidth * srcHeight);
     for (unsigned y = 0; y < srcHeight; ++y)
         for (unsigned x = 0; x < srcWidth; ++x)
@@ -82,13 +100,17 @@ std::auto_ptr<Gosu::TexChunk>
         }
     const unsigned* texData = &pixelData[0];
     unsigned format = GL_RGBA;
-    #else
-    #ifndef GL_BGRA
-    #define GL_BGRA 0x80E1
-    #endif
+#elif defined(GOSU_IS_IPHONE)
+    std::vector<unsigned> pixelData(srcWidth * srcHeight);
+    for (unsigned y = 0; y < srcHeight; ++y)
+        for (unsigned x = 0; x < srcWidth; ++x)
+            pixelData[y * srcWidth + x] = bmp.getPixel(x, y).abgr();
+    const unsigned* texData = &pixelData[0];
+    unsigned format = GL_RGBA;
+#else
     const unsigned* texData = bmp.glCompatibleData();
     unsigned format = GL_BGRA;
-    #endif
+#endif
     
     glBindTexture(GL_TEXTURE_2D, name);
     glTexSubImage2D(GL_TEXTURE_2D, 0, block->left, block->top, block->width, block->height,