From 229a21898fbfa68a0b8e584e3423e6adffcd9123 Mon Sep 17 00:00:00 2001 From: rude Date: Fri, 12 Feb 2010 21:47:12 +0100 Subject: [PATCH 1/3] Updated MSVC project files with the new Image.cpp. --- platform/msvc2008/graphics/graphics.vcproj | 20 ++++++++++++++++++++ platform/msvc2008/love.vcproj | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/platform/msvc2008/graphics/graphics.vcproj b/platform/msvc2008/graphics/graphics.vcproj index 6f520194b..393b451e3 100644 --- a/platform/msvc2008/graphics/graphics.vcproj +++ b/platform/msvc2008/graphics/graphics.vcproj @@ -610,11 +610,31 @@ + + + + + + + + diff --git a/platform/msvc2008/love.vcproj b/platform/msvc2008/love.vcproj index e9c77141b..a1f4737b0 100644 --- a/platform/msvc2008/love.vcproj +++ b/platform/msvc2008/love.vcproj @@ -658,6 +658,26 @@ RelativePath="..\..\src\modules\graphics\Graphics.h" > + + + + + + + + From 994c74848e78331cb3f26b99da96eaf52384d740 Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Thu, 18 Feb 2010 19:59:21 -0600 Subject: [PATCH 2/3] switched the default compiler version to gcc 4.0 so that it builds properly under 10.5, Debug mode --- platform/macosx/love.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index 46e5383f7..d97e65b65 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -1686,6 +1686,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO; + GCC_VERSION = 4.0; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_NEWLINE = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; From 9c4926b7da7c90b06789484057d7a65219f96fc4 Mon Sep 17 00:00:00 2001 From: rude Date: Sat, 20 Feb 2010 18:19:16 +0100 Subject: [PATCH 3/3] Fixed double-transform spritebatch bug. --- src/modules/graphics/opengl/SpriteBatch.cpp | 18 ++++++------------ src/modules/graphics/opengl/SpriteBatch.h | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/modules/graphics/opengl/SpriteBatch.cpp b/src/modules/graphics/opengl/SpriteBatch.cpp index 51457a568..053f64ced 100644 --- a/src/modules/graphics/opengl/SpriteBatch.cpp +++ b/src/modules/graphics/opengl/SpriteBatch.cpp @@ -117,7 +117,7 @@ namespace opengl t.setTransformation(x, y, a, sx, sy, ox, oy); t.transform(v, v, 4); - addv(t, v); + addv(v); // Increment counter. next++; @@ -138,9 +138,9 @@ namespace opengl // Transform. Matrix t; t.setTransformation(x, y, a, sx, sy, ox, oy); - t.transform(v, quad->getVertices(), 4); + t.transform(v, v, 4); - addv(t, v); + addv(v); // Increment counter. next++; @@ -207,24 +207,18 @@ namespace opengl glPopMatrix(); } - void SpriteBatch::addv(const Matrix & t, const vertex * v) + void SpriteBatch::addv(const vertex * v) { - // Get a pointer to the correct insertion position. - vertex * dst = vertices + next*4; - - // Transform. - t.transform(dst, dst, 4); - if(lockp != 0) { // Copy into mapped memory if buffer is locked. - memcpy(lockp + (next*4), dst, sizeof(vertex)*4); + memcpy(lockp + (next*4), v, sizeof(vertex)*4); } else { // ... use glBufferSubData otherwise. glBindBuffer(GL_ARRAY_BUFFER, vbo[0]); - glBufferSubData(GL_ARRAY_BUFFER, (next*4)*sizeof(vertex), sizeof(vertex)*4, dst); + glBufferSubData(GL_ARRAY_BUFFER, (next*4)*sizeof(vertex), sizeof(vertex)*4, v); glBindBuffer(GL_ARRAY_BUFFER, 0); } } diff --git a/src/modules/graphics/opengl/SpriteBatch.h b/src/modules/graphics/opengl/SpriteBatch.h index 56f4bb223..6a92fb410 100644 --- a/src/modules/graphics/opengl/SpriteBatch.h +++ b/src/modules/graphics/opengl/SpriteBatch.h @@ -101,7 +101,7 @@ namespace opengl private: - void addv(const Matrix & t, const vertex * v); + void addv(const vertex * v); }; // SpriteBatch