diff -Nru love-unstable-0.10.0~pre2657ppa2/changes.txt love-unstable-0.10.1~pre2723ppa1/changes.txt --- love-unstable-0.10.0~pre2657ppa2/changes.txt 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/changes.txt 2016-02-13 14:45:25.000000000 +0000 @@ -1,8 +1,41 @@ -LOVE 0.10.0 [Super Toast] --------------- +LOVE 0.10.1 [Super Toast] +------------------------- Released: N/A + * Added a new love.conf flag t.externalstorage, which determines whether files are saved in internal or external storage on Android devices. + * Added a new variant of love.graphics.arc which can draw different types of arcs ("pie", "open", or "closed"). + * Added "lighten" and "darken" BlendModes. They can only be used with the "premultiplied" BlendAlphaMode. + * Added the "lighten" GraphicsFeature constant. + * Added the ability to avoid clearing specific Canvases when calling love.graphics.clear, if multiple Canvases are active at once via love.graphics.setCanvas. + * Added Text:getDimensions. + * Added optional "collideconnected" argument to love.physics.newMotorJoint. + + * Fixed a Lua error in the no-game screen if the window's height is too small. + * Fixed the default error handler to reset the mouse Cursor. + * Fixed love.filesystem functions crashing when called if liblove is used directly without calling love.filesystem.init. + * Fixed audio on Android to pause when the app is inactive, and resume when the app becomes active again. + * Fixed the Video decoding thread hanging after Video:seek or when a Video finishes. + * Fixed Video:isPlaying to always return false after it finishes playing. + * Fixed RandomGenerator:random crashing if a nil 'self' is used. + * Fixed loading BMFont files which have characters with 0 width or height (a space character, for example). + * Fixed love.graphics.newFont causing crashes if FileData is passed in. + * Fixed a driver bug on some Android devices which caused all objects to show up as black. + * Fixed a driver bug on Windows with AMD graphics cards where love.graphics.clear would not always work. + * Fixed Shader:sendColor incorrectly converting alpha values from sRGB to linear RGB when gamma-correct rendering is enabled. + * Fixed love.graphics.newMesh(vertices) double-converting colors from sRGB to linear RGB when gamma-correct rendering is enabled. + * Fixed love.graphics.new* crashing when there is no graphics context/window. + + * Updated the Windows executable to prefer the high-powered AMD graphics card on systems which have switchable Intel+AMD GPUs. + * Updated love.touch.getTouches to return the list of IDs in the relative order that the touches initially happened, instead of being in a random order. + * Updated the error messages caused by invalid or bad arguments to ImageData and SoundData methods to be more descriptive. + + +LOVE 0.10.0 [Super Toast] +------------------------- + +Released: 2015-12-22 + * Added an iOS port. * Added an Android port. * Added the flag t.accelerometerjoystick to love.conf. Disables accelerometer-as-joystick functionality on mobile devices when false. @@ -20,7 +53,6 @@ * Added love.wheelmoved event callback function (replaces "wu" and "wd" constants for love.mousepressed.) * Added love.mouse.hasCursor. * Added a boolean argument to love.mousepressed and love.mousereleased indicating whether the button event originated from a touch press. - * Added more mouse button constants ("x3", "x4", and "x5".) * Added optional x/y/width/height arguments to love.keyboard.setTextInput. They tell the system where text will show up so on-screen keyboards can avoid that area. * Added Source:getType (replaces Source:isStatic.) * Added Source:getDuration and Decoder:getDuration. diff -Nru love-unstable-0.10.0~pre2657ppa2/CMakeLists.txt love-unstable-0.10.1~pre2723ppa1/CMakeLists.txt --- love-unstable-0.10.0~pre2657ppa2/CMakeLists.txt 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/CMakeLists.txt 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006-2015 LOVE Development Team +# Copyright (c) 2006-2016 LOVE Development Team # # This software is provided 'as-is', without any express or implied # warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/debian/changelog love-unstable-0.10.1~pre2723ppa1/debian/changelog --- love-unstable-0.10.0~pre2657ppa2/debian/changelog 2015-12-19 13:46:40.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/debian/changelog 2016-02-13 14:46:29.000000000 +0000 @@ -1,5 +1,5 @@ -love-unstable (0.10.0~pre2657ppa2) trusty; urgency=medium +love-unstable (0.10.1~pre2723ppa1) trusty; urgency=medium * Upstream testing release - -- Bart van Strien Sat, 19 Dec 2015 14:46:36 +0100 + -- Bart van Strien Sat, 13 Feb 2016 15:45:57 +0100 diff -Nru love-unstable-0.10.0~pre2657ppa2/extra/appveyor/appveyor.yml love-unstable-0.10.1~pre2723ppa1/extra/appveyor/appveyor.yml --- love-unstable-0.10.0~pre2657ppa2/extra/appveyor/appveyor.yml 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/extra/appveyor/appveyor.yml 2016-02-13 14:37:39.000000000 +0000 @@ -1,4 +1,4 @@ -version: 0.10.0.{build} +version: 0.10.1.{build} os: - Windows Server 2012 R2 Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/extra/nsis/game.ico and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/extra/nsis/game.ico differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/extra/nsis/love.ico and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/extra/nsis/love.ico differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/extra/windows/love.ico and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/extra/windows/love.ico differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/extra/windows/love.rc and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/extra/windows/love.rc differ diff -Nru love-unstable-0.10.0~pre2657ppa2/license.txt love-unstable-0.10.1~pre2723ppa1/license.txt --- love-unstable-0.10.0~pre2657ppa2/license.txt 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/license.txt 2016-02-13 14:37:39.000000000 +0000 @@ -1,6 +1,6 @@ This software uses LOVE: -LOVE is Copyright (c) 2006-2015 LOVE Development Team +LOVE is Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/unix/application-x-love-game.svg love-unstable-0.10.1~pre2723ppa1/platform/unix/application-x-love-game.svg --- love-unstable-0.10.0~pre2657ppa2/platform/unix/application-x-love-game.svg 2015-12-19 13:46:36.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/unix/application-x-love-game.svg 2016-02-13 14:45:57.000000000 +0000 @@ -1,1024 +1,793 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/unix/love.6 love-unstable-0.10.1~pre2723ppa1/platform/unix/love.6 --- love-unstable-0.10.0~pre2657ppa2/platform/unix/love.6 2015-12-19 13:46:36.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/unix/love.6 2016-02-13 14:45:57.000000000 +0000 @@ -10,27 +10,24 @@ .\" 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. .\" .\" 3. This notice may not be removed or altered from any source distribution. -.\" -.\" Modifications: -.\" - Update version to 0.9 and remove reference to doc dir -.\" - Add fused and version flags - -.TH "LOVE" "6" "0.9.2" -.SH "NAME" -love \- 2D game development framework - -.SH "SYNOPSIS" -.B love -[\-\-fused] <\fIgame.love\fR> -.PP -.B love -\-\-version -.PP - -.SH "DESCRIPTION" -LÖVE was created to be a user\-friendly engine in which simple (or complicated) games could be made without having extensive knowledge of system or graphics functions and without having to dedicate time towards developing the same engine features time and time again. -.P -Developed with cross\-platform implementation in mind, it utilizes the latest open source libraries to deliver a similar game experience, independent of operating system. By relying on the Lua scripting language for game\-specific programming, it allows even the novice game creator to quickly and efficiently develop an idea into a fully working game. - -.SH "SEE ALSO" -You can find more information at \fIhttp://love2d.org/\fR +.Dd December 23, 2015 +.Dt LOVE 6 +.Os LÖVE 0.10.0 +.Sh NAME +.Nm love +.Nd 2D game development framework +.Sh SYNOPSIS +.Nm love +.Op Fl Fl fused +.Ar game Ns .love +.Pp +.Nm love +.Fl Fl version +.Sh DESCRIPTION +LÖVE was created to be a user-friendly engine in which simple (or complicated) games could be made without having extensive knowledge of system or graphics functions and without having to dedicate time towards developing the same engine features time and time again. +.Pp +Developed with cross-platform implementation in mind, it utilizes the latest open source libraries to deliver a similar game experience, independent of operating system. +By relying on the Lua scripting language for game-specific programming, it allows even the novice game creator to quickly and efficiently develop an idea into a fully working game. +.Sh SEE ALSO +You can find more information at +.Lk http://love2d.org/ diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/unix/love.svg love-unstable-0.10.1~pre2723ppa1/platform/unix/love.svg --- love-unstable-0.10.0~pre2657ppa2/platform/unix/love.svg 2015-12-19 13:46:36.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/unix/love.svg 2016-02-13 14:45:57.000000000 +0000 @@ -1,1030 +1,962 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + width="141.73px" height="141.73px" viewBox="0 0 141.73 141.73" enable-background="new 0 0 141.73 141.73" xml:space="preserve"> - + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + - + + + + + + diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/Contents.json love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/Contents.json --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/Contents.json 1970-01-01 00:00:00.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/Contents.json 2016-02-13 14:37:39.000000000 +0000 @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_128x128@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_128x128@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_128x128.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_128x128.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_16x16@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_16x16@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_16x16.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_16x16.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_256x256@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_256x256@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_256x256.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_256x256.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_32x32@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_32x32@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_32x32.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_32x32.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_512x512@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_512x512@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/GameIcon.iconset/icon_512x512.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/GameIcon.iconset/icon_512x512.png differ diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json 1970-01-01 00:00:00.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/Contents.json 2016-02-13 14:37:40.000000000 +0000 @@ -0,0 +1,128 @@ +{ + "images" : [ + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "icon-29pt@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "icon-29pt@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "icon-29pt@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "icon-40pt@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "icon-40pt@3x.png", + "scale" : "3x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "icon-57pt@1x.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "icon-57pt@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon-60pt@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon-60pt@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "icon-29pt@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "icon-29pt@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "icon-40pt@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "icon-40pt@2x.png", + "scale" : "2x" + }, + { + "size" : "50x50", + "idiom" : "ipad", + "filename" : "icon-50pt@1x.png", + "scale" : "1x" + }, + { + "size" : "50x50", + "idiom" : "ipad", + "filename" : "icon-50pt@2x.png", + "scale" : "2x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "icon-72pt@1x.png", + "scale" : "1x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "icon-72pt@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon-76pt@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon-76pt@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "icon-83.5pt@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-29pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-29pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-29pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-29pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-29pt@3x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-29pt@3x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-40pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-40pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-40pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-40pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-40pt@3x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-40pt@3x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-50pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-50pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-50pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-50pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-57pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-57pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-57pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-57pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-60pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-60pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-60pt@3x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-60pt@3x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-72pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-72pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-72pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-72pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-76pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-76pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-76pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-76pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-83.5pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS AppIcon.appiconset/icon-83.5pt@2x.png differ diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS LaunchImage.launchimage/Contents.json love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS LaunchImage.launchimage/Contents.json --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/iOS LaunchImage.launchimage/Contents.json 1970-01-01 00:00:00.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/iOS LaunchImage.launchimage/Contents.json 2016-02-13 14:37:40.000000000 +0000 @@ -0,0 +1,142 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "667h", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/1024.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/1024.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/128.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/128.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/16.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/16.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/256.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/256.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/32.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/32.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/512.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/512.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/64.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/64.png differ diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/Contents.json love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/Contents.json --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/Contents.json 1970-01-01 00:00:00.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/Images.xcassets/OS X AppIcon.appiconset/Contents.json 2016-02-13 14:37:40.000000000 +0000 @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/Contents.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -{ - "images" : [ - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "pig-29pt@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "pig-29pt@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "pig-29pt@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "pig-40pt@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "pig-40pt@3x.png", - "scale" : "3x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "pig-57pt@1x.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "pig-57pt@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "pig-60pt@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "pig-60pt@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "pig-29pt@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "pig-29pt@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "pig-40pt@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "pig-40pt@2x.png", - "scale" : "2x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "pig-50pt@1x.png", - "scale" : "1x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "pig-50pt@2x.png", - "scale" : "2x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "pig-72pt@1x.png", - "scale" : "1x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "pig-72pt@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "pig-76pt@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "pig-76pt@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "pig-83.5pt@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-29pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-29pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-29pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-29pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-29pt@3x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-29pt@3x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-40pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-40pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-40pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-40pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-40pt@3x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-40pt@3x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-50pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-50pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-50pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-50pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-57pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-57pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-57pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-57pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-60pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-60pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-60pt@3x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-60pt@3x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-72pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-72pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-72pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-72pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-76pt@1x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-76pt@1x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-76pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-76pt@2x.png differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-83.5pt@2x.png and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/AppIcon.appiconset/pig-83.5pt@2x.png differ diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/LaunchImage.launchimage/Contents.json love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/LaunchImage.launchimage/Contents.json --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Images.xcassets/LaunchImage.launchimage/Contents.json 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Images.xcassets/LaunchImage.launchimage/Contents.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "scale" : "3x" - }, - { - "orientation" : "landscape", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "scale" : "3x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "667h", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Launch Screen.xib love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Launch Screen.xib --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/Launch Screen.xib 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/Launch Screen.xib 2016-02-13 14:37:40.000000000 +0000 @@ -1,8 +1,8 @@ - + - + diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/love-ios.plist love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/love-ios.plist --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/ios/love-ios.plist 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/ios/love-ios.plist 2016-02-13 14:37:40.000000000 +0000 @@ -40,7 +40,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 0.10.1 CFBundleSignature ???? CFBundleVersion diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/love.xcodeproj/project.pbxproj love-unstable-0.10.1~pre2723ppa1/platform/xcode/love.xcodeproj/project.pbxproj --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/love.xcodeproj/project.pbxproj 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/love.xcodeproj/project.pbxproj 2016-02-13 14:37:40.000000000 +0000 @@ -20,10 +20,9 @@ FA0797991BF480A200034B7C /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA0797981BF480A200034B7C /* GameController.framework */; }; FA08F69616C766E000F007B5 /* love.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA08F69116C765A200F007B5 /* love.framework */; }; FA08F69716C766E700F007B5 /* love.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = FA08F69116C765A200F007B5 /* love.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - FA0B78D21A95814A000E1D17 /* love.icns in Resources */ = {isa = PBXBuildFile; fileRef = FA0B78D01A95814A000E1D17 /* love.icns */; }; - FA0B78D31A95814A000E1D17 /* lovedocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = FA0B78D11A95814A000E1D17 /* lovedocument.icns */; }; FA0B7F301A95AC7D000E1D17 /* love.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E6A3410420AC0007D418B /* love.cpp */; }; FA27B3CB1B498696008A9DCE /* Theora.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA27B3CA1B498696008A9DCE /* Theora.framework */; }; + FA5933751C6D625B000EC779 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA5D249A1A96CF4300C6FC8F /* Images.xcassets */; }; FA5D24821A96CA1800C6FC8F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA5D24811A96CA1800C6FC8F /* OpenAL.framework */; }; FA5D24841A96CA2700C6FC8F /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA5D24831A96CA2700C6FC8F /* OpenGLES.framework */; }; FA5D24881A96CA8A00C6FC8F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA5D24871A96CA8A00C6FC8F /* UIKit.framework */; }; @@ -113,8 +112,6 @@ A9F169A6109E824900FC83D1 /* mpg123.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mpg123.framework; path = /Library/Frameworks/mpg123.framework; sourceTree = ""; }; FA0797981BF480A200034B7C /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.1.sdk/System/Library/Frameworks/GameController.framework; sourceTree = DEVELOPER_DIR; }; FA08F69116C765A200F007B5 /* love.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = love.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FA0B78D01A95814A000E1D17 /* love.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = love.icns; path = macosx/love.icns; sourceTree = ""; }; - FA0B78D11A95814A000E1D17 /* lovedocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = lovedocument.icns; path = macosx/lovedocument.icns; sourceTree = ""; }; FA0B7F061A95AAF3000E1D17 /* love.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = love.app; sourceTree = BUILT_PRODUCTS_DIR; }; FA27B3CA1B498696008A9DCE /* Theora.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Theora.framework; path = /Library/Frameworks/Theora.framework; sourceTree = ""; }; FA577A9316C7217800860150 /* liblove.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = liblove.xcodeproj; sourceTree = ""; }; @@ -127,7 +124,7 @@ FA5D24931A96CABA00C6FC8F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; FA5D24951A96CAC200C6FC8F /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; FA5D24971A96CE1E00C6FC8F /* love-ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "love-ios.plist"; path = "ios/love-ios.plist"; sourceTree = ""; }; - FA5D249A1A96CF4300C6FC8F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ios/Images.xcassets; sourceTree = ""; }; + FA5D249A1A96CF4300C6FC8F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; FA5D24C11A96D78000C6FC8F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; FA7C63691A9C49570000FD29 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Launch Screen.xib"; path = "ios/Launch Screen.xib"; sourceTree = ""; }; FA9B4A0916E1579F00074F42 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; @@ -206,8 +203,6 @@ isa = PBXGroup; children = ( FAC1A448196F5DC600125284 /* license.txt */, - FA0B78D01A95814A000E1D17 /* love.icns */, - FA0B78D11A95814A000E1D17 /* lovedocument.icns */, ); name = Resources; sourceTree = ""; @@ -379,9 +374,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + FA5933751C6D625B000EC779 /* Images.xcassets in Resources */, FAC1A449196F5DC600125284 /* license.txt in Resources */, - FA0B78D31A95814A000E1D17 /* lovedocument.icns in Resources */, - FA0B78D21A95814A000E1D17 /* love.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -432,6 +426,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = "OS X AppIcon"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -458,6 +453,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = "OS X AppIcon"; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( @@ -597,8 +593,8 @@ FA0B7F261A95AAF4000E1D17 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = "iOS AppIcon"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "iOS LaunchImage"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -633,7 +629,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = "love.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -643,8 +639,8 @@ FA0B7F271A95AAF4000E1D17 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = "iOS AppIcon"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "iOS LaunchImage"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -674,7 +670,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "love.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -685,8 +681,8 @@ FA0B7F281A95AAF4000E1D17 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = "iOS AppIcon"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "iOS LaunchImage"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -716,7 +712,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "love.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love; PRODUCT_NAME = love; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -786,6 +782,7 @@ FA5326C718971A0900F7BBF4 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = "OS X AppIcon"; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/macosx/liblove-macosx.plist love-unstable-0.10.1~pre2723ppa1/platform/xcode/macosx/liblove-macosx.plist --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/macosx/liblove-macosx.plist 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/macosx/liblove-macosx.plist 2016-02-13 14:37:40.000000000 +0000 @@ -17,11 +17,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.10.1 CFBundleSignature LoVe - CFBundleVersion - 0.10.0 NSPrincipalClass Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/macosx/lovedocument.icns and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/macosx/lovedocument.icns differ Binary files /tmp/tmplFi_9r/I2VtSSIEj7/love-unstable-0.10.0~pre2657ppa2/platform/xcode/macosx/love.icns and /tmp/tmplFi_9r/r0He_YNhCT/love-unstable-0.10.1~pre2723ppa1/platform/xcode/macosx/love.icns differ diff -Nru love-unstable-0.10.0~pre2657ppa2/platform/xcode/macosx/love-macosx.plist love-unstable-0.10.1~pre2723ppa1/platform/xcode/macosx/love-macosx.plist --- love-unstable-0.10.0~pre2657ppa2/platform/xcode/macosx/love-macosx.plist 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/platform/xcode/macosx/love-macosx.plist 2016-02-13 14:37:40.000000000 +0000 @@ -8,7 +8,7 @@ CFBundleTypeIconFile - lovedocument + GameIcon CFBundleTypeName LÖVE Project CFBundleTypeRole @@ -47,8 +47,6 @@ CFBundleExecutable love - CFBundleIconFile - love.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -58,7 +56,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.10.0 + 0.10.1 CFBundleSignature LoVe LSApplicationCategoryType @@ -66,7 +64,7 @@ NSHighResolutionCapable NSHumanReadableCopyright - © 2006-2015 LÖVE Development Team + © 2006-2016 LÖVE Development Team NSPrincipalClass NSApplication UTExportedTypeDeclarations @@ -79,7 +77,7 @@ UTTypeDescription LÖVE Project UTTypeIconFile - lovedocument + GameIcon UTTypeIdentifier org.love2d.love-game UTTypeReferenceURL diff -Nru love-unstable-0.10.0~pre2657ppa2/readme-iOS.rtf love-unstable-0.10.1~pre2723ppa1/readme-iOS.rtf --- love-unstable-0.10.0~pre2657ppa2/readme-iOS.rtf 1970-01-01 00:00:00.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/readme-iOS.rtf 2016-02-13 14:37:40.000000000 +0000 @@ -0,0 +1,67 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf340 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;\f2\fnil\fcharset0 LucidaGrande; +} +{\colortbl;\red255\green255\blue255;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1} +{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2} +{\list\listtemplateid3\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid201\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid3} +{\list\listtemplateid4\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid301\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid4} +{\list\listtemplateid5\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid401\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid5} +{\list\listtemplateid6\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid501\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid6}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}} +\margl1440\margr1440\vieww14040\viewh10200\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 + +\f0\b\fs36 \cf0 Building L\'d6VE for iOS +\b0\fs24 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ +In order to run L\'d6VE for iOS, it must first be compiled and installed. To do that, you\'92ll need Mac OS X and {\field{\*\fldinst{HYPERLINK "https://developer.apple.com/xcode/"}}{\fldrslt Xcode 7 or newer}}.\ +\ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0 +\ls1\ilvl0\cf0 {\listtext \'95 }If the +\f1\fs22 include +\f0\fs24 and +\f1\fs22 libraries +\f0\fs24 folders are not present in the +\f1\fs22 love/platform/xcode/ios +\f0\fs24 folder, {\field{\*\fldinst{HYPERLINK "https://bitbucket.org/rude/love/downloads/love-0.10.0-ios-libraries.zip"}}{\fldrslt download them}} and place them there. They contain the third-party library dependencies used by L\'d6VE.\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0 +\ls2\ilvl0\cf0 {\listtext \'95 }Open the Xcode project found at +\f1\fs22 love/platform/xcode/love.xcodeproj +\f0\fs24 , and select the \'93love-ios\'94 target in the dropdown menu at the top of the window.\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0 +\ls3\ilvl0\cf0 {\listtext \'95 }You may want to change the Build Configuration from Debug to Release mode for better runtime performance, by opening the \'93Edit Scheme\'85\'94 menu from the same dropdown selection.\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0 +\ls4\ilvl0\cf0 {\listtext \'95 }Choose either an iOS Simulator device or your plugged-in iOS device from the dropdown selection to the right of the previous one, and click the Build-and-Run +\f2 \uc0\u9654 \u65038 +\f0 button to the left, which will install and run L\'d6VE on the target device after compiling it.\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ + +\b\fs36 Running Games on iOS +\b0\fs24 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ +L\'d6VE on iOS includes a simple list interface of games that are installed (until you {\field{\*\fldinst{HYPERLINK "https://love2d.org/wiki/Game_Distribution"}}{\fldrslt fuse}} a .love to it for distribution.)\ +\ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0 +\ls5\ilvl0\cf0 {\listtext \'95 }To put a .love file on the iOS Simulator after L\'d6VE is installed, drag the file onto the iOS Simulator\'92s window while it\'92s open. L\'d6VE will launch if it\'92s not running already. If another game is currently active you may need to quit L\'d6VE for the new game to show up (press Shift-Command-H twice to open the App Switcher menu on the iOS Simulator.)\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0 +\ls6\ilvl0\cf0 {\listtext \'95 }To put a .love file or game folder on your iOS device after L\'d6VE is installed, you can either download it with the Safari, or transfer it from your computer through iTunes when your device is connected: open iTunes, go to the iOS device which has L\'d6VE installed, go to the \'91Apps\'92 section and scroll down and find L\'d6VE, and add the .love file or game folder to L\'d6VE\'92s Documents section.\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 +\cf0 \ + +\b\fs36 Distributing a Game on iOS +\b0\fs24 \ +\ +Refer to the {\field{\*\fldinst{HYPERLINK "https://love2d.org/wiki/Game_Distribution#iOS"}}{\fldrslt Game Distribution}} L\'d6VE wiki page.\ +} \ No newline at end of file diff -Nru love-unstable-0.10.0~pre2657ppa2/readme.md love-unstable-0.10.1~pre2723ppa1/readme.md --- love-unstable-0.10.0~pre2657ppa2/readme.md 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/readme.md 2016-02-13 14:37:40.000000000 +0000 @@ -32,6 +32,8 @@ Then use the Xcode project found at `platform/xcode/love.xcodeproj` to build the `love-ios` target. +See `readme-iOS.rtf` for more information. + ###Android Visit the [Android build repository][android-repository] for build instructions. @@ -83,7 +85,7 @@ [forums]: http://love2d.org/forums [irc]: irc://irc.oftc.net/love [dependencies]: http://love2d.org/sdk -[dependencies-ios]: https://dl.dropboxusercontent.com/u/4214717/love-ios-libraries-0.10.zip +[dependencies-ios]: https://bitbucket.org/rude/love/downloads/love-0.10.0-ios-libraries.zip [megasource]: https://bitbucket.org/rude/megasource [builds]: http://love2d.org/builds [stableppa]: https://launchpad.net/~bartbes/+archive/love-stable diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/android.cpp love-unstable-0.10.1~pre2723ppa1/src/common/android.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/android.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/android.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/android.h love-unstable-0.10.1~pre2723ppa1/src/common/android.h --- love-unstable-0.10.0~pre2657ppa2/src/common/android.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/android.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/b64.cpp love-unstable-0.10.1~pre2723ppa1/src/common/b64.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/b64.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/b64.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/b64.h love-unstable-0.10.1~pre2723ppa1/src/common/b64.h --- love-unstable-0.10.0~pre2657ppa2/src/common/b64.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/b64.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/config.h love-unstable-0.10.1~pre2723ppa1/src/common/config.h --- love-unstable-0.10.0~pre2657ppa2/src/common/config.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/config.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -76,7 +76,6 @@ #endif #if defined(LOVE_WINDOWS) -# define LOVE_LEGENDARY_UTF8_ARGV_HACK # define LOVE_LEGENDARY_CONSOLE_IO_HACK # define NOMINMAX #endif diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Data.h love-unstable-0.10.1~pre2723ppa1/src/common/Data.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Data.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Data.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/delay.cpp love-unstable-0.10.1~pre2723ppa1/src/common/delay.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/delay.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/delay.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/delay.h love-unstable-0.10.1~pre2723ppa1/src/common/delay.h --- love-unstable-0.10.0~pre2657ppa2/src/common/delay.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/delay.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/EnumMap.h love-unstable-0.10.1~pre2723ppa1/src/common/EnumMap.h --- love-unstable-0.10.0~pre2657ppa2/src/common/EnumMap.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/EnumMap.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Exception.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Exception.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Exception.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Exception.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Exception.h love-unstable-0.10.1~pre2723ppa1/src/common/Exception.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Exception.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Exception.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/int.h love-unstable-0.10.1~pre2723ppa1/src/common/int.h --- love-unstable-0.10.0~pre2657ppa2/src/common/int.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/int.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/ios.h love-unstable-0.10.1~pre2723ppa1/src/common/ios.h --- love-unstable-0.10.0~pre2657ppa2/src/common/ios.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/ios.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/ios.mm love-unstable-0.10.1~pre2723ppa1/src/common/ios.mm --- love-unstable-0.10.0~pre2657ppa2/src/common/ios.mm 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/ios.mm 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/macosx.h love-unstable-0.10.1~pre2723ppa1/src/common/macosx.h --- love-unstable-0.10.0~pre2657ppa2/src/common/macosx.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/macosx.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/macosx.mm love-unstable-0.10.1~pre2723ppa1/src/common/macosx.mm --- love-unstable-0.10.0~pre2657ppa2/src/common/macosx.mm 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/macosx.mm 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/math.h love-unstable-0.10.1~pre2723ppa1/src/common/math.h --- love-unstable-0.10.0~pre2657ppa2/src/common/math.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/math.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Matrix.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Matrix.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Matrix.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Matrix.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Matrix.h love-unstable-0.10.1~pre2723ppa1/src/common/Matrix.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Matrix.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Matrix.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Memoizer.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Memoizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Memoizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Memoizer.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Memoizer.h love-unstable-0.10.1~pre2723ppa1/src/common/Memoizer.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Memoizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Memoizer.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Module.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Module.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Module.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Module.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Module.h love-unstable-0.10.1~pre2723ppa1/src/common/Module.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Module.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Module.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Object.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Object.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Object.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Object.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Object.h love-unstable-0.10.1~pre2723ppa1/src/common/Object.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Object.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Object.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Reference.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Reference.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Reference.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Reference.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Reference.h love-unstable-0.10.1~pre2723ppa1/src/common/Reference.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Reference.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Reference.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/runtime.cpp love-unstable-0.10.1~pre2723ppa1/src/common/runtime.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/runtime.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/runtime.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/runtime.h love-unstable-0.10.1~pre2723ppa1/src/common/runtime.h --- love-unstable-0.10.0~pre2657ppa2/src/common/runtime.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/runtime.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/StringMap.h love-unstable-0.10.1~pre2723ppa1/src/common/StringMap.h --- love-unstable-0.10.0~pre2657ppa2/src/common/StringMap.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/StringMap.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/types.cpp love-unstable-0.10.1~pre2723ppa1/src/common/types.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/types.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/types.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/types.h love-unstable-0.10.1~pre2723ppa1/src/common/types.h --- love-unstable-0.10.0~pre2657ppa2/src/common/types.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/types.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/utf8.cpp love-unstable-0.10.1~pre2723ppa1/src/common/utf8.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/utf8.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/utf8.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/utf8.h love-unstable-0.10.1~pre2723ppa1/src/common/utf8.h --- love-unstable-0.10.0~pre2657ppa2/src/common/utf8.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/utf8.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Variant.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Variant.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Variant.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Variant.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Variant.h love-unstable-0.10.1~pre2723ppa1/src/common/Variant.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Variant.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Variant.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Vector.cpp love-unstable-0.10.1~pre2723ppa1/src/common/Vector.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/Vector.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Vector.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/Vector.h love-unstable-0.10.1~pre2723ppa1/src/common/Vector.h --- love-unstable-0.10.0~pre2657ppa2/src/common/Vector.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/Vector.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/version.h love-unstable-0.10.1~pre2723ppa1/src/common/version.h --- love-unstable-0.10.0~pre2657ppa2/src/common/version.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/version.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -25,12 +25,12 @@ { // Version stuff. -#define LOVE_VERSION_STRING "0.10.0" +#define LOVE_VERSION_STRING "0.10.1" static const int VERSION_MAJOR = 0; static const int VERSION_MINOR = 10; -static const int VERSION_REV = 0; +static const int VERSION_REV = 1; static const char *VERSION = LOVE_VERSION_STRING; -static const char *VERSION_COMPATIBILITY[] = { VERSION, 0 }; +static const char *VERSION_COMPATIBILITY[] = { VERSION, "0.10.0", 0 }; static const char *VERSION_CODENAME = "Super Toast"; } // love diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/wrap_Data.cpp love-unstable-0.10.1~pre2723ppa1/src/common/wrap_Data.cpp --- love-unstable-0.10.0~pre2657ppa2/src/common/wrap_Data.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/wrap_Data.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/common/wrap_Data.h love-unstable-0.10.1~pre2723ppa1/src/common/wrap_Data.h --- love-unstable-0.10.0~pre2657ppa2/src/common/wrap_Data.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/common/wrap_Data.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/libraries/enet/lua-enet.h love-unstable-0.10.1~pre2723ppa1/src/libraries/enet/lua-enet.h --- love-unstable-0.10.0~pre2657ppa2/src/libraries/enet/lua-enet.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/libraries/enet/lua-enet.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** -* Copyright (c) 2006-2015 LOVE Development Team +* Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/libraries/glad/glad.cpp love-unstable-0.10.1~pre2723ppa1/src/libraries/glad/glad.cpp --- love-unstable-0.10.0~pre2657ppa2/src/libraries/glad/glad.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/libraries/glad/glad.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -406,6 +406,7 @@ pfn_glUniformMatrix2x3dv fp_glUniformMatrix2x3dv; pfn_glProgramUniformMatrix4dv fp_glProgramUniformMatrix4dv; pfn_glSecondaryColor3sv fp_glSecondaryColor3sv; +pfn_glPrimitiveBoundingBox fp_glPrimitiveBoundingBox; pfn_glProgramUniformMatrix2x4dv fp_glProgramUniformMatrix2x4dv; pfn_glDispatchCompute fp_glDispatchCompute; pfn_glVertex3sv fp_glVertex3sv; @@ -1047,6 +1048,7 @@ pfn_glTexCoord2iv fp_glTexCoord2iv; pfn_glTextureBarrier fp_glTextureBarrier; pfn_glIsQuery fp_glIsQuery; +pfn_glBlendBarrier fp_glBlendBarrier; pfn_glProgramUniform2ui fp_glProgramUniform2ui; pfn_glProgramUniform4ui fp_glProgramUniform4ui; pfn_glVertexAttrib4sv fp_glVertexAttrib4sv; @@ -1159,13 +1161,51 @@ pfn_glBlendFuncSeparateiARB fp_glBlendFuncSeparateiARB; pfn_glDrawArraysInstancedARB fp_glDrawArraysInstancedARB; pfn_glDrawElementsInstancedARB fp_glDrawElementsInstancedARB; +pfn_glPrimitiveBoundingBoxARB fp_glPrimitiveBoundingBoxARB; pfn_glProgramParameteriARB fp_glProgramParameteriARB; pfn_glFramebufferTextureARB fp_glFramebufferTextureARB; pfn_glFramebufferTextureLayerARB fp_glFramebufferTextureLayerARB; pfn_glFramebufferTextureFaceARB fp_glFramebufferTextureFaceARB; +pfn_glUniform1i64ARB fp_glUniform1i64ARB; +pfn_glUniform2i64ARB fp_glUniform2i64ARB; +pfn_glUniform3i64ARB fp_glUniform3i64ARB; +pfn_glUniform4i64ARB fp_glUniform4i64ARB; +pfn_glUniform1i64vARB fp_glUniform1i64vARB; +pfn_glUniform2i64vARB fp_glUniform2i64vARB; +pfn_glUniform3i64vARB fp_glUniform3i64vARB; +pfn_glUniform4i64vARB fp_glUniform4i64vARB; +pfn_glUniform1ui64ARB fp_glUniform1ui64ARB; +pfn_glUniform2ui64ARB fp_glUniform2ui64ARB; +pfn_glUniform3ui64ARB fp_glUniform3ui64ARB; +pfn_glUniform4ui64ARB fp_glUniform4ui64ARB; +pfn_glUniform1ui64vARB fp_glUniform1ui64vARB; +pfn_glUniform2ui64vARB fp_glUniform2ui64vARB; +pfn_glUniform3ui64vARB fp_glUniform3ui64vARB; +pfn_glUniform4ui64vARB fp_glUniform4ui64vARB; +pfn_glGetUniformi64vARB fp_glGetUniformi64vARB; +pfn_glGetUniformui64vARB fp_glGetUniformui64vARB; +pfn_glGetnUniformi64vARB fp_glGetnUniformi64vARB; +pfn_glGetnUniformui64vARB fp_glGetnUniformui64vARB; +pfn_glProgramUniform1i64ARB fp_glProgramUniform1i64ARB; +pfn_glProgramUniform2i64ARB fp_glProgramUniform2i64ARB; +pfn_glProgramUniform3i64ARB fp_glProgramUniform3i64ARB; +pfn_glProgramUniform4i64ARB fp_glProgramUniform4i64ARB; +pfn_glProgramUniform1i64vARB fp_glProgramUniform1i64vARB; +pfn_glProgramUniform2i64vARB fp_glProgramUniform2i64vARB; +pfn_glProgramUniform3i64vARB fp_glProgramUniform3i64vARB; +pfn_glProgramUniform4i64vARB fp_glProgramUniform4i64vARB; +pfn_glProgramUniform1ui64ARB fp_glProgramUniform1ui64ARB; +pfn_glProgramUniform2ui64ARB fp_glProgramUniform2ui64ARB; +pfn_glProgramUniform3ui64ARB fp_glProgramUniform3ui64ARB; +pfn_glProgramUniform4ui64ARB fp_glProgramUniform4ui64ARB; +pfn_glProgramUniform1ui64vARB fp_glProgramUniform1ui64vARB; +pfn_glProgramUniform2ui64vARB fp_glProgramUniform2ui64vARB; +pfn_glProgramUniform3ui64vARB fp_glProgramUniform3ui64vARB; +pfn_glProgramUniform4ui64vARB fp_glProgramUniform4ui64vARB; pfn_glMultiDrawArraysIndirectCountARB fp_glMultiDrawArraysIndirectCountARB; pfn_glMultiDrawElementsIndirectCountARB fp_glMultiDrawElementsIndirectCountARB; pfn_glVertexAttribDivisorARB fp_glVertexAttribDivisorARB; +pfn_glMaxShaderCompilerThreadsARB fp_glMaxShaderCompilerThreadsARB; pfn_glGetGraphicsResetStatusARB fp_glGetGraphicsResetStatusARB; pfn_glGetnTexImageARB fp_glGetnTexImageARB; pfn_glReadnPixelsARB fp_glReadnPixelsARB; @@ -1186,6 +1226,9 @@ pfn_glGetnSeparableFilterARB fp_glGetnSeparableFilterARB; pfn_glGetnHistogramARB fp_glGetnHistogramARB; pfn_glGetnMinmaxARB fp_glGetnMinmaxARB; +pfn_glFramebufferSampleLocationsfvARB fp_glFramebufferSampleLocationsfvARB; +pfn_glNamedFramebufferSampleLocationsfvARB fp_glNamedFramebufferSampleLocationsfvARB; +pfn_glEvaluateDepthValuesARB fp_glEvaluateDepthValuesARB; pfn_glMinSampleShadingARB fp_glMinSampleShadingARB; pfn_glNamedStringARB fp_glNamedStringARB; pfn_glDeleteNamedStringARB fp_glDeleteNamedStringARB; @@ -1204,6 +1247,12 @@ pfn_glUniformBufferEXT fp_glUniformBufferEXT; pfn_glGetUniformBufferSizeEXT fp_glGetUniformBufferSizeEXT; pfn_glGetUniformOffsetEXT fp_glGetUniformOffsetEXT; +pfn_glBindFragDataLocationIndexedEXT fp_glBindFragDataLocationIndexedEXT; +pfn_glBindFragDataLocationEXT fp_glBindFragDataLocationEXT; +pfn_glGetProgramResourceLocationIndexEXT fp_glGetProgramResourceLocationIndexEXT; +pfn_glGetFragDataIndexEXT fp_glGetFragDataIndexEXT; +pfn_glBlendEquationEXT fp_glBlendEquationEXT; +pfn_glBufferStorageEXT fp_glBufferStorageEXT; pfn_glCopyImageSubDataEXT fp_glCopyImageSubDataEXT; pfn_glLabelObjectEXT fp_glLabelObjectEXT; pfn_glGetObjectLabelEXT fp_glGetObjectLabelEXT; @@ -1517,7 +1566,6 @@ pfn_glProgramEnvParameters4fvEXT fp_glProgramEnvParameters4fvEXT; pfn_glProgramLocalParameters4fvEXT fp_glProgramLocalParameters4fvEXT; pfn_glGetUniformuivEXT fp_glGetUniformuivEXT; -pfn_glBindFragDataLocationEXT fp_glBindFragDataLocationEXT; pfn_glGetFragDataLocationEXT fp_glGetFragDataLocationEXT; pfn_glUniform1uiEXT fp_glUniform1uiEXT; pfn_glUniform2uiEXT fp_glUniform2uiEXT; @@ -1559,6 +1607,7 @@ pfn_glValidateProgramPipelineEXT fp_glValidateProgramPipelineEXT; pfn_glBindImageTextureEXT fp_glBindImageTextureEXT; pfn_glMemoryBarrierEXT fp_glMemoryBarrierEXT; +pfn_glTexPageCommitmentEXT fp_glTexPageCommitmentEXT; pfn_glStencilClearTagEXT fp_glStencilClearTagEXT; pfn_glPatchParameteriEXT fp_glPatchParameteriEXT; pfn_glFramebufferTextureLayerEXT fp_glFramebufferTextureLayerEXT; @@ -1763,6 +1812,7 @@ pfn_glRenderbufferStorageMultisampleIMG fp_glRenderbufferStorageMultisampleIMG; pfn_glFramebufferTexture2DMultisampleIMG fp_glFramebufferTexture2DMultisampleIMG; pfn_glBlendFuncSeparateINGR fp_glBlendFuncSeparateINGR; +pfn_glApplyFramebufferAttachmentCMAAINTEL fp_glApplyFramebufferAttachmentCMAAINTEL; pfn_glSyncTextureINTEL fp_glSyncTextureINTEL; pfn_glUnmapTexture2DINTEL fp_glUnmapTexture2DINTEL; pfn_glMapTexture2DINTEL fp_glMapTexture2DINTEL; @@ -1795,9 +1845,27 @@ pfn_glIsImageHandleResidentNV fp_glIsImageHandleResidentNV; pfn_glBlendParameteriNV fp_glBlendParameteriNV; pfn_glBlendBarrierNV fp_glBlendBarrierNV; +pfn_glCreateStatesNV fp_glCreateStatesNV; +pfn_glDeleteStatesNV fp_glDeleteStatesNV; +pfn_glIsStateNV fp_glIsStateNV; +pfn_glStateCaptureNV fp_glStateCaptureNV; +pfn_glGetCommandHeaderNV fp_glGetCommandHeaderNV; +pfn_glGetStageIndexNV fp_glGetStageIndexNV; +pfn_glDrawCommandsNV fp_glDrawCommandsNV; +pfn_glDrawCommandsAddressNV fp_glDrawCommandsAddressNV; +pfn_glDrawCommandsStatesNV fp_glDrawCommandsStatesNV; +pfn_glDrawCommandsStatesAddressNV fp_glDrawCommandsStatesAddressNV; +pfn_glCreateCommandListsNV fp_glCreateCommandListsNV; +pfn_glDeleteCommandListsNV fp_glDeleteCommandListsNV; +pfn_glIsCommandListNV fp_glIsCommandListNV; +pfn_glListDrawCommandsStatesClientNV fp_glListDrawCommandsStatesClientNV; +pfn_glCommandListSegmentsNV fp_glCommandListSegmentsNV; +pfn_glCompileCommandListNV fp_glCompileCommandListNV; +pfn_glCallCommandListNV fp_glCallCommandListNV; pfn_glBeginConditionalRenderNV fp_glBeginConditionalRenderNV; pfn_glEndConditionalRenderNV fp_glEndConditionalRenderNV; pfn_glSubpixelPrecisionBiasNV fp_glSubpixelPrecisionBiasNV; +pfn_glConservativeRasterParameterfNV fp_glConservativeRasterParameterfNV; pfn_glCopyBufferSubDataNV fp_glCopyBufferSubDataNV; pfn_glCopyImageSubDataNV fp_glCopyImageSubDataNV; pfn_glCoverageMaskNV fp_glCoverageMaskNV; @@ -1974,6 +2042,7 @@ pfn_glGetPathColorGenfvNV fp_glGetPathColorGenfvNV; pfn_glGetPathTexGenivNV fp_glGetPathTexGenivNV; pfn_glGetPathTexGenfvNV fp_glGetPathTexGenfvNV; +pfn_glPolygonModeNV fp_glPolygonModeNV; pfn_glPresentFrameKeyedNV fp_glPresentFrameKeyedNV; pfn_glPresentFrameDualFillNV fp_glPresentFrameDualFillNV; pfn_glGetVideoivNV fp_glGetVideoivNV; @@ -2115,6 +2184,8 @@ pfn_glIsEnablediNV fp_glIsEnablediNV; pfn_glBeginConditionalRenderNVX fp_glBeginConditionalRenderNVX; pfn_glEndConditionalRenderNVX fp_glEndConditionalRenderNVX; +pfn_glFramebufferTextureMultiviewOVR fp_glFramebufferTextureMultiviewOVR; +pfn_glFramebufferTextureMultisampleMultiviewOVR fp_glFramebufferTextureMultisampleMultiviewOVR; pfn_glAlphaFuncQCOM fp_glAlphaFuncQCOM; pfn_glGetDriverControlsQCOM fp_glGetDriverControlsQCOM; pfn_glGetDriverControlStringQCOM fp_glGetDriverControlStringQCOM; @@ -2830,6 +2901,9 @@ fp_glGetActiveUniformBlockiv = (pfn_glGetActiveUniformBlockiv)load("glGetActiveUniformBlockiv"); fp_glGetActiveUniformBlockName = (pfn_glGetActiveUniformBlockName)load("glGetActiveUniformBlockName"); fp_glUniformBlockBinding = (pfn_glUniformBlockBinding)load("glUniformBlockBinding"); + fp_glBindBufferRange = (pfn_glBindBufferRange)load("glBindBufferRange"); + fp_glBindBufferBase = (pfn_glBindBufferBase)load("glBindBufferBase"); + fp_glGetIntegeri_v = (pfn_glGetIntegeri_v)load("glGetIntegeri_v"); } GLboolean GLAD_VERSION_3_2 = GL_FALSE; @@ -3600,6 +3674,55 @@ fp_glVertexBindingDivisor = (pfn_glVertexBindingDivisor)load("glVertexBindingDivisor"); } +GLboolean GLAD_ES_VERSION_3_2 = GL_FALSE; +static void load_GL_ES_VERSION_3_2(LOADER load) { + if(!GLAD_ES_VERSION_3_2) return; + fp_glBlendBarrier = (pfn_glBlendBarrier)load("glBlendBarrier"); + fp_glCopyImageSubData = (pfn_glCopyImageSubData)load("glCopyImageSubData"); + fp_glDebugMessageControl = (pfn_glDebugMessageControl)load("glDebugMessageControl"); + fp_glDebugMessageInsert = (pfn_glDebugMessageInsert)load("glDebugMessageInsert"); + fp_glDebugMessageCallback = (pfn_glDebugMessageCallback)load("glDebugMessageCallback"); + fp_glGetDebugMessageLog = (pfn_glGetDebugMessageLog)load("glGetDebugMessageLog"); + fp_glPushDebugGroup = (pfn_glPushDebugGroup)load("glPushDebugGroup"); + fp_glPopDebugGroup = (pfn_glPopDebugGroup)load("glPopDebugGroup"); + fp_glObjectLabel = (pfn_glObjectLabel)load("glObjectLabel"); + fp_glGetObjectLabel = (pfn_glGetObjectLabel)load("glGetObjectLabel"); + fp_glObjectPtrLabel = (pfn_glObjectPtrLabel)load("glObjectPtrLabel"); + fp_glGetObjectPtrLabel = (pfn_glGetObjectPtrLabel)load("glGetObjectPtrLabel"); + fp_glGetPointerv = (pfn_glGetPointerv)load("glGetPointerv"); + fp_glEnablei = (pfn_glEnablei)load("glEnablei"); + fp_glDisablei = (pfn_glDisablei)load("glDisablei"); + fp_glBlendEquationi = (pfn_glBlendEquationi)load("glBlendEquationi"); + fp_glBlendEquationSeparatei = (pfn_glBlendEquationSeparatei)load("glBlendEquationSeparatei"); + fp_glBlendFunci = (pfn_glBlendFunci)load("glBlendFunci"); + fp_glBlendFuncSeparatei = (pfn_glBlendFuncSeparatei)load("glBlendFuncSeparatei"); + fp_glColorMaski = (pfn_glColorMaski)load("glColorMaski"); + fp_glIsEnabledi = (pfn_glIsEnabledi)load("glIsEnabledi"); + fp_glDrawElementsBaseVertex = (pfn_glDrawElementsBaseVertex)load("glDrawElementsBaseVertex"); + fp_glDrawRangeElementsBaseVertex = (pfn_glDrawRangeElementsBaseVertex)load("glDrawRangeElementsBaseVertex"); + fp_glDrawElementsInstancedBaseVertex = (pfn_glDrawElementsInstancedBaseVertex)load("glDrawElementsInstancedBaseVertex"); + fp_glFramebufferTexture = (pfn_glFramebufferTexture)load("glFramebufferTexture"); + fp_glPrimitiveBoundingBox = (pfn_glPrimitiveBoundingBox)load("glPrimitiveBoundingBox"); + fp_glGetGraphicsResetStatus = (pfn_glGetGraphicsResetStatus)load("glGetGraphicsResetStatus"); + fp_glReadnPixels = (pfn_glReadnPixels)load("glReadnPixels"); + fp_glGetnUniformfv = (pfn_glGetnUniformfv)load("glGetnUniformfv"); + fp_glGetnUniformiv = (pfn_glGetnUniformiv)load("glGetnUniformiv"); + fp_glGetnUniformuiv = (pfn_glGetnUniformuiv)load("glGetnUniformuiv"); + fp_glMinSampleShading = (pfn_glMinSampleShading)load("glMinSampleShading"); + fp_glPatchParameteri = (pfn_glPatchParameteri)load("glPatchParameteri"); + fp_glTexParameterIiv = (pfn_glTexParameterIiv)load("glTexParameterIiv"); + fp_glTexParameterIuiv = (pfn_glTexParameterIuiv)load("glTexParameterIuiv"); + fp_glGetTexParameterIiv = (pfn_glGetTexParameterIiv)load("glGetTexParameterIiv"); + fp_glGetTexParameterIuiv = (pfn_glGetTexParameterIuiv)load("glGetTexParameterIuiv"); + fp_glSamplerParameterIiv = (pfn_glSamplerParameterIiv)load("glSamplerParameterIiv"); + fp_glSamplerParameterIuiv = (pfn_glSamplerParameterIuiv)load("glSamplerParameterIuiv"); + fp_glGetSamplerParameterIiv = (pfn_glGetSamplerParameterIiv)load("glGetSamplerParameterIiv"); + fp_glGetSamplerParameterIuiv = (pfn_glGetSamplerParameterIuiv)load("glGetSamplerParameterIuiv"); + fp_glTexBuffer = (pfn_glTexBuffer)load("glTexBuffer"); + fp_glTexBufferRange = (pfn_glTexBufferRange)load("glTexBufferRange"); + fp_glTexStorage3DMultisample = (pfn_glTexStorage3DMultisample)load("glTexStorage3DMultisample"); +} + GLboolean GLAD_KHR_blend_equation_advanced = GL_FALSE; static void load_GL_KHR_blend_equation_advanced(LOADER load) { if(!GLAD_KHR_blend_equation_advanced) return; @@ -3635,6 +3758,7 @@ fp_glGetPointervKHR = (pfn_glGetPointervKHR)load("glGetPointervKHR"); } +GLboolean GLAD_KHR_no_error = GL_FALSE; GLboolean GLAD_KHR_robust_buffer_access_behavior = GL_FALSE; GLboolean GLAD_KHR_robustness = GL_FALSE; static void load_GL_KHR_robustness(LOADER load) { @@ -3653,6 +3777,7 @@ GLboolean GLAD_KHR_texture_compression_astc_hdr = GL_FALSE; GLboolean GLAD_KHR_texture_compression_astc_ldr = GL_FALSE; +GLboolean GLAD_KHR_texture_compression_astc_sliced_3d = GL_FALSE; GLboolean GLAD_ARB_arrays_of_arrays = GL_FALSE; GLboolean GLAD_ARB_base_instance = GL_FALSE; static void load_GL_ARB_base_instance(LOADER load) { @@ -3921,11 +4046,18 @@ fp_glMemoryBarrierByRegion = (pfn_glMemoryBarrierByRegion)load("glMemoryBarrierByRegion"); } +GLboolean GLAD_ARB_ES3_2_compatibility = GL_FALSE; +static void load_GL_ARB_ES3_2_compatibility(LOADER load) { + if(!GLAD_ARB_ES3_2_compatibility) return; + fp_glPrimitiveBoundingBoxARB = (pfn_glPrimitiveBoundingBoxARB)load("glPrimitiveBoundingBoxARB"); +} + GLboolean GLAD_ARB_ES3_compatibility = GL_FALSE; GLboolean GLAD_ARB_explicit_attrib_location = GL_FALSE; GLboolean GLAD_ARB_explicit_uniform_location = GL_FALSE; GLboolean GLAD_ARB_fragment_coord_conventions = GL_FALSE; GLboolean GLAD_ARB_fragment_layer_viewport = GL_FALSE; +GLboolean GLAD_ARB_fragment_shader_interlock = GL_FALSE; GLboolean GLAD_ARB_framebuffer_no_attachments = GL_FALSE; static void load_GL_ARB_framebuffer_no_attachments(LOADER load) { if(!GLAD_ARB_framebuffer_no_attachments) return; @@ -4007,6 +4139,47 @@ fp_glGetUniformdv = (pfn_glGetUniformdv)load("glGetUniformdv"); } +GLboolean GLAD_ARB_gpu_shader_int64 = GL_FALSE; +static void load_GL_ARB_gpu_shader_int64(LOADER load) { + if(!GLAD_ARB_gpu_shader_int64) return; + fp_glUniform1i64ARB = (pfn_glUniform1i64ARB)load("glUniform1i64ARB"); + fp_glUniform2i64ARB = (pfn_glUniform2i64ARB)load("glUniform2i64ARB"); + fp_glUniform3i64ARB = (pfn_glUniform3i64ARB)load("glUniform3i64ARB"); + fp_glUniform4i64ARB = (pfn_glUniform4i64ARB)load("glUniform4i64ARB"); + fp_glUniform1i64vARB = (pfn_glUniform1i64vARB)load("glUniform1i64vARB"); + fp_glUniform2i64vARB = (pfn_glUniform2i64vARB)load("glUniform2i64vARB"); + fp_glUniform3i64vARB = (pfn_glUniform3i64vARB)load("glUniform3i64vARB"); + fp_glUniform4i64vARB = (pfn_glUniform4i64vARB)load("glUniform4i64vARB"); + fp_glUniform1ui64ARB = (pfn_glUniform1ui64ARB)load("glUniform1ui64ARB"); + fp_glUniform2ui64ARB = (pfn_glUniform2ui64ARB)load("glUniform2ui64ARB"); + fp_glUniform3ui64ARB = (pfn_glUniform3ui64ARB)load("glUniform3ui64ARB"); + fp_glUniform4ui64ARB = (pfn_glUniform4ui64ARB)load("glUniform4ui64ARB"); + fp_glUniform1ui64vARB = (pfn_glUniform1ui64vARB)load("glUniform1ui64vARB"); + fp_glUniform2ui64vARB = (pfn_glUniform2ui64vARB)load("glUniform2ui64vARB"); + fp_glUniform3ui64vARB = (pfn_glUniform3ui64vARB)load("glUniform3ui64vARB"); + fp_glUniform4ui64vARB = (pfn_glUniform4ui64vARB)load("glUniform4ui64vARB"); + fp_glGetUniformi64vARB = (pfn_glGetUniformi64vARB)load("glGetUniformi64vARB"); + fp_glGetUniformui64vARB = (pfn_glGetUniformui64vARB)load("glGetUniformui64vARB"); + fp_glGetnUniformi64vARB = (pfn_glGetnUniformi64vARB)load("glGetnUniformi64vARB"); + fp_glGetnUniformui64vARB = (pfn_glGetnUniformui64vARB)load("glGetnUniformui64vARB"); + fp_glProgramUniform1i64ARB = (pfn_glProgramUniform1i64ARB)load("glProgramUniform1i64ARB"); + fp_glProgramUniform2i64ARB = (pfn_glProgramUniform2i64ARB)load("glProgramUniform2i64ARB"); + fp_glProgramUniform3i64ARB = (pfn_glProgramUniform3i64ARB)load("glProgramUniform3i64ARB"); + fp_glProgramUniform4i64ARB = (pfn_glProgramUniform4i64ARB)load("glProgramUniform4i64ARB"); + fp_glProgramUniform1i64vARB = (pfn_glProgramUniform1i64vARB)load("glProgramUniform1i64vARB"); + fp_glProgramUniform2i64vARB = (pfn_glProgramUniform2i64vARB)load("glProgramUniform2i64vARB"); + fp_glProgramUniform3i64vARB = (pfn_glProgramUniform3i64vARB)load("glProgramUniform3i64vARB"); + fp_glProgramUniform4i64vARB = (pfn_glProgramUniform4i64vARB)load("glProgramUniform4i64vARB"); + fp_glProgramUniform1ui64ARB = (pfn_glProgramUniform1ui64ARB)load("glProgramUniform1ui64ARB"); + fp_glProgramUniform2ui64ARB = (pfn_glProgramUniform2ui64ARB)load("glProgramUniform2ui64ARB"); + fp_glProgramUniform3ui64ARB = (pfn_glProgramUniform3ui64ARB)load("glProgramUniform3ui64ARB"); + fp_glProgramUniform4ui64ARB = (pfn_glProgramUniform4ui64ARB)load("glProgramUniform4ui64ARB"); + fp_glProgramUniform1ui64vARB = (pfn_glProgramUniform1ui64vARB)load("glProgramUniform1ui64vARB"); + fp_glProgramUniform2ui64vARB = (pfn_glProgramUniform2ui64vARB)load("glProgramUniform2ui64vARB"); + fp_glProgramUniform3ui64vARB = (pfn_glProgramUniform3ui64vARB)load("glProgramUniform3ui64vARB"); + fp_glProgramUniform4ui64vARB = (pfn_glProgramUniform4ui64vARB)load("glProgramUniform4ui64vARB"); +} + GLboolean GLAD_ARB_half_float_pixel = GL_FALSE; GLboolean GLAD_ARB_half_float_vertex = GL_FALSE; GLboolean GLAD_ARB_indirect_parameters = GL_FALSE; @@ -4072,8 +4245,15 @@ } GLboolean GLAD_ARB_occlusion_query2 = GL_FALSE; +GLboolean GLAD_ARB_parallel_shader_compile = GL_FALSE; +static void load_GL_ARB_parallel_shader_compile(LOADER load) { + if(!GLAD_ARB_parallel_shader_compile) return; + fp_glMaxShaderCompilerThreadsARB = (pfn_glMaxShaderCompilerThreadsARB)load("glMaxShaderCompilerThreadsARB"); +} + GLboolean GLAD_ARB_pipeline_statistics_query = GL_FALSE; GLboolean GLAD_ARB_pixel_buffer_object = GL_FALSE; +GLboolean GLAD_ARB_post_depth_coverage = GL_FALSE; GLboolean GLAD_ARB_program_interface_query = GL_FALSE; static void load_GL_ARB_program_interface_query(LOADER load) { if(!GLAD_ARB_program_interface_query) return; @@ -4119,6 +4299,14 @@ } GLboolean GLAD_ARB_robustness_isolation = GL_FALSE; +GLboolean GLAD_ARB_sample_locations = GL_FALSE; +static void load_GL_ARB_sample_locations(LOADER load) { + if(!GLAD_ARB_sample_locations) return; + fp_glFramebufferSampleLocationsfvARB = (pfn_glFramebufferSampleLocationsfvARB)load("glFramebufferSampleLocationsfvARB"); + fp_glNamedFramebufferSampleLocationsfvARB = (pfn_glNamedFramebufferSampleLocationsfvARB)load("glNamedFramebufferSampleLocationsfvARB"); + fp_glEvaluateDepthValuesARB = (pfn_glEvaluateDepthValuesARB)load("glEvaluateDepthValuesARB"); +} + GLboolean GLAD_ARB_sample_shading = GL_FALSE; static void load_GL_ARB_sample_shading(LOADER load) { if(!GLAD_ARB_sample_shading) return; @@ -4211,13 +4399,16 @@ fp_glGetProgramPipelineInfoLog = (pfn_glGetProgramPipelineInfoLog)load("glGetProgramPipelineInfoLog"); } +GLboolean GLAD_ARB_shader_atomic_counter_ops = GL_FALSE; GLboolean GLAD_ARB_shader_atomic_counters = GL_FALSE; static void load_GL_ARB_shader_atomic_counters(LOADER load) { if(!GLAD_ARB_shader_atomic_counters) return; fp_glGetActiveAtomicCounterBufferiv = (pfn_glGetActiveAtomicCounterBufferiv)load("glGetActiveAtomicCounterBufferiv"); } +GLboolean GLAD_ARB_shader_ballot = GL_FALSE; GLboolean GLAD_ARB_shader_bit_encoding = GL_FALSE; +GLboolean GLAD_ARB_shader_clock = GL_FALSE; GLboolean GLAD_ARB_shader_draw_parameters = GL_FALSE; GLboolean GLAD_ARB_shader_group_vote = GL_FALSE; GLboolean GLAD_ARB_shader_image_load_store = GL_FALSE; @@ -4251,6 +4442,7 @@ GLboolean GLAD_ARB_shader_texture_image_samples = GL_FALSE; GLboolean GLAD_ARB_shader_texture_lod = GL_FALSE; +GLboolean GLAD_ARB_shader_viewport_layer_array = GL_FALSE; GLboolean GLAD_ARB_shading_language_420pack = GL_FALSE; GLboolean GLAD_ARB_shading_language_include = GL_FALSE; static void load_GL_ARB_shading_language_include(LOADER load) { @@ -4278,6 +4470,8 @@ fp_glTexPageCommitmentARB = (pfn_glTexPageCommitmentARB)load("glTexPageCommitmentARB"); } +GLboolean GLAD_ARB_sparse_texture2 = GL_FALSE; +GLboolean GLAD_ARB_sparse_texture_clamp = GL_FALSE; GLboolean GLAD_ARB_stencil_texturing = GL_FALSE; GLboolean GLAD_ARB_sync = GL_FALSE; static void load_GL_ARB_sync(LOADER load) { @@ -4320,6 +4514,7 @@ GLboolean GLAD_ARB_texture_compression_bptc = GL_FALSE; GLboolean GLAD_ARB_texture_compression_rgtc = GL_FALSE; GLboolean GLAD_ARB_texture_cube_map_array = GL_FALSE; +GLboolean GLAD_ARB_texture_filter_minmax = GL_FALSE; GLboolean GLAD_ARB_texture_float = GL_FALSE; GLboolean GLAD_ARB_texture_gather = GL_FALSE; GLboolean GLAD_ARB_texture_mirror_clamp_to_edge = GL_FALSE; @@ -4407,6 +4602,9 @@ fp_glGetActiveUniformBlockiv = (pfn_glGetActiveUniformBlockiv)load("glGetActiveUniformBlockiv"); fp_glGetActiveUniformBlockName = (pfn_glGetActiveUniformBlockName)load("glGetActiveUniformBlockName"); fp_glUniformBlockBinding = (pfn_glUniformBlockBinding)load("glUniformBlockBinding"); + fp_glBindBufferRange = (pfn_glBindBufferRange)load("glBindBufferRange"); + fp_glBindBufferBase = (pfn_glBindBufferBase)load("glBindBufferBase"); + fp_glGetIntegeri_v = (pfn_glGetIntegeri_v)load("glGetIntegeri_v"); } GLboolean GLAD_ARB_vertex_array_bgra = GL_FALSE; @@ -4521,6 +4719,28 @@ fp_glGetUniformOffsetEXT = (pfn_glGetUniformOffsetEXT)load("glGetUniformOffsetEXT"); } +GLboolean GLAD_EXT_blend_func_extended = GL_FALSE; +static void load_GL_EXT_blend_func_extended(LOADER load) { + if(!GLAD_EXT_blend_func_extended) return; + fp_glBindFragDataLocationIndexedEXT = (pfn_glBindFragDataLocationIndexedEXT)load("glBindFragDataLocationIndexedEXT"); + fp_glBindFragDataLocationEXT = (pfn_glBindFragDataLocationEXT)load("glBindFragDataLocationEXT"); + fp_glGetProgramResourceLocationIndexEXT = (pfn_glGetProgramResourceLocationIndexEXT)load("glGetProgramResourceLocationIndexEXT"); + fp_glGetFragDataIndexEXT = (pfn_glGetFragDataIndexEXT)load("glGetFragDataIndexEXT"); +} + +GLboolean GLAD_EXT_blend_minmax = GL_FALSE; +static void load_GL_EXT_blend_minmax(LOADER load) { + if(!GLAD_EXT_blend_minmax) return; + fp_glBlendEquationEXT = (pfn_glBlendEquationEXT)load("glBlendEquationEXT"); +} + +GLboolean GLAD_EXT_buffer_storage = GL_FALSE; +static void load_GL_EXT_buffer_storage(LOADER load) { + if(!GLAD_EXT_buffer_storage) return; + fp_glBufferStorageEXT = (pfn_glBufferStorageEXT)load("glBufferStorageEXT"); +} + +GLboolean GLAD_EXT_color_buffer_float = GL_FALSE; GLboolean GLAD_EXT_color_buffer_half_float = GL_FALSE; GLboolean GLAD_EXT_copy_image = GL_FALSE; static void load_GL_EXT_copy_image(LOADER load) { @@ -4871,6 +5091,7 @@ fp_glDrawElementsInstancedEXT = (pfn_glDrawElementsInstancedEXT)load("glDrawElementsInstancedEXT"); } +GLboolean GLAD_EXT_float_blend = GL_FALSE; GLboolean GLAD_EXT_framebuffer_blit = GL_FALSE; static void load_GL_EXT_framebuffer_blit(LOADER load) { if(!GLAD_EXT_framebuffer_blit) return; @@ -4966,6 +5187,7 @@ fp_glMultiDrawElementsIndirectEXT = (pfn_glMultiDrawElementsIndirectEXT)load("glMultiDrawElementsIndirectEXT"); } +GLboolean GLAD_EXT_multisampled_compatibility = GL_FALSE; GLboolean GLAD_EXT_multisampled_render_to_texture = GL_FALSE; static void load_GL_EXT_multisampled_render_to_texture(LOADER load) { if(!GLAD_EXT_multisampled_render_to_texture) return; @@ -5101,6 +5323,12 @@ GLboolean GLAD_EXT_shader_pixel_local_storage = GL_FALSE; GLboolean GLAD_EXT_shader_texture_lod = GL_FALSE; GLboolean GLAD_EXT_shadow_samplers = GL_FALSE; +GLboolean GLAD_EXT_sparse_texture = GL_FALSE; +static void load_GL_EXT_sparse_texture(LOADER load) { + if(!GLAD_EXT_sparse_texture) return; + fp_glTexPageCommitmentEXT = (pfn_glTexPageCommitmentEXT)load("glTexPageCommitmentEXT"); +} + GLboolean GLAD_EXT_sparse_texture2 = GL_FALSE; GLboolean GLAD_EXT_sRGB = GL_FALSE; GLboolean GLAD_EXT_sRGB_write_control = GL_FALSE; @@ -5725,6 +5953,7 @@ GLboolean GLAD_IMG_shader_binary = GL_FALSE; GLboolean GLAD_IMG_texture_compression_pvrtc = GL_FALSE; GLboolean GLAD_IMG_texture_compression_pvrtc2 = GL_FALSE; +GLboolean GLAD_IMG_texture_filter_cubic = GL_FALSE; GLboolean GLAD_INGR_blend_func_separate = GL_FALSE; static void load_GL_INGR_blend_func_separate(LOADER load) { if(!GLAD_INGR_blend_func_separate) return; @@ -5732,6 +5961,12 @@ } GLboolean GLAD_INTEL_fragment_shader_ordering = GL_FALSE; +GLboolean GLAD_INTEL_framebuffer_CMAA = GL_FALSE; +static void load_GL_INTEL_framebuffer_CMAA(LOADER load) { + if(!GLAD_INTEL_framebuffer_CMAA) return; + fp_glApplyFramebufferAttachmentCMAAINTEL = (pfn_glApplyFramebufferAttachmentCMAAINTEL)load("glApplyFramebufferAttachmentCMAAINTEL"); +} + GLboolean GLAD_INTEL_map_texture = GL_FALSE; static void load_GL_INTEL_map_texture(LOADER load) { if(!GLAD_INTEL_map_texture) return; @@ -5798,6 +6033,28 @@ } GLboolean GLAD_NV_blend_equation_advanced_coherent = GL_FALSE; +GLboolean GLAD_NV_command_list = GL_FALSE; +static void load_GL_NV_command_list(LOADER load) { + if(!GLAD_NV_command_list) return; + fp_glCreateStatesNV = (pfn_glCreateStatesNV)load("glCreateStatesNV"); + fp_glDeleteStatesNV = (pfn_glDeleteStatesNV)load("glDeleteStatesNV"); + fp_glIsStateNV = (pfn_glIsStateNV)load("glIsStateNV"); + fp_glStateCaptureNV = (pfn_glStateCaptureNV)load("glStateCaptureNV"); + fp_glGetCommandHeaderNV = (pfn_glGetCommandHeaderNV)load("glGetCommandHeaderNV"); + fp_glGetStageIndexNV = (pfn_glGetStageIndexNV)load("glGetStageIndexNV"); + fp_glDrawCommandsNV = (pfn_glDrawCommandsNV)load("glDrawCommandsNV"); + fp_glDrawCommandsAddressNV = (pfn_glDrawCommandsAddressNV)load("glDrawCommandsAddressNV"); + fp_glDrawCommandsStatesNV = (pfn_glDrawCommandsStatesNV)load("glDrawCommandsStatesNV"); + fp_glDrawCommandsStatesAddressNV = (pfn_glDrawCommandsStatesAddressNV)load("glDrawCommandsStatesAddressNV"); + fp_glCreateCommandListsNV = (pfn_glCreateCommandListsNV)load("glCreateCommandListsNV"); + fp_glDeleteCommandListsNV = (pfn_glDeleteCommandListsNV)load("glDeleteCommandListsNV"); + fp_glIsCommandListNV = (pfn_glIsCommandListNV)load("glIsCommandListNV"); + fp_glListDrawCommandsStatesClientNV = (pfn_glListDrawCommandsStatesClientNV)load("glListDrawCommandsStatesClientNV"); + fp_glCommandListSegmentsNV = (pfn_glCommandListSegmentsNV)load("glCommandListSegmentsNV"); + fp_glCompileCommandListNV = (pfn_glCompileCommandListNV)load("glCompileCommandListNV"); + fp_glCallCommandListNV = (pfn_glCallCommandListNV)load("glCallCommandListNV"); +} + GLboolean GLAD_NV_compute_program5 = GL_FALSE; GLboolean GLAD_NV_conditional_render = GL_FALSE; static void load_GL_NV_conditional_render(LOADER load) { @@ -5812,6 +6069,12 @@ fp_glSubpixelPrecisionBiasNV = (pfn_glSubpixelPrecisionBiasNV)load("glSubpixelPrecisionBiasNV"); } +GLboolean GLAD_NV_conservative_raster_dilate = GL_FALSE; +static void load_GL_NV_conservative_raster_dilate(LOADER load) { + if(!GLAD_NV_conservative_raster_dilate) return; + fp_glConservativeRasterParameterfNV = (pfn_glConservativeRasterParameterfNV)load("glConservativeRasterParameterfNV"); +} + GLboolean GLAD_NV_copy_buffer = GL_FALSE; static void load_GL_NV_copy_buffer(LOADER load) { if(!GLAD_NV_copy_buffer) return; @@ -6166,6 +6429,12 @@ } GLboolean GLAD_NV_path_rendering_shared_edge = GL_FALSE; +GLboolean GLAD_NV_polygon_mode = GL_FALSE; +static void load_GL_NV_polygon_mode(LOADER load) { + if(!GLAD_NV_polygon_mode) return; + fp_glPolygonModeNV = (pfn_glPolygonModeNV)load("glPolygonModeNV"); +} + GLboolean GLAD_NV_present_video = GL_FALSE; static void load_GL_NV_present_video(LOADER load) { if(!GLAD_NV_present_video) return; @@ -6412,6 +6681,19 @@ } GLboolean GLAD_NVX_gpu_memory_info = GL_FALSE; +GLboolean GLAD_OVR_multiview = GL_FALSE; +static void load_GL_OVR_multiview(LOADER load) { + if(!GLAD_OVR_multiview) return; + fp_glFramebufferTextureMultiviewOVR = (pfn_glFramebufferTextureMultiviewOVR)load("glFramebufferTextureMultiviewOVR"); +} + +GLboolean GLAD_OVR_multiview2 = GL_FALSE; +GLboolean GLAD_OVR_multiview_multisampled_render_to_texture = GL_FALSE; +static void load_GL_OVR_multiview_multisampled_render_to_texture(LOADER load) { + if(!GLAD_OVR_multiview_multisampled_render_to_texture) return; + fp_glFramebufferTextureMultisampleMultiviewOVR = (pfn_glFramebufferTextureMultisampleMultiviewOVR)load("glFramebufferTextureMultisampleMultiviewOVR"); +} + GLboolean GLAD_QCOM_alpha_test = GL_FALSE; static void load_GL_QCOM_alpha_test(LOADER load) { if(!GLAD_QCOM_alpha_test) return; @@ -6459,23 +6741,18 @@ } GLboolean GLAD_QCOM_writeonly_rendering = GL_FALSE; -GLboolean GLAD_SGIX_calligraphic_fragment = GL_FALSE; -GLboolean GLAD_SGIX_depth_pass_instrument = GL_FALSE; -GLboolean GLAD_SGIX_pixel_tiles = GL_FALSE; -GLboolean GLAD_SGIX_scalebias_hint = GL_FALSE; -GLboolean GLAD_SGIX_subsample = GL_FALSE; -GLboolean GLAD_SGIX_ycrcb_subsample = GL_FALSE; -GLboolean GLAD_SGIX_ycrcba = GL_FALSE; GLboolean GLAD_VIV_shader_binary = GL_FALSE; static void find_extensions(void) { GLAD_KHR_blend_equation_advanced = has_ext("GL_KHR_blend_equation_advanced"); GLAD_KHR_blend_equation_advanced_coherent = has_ext("GL_KHR_blend_equation_advanced_coherent"); GLAD_KHR_context_flush_control = has_ext("GL_KHR_context_flush_control"); GLAD_KHR_debug = has_ext("GL_KHR_debug"); + GLAD_KHR_no_error = has_ext("GL_KHR_no_error"); GLAD_KHR_robust_buffer_access_behavior = has_ext("GL_KHR_robust_buffer_access_behavior"); GLAD_KHR_robustness = has_ext("GL_KHR_robustness"); GLAD_KHR_texture_compression_astc_hdr = has_ext("GL_KHR_texture_compression_astc_hdr"); GLAD_KHR_texture_compression_astc_ldr = has_ext("GL_KHR_texture_compression_astc_ldr"); + GLAD_KHR_texture_compression_astc_sliced_3d = has_ext("GL_KHR_texture_compression_astc_sliced_3d"); GLAD_ARB_arrays_of_arrays = has_ext("GL_ARB_arrays_of_arrays"); GLAD_ARB_base_instance = has_ext("GL_ARB_base_instance"); GLAD_ARB_bindless_texture = has_ext("GL_ARB_bindless_texture"); @@ -6507,11 +6784,13 @@ GLAD_ARB_enhanced_layouts = has_ext("GL_ARB_enhanced_layouts"); GLAD_ARB_ES2_compatibility = has_ext("GL_ARB_ES2_compatibility"); GLAD_ARB_ES3_1_compatibility = has_ext("GL_ARB_ES3_1_compatibility"); + GLAD_ARB_ES3_2_compatibility = has_ext("GL_ARB_ES3_2_compatibility"); GLAD_ARB_ES3_compatibility = has_ext("GL_ARB_ES3_compatibility"); GLAD_ARB_explicit_attrib_location = has_ext("GL_ARB_explicit_attrib_location"); GLAD_ARB_explicit_uniform_location = has_ext("GL_ARB_explicit_uniform_location"); GLAD_ARB_fragment_coord_conventions = has_ext("GL_ARB_fragment_coord_conventions"); GLAD_ARB_fragment_layer_viewport = has_ext("GL_ARB_fragment_layer_viewport"); + GLAD_ARB_fragment_shader_interlock = has_ext("GL_ARB_fragment_shader_interlock"); GLAD_ARB_framebuffer_no_attachments = has_ext("GL_ARB_framebuffer_no_attachments"); GLAD_ARB_framebuffer_object = has_ext("GL_ARB_framebuffer_object"); GLAD_ARB_framebuffer_sRGB = has_ext("GL_ARB_framebuffer_sRGB"); @@ -6520,6 +6799,7 @@ GLAD_ARB_get_texture_sub_image = has_ext("GL_ARB_get_texture_sub_image"); GLAD_ARB_gpu_shader5 = has_ext("GL_ARB_gpu_shader5"); GLAD_ARB_gpu_shader_fp64 = has_ext("GL_ARB_gpu_shader_fp64"); + GLAD_ARB_gpu_shader_int64 = has_ext("GL_ARB_gpu_shader_int64"); GLAD_ARB_half_float_pixel = has_ext("GL_ARB_half_float_pixel"); GLAD_ARB_half_float_vertex = has_ext("GL_ARB_half_float_vertex"); GLAD_ARB_indirect_parameters = has_ext("GL_ARB_indirect_parameters"); @@ -6532,21 +6812,27 @@ GLAD_ARB_multi_bind = has_ext("GL_ARB_multi_bind"); GLAD_ARB_multi_draw_indirect = has_ext("GL_ARB_multi_draw_indirect"); GLAD_ARB_occlusion_query2 = has_ext("GL_ARB_occlusion_query2"); + GLAD_ARB_parallel_shader_compile = has_ext("GL_ARB_parallel_shader_compile"); GLAD_ARB_pipeline_statistics_query = has_ext("GL_ARB_pipeline_statistics_query"); GLAD_ARB_pixel_buffer_object = has_ext("GL_ARB_pixel_buffer_object"); + GLAD_ARB_post_depth_coverage = has_ext("GL_ARB_post_depth_coverage"); GLAD_ARB_program_interface_query = has_ext("GL_ARB_program_interface_query"); GLAD_ARB_provoking_vertex = has_ext("GL_ARB_provoking_vertex"); GLAD_ARB_query_buffer_object = has_ext("GL_ARB_query_buffer_object"); GLAD_ARB_robust_buffer_access_behavior = has_ext("GL_ARB_robust_buffer_access_behavior"); GLAD_ARB_robustness = has_ext("GL_ARB_robustness"); GLAD_ARB_robustness_isolation = has_ext("GL_ARB_robustness_isolation"); + GLAD_ARB_sample_locations = has_ext("GL_ARB_sample_locations"); GLAD_ARB_sample_shading = has_ext("GL_ARB_sample_shading"); GLAD_ARB_sampler_objects = has_ext("GL_ARB_sampler_objects"); GLAD_ARB_seamless_cube_map = has_ext("GL_ARB_seamless_cube_map"); GLAD_ARB_seamless_cubemap_per_texture = has_ext("GL_ARB_seamless_cubemap_per_texture"); GLAD_ARB_separate_shader_objects = has_ext("GL_ARB_separate_shader_objects"); + GLAD_ARB_shader_atomic_counter_ops = has_ext("GL_ARB_shader_atomic_counter_ops"); GLAD_ARB_shader_atomic_counters = has_ext("GL_ARB_shader_atomic_counters"); + GLAD_ARB_shader_ballot = has_ext("GL_ARB_shader_ballot"); GLAD_ARB_shader_bit_encoding = has_ext("GL_ARB_shader_bit_encoding"); + GLAD_ARB_shader_clock = has_ext("GL_ARB_shader_clock"); GLAD_ARB_shader_draw_parameters = has_ext("GL_ARB_shader_draw_parameters"); GLAD_ARB_shader_group_vote = has_ext("GL_ARB_shader_group_vote"); GLAD_ARB_shader_image_load_store = has_ext("GL_ARB_shader_image_load_store"); @@ -6557,11 +6843,14 @@ GLAD_ARB_shader_subroutine = has_ext("GL_ARB_shader_subroutine"); GLAD_ARB_shader_texture_image_samples = has_ext("GL_ARB_shader_texture_image_samples"); GLAD_ARB_shader_texture_lod = has_ext("GL_ARB_shader_texture_lod"); + GLAD_ARB_shader_viewport_layer_array = has_ext("GL_ARB_shader_viewport_layer_array"); GLAD_ARB_shading_language_420pack = has_ext("GL_ARB_shading_language_420pack"); GLAD_ARB_shading_language_include = has_ext("GL_ARB_shading_language_include"); GLAD_ARB_shading_language_packing = has_ext("GL_ARB_shading_language_packing"); GLAD_ARB_sparse_buffer = has_ext("GL_ARB_sparse_buffer"); GLAD_ARB_sparse_texture = has_ext("GL_ARB_sparse_texture"); + GLAD_ARB_sparse_texture2 = has_ext("GL_ARB_sparse_texture2"); + GLAD_ARB_sparse_texture_clamp = has_ext("GL_ARB_sparse_texture_clamp"); GLAD_ARB_stencil_texturing = has_ext("GL_ARB_stencil_texturing"); GLAD_ARB_sync = has_ext("GL_ARB_sync"); GLAD_ARB_tessellation_shader = has_ext("GL_ARB_tessellation_shader"); @@ -6572,6 +6861,7 @@ GLAD_ARB_texture_compression_bptc = has_ext("GL_ARB_texture_compression_bptc"); GLAD_ARB_texture_compression_rgtc = has_ext("GL_ARB_texture_compression_rgtc"); GLAD_ARB_texture_cube_map_array = has_ext("GL_ARB_texture_cube_map_array"); + GLAD_ARB_texture_filter_minmax = has_ext("GL_ARB_texture_filter_minmax"); GLAD_ARB_texture_float = has_ext("GL_ARB_texture_float"); GLAD_ARB_texture_gather = has_ext("GL_ARB_texture_gather"); GLAD_ARB_texture_mirror_clamp_to_edge = has_ext("GL_ARB_texture_mirror_clamp_to_edge"); @@ -6602,6 +6892,10 @@ GLAD_EXT_base_instance = has_ext("GL_EXT_base_instance"); GLAD_EXT_bgra = has_ext("GL_EXT_bgra"); GLAD_EXT_bindable_uniform = has_ext("GL_EXT_bindable_uniform"); + GLAD_EXT_blend_func_extended = has_ext("GL_EXT_blend_func_extended"); + GLAD_EXT_blend_minmax = has_ext("GL_EXT_blend_minmax"); + GLAD_EXT_buffer_storage = has_ext("GL_EXT_buffer_storage"); + GLAD_EXT_color_buffer_float = has_ext("GL_EXT_color_buffer_float"); GLAD_EXT_color_buffer_half_float = has_ext("GL_EXT_color_buffer_half_float"); GLAD_EXT_copy_image = has_ext("GL_EXT_copy_image"); GLAD_EXT_debug_label = has_ext("GL_EXT_debug_label"); @@ -6614,6 +6908,7 @@ GLAD_EXT_draw_buffers_indexed = has_ext("GL_EXT_draw_buffers_indexed"); GLAD_EXT_draw_elements_base_vertex = has_ext("GL_EXT_draw_elements_base_vertex"); GLAD_EXT_draw_instanced = has_ext("GL_EXT_draw_instanced"); + GLAD_EXT_float_blend = has_ext("GL_EXT_float_blend"); GLAD_EXT_framebuffer_blit = has_ext("GL_EXT_framebuffer_blit"); GLAD_EXT_framebuffer_multisample = has_ext("GL_EXT_framebuffer_multisample"); GLAD_EXT_framebuffer_multisample_blit_scaled = has_ext("GL_EXT_framebuffer_multisample_blit_scaled"); @@ -6628,6 +6923,7 @@ GLAD_EXT_instanced_arrays = has_ext("GL_EXT_instanced_arrays"); GLAD_EXT_map_buffer_range = has_ext("GL_EXT_map_buffer_range"); GLAD_EXT_multi_draw_indirect = has_ext("GL_EXT_multi_draw_indirect"); + GLAD_EXT_multisampled_compatibility = has_ext("GL_EXT_multisampled_compatibility"); GLAD_EXT_multisampled_render_to_texture = has_ext("GL_EXT_multisampled_render_to_texture"); GLAD_EXT_multiview_draw_buffers = has_ext("GL_EXT_multiview_draw_buffers"); GLAD_EXT_occlusion_query_boolean = has_ext("GL_EXT_occlusion_query_boolean"); @@ -6653,6 +6949,7 @@ GLAD_EXT_shader_pixel_local_storage = has_ext("GL_EXT_shader_pixel_local_storage"); GLAD_EXT_shader_texture_lod = has_ext("GL_EXT_shader_texture_lod"); GLAD_EXT_shadow_samplers = has_ext("GL_EXT_shadow_samplers"); + GLAD_EXT_sparse_texture = has_ext("GL_EXT_sparse_texture"); GLAD_EXT_sparse_texture2 = has_ext("GL_EXT_sparse_texture2"); GLAD_EXT_sRGB = has_ext("GL_EXT_sRGB"); GLAD_EXT_sRGB_write_control = has_ext("GL_EXT_sRGB_write_control"); @@ -6823,8 +7120,10 @@ GLAD_IMG_shader_binary = has_ext("GL_IMG_shader_binary"); GLAD_IMG_texture_compression_pvrtc = has_ext("GL_IMG_texture_compression_pvrtc"); GLAD_IMG_texture_compression_pvrtc2 = has_ext("GL_IMG_texture_compression_pvrtc2"); + GLAD_IMG_texture_filter_cubic = has_ext("GL_IMG_texture_filter_cubic"); GLAD_INGR_blend_func_separate = has_ext("GL_INGR_blend_func_separate"); GLAD_INTEL_fragment_shader_ordering = has_ext("GL_INTEL_fragment_shader_ordering"); + GLAD_INTEL_framebuffer_CMAA = has_ext("GL_INTEL_framebuffer_CMAA"); GLAD_INTEL_map_texture = has_ext("GL_INTEL_map_texture"); GLAD_INTEL_performance_query = has_ext("GL_INTEL_performance_query"); GLAD_MESA_pack_invert = has_ext("GL_MESA_pack_invert"); @@ -6835,9 +7134,11 @@ GLAD_NV_bindless_texture = has_ext("GL_NV_bindless_texture"); GLAD_NV_blend_equation_advanced = has_ext("GL_NV_blend_equation_advanced"); GLAD_NV_blend_equation_advanced_coherent = has_ext("GL_NV_blend_equation_advanced_coherent"); + GLAD_NV_command_list = has_ext("GL_NV_command_list"); GLAD_NV_compute_program5 = has_ext("GL_NV_compute_program5"); GLAD_NV_conditional_render = has_ext("GL_NV_conditional_render"); GLAD_NV_conservative_raster = has_ext("GL_NV_conservative_raster"); + GLAD_NV_conservative_raster_dilate = has_ext("GL_NV_conservative_raster_dilate"); GLAD_NV_copy_buffer = has_ext("GL_NV_copy_buffer"); GLAD_NV_copy_image = has_ext("GL_NV_copy_image"); GLAD_NV_coverage_sample = has_ext("GL_NV_coverage_sample"); @@ -6880,6 +7181,7 @@ GLAD_NV_parameter_buffer_object2 = has_ext("GL_NV_parameter_buffer_object2"); GLAD_NV_path_rendering = has_ext("GL_NV_path_rendering"); GLAD_NV_path_rendering_shared_edge = has_ext("GL_NV_path_rendering_shared_edge"); + GLAD_NV_polygon_mode = has_ext("GL_NV_polygon_mode"); GLAD_NV_present_video = has_ext("GL_NV_present_video"); GLAD_NV_primitive_restart = has_ext("GL_NV_primitive_restart"); GLAD_NV_read_buffer = has_ext("GL_NV_read_buffer"); @@ -6920,6 +7222,9 @@ GLAD_NV_viewport_array2 = has_ext("GL_NV_viewport_array2"); GLAD_NVX_conditional_render = has_ext("GL_NVX_conditional_render"); GLAD_NVX_gpu_memory_info = has_ext("GL_NVX_gpu_memory_info"); + GLAD_OVR_multiview = has_ext("GL_OVR_multiview"); + GLAD_OVR_multiview2 = has_ext("GL_OVR_multiview2"); + GLAD_OVR_multiview_multisampled_render_to_texture = has_ext("GL_OVR_multiview_multisampled_render_to_texture"); GLAD_QCOM_alpha_test = has_ext("GL_QCOM_alpha_test"); GLAD_QCOM_binning_control = has_ext("GL_QCOM_binning_control"); GLAD_QCOM_driver_control = has_ext("GL_QCOM_driver_control"); @@ -6928,13 +7233,6 @@ GLAD_QCOM_perfmon_global_mode = has_ext("GL_QCOM_perfmon_global_mode"); GLAD_QCOM_tiled_rendering = has_ext("GL_QCOM_tiled_rendering"); GLAD_QCOM_writeonly_rendering = has_ext("GL_QCOM_writeonly_rendering"); - GLAD_SGIX_calligraphic_fragment = has_ext("GL_SGIX_calligraphic_fragment"); - GLAD_SGIX_depth_pass_instrument = has_ext("GL_SGIX_depth_pass_instrument"); - GLAD_SGIX_pixel_tiles = has_ext("GL_SGIX_pixel_tiles"); - GLAD_SGIX_scalebias_hint = has_ext("GL_SGIX_scalebias_hint"); - GLAD_SGIX_subsample = has_ext("GL_SGIX_subsample"); - GLAD_SGIX_ycrcb_subsample = has_ext("GL_SGIX_ycrcb_subsample"); - GLAD_SGIX_ycrcba = has_ext("GL_SGIX_ycrcba"); GLAD_VIV_shader_binary = has_ext("GL_VIV_shader_binary"); } @@ -6967,6 +7265,7 @@ GLAD_ES_VERSION_2_0 = gles == 1 && ((major == 2 && minor >= 0) || major > 2); GLAD_ES_VERSION_3_0 = gles == 1 && ((major == 3 && minor >= 0) || major > 3); GLAD_ES_VERSION_3_1 = gles == 1 && ((major == 3 && minor >= 1) || major > 3); + GLAD_ES_VERSION_3_2 = gles == 1 && ((major == 3 && minor >= 2) || major > 3); } bool gladLoadGLLoader(LOADER load) { @@ -6995,6 +7294,7 @@ load_GL_ES_VERSION_2_0(load); load_GL_ES_VERSION_3_0(load); load_GL_ES_VERSION_3_1(load); + load_GL_ES_VERSION_3_2(load); find_extensions(); load_GL_KHR_blend_equation_advanced(load); @@ -7021,12 +7321,14 @@ load_GL_ARB_draw_instanced(load); load_GL_ARB_ES2_compatibility(load); load_GL_ARB_ES3_1_compatibility(load); + load_GL_ARB_ES3_2_compatibility(load); load_GL_ARB_framebuffer_no_attachments(load); load_GL_ARB_framebuffer_object(load); load_GL_ARB_geometry_shader4(load); load_GL_ARB_get_program_binary(load); load_GL_ARB_get_texture_sub_image(load); load_GL_ARB_gpu_shader_fp64(load); + load_GL_ARB_gpu_shader_int64(load); load_GL_ARB_indirect_parameters(load); load_GL_ARB_instanced_arrays(load); load_GL_ARB_internalformat_query(load); @@ -7035,9 +7337,11 @@ load_GL_ARB_map_buffer_range(load); load_GL_ARB_multi_bind(load); load_GL_ARB_multi_draw_indirect(load); + load_GL_ARB_parallel_shader_compile(load); load_GL_ARB_program_interface_query(load); load_GL_ARB_provoking_vertex(load); load_GL_ARB_robustness(load); + load_GL_ARB_sample_locations(load); load_GL_ARB_sample_shading(load); load_GL_ARB_sampler_objects(load); load_GL_ARB_separate_shader_objects(load); @@ -7069,6 +7373,9 @@ load_GL_ARB_viewport_array(load); load_GL_EXT_base_instance(load); load_GL_EXT_bindable_uniform(load); + load_GL_EXT_blend_func_extended(load); + load_GL_EXT_blend_minmax(load); + load_GL_EXT_buffer_storage(load); load_GL_EXT_copy_image(load); load_GL_EXT_debug_label(load); load_GL_EXT_debug_marker(load); @@ -7100,6 +7407,7 @@ load_GL_EXT_robustness(load); load_GL_EXT_separate_shader_objects(load); load_GL_EXT_shader_image_load_store(load); + load_GL_EXT_sparse_texture(load); load_GL_EXT_stencil_clear_tag(load); load_GL_EXT_tessellation_shader(load); load_GL_EXT_texture_array(load); @@ -7161,14 +7469,17 @@ load_GL_GREMEDY_string_marker(load); load_GL_IMG_multisampled_render_to_texture(load); load_GL_INGR_blend_func_separate(load); + load_GL_INTEL_framebuffer_CMAA(load); load_GL_INTEL_map_texture(load); load_GL_INTEL_performance_query(load); load_GL_NV_bindless_multi_draw_indirect(load); load_GL_NV_bindless_multi_draw_indirect_count(load); load_GL_NV_bindless_texture(load); load_GL_NV_blend_equation_advanced(load); + load_GL_NV_command_list(load); load_GL_NV_conditional_render(load); load_GL_NV_conservative_raster(load); + load_GL_NV_conservative_raster_dilate(load); load_GL_NV_copy_buffer(load); load_GL_NV_copy_image(load); load_GL_NV_coverage_sample(load); @@ -7194,6 +7505,7 @@ load_GL_NV_occlusion_query(load); load_GL_NV_parameter_buffer_object(load); load_GL_NV_path_rendering(load); + load_GL_NV_polygon_mode(load); load_GL_NV_present_video(load); load_GL_NV_primitive_restart(load); load_GL_NV_read_buffer(load); @@ -7210,6 +7522,8 @@ load_GL_NV_video_capture(load); load_GL_NV_viewport_array(load); load_GL_NVX_conditional_render(load); + load_GL_OVR_multiview(load); + load_GL_OVR_multiview_multisampled_render_to_texture(load); load_GL_QCOM_alpha_test(load); load_GL_QCOM_driver_control(load); load_GL_QCOM_extended_get(load); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/libraries/glad/gladfuncs.hpp love-unstable-0.10.1~pre2723ppa1/src/libraries/glad/gladfuncs.hpp --- love-unstable-0.10.0~pre2657ppa2/src/libraries/glad/gladfuncs.hpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/libraries/glad/gladfuncs.hpp 2016-02-13 14:37:39.000000000 +0000 @@ -30,6 +30,7 @@ namespace glad { + /* GL_VERSION_1_0 */ inline void glCullFace(GLenum mode) { fp_glCullFace(mode); } inline void glFrontFace(GLenum mode) { fp_glFrontFace(mode); } @@ -1022,7 +1023,7 @@ inline void glClearNamedFramebufferiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint* value) { fp_glClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value); } inline void glClearNamedFramebufferuiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint* value) { fp_glClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value); } inline void glClearNamedFramebufferfv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat* value) { fp_glClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value); } -inline void glClearNamedFramebufferfi(GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil) { fp_glClearNamedFramebufferfi(framebuffer, buffer, depth, stencil); } +inline void glClearNamedFramebufferfi(GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil) { fp_glClearNamedFramebufferfi(framebuffer, buffer, drawbuffer, depth, stencil); } inline void glBlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { fp_glBlitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } inline GLenum glCheckNamedFramebufferStatus(GLuint framebuffer, GLenum target) { return fp_glCheckNamedFramebufferStatus(framebuffer, target); } inline void glGetNamedFramebufferParameteriv(GLuint framebuffer, GLenum pname, GLint* param) { fp_glGetNamedFramebufferParameteriv(framebuffer, pname, param); } @@ -1110,6 +1111,10 @@ inline void glGetnMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values) { fp_glGetnMinmax(target, reset, format, type, bufSize, values); } inline void glTextureBarrier() { fp_glTextureBarrier(); } +/* GL_ES_VERSION_3_2 */ +inline void glBlendBarrier() { fp_glBlendBarrier(); } +inline void glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW) { fp_glPrimitiveBoundingBox(minX, minY, minZ, minW, maxX, maxY, maxZ, maxW); } + /* GL_KHR_blend_equation_advanced */ inline void glBlendBarrierKHR() { fp_glBlendBarrierKHR(); } @@ -1176,12 +1181,53 @@ inline void glDrawArraysInstancedARB(GLenum mode, GLint first, GLsizei count, GLsizei primcount) { fp_glDrawArraysInstancedARB(mode, first, count, primcount); } inline void glDrawElementsInstancedARB(GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount) { fp_glDrawElementsInstancedARB(mode, count, type, indices, primcount); } +/* GL_ARB_ES3_2_compatibility */ +inline void glPrimitiveBoundingBoxARB(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW) { fp_glPrimitiveBoundingBoxARB(minX, minY, minZ, minW, maxX, maxY, maxZ, maxW); } + /* GL_ARB_geometry_shader4 */ inline void glProgramParameteriARB(GLuint program, GLenum pname, GLint value) { fp_glProgramParameteriARB(program, pname, value); } inline void glFramebufferTextureARB(GLenum target, GLenum attachment, GLuint texture, GLint level) { fp_glFramebufferTextureARB(target, attachment, texture, level); } inline void glFramebufferTextureLayerARB(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) { fp_glFramebufferTextureLayerARB(target, attachment, texture, level, layer); } inline void glFramebufferTextureFaceARB(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face) { fp_glFramebufferTextureFaceARB(target, attachment, texture, level, face); } +/* GL_ARB_gpu_shader_int64 */ +inline void glUniform1i64ARB(GLint location, GLint64 x) { fp_glUniform1i64ARB(location, x); } +inline void glUniform2i64ARB(GLint location, GLint64 x, GLint64 y) { fp_glUniform2i64ARB(location, x, y); } +inline void glUniform3i64ARB(GLint location, GLint64 x, GLint64 y, GLint64 z) { fp_glUniform3i64ARB(location, x, y, z); } +inline void glUniform4i64ARB(GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w) { fp_glUniform4i64ARB(location, x, y, z, w); } +inline void glUniform1i64vARB(GLint location, GLsizei count, const GLint64* value) { fp_glUniform1i64vARB(location, count, value); } +inline void glUniform2i64vARB(GLint location, GLsizei count, const GLint64* value) { fp_glUniform2i64vARB(location, count, value); } +inline void glUniform3i64vARB(GLint location, GLsizei count, const GLint64* value) { fp_glUniform3i64vARB(location, count, value); } +inline void glUniform4i64vARB(GLint location, GLsizei count, const GLint64* value) { fp_glUniform4i64vARB(location, count, value); } +inline void glUniform1ui64ARB(GLint location, GLuint64 x) { fp_glUniform1ui64ARB(location, x); } +inline void glUniform2ui64ARB(GLint location, GLuint64 x, GLuint64 y) { fp_glUniform2ui64ARB(location, x, y); } +inline void glUniform3ui64ARB(GLint location, GLuint64 x, GLuint64 y, GLuint64 z) { fp_glUniform3ui64ARB(location, x, y, z); } +inline void glUniform4ui64ARB(GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w) { fp_glUniform4ui64ARB(location, x, y, z, w); } +inline void glUniform1ui64vARB(GLint location, GLsizei count, const GLuint64* value) { fp_glUniform1ui64vARB(location, count, value); } +inline void glUniform2ui64vARB(GLint location, GLsizei count, const GLuint64* value) { fp_glUniform2ui64vARB(location, count, value); } +inline void glUniform3ui64vARB(GLint location, GLsizei count, const GLuint64* value) { fp_glUniform3ui64vARB(location, count, value); } +inline void glUniform4ui64vARB(GLint location, GLsizei count, const GLuint64* value) { fp_glUniform4ui64vARB(location, count, value); } +inline void glGetUniformi64vARB(GLuint program, GLint location, GLint64* params) { fp_glGetUniformi64vARB(program, location, params); } +inline void glGetUniformui64vARB(GLuint program, GLint location, GLuint64* params) { fp_glGetUniformui64vARB(program, location, params); } +inline void glGetnUniformi64vARB(GLuint program, GLint location, GLsizei bufSize, GLint64* params) { fp_glGetnUniformi64vARB(program, location, bufSize, params); } +inline void glGetnUniformui64vARB(GLuint program, GLint location, GLsizei bufSize, GLuint64* params) { fp_glGetnUniformui64vARB(program, location, bufSize, params); } +inline void glProgramUniform1i64ARB(GLuint program, GLint location, GLint64 x) { fp_glProgramUniform1i64ARB(program, location, x); } +inline void glProgramUniform2i64ARB(GLuint program, GLint location, GLint64 x, GLint64 y) { fp_glProgramUniform2i64ARB(program, location, x, y); } +inline void glProgramUniform3i64ARB(GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z) { fp_glProgramUniform3i64ARB(program, location, x, y, z); } +inline void glProgramUniform4i64ARB(GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w) { fp_glProgramUniform4i64ARB(program, location, x, y, z, w); } +inline void glProgramUniform1i64vARB(GLuint program, GLint location, GLsizei count, const GLint64* value) { fp_glProgramUniform1i64vARB(program, location, count, value); } +inline void glProgramUniform2i64vARB(GLuint program, GLint location, GLsizei count, const GLint64* value) { fp_glProgramUniform2i64vARB(program, location, count, value); } +inline void glProgramUniform3i64vARB(GLuint program, GLint location, GLsizei count, const GLint64* value) { fp_glProgramUniform3i64vARB(program, location, count, value); } +inline void glProgramUniform4i64vARB(GLuint program, GLint location, GLsizei count, const GLint64* value) { fp_glProgramUniform4i64vARB(program, location, count, value); } +inline void glProgramUniform1ui64ARB(GLuint program, GLint location, GLuint64 x) { fp_glProgramUniform1ui64ARB(program, location, x); } +inline void glProgramUniform2ui64ARB(GLuint program, GLint location, GLuint64 x, GLuint64 y) { fp_glProgramUniform2ui64ARB(program, location, x, y); } +inline void glProgramUniform3ui64ARB(GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z) { fp_glProgramUniform3ui64ARB(program, location, x, y, z); } +inline void glProgramUniform4ui64ARB(GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w) { fp_glProgramUniform4ui64ARB(program, location, x, y, z, w); } +inline void glProgramUniform1ui64vARB(GLuint program, GLint location, GLsizei count, const GLuint64* value) { fp_glProgramUniform1ui64vARB(program, location, count, value); } +inline void glProgramUniform2ui64vARB(GLuint program, GLint location, GLsizei count, const GLuint64* value) { fp_glProgramUniform2ui64vARB(program, location, count, value); } +inline void glProgramUniform3ui64vARB(GLuint program, GLint location, GLsizei count, const GLuint64* value) { fp_glProgramUniform3ui64vARB(program, location, count, value); } +inline void glProgramUniform4ui64vARB(GLuint program, GLint location, GLsizei count, const GLuint64* value) { fp_glProgramUniform4ui64vARB(program, location, count, value); } + /* GL_ARB_indirect_parameters */ inline void glMultiDrawArraysIndirectCountARB(GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride) { fp_glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride); } inline void glMultiDrawElementsIndirectCountARB(GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride) { fp_glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride); } @@ -1189,6 +1235,9 @@ /* GL_ARB_instanced_arrays */ inline void glVertexAttribDivisorARB(GLuint index, GLuint divisor) { fp_glVertexAttribDivisorARB(index, divisor); } +/* GL_ARB_parallel_shader_compile */ +inline void glMaxShaderCompilerThreadsARB(GLuint count) { fp_glMaxShaderCompilerThreadsARB(count); } + /* GL_ARB_robustness */ inline GLenum glGetGraphicsResetStatusARB() { return fp_glGetGraphicsResetStatusARB(); } inline void glGetnTexImageARB(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* img) { fp_glGetnTexImageARB(target, level, format, type, bufSize, img); } @@ -1211,6 +1260,11 @@ inline void glGetnHistogramARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values) { fp_glGetnHistogramARB(target, reset, format, type, bufSize, values); } inline void glGetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values) { fp_glGetnMinmaxARB(target, reset, format, type, bufSize, values); } +/* GL_ARB_sample_locations */ +inline void glFramebufferSampleLocationsfvARB(GLenum target, GLuint start, GLsizei count, const GLfloat* v) { fp_glFramebufferSampleLocationsfvARB(target, start, count, v); } +inline void glNamedFramebufferSampleLocationsfvARB(GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v) { fp_glNamedFramebufferSampleLocationsfvARB(framebuffer, start, count, v); } +inline void glEvaluateDepthValuesARB() { fp_glEvaluateDepthValuesARB(); } + /* GL_ARB_sample_shading */ inline void glMinSampleShadingARB(GLfloat value) { fp_glMinSampleShadingARB(value); } @@ -1228,7 +1282,7 @@ inline void glNamedBufferPageCommitmentARB(GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit) { fp_glNamedBufferPageCommitmentARB(buffer, offset, size, commit); } /* GL_ARB_sparse_texture */ -inline void glTexPageCommitmentARB(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident) { fp_glTexPageCommitmentARB(target, level, xoffset, yoffset, zoffset, width, height, depth, resident); } +inline void glTexPageCommitmentARB(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit) { fp_glTexPageCommitmentARB(target, level, xoffset, yoffset, zoffset, width, height, depth, commit); } /* GL_ARB_texture_buffer_object */ inline void glTexBufferARB(GLenum target, GLenum internalformat, GLuint buffer) { fp_glTexBufferARB(target, internalformat, buffer); } @@ -1243,6 +1297,18 @@ inline GLint glGetUniformBufferSizeEXT(GLuint program, GLint location) { return fp_glGetUniformBufferSizeEXT(program, location); } inline GLintptr glGetUniformOffsetEXT(GLuint program, GLint location) { return fp_glGetUniformOffsetEXT(program, location); } +/* GL_EXT_blend_func_extended */ +inline void glBindFragDataLocationIndexedEXT(GLuint program, GLuint colorNumber, GLuint index, const GLchar* name) { fp_glBindFragDataLocationIndexedEXT(program, colorNumber, index, name); } +inline void glBindFragDataLocationEXT(GLuint program, GLuint color, const GLchar* name) { fp_glBindFragDataLocationEXT(program, color, name); } +inline GLint glGetProgramResourceLocationIndexEXT(GLuint program, GLenum programInterface, const GLchar* name) { return fp_glGetProgramResourceLocationIndexEXT(program, programInterface, name); } +inline GLint glGetFragDataIndexEXT(GLuint program, const GLchar* name) { return fp_glGetFragDataIndexEXT(program, name); } + +/* GL_EXT_blend_minmax */ +inline void glBlendEquationEXT(GLenum mode) { fp_glBlendEquationEXT(mode); } + +/* GL_EXT_buffer_storage */ +inline void glBufferStorageEXT(GLenum target, GLsizeiptr size, const void* data, GLbitfield flags) { fp_glBufferStorageEXT(target, size, data, flags); } + /* GL_EXT_copy_image */ inline void glCopyImageSubDataEXT(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth) { fp_glCopyImageSubDataEXT(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth); } @@ -1509,7 +1575,7 @@ inline void glVertexArrayVertexAttribBindingEXT(GLuint vaobj, GLuint attribindex, GLuint bindingindex) { fp_glVertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex); } inline void glVertexArrayVertexBindingDivisorEXT(GLuint vaobj, GLuint bindingindex, GLuint divisor) { fp_glVertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor); } inline void glVertexArrayVertexAttribLOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset) { fp_glVertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offset); } -inline void glTexturePageCommitmentEXT(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident) { fp_glTexturePageCommitmentEXT(texture, level, xoffset, yoffset, zoffset, width, height, depth, resident); } +inline void glTexturePageCommitmentEXT(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit) { fp_glTexturePageCommitmentEXT(texture, level, xoffset, yoffset, zoffset, width, height, depth, commit); } inline void glVertexArrayVertexAttribDivisorEXT(GLuint vaobj, GLuint index, GLuint divisor) { fp_glVertexArrayVertexAttribDivisorEXT(vaobj, index, divisor); } /* GL_EXT_discard_framebuffer */ @@ -1591,7 +1657,6 @@ /* GL_EXT_gpu_shader4 */ inline void glGetUniformuivEXT(GLuint program, GLint location, GLuint* params) { fp_glGetUniformuivEXT(program, location, params); } -inline void glBindFragDataLocationEXT(GLuint program, GLuint color, const GLchar* name) { fp_glBindFragDataLocationEXT(program, color, name); } inline GLint glGetFragDataLocationEXT(GLuint program, const GLchar* name) { return fp_glGetFragDataLocationEXT(program, name); } inline void glUniform1uiEXT(GLint location, GLuint v0) { fp_glUniform1uiEXT(location, v0); } inline void glUniform2uiEXT(GLint location, GLuint v0, GLuint v1) { fp_glUniform2uiEXT(location, v0, v1); } @@ -1658,6 +1723,9 @@ inline void glBindImageTextureEXT(GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format) { fp_glBindImageTextureEXT(index, texture, level, layered, layer, access, format); } inline void glMemoryBarrierEXT(GLbitfield barriers) { fp_glMemoryBarrierEXT(barriers); } +/* GL_EXT_sparse_texture */ +inline void glTexPageCommitmentEXT(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit) { fp_glTexPageCommitmentEXT(target, level, xoffset, yoffset, zoffset, width, height, depth, commit); } + /* GL_EXT_stencil_clear_tag */ inline void glStencilClearTagEXT(GLsizei stencilTagBits, GLuint stencilClearTag) { fp_glStencilClearTagEXT(stencilTagBits, stencilClearTag); } @@ -1978,6 +2046,9 @@ /* GL_INGR_blend_func_separate */ inline void glBlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) { fp_glBlendFuncSeparateINGR(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); } +/* GL_INTEL_framebuffer_CMAA */ +inline void glApplyFramebufferAttachmentCMAAINTEL() { fp_glApplyFramebufferAttachmentCMAAINTEL(); } + /* GL_INTEL_map_texture */ inline void glSyncTextureINTEL(GLuint texture) { fp_glSyncTextureINTEL(texture); } inline void glUnmapTexture2DINTEL(GLuint texture, GLint level) { fp_glUnmapTexture2DINTEL(texture, level); } @@ -2022,6 +2093,25 @@ inline void glBlendParameteriNV(GLenum pname, GLint value) { fp_glBlendParameteriNV(pname, value); } inline void glBlendBarrierNV() { fp_glBlendBarrierNV(); } +/* GL_NV_command_list */ +inline void glCreateStatesNV(GLsizei n, GLuint* states) { fp_glCreateStatesNV(n, states); } +inline void glDeleteStatesNV(GLsizei n, const GLuint* states) { fp_glDeleteStatesNV(n, states); } +inline GLboolean glIsStateNV(GLuint state) { return fp_glIsStateNV(state); } +inline void glStateCaptureNV(GLuint state, GLenum mode) { fp_glStateCaptureNV(state, mode); } +inline GLuint glGetCommandHeaderNV(GLenum tokenID, GLuint size) { return fp_glGetCommandHeaderNV(tokenID, size); } +inline GLushort glGetStageIndexNV(GLenum shadertype) { return fp_glGetStageIndexNV(shadertype); } +inline void glDrawCommandsNV(GLenum primitiveMode, GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, GLuint count) { fp_glDrawCommandsNV(primitiveMode, buffer, indirects, sizes, count); } +inline void glDrawCommandsAddressNV(GLenum primitiveMode, const GLuint64* indirects, const GLsizei* sizes, GLuint count) { fp_glDrawCommandsAddressNV(primitiveMode, indirects, sizes, count); } +inline void glDrawCommandsStatesNV(GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count) { fp_glDrawCommandsStatesNV(buffer, indirects, sizes, states, fbos, count); } +inline void glDrawCommandsStatesAddressNV(const GLuint64* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count) { fp_glDrawCommandsStatesAddressNV(indirects, sizes, states, fbos, count); } +inline void glCreateCommandListsNV(GLsizei n, GLuint* lists) { fp_glCreateCommandListsNV(n, lists); } +inline void glDeleteCommandListsNV(GLsizei n, const GLuint* lists) { fp_glDeleteCommandListsNV(n, lists); } +inline GLboolean glIsCommandListNV(GLuint list) { return fp_glIsCommandListNV(list); } +inline void glListDrawCommandsStatesClientNV(GLuint list, GLuint segment, const void** indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count) { fp_glListDrawCommandsStatesClientNV(list, segment, indirects, sizes, states, fbos, count); } +inline void glCommandListSegmentsNV(GLuint list, GLuint segments) { fp_glCommandListSegmentsNV(list, segments); } +inline void glCompileCommandListNV(GLuint list) { fp_glCompileCommandListNV(list); } +inline void glCallCommandListNV(GLuint list) { fp_glCallCommandListNV(list); } + /* GL_NV_conditional_render */ inline void glBeginConditionalRenderNV(GLuint id, GLenum mode) { fp_glBeginConditionalRenderNV(id, mode); } inline void glEndConditionalRenderNV() { fp_glEndConditionalRenderNV(); } @@ -2029,6 +2119,9 @@ /* GL_NV_conservative_raster */ inline void glSubpixelPrecisionBiasNV(GLuint xbits, GLuint ybits) { fp_glSubpixelPrecisionBiasNV(xbits, ybits); } +/* GL_NV_conservative_raster_dilate */ +inline void glConservativeRasterParameterfNV(GLenum pname, GLfloat value) { fp_glConservativeRasterParameterfNV(pname, value); } + /* GL_NV_copy_buffer */ inline void glCopyBufferSubDataNV(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) { fp_glCopyBufferSubDataNV(readTarget, writeTarget, readOffset, writeOffset, size); } @@ -2253,6 +2346,9 @@ inline void glGetPathTexGenivNV(GLenum texCoordSet, GLenum pname, GLint* value) { fp_glGetPathTexGenivNV(texCoordSet, pname, value); } inline void glGetPathTexGenfvNV(GLenum texCoordSet, GLenum pname, GLfloat* value) { fp_glGetPathTexGenfvNV(texCoordSet, pname, value); } +/* GL_NV_polygon_mode */ +inline void glPolygonModeNV(GLenum face, GLenum mode) { fp_glPolygonModeNV(face, mode); } + /* GL_NV_present_video */ inline void glPresentFrameKeyedNV(GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1) { fp_glPresentFrameKeyedNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1); } inline void glPresentFrameDualFillNV(GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3) { fp_glPresentFrameDualFillNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3); } @@ -2426,6 +2522,12 @@ inline void glBeginConditionalRenderNVX(GLuint id) { fp_glBeginConditionalRenderNVX(id); } inline void glEndConditionalRenderNVX() { fp_glEndConditionalRenderNVX(); } +/* GL_OVR_multiview */ +inline void glFramebufferTextureMultiviewOVR(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews) { fp_glFramebufferTextureMultiviewOVR(target, attachment, texture, level, baseViewIndex, numViews); } + +/* GL_OVR_multiview_multisampled_render_to_texture */ +inline void glFramebufferTextureMultisampleMultiviewOVR(GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei samples, GLint baseViewIndex, GLsizei numViews) { fp_glFramebufferTextureMultisampleMultiviewOVR(target, attachment, texture, level, samples, baseViewIndex, numViews); } + /* GL_QCOM_alpha_test */ inline void glAlphaFuncQCOM(GLenum func, GLclampf ref) { fp_glAlphaFuncQCOM(func, ref); } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/libraries/glad/glad.hpp love-unstable-0.10.1~pre2723ppa1/src/libraries/glad/glad.hpp --- love-unstable-0.10.0~pre2657ppa2/src/libraries/glad/glad.hpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/libraries/glad/glad.hpp 2016-02-13 14:37:39.000000000 +0000 @@ -60,7 +60,6 @@ #define GLAPI extern #endif -/* Moved here from inside the namespace to prevent some compilation issues. */ #include namespace glad { @@ -2312,6 +2311,22 @@ #define GL_COLOR_ATTACHMENT13 0x8CED #define GL_COLOR_ATTACHMENT14 0x8CEE #define GL_COLOR_ATTACHMENT15 0x8CEF +#define GL_COLOR_ATTACHMENT16 0x8CF0 +#define GL_COLOR_ATTACHMENT17 0x8CF1 +#define GL_COLOR_ATTACHMENT18 0x8CF2 +#define GL_COLOR_ATTACHMENT19 0x8CF3 +#define GL_COLOR_ATTACHMENT20 0x8CF4 +#define GL_COLOR_ATTACHMENT21 0x8CF5 +#define GL_COLOR_ATTACHMENT22 0x8CF6 +#define GL_COLOR_ATTACHMENT23 0x8CF7 +#define GL_COLOR_ATTACHMENT24 0x8CF8 +#define GL_COLOR_ATTACHMENT25 0x8CF9 +#define GL_COLOR_ATTACHMENT26 0x8CFA +#define GL_COLOR_ATTACHMENT27 0x8CFB +#define GL_COLOR_ATTACHMENT28 0x8CFC +#define GL_COLOR_ATTACHMENT29 0x8CFD +#define GL_COLOR_ATTACHMENT30 0x8CFE +#define GL_COLOR_ATTACHMENT31 0x8CFF #define GL_DEPTH_ATTACHMENT 0x8D00 #define GL_STENCIL_ATTACHMENT 0x8D20 #define GL_FRAMEBUFFER 0x8D40 @@ -3876,7 +3891,7 @@ extern pfn_glClearNamedFramebufferuiv fp_glClearNamedFramebufferuiv; typedef void (APIENTRYP pfn_glClearNamedFramebufferfv) (GLuint, GLenum, GLint, const GLfloat*); extern pfn_glClearNamedFramebufferfv fp_glClearNamedFramebufferfv; -typedef void (APIENTRYP pfn_glClearNamedFramebufferfi) (GLuint, GLenum, const GLfloat, GLint); +typedef void (APIENTRYP pfn_glClearNamedFramebufferfi) (GLuint, GLenum, GLint, GLfloat, GLint); extern pfn_glClearNamedFramebufferfi fp_glClearNamedFramebufferfi; typedef void (APIENTRYP pfn_glBlitNamedFramebuffer) (GLuint, GLuint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); extern pfn_glBlitNamedFramebuffer fp_glBlitNamedFramebuffer; @@ -4063,6 +4078,59 @@ /* GL_ES_VERSION_3_1 */ extern GLboolean GLAD_ES_VERSION_3_1; + /* GL_ES_VERSION_3_2 */ +extern GLboolean GLAD_ES_VERSION_3_2; +#define GL_MULTISAMPLE_LINE_WIDTH_RANGE 0x9381 +#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY 0x9382 +#define GL_MULTIPLY 0x9294 +#define GL_SCREEN 0x9295 +#define GL_OVERLAY 0x9296 +#define GL_DARKEN 0x9297 +#define GL_LIGHTEN 0x9298 +#define GL_COLORDODGE 0x9299 +#define GL_COLORBURN 0x929A +#define GL_HARDLIGHT 0x929B +#define GL_SOFTLIGHT 0x929C +#define GL_DIFFERENCE 0x929E +#define GL_EXCLUSION 0x92A0 +#define GL_HSL_HUE 0x92AD +#define GL_HSL_SATURATION 0x92AE +#define GL_HSL_COLOR 0x92AF +#define GL_HSL_LUMINOSITY 0x92B0 +#define GL_PRIMITIVE_BOUNDING_BOX 0x92BE +#define GL_COMPRESSED_RGBA_ASTC_4x4 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8 0x93B7 +#define GL_COMPRESSED_RGBA_ASTC_10x5 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_10x10 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_12x10 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12 0x93BD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8 0x93D7 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12 0x93DD +typedef void (APIENTRYP pfn_glBlendBarrier) (); +extern pfn_glBlendBarrier fp_glBlendBarrier; +typedef void (APIENTRYP pfn_glPrimitiveBoundingBox) (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +extern pfn_glPrimitiveBoundingBox fp_glPrimitiveBoundingBox; + /* GL_KHR_blend_equation_advanced */ extern GLboolean GLAD_KHR_blend_equation_advanced; #define GL_MULTIPLY_KHR 0x9294 @@ -4157,6 +4225,10 @@ typedef void (APIENTRYP pfn_glGetPointervKHR) (GLenum, void**); extern pfn_glGetPointervKHR fp_glGetPointervKHR; + /* GL_KHR_no_error */ +extern GLboolean GLAD_KHR_no_error; +#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008 + /* GL_KHR_robust_buffer_access_behavior */ extern GLboolean GLAD_KHR_robust_buffer_access_behavior; @@ -4216,6 +4288,9 @@ /* GL_KHR_texture_compression_astc_ldr */ extern GLboolean GLAD_KHR_texture_compression_astc_ldr; + /* GL_KHR_texture_compression_astc_sliced_3d */ +extern GLboolean GLAD_KHR_texture_compression_astc_sliced_3d; + /* GL_ARB_arrays_of_arrays */ extern GLboolean GLAD_ARB_arrays_of_arrays; @@ -4401,6 +4476,14 @@ /* GL_ARB_ES3_1_compatibility */ extern GLboolean GLAD_ARB_ES3_1_compatibility; + /* GL_ARB_ES3_2_compatibility */ +extern GLboolean GLAD_ARB_ES3_2_compatibility; +#define GL_PRIMITIVE_BOUNDING_BOX_ARB 0x92BE +#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381 +#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382 +typedef void (APIENTRYP pfn_glPrimitiveBoundingBoxARB) (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +extern pfn_glPrimitiveBoundingBoxARB fp_glPrimitiveBoundingBoxARB; + /* GL_ARB_ES3_compatibility */ extern GLboolean GLAD_ARB_ES3_compatibility; @@ -4416,6 +4499,9 @@ /* GL_ARB_fragment_layer_viewport */ extern GLboolean GLAD_ARB_fragment_layer_viewport; + /* GL_ARB_fragment_shader_interlock */ +extern GLboolean GLAD_ARB_fragment_shader_interlock; + /* GL_ARB_framebuffer_no_attachments */ extern GLboolean GLAD_ARB_framebuffer_no_attachments; @@ -4466,6 +4552,88 @@ /* GL_ARB_gpu_shader_fp64 */ extern GLboolean GLAD_ARB_gpu_shader_fp64; + /* GL_ARB_gpu_shader_int64 */ +extern GLboolean GLAD_ARB_gpu_shader_int64; +#define GL_INT64_ARB 0x140E +#define GL_INT64_VEC2_ARB 0x8FE9 +#define GL_INT64_VEC3_ARB 0x8FEA +#define GL_INT64_VEC4_ARB 0x8FEB +#define GL_UNSIGNED_INT64_VEC2_ARB 0x8FF5 +#define GL_UNSIGNED_INT64_VEC3_ARB 0x8FF6 +#define GL_UNSIGNED_INT64_VEC4_ARB 0x8FF7 +typedef void (APIENTRYP pfn_glUniform1i64ARB) (GLint, GLint64); +extern pfn_glUniform1i64ARB fp_glUniform1i64ARB; +typedef void (APIENTRYP pfn_glUniform2i64ARB) (GLint, GLint64, GLint64); +extern pfn_glUniform2i64ARB fp_glUniform2i64ARB; +typedef void (APIENTRYP pfn_glUniform3i64ARB) (GLint, GLint64, GLint64, GLint64); +extern pfn_glUniform3i64ARB fp_glUniform3i64ARB; +typedef void (APIENTRYP pfn_glUniform4i64ARB) (GLint, GLint64, GLint64, GLint64, GLint64); +extern pfn_glUniform4i64ARB fp_glUniform4i64ARB; +typedef void (APIENTRYP pfn_glUniform1i64vARB) (GLint, GLsizei, const GLint64*); +extern pfn_glUniform1i64vARB fp_glUniform1i64vARB; +typedef void (APIENTRYP pfn_glUniform2i64vARB) (GLint, GLsizei, const GLint64*); +extern pfn_glUniform2i64vARB fp_glUniform2i64vARB; +typedef void (APIENTRYP pfn_glUniform3i64vARB) (GLint, GLsizei, const GLint64*); +extern pfn_glUniform3i64vARB fp_glUniform3i64vARB; +typedef void (APIENTRYP pfn_glUniform4i64vARB) (GLint, GLsizei, const GLint64*); +extern pfn_glUniform4i64vARB fp_glUniform4i64vARB; +typedef void (APIENTRYP pfn_glUniform1ui64ARB) (GLint, GLuint64); +extern pfn_glUniform1ui64ARB fp_glUniform1ui64ARB; +typedef void (APIENTRYP pfn_glUniform2ui64ARB) (GLint, GLuint64, GLuint64); +extern pfn_glUniform2ui64ARB fp_glUniform2ui64ARB; +typedef void (APIENTRYP pfn_glUniform3ui64ARB) (GLint, GLuint64, GLuint64, GLuint64); +extern pfn_glUniform3ui64ARB fp_glUniform3ui64ARB; +typedef void (APIENTRYP pfn_glUniform4ui64ARB) (GLint, GLuint64, GLuint64, GLuint64, GLuint64); +extern pfn_glUniform4ui64ARB fp_glUniform4ui64ARB; +typedef void (APIENTRYP pfn_glUniform1ui64vARB) (GLint, GLsizei, const GLuint64*); +extern pfn_glUniform1ui64vARB fp_glUniform1ui64vARB; +typedef void (APIENTRYP pfn_glUniform2ui64vARB) (GLint, GLsizei, const GLuint64*); +extern pfn_glUniform2ui64vARB fp_glUniform2ui64vARB; +typedef void (APIENTRYP pfn_glUniform3ui64vARB) (GLint, GLsizei, const GLuint64*); +extern pfn_glUniform3ui64vARB fp_glUniform3ui64vARB; +typedef void (APIENTRYP pfn_glUniform4ui64vARB) (GLint, GLsizei, const GLuint64*); +extern pfn_glUniform4ui64vARB fp_glUniform4ui64vARB; +typedef void (APIENTRYP pfn_glGetUniformi64vARB) (GLuint, GLint, GLint64*); +extern pfn_glGetUniformi64vARB fp_glGetUniformi64vARB; +typedef void (APIENTRYP pfn_glGetUniformui64vARB) (GLuint, GLint, GLuint64*); +extern pfn_glGetUniformui64vARB fp_glGetUniformui64vARB; +typedef void (APIENTRYP pfn_glGetnUniformi64vARB) (GLuint, GLint, GLsizei, GLint64*); +extern pfn_glGetnUniformi64vARB fp_glGetnUniformi64vARB; +typedef void (APIENTRYP pfn_glGetnUniformui64vARB) (GLuint, GLint, GLsizei, GLuint64*); +extern pfn_glGetnUniformui64vARB fp_glGetnUniformui64vARB; +typedef void (APIENTRYP pfn_glProgramUniform1i64ARB) (GLuint, GLint, GLint64); +extern pfn_glProgramUniform1i64ARB fp_glProgramUniform1i64ARB; +typedef void (APIENTRYP pfn_glProgramUniform2i64ARB) (GLuint, GLint, GLint64, GLint64); +extern pfn_glProgramUniform2i64ARB fp_glProgramUniform2i64ARB; +typedef void (APIENTRYP pfn_glProgramUniform3i64ARB) (GLuint, GLint, GLint64, GLint64, GLint64); +extern pfn_glProgramUniform3i64ARB fp_glProgramUniform3i64ARB; +typedef void (APIENTRYP pfn_glProgramUniform4i64ARB) (GLuint, GLint, GLint64, GLint64, GLint64, GLint64); +extern pfn_glProgramUniform4i64ARB fp_glProgramUniform4i64ARB; +typedef void (APIENTRYP pfn_glProgramUniform1i64vARB) (GLuint, GLint, GLsizei, const GLint64*); +extern pfn_glProgramUniform1i64vARB fp_glProgramUniform1i64vARB; +typedef void (APIENTRYP pfn_glProgramUniform2i64vARB) (GLuint, GLint, GLsizei, const GLint64*); +extern pfn_glProgramUniform2i64vARB fp_glProgramUniform2i64vARB; +typedef void (APIENTRYP pfn_glProgramUniform3i64vARB) (GLuint, GLint, GLsizei, const GLint64*); +extern pfn_glProgramUniform3i64vARB fp_glProgramUniform3i64vARB; +typedef void (APIENTRYP pfn_glProgramUniform4i64vARB) (GLuint, GLint, GLsizei, const GLint64*); +extern pfn_glProgramUniform4i64vARB fp_glProgramUniform4i64vARB; +typedef void (APIENTRYP pfn_glProgramUniform1ui64ARB) (GLuint, GLint, GLuint64); +extern pfn_glProgramUniform1ui64ARB fp_glProgramUniform1ui64ARB; +typedef void (APIENTRYP pfn_glProgramUniform2ui64ARB) (GLuint, GLint, GLuint64, GLuint64); +extern pfn_glProgramUniform2ui64ARB fp_glProgramUniform2ui64ARB; +typedef void (APIENTRYP pfn_glProgramUniform3ui64ARB) (GLuint, GLint, GLuint64, GLuint64, GLuint64); +extern pfn_glProgramUniform3ui64ARB fp_glProgramUniform3ui64ARB; +typedef void (APIENTRYP pfn_glProgramUniform4ui64ARB) (GLuint, GLint, GLuint64, GLuint64, GLuint64, GLuint64); +extern pfn_glProgramUniform4ui64ARB fp_glProgramUniform4ui64ARB; +typedef void (APIENTRYP pfn_glProgramUniform1ui64vARB) (GLuint, GLint, GLsizei, const GLuint64*); +extern pfn_glProgramUniform1ui64vARB fp_glProgramUniform1ui64vARB; +typedef void (APIENTRYP pfn_glProgramUniform2ui64vARB) (GLuint, GLint, GLsizei, const GLuint64*); +extern pfn_glProgramUniform2ui64vARB fp_glProgramUniform2ui64vARB; +typedef void (APIENTRYP pfn_glProgramUniform3ui64vARB) (GLuint, GLint, GLsizei, const GLuint64*); +extern pfn_glProgramUniform3ui64vARB fp_glProgramUniform3ui64vARB; +typedef void (APIENTRYP pfn_glProgramUniform4ui64vARB) (GLuint, GLint, GLsizei, const GLuint64*); +extern pfn_glProgramUniform4ui64vARB fp_glProgramUniform4ui64vARB; + /* GL_ARB_half_float_pixel */ extern GLboolean GLAD_ARB_half_float_pixel; #define GL_HALF_FLOAT_ARB 0x140B @@ -4513,6 +4681,13 @@ /* GL_ARB_occlusion_query2 */ extern GLboolean GLAD_ARB_occlusion_query2; + /* GL_ARB_parallel_shader_compile */ +extern GLboolean GLAD_ARB_parallel_shader_compile; +#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0 +#define GL_COMPLETION_STATUS_ARB 0x91B1 +typedef void (APIENTRYP pfn_glMaxShaderCompilerThreadsARB) (GLuint); +extern pfn_glMaxShaderCompilerThreadsARB fp_glMaxShaderCompilerThreadsARB; + /* GL_ARB_pipeline_statistics_query */ extern GLboolean GLAD_ARB_pipeline_statistics_query; #define GL_VERTICES_SUBMITTED_ARB 0x82EE @@ -4533,6 +4708,9 @@ #define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED #define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF + /* GL_ARB_post_depth_coverage */ +extern GLboolean GLAD_ARB_post_depth_coverage; + /* GL_ARB_program_interface_query */ extern GLboolean GLAD_ARB_program_interface_query; @@ -4598,6 +4776,23 @@ /* GL_ARB_robustness_isolation */ extern GLboolean GLAD_ARB_robustness_isolation; + /* GL_ARB_sample_locations */ +extern GLboolean GLAD_ARB_sample_locations; +#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D +#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E +#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340 +#define GL_SAMPLE_LOCATION_ARB 0x8E50 +#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341 +#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342 +#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343 +typedef void (APIENTRYP pfn_glFramebufferSampleLocationsfvARB) (GLenum, GLuint, GLsizei, const GLfloat*); +extern pfn_glFramebufferSampleLocationsfvARB fp_glFramebufferSampleLocationsfvARB; +typedef void (APIENTRYP pfn_glNamedFramebufferSampleLocationsfvARB) (GLuint, GLuint, GLsizei, const GLfloat*); +extern pfn_glNamedFramebufferSampleLocationsfvARB fp_glNamedFramebufferSampleLocationsfvARB; +typedef void (APIENTRYP pfn_glEvaluateDepthValuesARB) (); +extern pfn_glEvaluateDepthValuesARB fp_glEvaluateDepthValuesARB; + /* GL_ARB_sample_shading */ extern GLboolean GLAD_ARB_sample_shading; #define GL_SAMPLE_SHADING_ARB 0x8C36 @@ -4617,12 +4812,21 @@ /* GL_ARB_separate_shader_objects */ extern GLboolean GLAD_ARB_separate_shader_objects; + /* GL_ARB_shader_atomic_counter_ops */ +extern GLboolean GLAD_ARB_shader_atomic_counter_ops; + /* GL_ARB_shader_atomic_counters */ extern GLboolean GLAD_ARB_shader_atomic_counters; + /* GL_ARB_shader_ballot */ +extern GLboolean GLAD_ARB_shader_ballot; + /* GL_ARB_shader_bit_encoding */ extern GLboolean GLAD_ARB_shader_bit_encoding; + /* GL_ARB_shader_clock */ +extern GLboolean GLAD_ARB_shader_clock; + /* GL_ARB_shader_draw_parameters */ extern GLboolean GLAD_ARB_shader_draw_parameters; @@ -4653,6 +4857,9 @@ /* GL_ARB_shader_texture_lod */ extern GLboolean GLAD_ARB_shader_texture_lod; + /* GL_ARB_shader_viewport_layer_array */ +extern GLboolean GLAD_ARB_shader_viewport_layer_array; + /* GL_ARB_shading_language_420pack */ extern GLboolean GLAD_ARB_shading_language_420pack; @@ -4704,6 +4911,12 @@ typedef void (APIENTRYP pfn_glTexPageCommitmentARB) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLboolean); extern pfn_glTexPageCommitmentARB fp_glTexPageCommitmentARB; + /* GL_ARB_sparse_texture2 */ +extern GLboolean GLAD_ARB_sparse_texture2; + + /* GL_ARB_sparse_texture_clamp */ +extern GLboolean GLAD_ARB_sparse_texture_clamp; + /* GL_ARB_stencil_texturing */ extern GLboolean GLAD_ARB_stencil_texturing; @@ -4752,6 +4965,11 @@ #define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E #define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F + /* GL_ARB_texture_filter_minmax */ +extern GLboolean GLAD_ARB_texture_filter_minmax; +#define GL_TEXTURE_REDUCTION_MODE_ARB 0x9366 +#define GL_WEIGHTED_AVERAGE_ARB 0x9367 + /* GL_ARB_texture_float */ extern GLboolean GLAD_ARB_texture_float; #define GL_TEXTURE_RED_TYPE_ARB 0x8C10 @@ -4891,6 +5109,48 @@ typedef GLintptr (APIENTRYP pfn_glGetUniformOffsetEXT) (GLuint, GLint); extern pfn_glGetUniformOffsetEXT fp_glGetUniformOffsetEXT; + /* GL_EXT_blend_func_extended */ +extern GLboolean GLAD_EXT_blend_func_extended; +#define GL_SRC1_COLOR_EXT 0x88F9 +#define GL_SRC1_ALPHA_EXT 0x8589 +#define GL_ONE_MINUS_SRC1_COLOR_EXT 0x88FA +#define GL_ONE_MINUS_SRC1_ALPHA_EXT 0x88FB +#define GL_SRC_ALPHA_SATURATE_EXT 0x0308 +#define GL_LOCATION_INDEX_EXT 0x930F +#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT 0x88FC +typedef void (APIENTRYP pfn_glBindFragDataLocationIndexedEXT) (GLuint, GLuint, GLuint, const GLchar*); +extern pfn_glBindFragDataLocationIndexedEXT fp_glBindFragDataLocationIndexedEXT; +typedef void (APIENTRYP pfn_glBindFragDataLocationEXT) (GLuint, GLuint, const GLchar*); +extern pfn_glBindFragDataLocationEXT fp_glBindFragDataLocationEXT; +typedef GLint (APIENTRYP pfn_glGetProgramResourceLocationIndexEXT) (GLuint, GLenum, const GLchar*); +extern pfn_glGetProgramResourceLocationIndexEXT fp_glGetProgramResourceLocationIndexEXT; +typedef GLint (APIENTRYP pfn_glGetFragDataIndexEXT) (GLuint, const GLchar*); +extern pfn_glGetFragDataIndexEXT fp_glGetFragDataIndexEXT; + + /* GL_EXT_blend_minmax */ +extern GLboolean GLAD_EXT_blend_minmax; +#define GL_MIN_EXT 0x8007 +#define GL_MAX_EXT 0x8008 +#define GL_FUNC_ADD_EXT 0x8006 +#define GL_BLEND_EQUATION_EXT 0x8009 +typedef void (APIENTRYP pfn_glBlendEquationEXT) (GLenum); +extern pfn_glBlendEquationEXT fp_glBlendEquationEXT; + + /* GL_EXT_buffer_storage */ +extern GLboolean GLAD_EXT_buffer_storage; +#define GL_MAP_PERSISTENT_BIT_EXT 0x0040 +#define GL_MAP_COHERENT_BIT_EXT 0x0080 +#define GL_DYNAMIC_STORAGE_BIT_EXT 0x0100 +#define GL_CLIENT_STORAGE_BIT_EXT 0x0200 +#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT_EXT 0x00004000 +#define GL_BUFFER_IMMUTABLE_STORAGE_EXT 0x821F +#define GL_BUFFER_STORAGE_FLAGS_EXT 0x8220 +typedef void (APIENTRYP pfn_glBufferStorageEXT) (GLenum, GLsizeiptr, const void*, GLbitfield); +extern pfn_glBufferStorageEXT fp_glBufferStorageEXT; + + /* GL_EXT_color_buffer_float */ +extern GLboolean GLAD_EXT_color_buffer_float; + /* GL_EXT_color_buffer_half_float */ extern GLboolean GLAD_EXT_color_buffer_half_float; #define GL_RGBA16F_EXT 0x881A @@ -5564,6 +5824,9 @@ typedef void (APIENTRYP pfn_glDrawElementsInstancedEXT) (GLenum, GLsizei, GLenum, const void*, GLsizei); extern pfn_glDrawElementsInstancedEXT fp_glDrawElementsInstancedEXT; + /* GL_EXT_float_blend */ +extern GLboolean GLAD_EXT_float_blend; + /* GL_EXT_framebuffer_blit */ extern GLboolean GLAD_EXT_framebuffer_blit; #define GL_READ_FRAMEBUFFER_EXT 0x8CA8 @@ -5756,8 +6019,6 @@ #define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT 0x8905 typedef void (APIENTRYP pfn_glGetUniformuivEXT) (GLuint, GLint, GLuint*); extern pfn_glGetUniformuivEXT fp_glGetUniformuivEXT; -typedef void (APIENTRYP pfn_glBindFragDataLocationEXT) (GLuint, GLuint, const GLchar*); -extern pfn_glBindFragDataLocationEXT fp_glBindFragDataLocationEXT; typedef GLint (APIENTRYP pfn_glGetFragDataLocationEXT) (GLuint, const GLchar*); extern pfn_glGetFragDataLocationEXT fp_glGetFragDataLocationEXT; typedef void (APIENTRYP pfn_glUniform1uiEXT) (GLint, GLuint); @@ -5806,6 +6067,11 @@ typedef void (APIENTRYP pfn_glMultiDrawElementsIndirectEXT) (GLenum, GLenum, const void*, GLsizei, GLsizei); extern pfn_glMultiDrawElementsIndirectEXT fp_glMultiDrawElementsIndirectEXT; + /* GL_EXT_multisampled_compatibility */ +extern GLboolean GLAD_EXT_multisampled_compatibility; +#define GL_MULTISAMPLE_EXT 0x809D +#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F + /* GL_EXT_multisampled_render_to_texture */ extern GLboolean GLAD_EXT_multisampled_render_to_texture; #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C @@ -6051,6 +6317,23 @@ #define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E #define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 + /* GL_EXT_sparse_texture */ +extern GLboolean GLAD_EXT_sparse_texture; +#define GL_TEXTURE_SPARSE_EXT 0x91A6 +#define GL_VIRTUAL_PAGE_SIZE_INDEX_EXT 0x91A7 +#define GL_NUM_SPARSE_LEVELS_EXT 0x91AA +#define GL_NUM_VIRTUAL_PAGE_SIZES_EXT 0x91A8 +#define GL_VIRTUAL_PAGE_SIZE_X_EXT 0x9195 +#define GL_VIRTUAL_PAGE_SIZE_Y_EXT 0x9196 +#define GL_VIRTUAL_PAGE_SIZE_Z_EXT 0x9197 +#define GL_TEXTURE_CUBE_MAP_ARRAY_OES 0x9009 +#define GL_MAX_SPARSE_TEXTURE_SIZE_EXT 0x9198 +#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_EXT 0x9199 +#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_EXT 0x919A +#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_EXT 0x91A9 +typedef void (APIENTRYP pfn_glTexPageCommitmentEXT) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLboolean); +extern pfn_glTexPageCommitmentEXT fp_glTexPageCommitmentEXT; + /* GL_EXT_sparse_texture2 */ extern GLboolean GLAD_EXT_sparse_texture2; @@ -6843,7 +7126,6 @@ /* GL_OES_texture_cube_map_array */ extern GLboolean GLAD_OES_texture_cube_map_array; -#define GL_TEXTURE_CUBE_MAP_ARRAY_OES 0x9009 #define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_OES 0x900A #define GL_SAMPLER_CUBE_MAP_ARRAY_OES 0x900C #define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_OES 0x900D @@ -7632,6 +7914,12 @@ #define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137 #define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138 + /* GL_IMG_texture_filter_cubic */ +extern GLboolean GLAD_IMG_texture_filter_cubic; +#define GL_CUBIC_IMG 0x9139 +#define GL_CUBIC_MIPMAP_NEAREST_IMG 0x913A +#define GL_CUBIC_MIPMAP_LINEAR_IMG 0x913B + /* GL_INGR_blend_func_separate */ extern GLboolean GLAD_INGR_blend_func_separate; typedef void (APIENTRYP pfn_glBlendFuncSeparateINGR) (GLenum, GLenum, GLenum, GLenum); @@ -7640,6 +7928,11 @@ /* GL_INTEL_fragment_shader_ordering */ extern GLboolean GLAD_INTEL_fragment_shader_ordering; + /* GL_INTEL_framebuffer_CMAA */ +extern GLboolean GLAD_INTEL_framebuffer_CMAA; +typedef void (APIENTRYP pfn_glApplyFramebufferAttachmentCMAAINTEL) (); +extern pfn_glApplyFramebufferAttachmentCMAAINTEL fp_glApplyFramebufferAttachmentCMAAINTEL; + /* GL_INTEL_map_texture */ extern GLboolean GLAD_INTEL_map_texture; #define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF @@ -7818,6 +8111,62 @@ extern GLboolean GLAD_NV_blend_equation_advanced_coherent; #define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 + /* GL_NV_command_list */ +extern GLboolean GLAD_NV_command_list; +#define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000 +#define GL_NOP_COMMAND_NV 0x0001 +#define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002 +#define GL_DRAW_ARRAYS_COMMAND_NV 0x0003 +#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004 +#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV 0x0005 +#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006 +#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007 +#define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008 +#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009 +#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000A +#define GL_BLEND_COLOR_COMMAND_NV 0x000B +#define GL_STENCIL_REF_COMMAND_NV 0x000C +#define GL_LINE_WIDTH_COMMAND_NV 0x000D +#define GL_POLYGON_OFFSET_COMMAND_NV 0x000E +#define GL_ALPHA_REF_COMMAND_NV 0x000F +#define GL_VIEWPORT_COMMAND_NV 0x0010 +#define GL_SCISSOR_COMMAND_NV 0x0011 +#define GL_FRONT_FACE_COMMAND_NV 0x0012 +typedef void (APIENTRYP pfn_glCreateStatesNV) (GLsizei, GLuint*); +extern pfn_glCreateStatesNV fp_glCreateStatesNV; +typedef void (APIENTRYP pfn_glDeleteStatesNV) (GLsizei, const GLuint*); +extern pfn_glDeleteStatesNV fp_glDeleteStatesNV; +typedef GLboolean (APIENTRYP pfn_glIsStateNV) (GLuint); +extern pfn_glIsStateNV fp_glIsStateNV; +typedef void (APIENTRYP pfn_glStateCaptureNV) (GLuint, GLenum); +extern pfn_glStateCaptureNV fp_glStateCaptureNV; +typedef GLuint (APIENTRYP pfn_glGetCommandHeaderNV) (GLenum, GLuint); +extern pfn_glGetCommandHeaderNV fp_glGetCommandHeaderNV; +typedef GLushort (APIENTRYP pfn_glGetStageIndexNV) (GLenum); +extern pfn_glGetStageIndexNV fp_glGetStageIndexNV; +typedef void (APIENTRYP pfn_glDrawCommandsNV) (GLenum, GLuint, const GLintptr*, const GLsizei*, GLuint); +extern pfn_glDrawCommandsNV fp_glDrawCommandsNV; +typedef void (APIENTRYP pfn_glDrawCommandsAddressNV) (GLenum, const GLuint64*, const GLsizei*, GLuint); +extern pfn_glDrawCommandsAddressNV fp_glDrawCommandsAddressNV; +typedef void (APIENTRYP pfn_glDrawCommandsStatesNV) (GLuint, const GLintptr*, const GLsizei*, const GLuint*, const GLuint*, GLuint); +extern pfn_glDrawCommandsStatesNV fp_glDrawCommandsStatesNV; +typedef void (APIENTRYP pfn_glDrawCommandsStatesAddressNV) (const GLuint64*, const GLsizei*, const GLuint*, const GLuint*, GLuint); +extern pfn_glDrawCommandsStatesAddressNV fp_glDrawCommandsStatesAddressNV; +typedef void (APIENTRYP pfn_glCreateCommandListsNV) (GLsizei, GLuint*); +extern pfn_glCreateCommandListsNV fp_glCreateCommandListsNV; +typedef void (APIENTRYP pfn_glDeleteCommandListsNV) (GLsizei, const GLuint*); +extern pfn_glDeleteCommandListsNV fp_glDeleteCommandListsNV; +typedef GLboolean (APIENTRYP pfn_glIsCommandListNV) (GLuint); +extern pfn_glIsCommandListNV fp_glIsCommandListNV; +typedef void (APIENTRYP pfn_glListDrawCommandsStatesClientNV) (GLuint, GLuint, const void**, const GLsizei*, const GLuint*, const GLuint*, GLuint); +extern pfn_glListDrawCommandsStatesClientNV fp_glListDrawCommandsStatesClientNV; +typedef void (APIENTRYP pfn_glCommandListSegmentsNV) (GLuint, GLuint); +extern pfn_glCommandListSegmentsNV fp_glCommandListSegmentsNV; +typedef void (APIENTRYP pfn_glCompileCommandListNV) (GLuint); +extern pfn_glCompileCommandListNV fp_glCompileCommandListNV; +typedef void (APIENTRYP pfn_glCallCommandListNV) (GLuint); +extern pfn_glCallCommandListNV fp_glCallCommandListNV; + /* GL_NV_compute_program5 */ extern GLboolean GLAD_NV_compute_program5; #define GL_COMPUTE_PROGRAM_NV 0x90FB @@ -7843,6 +8192,14 @@ typedef void (APIENTRYP pfn_glSubpixelPrecisionBiasNV) (GLuint, GLuint); extern pfn_glSubpixelPrecisionBiasNV fp_glSubpixelPrecisionBiasNV; + /* GL_NV_conservative_raster_dilate */ +extern GLboolean GLAD_NV_conservative_raster_dilate; +#define GL_CONSERVATIVE_RASTER_DILATE_NV 0x9379 +#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A +#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B +typedef void (APIENTRYP pfn_glConservativeRasterParameterfNV) (GLenum, GLfloat); +extern pfn_glConservativeRasterParameterfNV fp_glConservativeRasterParameterfNV; + /* GL_NV_copy_buffer */ extern GLboolean GLAD_NV_copy_buffer; #define GL_COPY_READ_BUFFER_NV 0x8F36 @@ -8629,6 +8986,17 @@ extern GLboolean GLAD_NV_path_rendering_shared_edge; #define GL_SHARED_EDGE_NV 0xC0 + /* GL_NV_polygon_mode */ +extern GLboolean GLAD_NV_polygon_mode; +#define GL_POLYGON_MODE_NV 0x0B40 +#define GL_POLYGON_OFFSET_POINT_NV 0x2A01 +#define GL_POLYGON_OFFSET_LINE_NV 0x2A02 +#define GL_POINT_NV 0x1B00 +#define GL_LINE_NV 0x1B01 +#define GL_FILL_NV 0x1B02 +typedef void (APIENTRYP pfn_glPolygonModeNV) (GLenum, GLenum); +extern pfn_glPolygonModeNV fp_glPolygonModeNV; + /* GL_NV_present_video */ extern GLboolean GLAD_NV_present_video; #define GL_FRAME_NV 0x8E26 @@ -9182,6 +9550,22 @@ #define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A #define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B + /* GL_OVR_multiview */ +extern GLboolean GLAD_OVR_multiview; +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632 +#define GL_MAX_VIEWS_OVR 0x9631 +typedef void (APIENTRYP pfn_glFramebufferTextureMultiviewOVR) (GLenum, GLenum, GLuint, GLint, GLint, GLsizei); +extern pfn_glFramebufferTextureMultiviewOVR fp_glFramebufferTextureMultiviewOVR; + + /* GL_OVR_multiview2 */ +extern GLboolean GLAD_OVR_multiview2; + + /* GL_OVR_multiview_multisampled_render_to_texture */ +extern GLboolean GLAD_OVR_multiview_multisampled_render_to_texture; +typedef void (APIENTRYP pfn_glFramebufferTextureMultisampleMultiviewOVR) (GLenum, GLenum, GLuint, GLint, GLsizei, GLint, GLsizei); +extern pfn_glFramebufferTextureMultisampleMultiviewOVR fp_glFramebufferTextureMultisampleMultiviewOVR; + /* GL_QCOM_alpha_test */ extern GLboolean GLAD_QCOM_alpha_test; #define GL_ALPHA_TEST_QCOM 0x0BC0 @@ -9296,44 +9680,6 @@ extern GLboolean GLAD_QCOM_writeonly_rendering; #define GL_WRITEONLY_RENDERING_QCOM 0x8823 - /* GL_SGIX_calligraphic_fragment */ -extern GLboolean GLAD_SGIX_calligraphic_fragment; -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 - - /* GL_SGIX_depth_pass_instrument */ -extern GLboolean GLAD_SGIX_depth_pass_instrument; - - /* GL_SGIX_pixel_tiles */ -extern GLboolean GLAD_SGIX_pixel_tiles; -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 - - /* GL_SGIX_scalebias_hint */ -extern GLboolean GLAD_SGIX_scalebias_hint; -#define GL_SCALEBIAS_HINT_SGIX 0x8322 - - /* GL_SGIX_subsample */ -extern GLboolean GLAD_SGIX_subsample; -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 - - /* GL_SGIX_ycrcb_subsample */ -extern GLboolean GLAD_SGIX_ycrcb_subsample; - - /* GL_SGIX_ycrcba */ -extern GLboolean GLAD_SGIX_ycrcba; -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 - /* GL_VIV_shader_binary */ extern GLboolean GLAD_VIV_shader_binary; #define GL_SHADER_BINARY_VIV 0x8FC4 diff -Nru love-unstable-0.10.0~pre2657ppa2/src/libraries/luasocket/luasocket.cpp love-unstable-0.10.1~pre2723ppa1/src/libraries/luasocket/luasocket.cpp --- love-unstable-0.10.0~pre2657ppa2/src/libraries/luasocket/luasocket.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/libraries/luasocket/luasocket.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/libraries/luasocket/luasocket.h love-unstable-0.10.1~pre2723ppa1/src/libraries/luasocket/luasocket.h --- love-unstable-0.10.0~pre2657ppa2/src/libraries/luasocket/luasocket.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/libraries/luasocket/luasocket.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/love.cpp love-unstable-0.10.1~pre2723ppa1/src/love.cpp --- love-unstable-0.10.0~pre2657ppa2/src/love.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/love.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -46,6 +46,10 @@ #ifdef LOVE_ANDROID #include "common/android.h" +extern "C" +{ +#include "luajit.h" +} #endif #ifdef LOVE_WINDOWS @@ -55,46 +59,13 @@ // http://developer.download.nvidia.com/devzone/devcenter/gamegraphics/files/OptimusRenderingPolicies.pdf // TODO: Re-evaluate in the future when the average integrated GPU in Optimus // systems is less mediocre? -LOVE_EXPORT DWORD NvOptimusEnablement = 0x00000001; -} -#endif // LOVE_WINDOWS - -#ifdef LOVE_LEGENDARY_UTF8_ARGV_HACK - -void get_utf8_arguments(int &argc, char **&argv) -{ - LPWSTR cmd = GetCommandLineW(); - - if (!cmd) - return; - - LPWSTR *argv_w = CommandLineToArgvW(cmd, &argc); - - argv = new char *[argc]; - - for (int i = 0; i < argc; ++i) - { - // Size of wide char buffer (plus one for trailing '\0'). - size_t wide_len = wcslen(argv_w[i]) + 1; +LOVE_EXPORT DWORD NvOptimusEnablement = 1; - // Get size in UTF-8. - int utf8_size = WideCharToMultiByte(CP_UTF8, 0, argv_w[i], wide_len, argv[i], 0, 0, 0); - - argv[i] = new char[utf8_size]; - - // Convert to UTF-8. - int ok = WideCharToMultiByte(CP_UTF8, 0, argv_w[i], wide_len, argv[i], utf8_size, 0, 0); - - int len = strlen(argv[i]); - - if (!ok) - printf("Warning: could not convert to UTF8.\n"); - } - - LocalFree(argv_w); +// Same with AMD GPUs. +// https://community.amd.com/thread/169965 +LOVE_EXPORT DWORD AmdPowerXpressRequestHighPerformance = 1; } - -#endif // LOVE_LEGENDARY_UTF8_ARGV_HACK +#endif // LOVE_WINDOWS #ifdef LOVE_LEGENDARY_APP_ARGV_HACK @@ -218,13 +189,6 @@ argv = orig_argv; #endif -#ifdef LOVE_LEGENDARY_UTF8_ARGV_HACK - int hack_argc = 0; char **hack_argv = 0; - get_utf8_arguments(hack_argc, hack_argv); - argc = hack_argc; - argv = hack_argv; -#endif // LOVE_LEGENDARY_UTF8_ARGV_HACK - #ifdef LOVE_LEGENDARY_APP_ARGV_HACK int hack_argc = 0; char **hack_argv = 0; @@ -252,6 +216,7 @@ luaL_openlibs(L); #ifdef LOVE_ANDROID + luaJIT_setmode(L, 0, LUAJIT_MODE_ENGINE| LUAJIT_MODE_OFF); lua_register(L, "print", l_print_sdl_log); #endif @@ -309,14 +274,14 @@ lua_close(L); -#if defined(LOVE_LEGENDARY_UTF8_ARGV_HACK) || defined(LOVE_LEGENDARY_APP_ARGV_HACK) +#if defined(LOVE_LEGENDARY_APP_ARGV_HACK) if (hack_argv) { for (int i = 0; i(Module::M_AUDIO); - if (audio) - audio->pause(); - } - break; - case SDL_WINDOWEVENT_RESTORED: - { - auto audio = Module::getInstance(Module::M_AUDIO); - if (audio) - audio->resume(); - } - break; -#endif default: break; } @@ -590,6 +574,21 @@ if (win) win->onSizeChanged(e.window.data1, e.window.data2); break; + case SDL_WINDOWEVENT_MINIMIZED: + case SDL_WINDOWEVENT_RESTORED: +#ifdef LOVE_ANDROID + { + auto audio = Module::getInstance(Module::M_AUDIO); + if (audio) + { + if (e.window.event == SDL_WINDOWEVENT_MINIMIZED) + audio->pause(); + else if (e.window.event == SDL_WINDOWEVENT_RESTORED) + audio->resume(); + } + } +#endif + break; } // We gave +1 refs to the StrongRef list, so we should release them. diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/event/sdl/Event.h love-unstable-0.10.1~pre2723ppa1/src/modules/event/sdl/Event.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/event/sdl/Event.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/event/sdl/Event.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/event/wrap_Event.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/event/wrap_Event.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/event/wrap_Event.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/event/wrap_Event.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/event/wrap_Event.h love-unstable-0.10.1~pre2723ppa1/src/modules/event/wrap_Event.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/event/wrap_Event.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/event/wrap_Event.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/DroppedFile.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/DroppedFile.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/DroppedFile.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/DroppedFile.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/DroppedFile.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/DroppedFile.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/DroppedFile.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/DroppedFile.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/File.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/File.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/File.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/File.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/FileData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/FileData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/FileData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/FileData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/FileData.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/FileData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/FileData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/FileData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/File.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/File.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/File.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/File.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/Filesystem.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/Filesystem.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/Filesystem.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/Filesystem.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -50,6 +50,16 @@ { } +void Filesystem::setAndroidSaveExternal(bool useExternal) +{ + this->useExternal = useExternal; +} + +bool Filesystem::isAndroidSaveExternal() const +{ + return useExternal; +} + bool Filesystem::isRealDirectory(const std::string &path) const { #ifdef LOVE_WINDOWS diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/Filesystem.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/Filesystem.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/Filesystem.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/Filesystem.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -80,6 +80,20 @@ virtual bool setupWriteDirectory() = 0; /** + * This sets the save location on Android. + * False for internal, true for external + * @param external Bool for whether + * Android should use external file storage. + **/ + virtual void setAndroidSaveExternal(bool useExternal = false); + + /** + * Gets whether the Android save is external. + * Returns a bool. + **/ + virtual bool isAndroidSaveExternal() const; + + /** * Sets the name of the save folder. * @param ident The name of the game. Will be used to * to create the folder in the LOVE data folder. @@ -263,6 +277,10 @@ **/ virtual std::string getExecutablePath() const; +private: + + //should we save external or internal for Android + bool useExternal; }; // Filesystem } // filesystem diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/File.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/File.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/File.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/File.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -57,6 +57,9 @@ if (mode == MODE_CLOSED) return true; + if (!PHYSFS_isInit()) + throw love::Exception("PhysFS is not initialized."); + // File must exist if read mode. if ((mode == MODE_READ) && !PHYSFS_exists(filename.c_str())) throw love::Exception("Could not open file %s. Does not exist.", filename.c_str()); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/File.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/File.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/File.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/File.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/Filesystem.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/Filesystem.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/Filesystem.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/Filesystem.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -144,7 +144,7 @@ return fused; } -bool Filesystem::setIdentity(const char *ident, bool appendToPath) +bool Filesystem::setIdentity(const char *ident, bool appendToPath) { if (!PHYSFS_isInit()) return false; @@ -169,11 +169,16 @@ #ifdef LOVE_ANDROID if (save_identity == "") save_identity = "unnamed"; - - std::string internal_storage_path = SDL_AndroidGetInternalStoragePath(); - std::string save_directory = internal_storage_path + "/save"; - save_path_full = std::string(SDL_AndroidGetInternalStoragePath()) + std::string("/save/") + save_identity; + std::string storage_path; + if (isAndroidSaveExternal()) + storage_path = SDL_AndroidGetExternalStoragePath(); + else + storage_path = SDL_AndroidGetInternalStoragePath(); + + std::string save_directory = storage_path + "/save"; + + save_path_full = storage_path + std::string("/save/") + save_identity; if (!love::android::directoryExists(save_path_full.c_str()) && !love::android::mkdir(save_path_full.c_str())) @@ -571,6 +576,9 @@ std::string Filesystem::getRealDirectory(const char *filename) const { + if (!PHYSFS_isInit()) + throw love::Exception("PhysFS is not initialized."); + const char *dir = PHYSFS_getRealDir(filename); if (dir == nullptr) @@ -581,11 +589,17 @@ bool Filesystem::exists(const char *path) const { + if (!PHYSFS_isInit()) + return false; + return PHYSFS_exists(path) != 0; } bool Filesystem::isDirectory(const char *dir) const { + if (!PHYSFS_isInit()) + return false; + #ifdef LOVE_USE_PHYSFS_2_1 PHYSFS_Stat stat = {}; if (PHYSFS_stat(dir, &stat)) @@ -599,11 +613,17 @@ bool Filesystem::isFile(const char *file) const { + if (!PHYSFS_isInit()) + return false; + return PHYSFS_exists(file) && !isDirectory(file); } bool Filesystem::isSymlink(const char *filename) const { + if (!PHYSFS_isInit()) + return false; + #ifdef LOVE_USE_PHYSFS_2_1 PHYSFS_Stat stat = {}; if (PHYSFS_stat(filename, &stat)) @@ -617,21 +637,29 @@ bool Filesystem::createDirectory(const char *dir) { + if (!PHYSFS_isInit()) + return false; + if (PHYSFS_getWriteDir() == 0 && !setupWriteDirectory()) return false; if (!PHYSFS_mkdir(dir)) return false; + return true; } bool Filesystem::remove(const char *file) { + if (!PHYSFS_isInit()) + return false; + if (PHYSFS_getWriteDir() == 0 && !setupWriteDirectory()) return false; if (!PHYSFS_delete(file)) return false; + return true; } @@ -669,8 +697,14 @@ void Filesystem::getDirectoryItems(const char *dir, std::vector &items) { + if (!PHYSFS_isInit()) + return; + char **rc = PHYSFS_enumerateFiles(dir); + if (rc == nullptr) + return; + for (char **i = rc; *i != 0; i++) items.push_back(*i); @@ -681,6 +715,9 @@ { PHYSFS_sint64 time = -1; + if (!PHYSFS_isInit()) + return -1; + #ifdef LOVE_USE_PHYSFS_2_1 PHYSFS_Stat stat = {}; if (PHYSFS_stat(filename, &stat)) @@ -704,6 +741,9 @@ void Filesystem::setSymlinksEnabled(bool enable) { + if (!PHYSFS_isInit()) + return; + if (!enable) { PHYSFS_Version version = {}; @@ -720,6 +760,9 @@ bool Filesystem::areSymlinksEnabled() const { + if (!PHYSFS_isInit()) + return false; + return PHYSFS_symbolicLinksPermitted() != 0; } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/Filesystem.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/Filesystem.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/physfs/Filesystem.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/physfs/Filesystem.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_DroppedFile.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_DroppedFile.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_DroppedFile.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_DroppedFile.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_DroppedFile.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_DroppedFile.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_DroppedFile.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_DroppedFile.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_File.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_File.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_File.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_File.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_FileData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_FileData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_FileData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_FileData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_FileData.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_FileData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_FileData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_FileData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_File.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_File.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_File.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_File.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_Filesystem.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_Filesystem.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_Filesystem.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_Filesystem.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -69,6 +69,13 @@ return 1; } +int w_setAndroidSaveExternal(lua_State *L) +{ + bool useExternal = luax_optboolean(L, 1, false); + instance()->setAndroidSaveExternal(useExternal); + return 0; +} + int w_setIdentity(lua_State *L) { const char *arg = luaL_checkstring(L, 1); @@ -708,6 +715,7 @@ { "init", w_init }, { "setFused", w_setFused }, { "isFused", w_isFused }, + { "_setAndroidSaveExternal", w_setAndroidSaveExternal }, { "setIdentity", w_setIdentity }, { "getIdentity", w_getIdentity }, { "setSource", w_setSource }, diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_Filesystem.h love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_Filesystem.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/filesystem/wrap_Filesystem.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/filesystem/wrap_Filesystem.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/BMFontRasterizer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/BMFontRasterizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/BMFontRasterizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/BMFontRasterizer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -245,6 +245,8 @@ for (const auto &cpair : characters) { const BMFontCharacter &c = cpair.second; + int width = c.metrics.width; + int height = c.metrics.height; if (!unicode && cpair.first > 127) throw love::Exception("Invalid BMFont character id (only unicode and ASCII are supported)"); @@ -254,8 +256,14 @@ const image::ImageData *id = images[c.page].get(); - if (!id->inside(c.x, c.y) || !id->inside(c.x + c.metrics.width - 1, c.y + c.metrics.height - 1)) - throw love::Exception("Invalid BMFont character coordinates."); + if (!id->inside(c.x, c.y)) + throw love::Exception("Invalid coordinates for BMFont character %u.", cpair.first); + + if (width > 0 && !id->inside(c.x + width - 1, c.y)) + throw love::Exception("Invalid width %d for BMFont character %u.", width, cpair.first); + + if (height > 0 && !id->inside(c.x, c.y + height - 1)) + throw love::Exception("Invalid height %d for BMFont character %u.", height, cpair.first); if (guessheight) lineHeight = std::max(lineHeight, c.metrics.height); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/BMFontRasterizer.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/BMFontRasterizer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/BMFontRasterizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/BMFontRasterizer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/Font.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/Font.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/Font.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/Font.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/Font.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/Font.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/Font.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/Font.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/Font.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/Font.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/Font.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/Font.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/Font.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/Font.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/Font.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/Font.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/TrueTypeRasterizer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/TrueTypeRasterizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/TrueTypeRasterizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/TrueTypeRasterizer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/TrueTypeRasterizer.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/TrueTypeRasterizer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/freetype/TrueTypeRasterizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/freetype/TrueTypeRasterizer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/GlyphData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/GlyphData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/GlyphData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/GlyphData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/GlyphData.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/GlyphData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/GlyphData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/GlyphData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/ImageRasterizer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/ImageRasterizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/ImageRasterizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/ImageRasterizer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/ImageRasterizer.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/ImageRasterizer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/ImageRasterizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/ImageRasterizer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/Rasterizer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/Rasterizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/Rasterizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/Rasterizer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/Rasterizer.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/Rasterizer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/Rasterizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/Rasterizer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/TrueTypeRasterizer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/TrueTypeRasterizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/TrueTypeRasterizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/TrueTypeRasterizer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/TrueTypeRasterizer.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/TrueTypeRasterizer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/TrueTypeRasterizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/TrueTypeRasterizer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Font.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Font.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Font.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Font.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -85,7 +85,10 @@ love::Data *d = nullptr; if (luax_istype(L, 1, DATA_ID)) + { d = luax_checkdata(L, 1); + d->retain(); + } else d = filesystem::luax_getfiledata(L, 1); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Font.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Font.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Font.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Font.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_GlyphData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_GlyphData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_GlyphData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_GlyphData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_GlyphData.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_GlyphData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_GlyphData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_GlyphData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Rasterizer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Rasterizer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Rasterizer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Rasterizer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Rasterizer.h love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Rasterizer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/font/wrap_Rasterizer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/font/wrap_Rasterizer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Drawable.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Drawable.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Drawable.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Drawable.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Graphics.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Graphics.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Graphics.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Graphics.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -72,6 +72,16 @@ return drawModes.find(in, out); } +bool Graphics::getConstant(const char *in, ArcMode &out) +{ + return arcModes.find(in, out); +} + +bool Graphics::getConstant(ArcMode in, const char *&out) +{ + return arcModes.find(in, out); +} + bool Graphics::getConstant(const char *in, BlendMode &out) { return blendModes.find(in, out); @@ -180,12 +190,23 @@ StringMap Graphics::drawModes(Graphics::drawModeEntries, sizeof(Graphics::drawModeEntries)); +StringMap::Entry Graphics::arcModeEntries[] = +{ + { "open", ARC_OPEN }, + { "closed", ARC_CLOSED }, + { "pie", ARC_PIE }, +}; + +StringMap Graphics::arcModes(Graphics::arcModeEntries, sizeof(Graphics::arcModeEntries)); + StringMap::Entry Graphics::blendModeEntries[] = { { "alpha", BLEND_ALPHA }, { "add", BLEND_ADD }, { "subtract", BLEND_SUBTRACT }, { "multiply", BLEND_MULTIPLY }, + { "lighten", BLEND_LIGHTEN }, + { "darken", BLEND_DARKEN }, { "screen", BLEND_SCREEN }, { "replace", BLEND_REPLACE }, }; @@ -246,6 +267,7 @@ { { "multicanvasformats", SUPPORT_MULTI_CANVAS_FORMATS }, { "clampzero", SUPPORT_CLAMP_ZERO }, + { "lighten", SUPPORT_LIGHTEN }, }; StringMap Graphics::support(Graphics::supportEntries, sizeof(Graphics::supportEntries)); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Graphics.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Graphics.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Graphics.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Graphics.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -70,12 +70,22 @@ DRAW_MAX_ENUM }; + enum ArcMode + { + ARC_OPEN, + ARC_CLOSED, + ARC_PIE, + ARC_MAX_ENUM + }; + enum BlendMode { BLEND_ALPHA, BLEND_ADD, BLEND_SUBTRACT, BLEND_MULTIPLY, + BLEND_LIGHTEN, + BLEND_DARKEN, BLEND_SCREEN, BLEND_REPLACE, BLEND_MAX_ENUM @@ -130,6 +140,7 @@ { SUPPORT_MULTI_CANVAS_FORMATS, SUPPORT_CLAMP_ZERO, + SUPPORT_LIGHTEN, SUPPORT_MAX_ENUM }; @@ -259,6 +270,9 @@ static bool getConstant(const char *in, DrawMode &out); static bool getConstant(DrawMode in, const char *&out); + static bool getConstant(const char *in, ArcMode &out); + static bool getConstant(ArcMode in, const char *&out); + static bool getConstant(const char *in, BlendMode &out); static bool getConstant(BlendMode in, const char *&out); @@ -294,6 +308,9 @@ static StringMap::Entry drawModeEntries[]; static StringMap drawModes; + static StringMap::Entry arcModeEntries[]; + static StringMap arcModes; + static StringMap::Entry blendModeEntries[]; static StringMap blendModes; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Canvas.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Canvas.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Canvas.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Canvas.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Canvas.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Canvas.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Canvas.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Canvas.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -117,6 +117,7 @@ return actual_samples; } + static Format getSizedFormat(Format format); static bool isSupported(); static bool isMultiFormatMultiCanvasSupported(); static bool isFormatSupported(Format format); @@ -143,7 +144,6 @@ void drawv(const Matrix4 &t, const Vertex *v); - static Format getSizedFormat(Format format); static void convertFormat(Format format, GLenum &internalformat, GLenum &externalformat, GLenum &type); static size_t getFormatBitsPerPixel(Format format); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Font.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Font.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Font.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Font.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -901,13 +901,13 @@ } } -void Font::getWrap(const std::string &text, float wraplimit, std::vector &lines, std::vector *linewidths) +void Font::getWrap(const std::vector &text, float wraplimit, std::vector &lines, std::vector *linewidths) { - ColoredCodepoints codepoints; - getCodepointsFromString(text, codepoints.cps); + ColoredCodepoints cps; + getCodepointsFromString(text, cps); std::vector codepointlines; - getWrap(codepoints, wraplimit, codepointlines, linewidths); + getWrap(cps, wraplimit, codepointlines, linewidths); std::string line; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Font.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Font.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Font.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Font.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -160,7 +160,7 @@ * @param max_width Optional output of the maximum width * Returns a vector with the lines. **/ - void getWrap(const std::string &text, float wraplimit, std::vector &lines, std::vector *line_widths = nullptr); + void getWrap(const std::vector &text, float wraplimit, std::vector &lines, std::vector *line_widths = nullptr); void getWrap(const ColoredCodepoints &codepoints, float wraplimit, std::vector &lines, std::vector *line_widths = nullptr); /** diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/GLBuffer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/GLBuffer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/GLBuffer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/GLBuffer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/GLBuffer.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/GLBuffer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/GLBuffer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/GLBuffer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Graphics.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Graphics.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Graphics.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Graphics.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -446,23 +446,39 @@ glClearColor(nc.r, nc.g, nc.b, nc.a); glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + if (gl.bugs.clearRequiresDriverTextureStateUpdate && Shader::current) + { + // This seems to be enough to fix the bug for me. Other methods I've + // tried (e.g. dummy draws) don't work in all cases. + glUseProgram(0); + glUseProgram(Shader::current->getProgram()); + } } -void Graphics::clear(const std::vector &colors) +void Graphics::clear(const std::vector &colors) { if (colors.size() == 0) return; if (states.back().canvases.size() == 0) - return clear(colors[0]); + { + if (colors[0].enabled) + clear({colors[0].r, colors[0].g, colors[0].b, colors[0].a}); + + return; + } if (colors.size() != states.back().canvases.size()) throw love::Exception("Number of clear colors must match the number of active canvases (%ld)", states.back().canvases.size()); - std::vector bufs; + bool drawbuffermodified = false; for (int i = 0; i < (int) colors.size(); i++) { + if (!colors[i].enabled) + continue; + GLfloat c[] = {colors[i].r/255.f, colors[i].g/255.f, colors[i].b/255.f, colors[i].a/255.f}; // TODO: Investigate a potential bug on AMD drivers in Windows/Linux @@ -478,10 +494,11 @@ glClearBufferfv(GL_COLOR, i, c); else { - bufs.push_back(GL_COLOR_ATTACHMENT0 + i); glDrawBuffer(GL_COLOR_ATTACHMENT0 + i); glClearColor(c[0], c[1], c[2], c[3]); glClear(GL_COLOR_BUFFER_BIT); + + drawbuffermodified = true; } } @@ -489,13 +506,26 @@ // Revert to the expected draw buffers once we're done, if glClearBuffer // wasn't supported. - if (!(GLAD_ES_VERSION_3_0 || GLAD_VERSION_3_0)) + if (drawbuffermodified) { + std::vector bufs; + + for (int i = 0; i < (int) states.back().canvases.size(); i++) + bufs.push_back(GL_COLOR_ATTACHMENT0 + i); + if (bufs.size() > 1) glDrawBuffers((int) bufs.size(), &bufs[0]); else glDrawBuffer(GL_COLOR_ATTACHMENT0); } + + if (gl.bugs.clearRequiresDriverTextureStateUpdate && Shader::current) + { + // This seems to be enough to fix the bug for me. Other methods I've + // tried (e.g. dummy draws) don't work in all cases. + glUseProgram(0); + glUseProgram(Shader::current->getProgram()); + } } void Graphics::discard(const std::vector &colorbuffers, bool stencil) @@ -812,11 +842,14 @@ Canvas *Graphics::newCanvas(int width, int height, Canvas::Format format, int msaa) { + if (!Canvas::isSupported()) + throw love::Exception("Canvases are not supported by your OpenGL drivers!"); + if (!Canvas::isFormatSupported(format)) { const char *fstr = "rgba8"; - Canvas::getConstant(format, fstr); - throw love::Exception("The %s canvas format is not supported by your OpenGL implementation.", fstr); + Canvas::getConstant(Canvas::getSizedFormat(format), fstr); + throw love::Exception("The %s canvas format is not supported by your OpenGL drivers.", fstr); } if (width > gl.getMaxTextureSize()) @@ -840,7 +873,7 @@ switch (err) { case GL_FRAMEBUFFER_UNSUPPORTED: - error_string << "Not supported by your OpenGL implementation."; + error_string << "Not supported by your OpenGL drivers."; break; case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: error_string << "Texture format cannot be rendered to on this system."; @@ -851,14 +884,14 @@ case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER: case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER: case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: - error_string << "Error in implementation."; + error_string << "Error in graphics driver."; break; default: // my intel hda card wrongly returns 0 to glCheckFramebufferStatus() but sets // no error flag. I think it meant to return GL_FRAMEBUFFER_UNSUPPORTED, but who // knows. if (glGetError() == GL_NO_ERROR) - error_string << "May not be supported by your OpenGL implementation."; + error_string << "May not be supported by your OpenGL drivers."; // the remaining error is an indication of a serious fuckup since it should // only be returned if glCheckFramebufferStatus() was called with the wrong // arguments. @@ -1065,6 +1098,28 @@ GLenum dstRGB = GL_ZERO; GLenum dstA = GL_ZERO; + if (mode == BLEND_LIGHTEN || mode == BLEND_DARKEN) + { + if (!isSupported(SUPPORT_LIGHTEN)) + throw love::Exception("The 'lighten' and 'darken' blend modes are not supported on this system."); + } + + if (alphamode != BLENDALPHA_PREMULTIPLIED) + { + const char *modestr = "unknown"; + switch (mode) + { + case BLEND_LIGHTEN: + case BLEND_DARKEN: + /*case BLEND_MULTIPLY:*/ // FIXME: Uncomment for 0.11.0 + getConstant(mode, modestr); + throw love::Exception("The '%s' blend mode must be used with premultiplied alpha.", modestr); + break; + default: + break; + } + } + switch (mode) { case BLEND_ALPHA: @@ -1082,6 +1137,12 @@ srcA = GL_ZERO; dstRGB = dstA = GL_ONE; break; + case BLEND_LIGHTEN: + func = GL_MAX; + break; + case BLEND_DARKEN: + func = GL_MIN; + break; case BLEND_SCREEN: srcRGB = srcA = GL_ONE; dstRGB = dstA = GL_ONE_MINUS_SRC_COLOR; @@ -1355,7 +1416,7 @@ delete[] coords; } -void Graphics::arc(DrawMode mode, float x, float y, float radius, float angle1, float angle2, int points) +void Graphics::arc(DrawMode drawmode, ArcMode arcmode, float x, float y, float radius, float angle1, float angle2, int points) { // Nothing to display with no points or equal angles. (Or is there with line mode?) if (points <= 0 || angle1 == angle2) @@ -1364,7 +1425,7 @@ // Oh, you want to draw a circle? if (fabs(angle1 - angle2) >= 2.0f * (float) LOVE_M_PI) { - circle(mode, x, y, radius, points); + circle(drawmode, x, y, radius, points); return; } @@ -1373,20 +1434,62 @@ if (angle_shift == 0.0) return; + // Prevent the connecting line from being drawn if a closed line arc has a + // small angle. Avoids some visual issues when connected lines are at sharp + // angles, due to the miter line join drawing code. + if (drawmode == DRAW_LINE && arcmode == ARC_CLOSED && fabsf(angle1 - angle2) < LOVE_TORAD(4)) + arcmode = ARC_OPEN; + + // Quick fix for the last part of a filled open arc not being drawn (because + // polygon(DRAW_FILL, ...) doesn't work without a closed loop of vertices.) + if (drawmode == DRAW_FILL && arcmode == ARC_OPEN) + arcmode = ARC_CLOSED; + float phi = angle1; - int num_coords = (points + 3) * 2; - float *coords = new float[num_coords]; - coords[0] = coords[num_coords - 2] = x; - coords[1] = coords[num_coords - 1] = y; - for (int i = 0; i <= points; ++i, phi += angle_shift) + float *coords = nullptr; + int num_coords = 0; + + const auto createPoints = [&](float *coordinates) + { + for (int i = 0; i <= points; ++i, phi += angle_shift) + { + coordinates[2 * i + 0] = x + radius * cosf(phi); + coordinates[2 * i + 1] = y + radius * sinf(phi); + } + }; + + if (arcmode == ARC_PIE) { - coords[2 * (i+1)] = x + radius * cosf(phi); - coords[2 * (i+1) + 1] = y + radius * sinf(phi); + num_coords = (points + 3) * 2; + coords = new float[num_coords]; + + coords[0] = coords[num_coords - 2] = x; + coords[1] = coords[num_coords - 1] = y; + + createPoints(coords + 2); + } + else if (arcmode == ARC_OPEN) + { + num_coords = (points + 1) * 2; + coords = new float[num_coords]; + + createPoints(coords); + } + else // ARC_CLOSED + { + num_coords = (points + 2) * 2; + coords = new float[num_coords]; + + createPoints(coords); + + // Connect the ends of the arc. + coords[num_coords - 2] = coords[0]; + coords[num_coords - 1] = coords[1]; } // NOTE: We rely on polygon() using GL_TRIANGLE_FAN, when fill mode is used. - polygon(mode, coords, num_coords); + polygon(drawmode, coords, num_coords); delete[] coords; } @@ -1553,14 +1656,13 @@ double Graphics::getSystemLimit(SystemLimit limittype) const { + GLfloat limits[2]; + switch (limittype) { case Graphics::LIMIT_POINT_SIZE: - { - GLfloat limits[2]; - glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, limits); - return (double) limits[1]; - } + glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, limits); + return (double) limits[1]; case Graphics::LIMIT_TEXTURE_SIZE: return (double) gl.getMaxTextureSize(); case Graphics::LIMIT_MULTI_CANVAS: @@ -1580,6 +1682,8 @@ return Canvas::isMultiFormatMultiCanvasSupported(); case SUPPORT_CLAMP_ZERO: return gl.isClampZeroTextureWrapSupported(); + case SUPPORT_LIGHTEN: + return GLAD_VERSION_1_4 || GLAD_ES_VERSION_3_0 || GLAD_EXT_blend_minmax; default: return false; } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Graphics.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Graphics.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Graphics.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Graphics.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -62,6 +62,12 @@ { public: + struct OptionalColorf + { + float r, g, b, a; + bool enabled; + }; + Graphics(); virtual ~Graphics(); @@ -92,7 +98,7 @@ /** * Clears each active canvas to a different color. **/ - void clear(const std::vector &colors); + void clear(const std::vector &colors); /** * Discards the contents of the screen. @@ -414,7 +420,8 @@ /** * Draws an arc using the specified arguments. - * @param mode The mode of drawing (line/filled). + * @param drawmode The mode of drawing (line/filled). + * @param arcmode The type of arc. * @param x X-coordinate. * @param y Y-coordinate. * @param radius Radius of the arc. @@ -422,7 +429,7 @@ * @param angle2 The angle at which the arc terminates. * @param points Number of points to use to draw the arc. **/ - void arc(DrawMode mode, float x, float y, float radius, float angle1, float angle2, int points = 10); + void arc(DrawMode drawmode, ArcMode arcmode, float x, float y, float radius, float angle1, float angle2, int points = 10); /** * Draws a polygon with an arbitrary number of vertices. diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Image.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Image.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Image.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Image.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -29,10 +29,10 @@ #ifdef LOVE_ANDROID // log2 is not declared in the math.h shipped with the Android NDK #include -inline double log2( double n ) +inline double log2(double n) { // log(n)/log(2) is log2. - return std::log( n ) / std::log( 2 ); + return std::log(n) / std::log(2); } #endif @@ -202,11 +202,8 @@ if (flags.mipmaps && !isCompressed() && (GLAD_ES_VERSION_2_0 || GLAD_VERSION_3_0 || GLAD_ARB_framebuffer_object)) { - // Driver bug: http://www.opengl.org/wiki/Common_Mistakes#Automatic_mipmap_generation -#if defined(LOVE_WINDOWS) || defined(LOVE_LINUX) - if (gl.getVendor() == OpenGL::VENDOR_AMD) + if (gl.bugs.generateMipmapsRequiresTexture2DEnable) glEnable(GL_TEXTURE_2D); -#endif glGenerateMipmap(GL_TEXTURE_2D); } @@ -751,7 +748,7 @@ case CompressedImageData::FORMAT_ASTC_10x10: case CompressedImageData::FORMAT_ASTC_12x10: case CompressedImageData::FORMAT_ASTC_12x12: - return /*GLAD_ES_VERSION_3_2 ||*/ GLAD_KHR_texture_compression_astc_ldr; + return GLAD_ES_VERSION_3_2 || GLAD_KHR_texture_compression_astc_ldr; default: return false; } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Image.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Image.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Image.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Image.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Mesh.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Mesh.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Mesh.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Mesh.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Mesh.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Mesh.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Mesh.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Mesh.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/OpenGL.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/OpenGL.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/OpenGL.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/OpenGL.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -90,6 +90,17 @@ initVendor(); initMatrices(); + bugs = {}; + +#if defined(LOVE_WINDOWS) || defined(LOVE_LINUX) + // See the comments in OpenGL.h. + if (getVendor() == VENDOR_AMD) + { + bugs.clearRequiresDriverTextureStateUpdate = true; + bugs.generateMipmapsRequiresTexture2DEnable = true; + } +#endif + contextInitialized = true; return true; @@ -136,19 +147,14 @@ state.boundTextures.clear(); state.boundTextures.resize(maxTextureUnits, 0); - GLenum curgltextureunit; - glGetIntegerv(GL_ACTIVE_TEXTURE, (GLint *) &curgltextureunit); - - state.curTextureUnit = (int) curgltextureunit - GL_TEXTURE0; - - // Retrieve currently bound textures for each texture unit. for (int i = 0; i < (int) state.boundTextures.size(); i++) { glActiveTexture(GL_TEXTURE0 + i); - glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint *) &state.boundTextures[i]); + glBindTexture(GL_TEXTURE_2D, 0); } - glActiveTexture(curgltextureunit); + glActiveTexture(GL_TEXTURE0); + state.curTextureUnit = 0; createDefaultTexture(); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/OpenGL.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/OpenGL.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/OpenGL.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/OpenGL.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -169,6 +169,49 @@ int framebufferBinds; } stats; + struct Bugs + { + /** + * On AMD's Windows (and probably Linux) drivers, + * glBindFramebuffer + glClear + glBindFramebuffer + draw(fbo_tex) won't + * work unless there's some kind of draw or state change which causes + * the driver to update the texture's contents (just drawing the texture + * won't always do it, with this driver bug). + * Activating shader program 0 and then activating the actual program + * seems to always 'fix' it for me. + * Bug observed January 2016 with multiple AMD GPUs and driver versions. + * https://love2d.org/forums/viewtopic.php?f=4&t=81496 + **/ + bool clearRequiresDriverTextureStateUpdate; + + /** + * AMD's Windows drivers don't always properly generate mipmaps unless + * glEnable(GL_TEXTURE_2D) is called directly before glGenerateMipmap. + * This only applies to legacy and Compatibility Profile contexts, of + * course. + * https://www.opengl.org/wiki/Common_Mistakes#Automatic_mipmap_generation + **/ + bool generateMipmapsRequiresTexture2DEnable; + + /** + * Other bugs which have workarounds that don't use conditional code at + * the moment: + * + * Kepler nvidia GPUs in at least OS X 10.10 and 10.11 fail to render + * geometry with glDrawElements if index data comes from a Buffer Object + * and vertex data doesn't. One workaround is to use a CPU-side index + * array when there's also a CPU-side vertex array. + * https://love2d.org/forums/viewtopic.php?f=4&t=81401&start=10 + * + * Some android drivers don't seem to initialize the sampler index + * values of sampler uniforms in shaders to 0 (which is required by the + * GLSL ES specification) when linking the shader program. One + * workaround is to always set the values of said sampler uniforms to 0 + * just after linking the shader program. + * https://love2d.org/forums/viewtopic.php?f=4&t=81458 + **/ + } bugs; + OpenGL(); /** diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/ParticleSystem.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/ParticleSystem.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/ParticleSystem.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/ParticleSystem.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/ParticleSystem.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/ParticleSystem.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/ParticleSystem.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/ParticleSystem.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Polyline.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Polyline.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Polyline.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Polyline.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Polyline.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Polyline.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Polyline.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Polyline.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Shader.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Shader.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Shader.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Shader.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -178,6 +178,11 @@ uniforms.clear(); + GLint activeprogram = 0; + glGetIntegerv(GL_CURRENT_PROGRAM, &activeprogram); + + glUseProgram(program); + GLint numuniforms; glGetProgramiv(program, GL_ACTIVE_UNIFORMS, &numuniforms); @@ -195,6 +200,12 @@ u.location = glGetUniformLocation(program, u.name.c_str()); u.baseType = getUniformBaseType(u.type); + // Initialize all samplers to 0. Both GLSL and GLSL ES are supposed to + // do this themselves, but some Android devices (galaxy tab 3 and 4) + // don't seem to do it... + if (u.baseType == UNIFORM_SAMPLER) + glUniform1i(u.location, 0); + // glGetActiveUniform appends "[0]" to the end of array uniform names... if (u.name.length() > 3) { @@ -211,6 +222,8 @@ if (u.location != -1) uniforms[u.name] = u; } + + glUseProgram(activeprogram); } bool Shader::loadVolatile() @@ -883,6 +896,12 @@ case GL_FLOAT_MAT2: case GL_FLOAT_MAT3: case GL_FLOAT_MAT4: + case GL_FLOAT_MAT2x3: + case GL_FLOAT_MAT2x4: + case GL_FLOAT_MAT3x2: + case GL_FLOAT_MAT3x4: + case GL_FLOAT_MAT4x2: + case GL_FLOAT_MAT4x3: return UNIFORM_FLOAT; case GL_BOOL: case GL_BOOL_VEC2: @@ -890,8 +909,22 @@ case GL_BOOL_VEC4: return UNIFORM_BOOL; case GL_SAMPLER_1D: + case GL_SAMPLER_1D_SHADOW: + case GL_SAMPLER_1D_ARRAY: + case GL_SAMPLER_1D_ARRAY_SHADOW: case GL_SAMPLER_2D: + case GL_SAMPLER_2D_MULTISAMPLE: + case GL_SAMPLER_2D_MULTISAMPLE_ARRAY: + case GL_SAMPLER_2D_RECT: + case GL_SAMPLER_2D_RECT_SHADOW: + case GL_SAMPLER_2D_SHADOW: + case GL_SAMPLER_2D_ARRAY: + case GL_SAMPLER_2D_ARRAY_SHADOW: case GL_SAMPLER_3D: + case GL_SAMPLER_CUBE: + case GL_SAMPLER_CUBE_SHADOW: + case GL_SAMPLER_CUBE_MAP_ARRAY: + case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW: return UNIFORM_SAMPLER; default: return UNIFORM_UNKNOWN; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Shader.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Shader.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Shader.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Shader.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -194,6 +194,11 @@ const std::map &getBoundRetainables() const; + GLuint getProgram() const + { + return program; + } + static std::string getGLSLVersion(); static bool isSupported(); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/SpriteBatch.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/SpriteBatch.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/SpriteBatch.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/SpriteBatch.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/SpriteBatch.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/SpriteBatch.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/SpriteBatch.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/SpriteBatch.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Text.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Text.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Text.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Text.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Text.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Text.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Text.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Text.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Video.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Video.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Video.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Video.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Video.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Video.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/Video.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/Video.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Canvas.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Canvas.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Canvas.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Canvas.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Canvas.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Canvas.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Canvas.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Canvas.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Font.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Font.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Font.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Font.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -21,6 +21,7 @@ // LOVE #include "common/config.h" #include "wrap_Font.h" +#include "wrap_Text.h" // C++ #include @@ -56,13 +57,16 @@ int w_Font_getWrap(lua_State *L) { Font *t = luax_checkfont(L, 1); - const char *str = luaL_checkstring(L, 2); + + std::vector text; + luax_checkcoloredstring(L, 2, text); + float wrap = (float) luaL_checknumber(L, 3); int max_width = 0; std::vector lines; std::vector widths; - luax_catchexcept(L, [&]() { t->getWrap(str, wrap, lines, &widths); }); + luax_catchexcept(L, [&]() { t->getWrap(text, wrap, lines, &widths); }); for (int width : widths) max_width = std::max(max_width, width); diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Font.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Font.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Font.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Font.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Graphics.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Graphics.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Graphics.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Graphics.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -47,6 +47,13 @@ #define instance() (Module::getInstance(Module::M_GRAPHICS)) +static int luax_checkgraphicscreated(lua_State *L) +{ + if (!instance()->isCreated()) + return luaL_error(L, "love.graphics cannot function without a window!"); + return 0; +} + int w_reset(lua_State *) { instance()->reset(); @@ -55,19 +62,26 @@ int w_clear(lua_State *L) { - std::vector colors(1); + Colorf color; if (lua_isnoneornil(L, 1)) - colors[0].set(0, 0, 0, 0); + color.set(0, 0, 0, 0); else if (lua_istable(L, 1)) { - colors.resize((size_t) lua_gettop(L)); + std::vector colors((size_t) lua_gettop(L)); for (int i = 0; i < lua_gettop(L); i++) { + if (lua_isnoneornil(L, i + 1) || luax_objlen(L, i + 1) == 0) + { + colors[i].enabled = false; + continue; + } + for (int j = 1; j <= 4; j++) lua_rawgeti(L, i + 1, j); + colors[i].enabled = true; colors[i].r = (float) luaL_checknumber(L, -4); colors[i].g = (float) luaL_checknumber(L, -3); colors[i].b = (float) luaL_checknumber(L, -2); @@ -75,22 +89,19 @@ lua_pop(L, 4); } + + luax_catchexcept(L, [&]() { instance()->clear(colors); }); + return 0; } else { - colors[0].r = (float) luaL_checknumber(L, 1); - colors[0].g = (float) luaL_checknumber(L, 2); - colors[0].b = (float) luaL_checknumber(L, 3); - colors[0].a = (float) luaL_optnumber(L, 4, 255); + color.r = (float) luaL_checknumber(L, 1); + color.g = (float) luaL_checknumber(L, 2); + color.b = (float) luaL_checknumber(L, 3); + color.a = (float) luaL_optnumber(L, 4, 255); } - luax_catchexcept(L, [&]() { - if (colors.size() == 1) - instance()->clear(colors[0]); - else - instance()->clear(colors); - }); - + luax_catchexcept(L, [&]() { instance()->clear(color); }); return 0; } @@ -286,6 +297,8 @@ int w_newImage(lua_State *L) { + luax_checkgraphicscreated(L); + std::vector data; std::vector cdata; @@ -396,6 +409,8 @@ int w_newQuad(lua_State *L) { + luax_checkgraphicscreated(L); + Quad::Viewport v; v.x = luaL_checknumber(L, 1); v.y = luaL_checknumber(L, 2); @@ -413,6 +428,8 @@ int w_newFont(lua_State *L) { + luax_checkgraphicscreated(L); + Font *font = nullptr; // Convert to Rasterizer, if necessary. @@ -439,6 +456,8 @@ int w_newImageFont(lua_State *L) { + luax_checkgraphicscreated(L); + // filter for glyphs Texture::Filter filter = instance()->getDefaultFilter(); @@ -479,6 +498,8 @@ int w_newSpriteBatch(lua_State *L) { + luax_checkgraphicscreated(L); + Texture *texture = luax_checktexture(L, 1); int size = (int) luaL_optnumber(L, 2, 1000); Mesh::Usage usage = Mesh::USAGE_DYNAMIC; @@ -501,6 +522,8 @@ int w_newParticleSystem(lua_State *L) { + luax_checkgraphicscreated(L); + Texture *texture = luax_checktexture(L, 1); lua_Number size = luaL_optnumber(L, 2, 1000); ParticleSystem *t = 0; @@ -518,6 +541,8 @@ int w_newCanvas(lua_State *L) { + luax_checkgraphicscreated(L); + // check if width and height are given. else default to screen dimensions. int width = (int) luaL_optnumber(L, 1, instance()->getWidth()); int height = (int) luaL_optnumber(L, 2, instance()->getHeight()); @@ -543,6 +568,8 @@ int w_newShader(lua_State *L) { + luax_checkgraphicscreated(L); + // clamp stack to 2 elements lua_settop(L, 2); @@ -702,19 +729,10 @@ v.s = (float) luaL_optnumber(L, -6, 0.0); v.t = (float) luaL_optnumber(L, -5, 0.0); - Colorf c = { - (float) luaL_optnumber(L, -4, 255) / 255.0f, - (float) luaL_optnumber(L, -3, 255) / 255.0f, - (float) luaL_optnumber(L, -2, 255) / 255.0f, - (float) luaL_optnumber(L, -1, 255) / 255.0f - }; - - gammaCorrectColor(c); - - v.r = (unsigned char) (c.r * 255.0f); - v.g = (unsigned char) (c.g * 255.0f); - v.b = (unsigned char) (c.b * 255.0f); - v.a = (unsigned char) (c.a * 255.0f); + v.r = (unsigned char) luaL_optnumber(L, -4, 255); + v.g = (unsigned char) luaL_optnumber(L, -3, 255); + v.b = (unsigned char) luaL_optnumber(L, -2, 255); + v.a = (unsigned char) luaL_optnumber(L, -1, 255); lua_pop(L, 9); vertices.push_back(v); @@ -853,6 +871,8 @@ int w_newMesh(lua_State *L) { + luax_checkgraphicscreated(L); + // Check first argument: table or number of vertices. int arg1type = lua_type(L, 1); if (arg1type != LUA_TTABLE && arg1type != LUA_TNUMBER) @@ -873,6 +893,8 @@ int w_newText(lua_State *L) { + luax_checkgraphicscreated(L); + Font *font = luax_checkfont(L, 1); Text *t = nullptr; @@ -893,6 +915,8 @@ int w_newVideo(lua_State *L) { + luax_checkgraphicscreated(L); + if (!luax_istype(L, 1, VIDEO_VIDEO_STREAM_ID)) luax_convobj(L, 1, "video", "newVideoStream"); @@ -1716,7 +1740,7 @@ Graphics::DrawMode mode; const char *str = luaL_checkstring(L, 1); if (!Graphics::getConstant(str, mode)) - return luaL_error(L, "Incorrect draw mode %s", str); + return luaL_error(L, "Invalid draw mode: %s", str); float x = (float)luaL_checknumber(L, 2); float y = (float)luaL_checknumber(L, 3); @@ -1747,7 +1771,7 @@ Graphics::DrawMode mode; const char *str = luaL_checkstring(L, 1); if (!Graphics::getConstant(str, mode)) - return luaL_error(L, "Incorrect draw mode %s", str); + return luaL_error(L, "Invalid draw mode: %s", str); float x = (float)luaL_checknumber(L, 2); float y = (float)luaL_checknumber(L, 3); @@ -1767,7 +1791,7 @@ Graphics::DrawMode mode; const char *str = luaL_checkstring(L, 1); if (!Graphics::getConstant(str, mode)) - return luaL_error(L, "Incorrect draw mode %s", str); + return luaL_error(L, "Invalid draw mode: %s", str); float x = (float)luaL_checknumber(L, 2); float y = (float)luaL_checknumber(L, 3); @@ -1786,23 +1810,41 @@ int w_arc(lua_State *L) { - Graphics::DrawMode mode; - const char *str = luaL_checkstring(L, 1); - if (!Graphics::getConstant(str, mode)) - return luaL_error(L, "Incorrect draw mode %s", str); + Graphics::DrawMode drawmode; + const char *drawstr = luaL_checkstring(L, 1); + if (!Graphics::getConstant(drawstr, drawmode)) + return luaL_error(L, "Invalid draw mode: %s", drawstr); - float x = (float)luaL_checknumber(L, 2); - float y = (float)luaL_checknumber(L, 3); - float radius = (float)luaL_checknumber(L, 4); - float angle1 = (float)luaL_checknumber(L, 5); - float angle2 = (float)luaL_checknumber(L, 6); - int points; - if (lua_isnoneornil(L, 7)) - points = radius > 10 ? (int)(radius) : 10; - else - points = (int) luaL_checknumber(L, 7); + int startidx = 2; + + Graphics::ArcMode arcmode = Graphics::ARC_PIE; + + if (lua_type(L, 2) == LUA_TSTRING) + { + const char *arcstr = luaL_checkstring(L, 2); + if (!Graphics::getConstant(arcstr, arcmode)) + return luaL_error(L, "Invalid arc mode: %s", arcstr); + + startidx = 3; + } + + float x = (float) luaL_checknumber(L, startidx + 0); + float y = (float) luaL_checknumber(L, startidx + 1); + float radius = (float) luaL_checknumber(L, startidx + 2); + float angle1 = (float) luaL_checknumber(L, startidx + 3); + float angle2 = (float) luaL_checknumber(L, startidx + 4); + + int points = (int) radius; + float angle = fabs(angle1 - angle2); + + // The amount of points is based on the fraction of the circle created by the arc. + if (angle < 2.0f * (float) LOVE_M_PI) + points *= angle / (2.0f * (float) LOVE_M_PI); + + points = std::max(points, 10); + points = (int) luaL_optnumber(L, startidx + 5, points); - instance()->arc(mode, x, y, radius, angle1, angle2, points); + instance()->arc(drawmode, arcmode, x, y, radius, angle1, angle2, points); return 0; } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Graphics.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Graphics.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Graphics.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Graphics.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Graphics.lua love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Graphics.lua --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Graphics.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Graphics.lua 2016-02-13 14:37:40.000000000 +0000 @@ -3,7 +3,7 @@ -- There is a matching delimiter at the bottom of the file. --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -82,7 +82,7 @@ return c < 0.0031308 ? c * 12.92 : 1.055 * pow(c, 1.0 / 2.4) - 0.055; } vec3 linearToGammaPrecise(vec3 c) { - bvec3 lt = lessThan(c, vec3(0.0031308)); + bvec3 lt = lessThanEqual(c, vec3(0.0031308)); c.r = lt.r ? c.r * 12.92 : 1.055 * pow(c.r, 1.0 / 2.4) - 0.055; c.g = lt.g ? c.g * 12.92 : 1.055 * pow(c.g, 1.0 / 2.4) - 0.055; c.b = lt.b ? c.b * 12.92 : 1.055 * pow(c.b, 1.0 / 2.4) - 0.055; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Image.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Image.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Image.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Image.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Image.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Image.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Image.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Image.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Mesh.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Mesh.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Mesh.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Mesh.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Mesh.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Mesh.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Mesh.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Mesh.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_ParticleSystem.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_ParticleSystem.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_ParticleSystem.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_ParticleSystem.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_ParticleSystem.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_ParticleSystem.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_ParticleSystem.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_ParticleSystem.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Shader.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Shader.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Shader.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Shader.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -184,7 +184,7 @@ for (int j = 0; j < (int) dimension; j++) { // the fourth component (alpha) is always already linear, if it exists. - if (gammacorrect && i < 4) + if (gammacorrect && j < 3) values[i * dimension + j] = m.gammaToLinear(values[i * dimension + j] / 255.0f); else values[i * dimension + j] /= 255.0f; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Shader.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Shader.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Shader.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Shader.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_SpriteBatch.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_SpriteBatch.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_SpriteBatch.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_SpriteBatch.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_SpriteBatch.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_SpriteBatch.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_SpriteBatch.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_SpriteBatch.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Text.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Text.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Text.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Text.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -222,6 +222,15 @@ return 1; } +int w_Text_getDimensions(lua_State *L) +{ + Text *t = luax_checktext(L, 1); + int index = (int) luaL_optnumber(L, 2, 0) - 1; + lua_pushnumber(L, t->getWidth(index)); + lua_pushnumber(L, t->getHeight(index)); + return 2; +} + static const luaL_Reg w_Text_functions[] = { { "set", w_Text_set }, @@ -233,6 +242,7 @@ { "getFont", w_Text_getFont }, { "getWidth", w_Text_getWidth }, { "getHeight", w_Text_getHeight }, + { "getDimensions", w_Text_getDimensions }, { 0, 0 } }; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Text.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Text.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Text.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Text.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Video.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Video.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Video.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Video.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Video.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Video.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Video.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Video.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Video.lua love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Video.lua --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/opengl/wrap_Video.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/opengl/wrap_Video.lua 2016-02-13 14:37:40.000000000 +0000 @@ -3,7 +3,7 @@ -- There is a matching delimiter at the bottom of the file. --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/ParticleSystem.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/ParticleSystem.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/ParticleSystem.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/ParticleSystem.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/ParticleSystem.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/ParticleSystem.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/ParticleSystem.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/ParticleSystem.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Quad.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Quad.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Quad.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Quad.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Quad.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Quad.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Quad.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Quad.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Texture.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Texture.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Texture.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Texture.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Texture.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Texture.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Texture.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Texture.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Volatile.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Volatile.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Volatile.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Volatile.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Volatile.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Volatile.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/Volatile.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/Volatile.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Quad.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Quad.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Quad.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Quad.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Quad.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Quad.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Quad.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Quad.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Texture.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Texture.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Texture.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Texture.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Texture.h love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Texture.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/graphics/wrap_Texture.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/graphics/wrap_Texture.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/CompressedImageData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/CompressedImageData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/CompressedImageData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/CompressedImageData.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/CompressedImageData.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/CompressedImageData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/CompressedImageData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/CompressedImageData.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/ImageData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/ImageData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/ImageData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/ImageData.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/ImageData.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/ImageData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/ImageData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/ImageData.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/Image.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/Image.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/Image.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/Image.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ASTCHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ASTCHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ASTCHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ASTCHandler.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ASTCHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ASTCHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ASTCHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ASTCHandler.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/CompressedFormatHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/CompressedFormatHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/CompressedFormatHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/CompressedFormatHandler.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/CompressedImageData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/CompressedImageData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/CompressedImageData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/CompressedImageData.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/CompressedImageData.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/CompressedImageData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/CompressedImageData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/CompressedImageData.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ddsHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ddsHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ddsHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ddsHandler.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ddsHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ddsHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ddsHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ddsHandler.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/FormatHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/FormatHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/FormatHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/FormatHandler.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/FormatHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/FormatHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/FormatHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/FormatHandler.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/Image.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/Image.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/Image.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/Image.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ImageData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ImageData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ImageData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ImageData.cpp 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ImageData.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ImageData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/ImageData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/ImageData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/Image.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/Image.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/Image.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/Image.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/KTXHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/KTXHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/KTXHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/KTXHandler.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/KTXHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/KTXHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/KTXHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/KTXHandler.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PKMHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PKMHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PKMHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PKMHandler.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PKMHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PKMHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PKMHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PKMHandler.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PNGHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PNGHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PNGHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PNGHandler.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PNGHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PNGHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PNGHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PNGHandler.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PVRHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PVRHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PVRHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PVRHandler.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PVRHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PVRHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/PVRHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/PVRHandler.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/STBHandler.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/STBHandler.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/STBHandler.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/STBHandler.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/STBHandler.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/STBHandler.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/magpie/STBHandler.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/magpie/STBHandler.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_CompressedImageData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_CompressedImageData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_CompressedImageData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_CompressedImageData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_CompressedImageData.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_CompressedImageData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_CompressedImageData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_CompressedImageData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_Image.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_Image.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_Image.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_Image.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_ImageData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_ImageData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_ImageData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_ImageData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_ImageData.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_ImageData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_ImageData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_ImageData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_ImageData.lua love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_ImageData.lua --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_ImageData.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_ImageData.lua 2016-02-13 14:37:39.000000000 +0000 @@ -3,7 +3,7 @@ -- There is a matching delimiter at the bottom of the file. --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,12 +42,12 @@ iw = iw or idw ih = ih or idh - if type(ix) ~= "number" then error("Invalid argument #2 to ImageData:mapPixel (expected number)", 2) end - if type(iy) ~= "number" then error("Invalid argument #3 to ImageData:mapPixel (expected number)", 2) end - if type(iw) ~= "number" then error("Invalid argument #4 to ImageData:mapPixel (expected number)", 2) end - if type(ih) ~= "number" then error("Invalid argument #5 to ImageData:mapPixel (expected number)", 2) end + if type(ix) ~= "number" then error("bad argument #2 to ImageData:mapPixel (expected number)", 2) end + if type(iy) ~= "number" then error("bad argument #3 to ImageData:mapPixel (expected number)", 2) end + if type(iw) ~= "number" then error("bad argument #4 to ImageData:mapPixel (expected number)", 2) end + if type(ih) ~= "number" then error("bad argument #5 to ImageData:mapPixel (expected number)", 2) end - if type(func) ~= "function" then error("Invalid argument #1 to ImageData:mapPixel (expected function)", 2) end + if type(func) ~= "function" then error("bad argument #1 to ImageData:mapPixel (expected function)", 2) end if not (inside(ix, iy, idw, idh) and inside(ix+iw-1, iy+ih-1, idw, idh)) then error("Invalid rectangle dimensions", 2) end -- performAtomic and mapPixelUnsafe have Lua-C API and FFI versions. @@ -141,6 +141,9 @@ end function ImageData:getPixel(x, y) + if type(x) ~= "number" then error("bad argument #1 to ImageData:getPixel (expected number)", 2) end + if type(y) ~= "number" then error("bad argument #2 to ImageData:getPixel (expected number)", 2) end + local p = objectcache[self] if not inside(x, y, p.width, p.height) then error("Attempt to get out-of-range pixel!", 2) end @@ -154,15 +157,23 @@ local temppixel = ffi.new("ImageData_Pixel") -function ImageData:setPixel(x, y, r, g, b, a) - local p = objectcache[self] - if not inside(x, y, p.width, p.height) then error("Attempt to set out-of-range pixel!", 2) end +function ImageData:setPixel(x, y, r, g, b, a) + if type(x) ~= "number" then error("bad argument #1 to ImageData:setPixel (expected number)", 2) end + if type(y) ~= "number" then error("bad argument #2 to ImageData:setPixel (expected number)", 2) end if type(r) == "table" then local t = r r, g, b, a = t[1], t[2], t[3], t[4] end + if type(r) ~= "number" then error("bad red color component argument to ImageData:setPixel (expected number)", 2) end + if type(g) ~= "number" then error("bad green color component argument to ImageData:setPixel (expected number)", 2) end + if type(b) ~= "number" then error("bad blue color component argument to ImageData:setPixel (expected number)", 2) end + if a ~= nil and type(a) ~= "number" then error("bad alpha color component argument to ImageData:setPixel (expected number)", 2) end + + local p = objectcache[self] + if not inside(x, y, p.width, p.height) then error("Attempt to set out-of-range pixel!", 2) end + temppixel.r = r temppixel.g = g temppixel.b = b diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_Image.h love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_Image.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/image/wrap_Image.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/image/wrap_Image.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/Joystick.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/Joystick.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/Joystick.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/Joystick.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/Joystick.h love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/Joystick.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/Joystick.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/Joystick.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/JoystickModule.h love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/JoystickModule.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/JoystickModule.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/JoystickModule.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/Joystick.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/Joystick.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/Joystick.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/Joystick.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/Joystick.h love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/Joystick.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/Joystick.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/Joystick.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/JoystickModule.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/JoystickModule.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/JoystickModule.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/JoystickModule.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/JoystickModule.h love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/JoystickModule.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/sdl/JoystickModule.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/sdl/JoystickModule.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_Joystick.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_Joystick.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_Joystick.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_Joystick.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_Joystick.h love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_Joystick.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_Joystick.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_Joystick.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_JoystickModule.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_JoystickModule.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_JoystickModule.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_JoystickModule.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_JoystickModule.h love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_JoystickModule.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/joystick/wrap_JoystickModule.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/joystick/wrap_JoystickModule.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/Keyboard.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/Keyboard.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/Keyboard.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/Keyboard.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -368,7 +368,7 @@ {"nonusbackslash", SCANCODE_NONUSBACKSLASH}, {"application", SCANCODE_APPLICATION}, {"power", SCANCODE_POWER}, - {"=", SCANCODE_KP_EQUALS}, + {"kp=", SCANCODE_KP_EQUALS}, {"f13", SCANCODE_F13}, {"f14", SCANCODE_F14}, {"f15", SCANCODE_F15}, diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/Keyboard.h love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/Keyboard.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/Keyboard.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/Keyboard.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/sdl/Keyboard.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/sdl/Keyboard.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/sdl/Keyboard.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/sdl/Keyboard.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -55,6 +55,7 @@ for (Key key : keylist) { SDL_Scancode scancode = SDL_GetScancodeFromKey(keymap[key]); + if (state[scancode]) return true; } @@ -68,11 +69,9 @@ for (Scancode scancode : scancodelist) { - SDL_Scancode sdlscancode = SDL_SCANCODE_UNKNOWN; - if (!scancodes.find(scancode, sdlscancode)) - continue; + SDL_Scancode sdlcode = SDL_SCANCODE_UNKNOWN; - if (state[sdlscancode]) + if (scancodes.find(scancode, sdlcode) && state[sdlcode]) return true; } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/sdl/Keyboard.h love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/sdl/Keyboard.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/sdl/Keyboard.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/sdl/Keyboard.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/wrap_Keyboard.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/wrap_Keyboard.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/wrap_Keyboard.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/wrap_Keyboard.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/wrap_Keyboard.h love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/wrap_Keyboard.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/keyboard/wrap_Keyboard.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/keyboard/wrap_Keyboard.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/love/love.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/love/love.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/love/love.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/love/love.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/love/love.h love-unstable-0.10.1~pre2723ppa1/src/modules/love/love.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/love/love.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/love/love.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/BezierCurve.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/BezierCurve.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/BezierCurve.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/BezierCurve.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/BezierCurve.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/BezierCurve.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/BezierCurve.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/BezierCurve.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/CompressedData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/CompressedData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/CompressedData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/CompressedData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/CompressedData.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/CompressedData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/CompressedData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/CompressedData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/Compressor.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/Compressor.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/Compressor.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/Compressor.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/Compressor.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/Compressor.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/Compressor.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/Compressor.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/MathModule.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/MathModule.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/MathModule.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/MathModule.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -213,7 +213,7 @@ **/ float Math::linearToGamma(float c) const { - if (c < 0.0031308f) + if (c <= 0.0031308f) return c * 12.92f; else return 1.055f * powf(c, 1.0f / 2.4f) - 0.055f; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/MathModule.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/MathModule.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/MathModule.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/MathModule.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/RandomGenerator.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/RandomGenerator.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/RandomGenerator.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/RandomGenerator.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/RandomGenerator.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/RandomGenerator.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/RandomGenerator.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/RandomGenerator.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_BezierCurve.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_BezierCurve.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_BezierCurve.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_BezierCurve.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_BezierCurve.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_BezierCurve.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_BezierCurve.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_BezierCurve.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_CompressedData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_CompressedData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_CompressedData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_CompressedData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_CompressedData.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_CompressedData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_CompressedData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_CompressedData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_Math.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_Math.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_Math.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_Math.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_Math.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_Math.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_Math.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_Math.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_Math.lua love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_Math.lua --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_Math.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_Math.lua 2016-02-13 14:37:39.000000000 +0000 @@ -3,7 +3,7 @@ -- There is a matching delimiter at the bottom of the file. --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_RandomGenerator.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_RandomGenerator.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_RandomGenerator.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_RandomGenerator.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -126,7 +126,7 @@ [](Proxy *p) -> double // random() { // FIXME: We need better type-checking... - if (!typeFlags[p->type][MATH_RANDOM_GENERATOR_ID]) + if (p == nullptr || !typeFlags[p->type][MATH_RANDOM_GENERATOR_ID]) return 0.0; RandomGenerator *rng = (RandomGenerator *) p->object; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_RandomGenerator.h love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_RandomGenerator.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_RandomGenerator.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_RandomGenerator.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_RandomGenerator.lua love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_RandomGenerator.lua --- love-unstable-0.10.0~pre2657ppa2/src/modules/math/wrap_RandomGenerator.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/math/wrap_RandomGenerator.lua 2016-02-13 14:37:39.000000000 +0000 @@ -3,7 +3,7 @@ -- There is a matching delimiter at the bottom of the file. --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/Cursor.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/Cursor.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/Cursor.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/Cursor.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/Cursor.h love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/Cursor.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/Cursor.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/Cursor.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/Mouse.h love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/Mouse.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/Mouse.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/Mouse.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Cursor.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Cursor.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Cursor.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Cursor.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Cursor.h love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Cursor.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Cursor.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Cursor.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Mouse.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Mouse.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Mouse.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Mouse.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Mouse.h love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Mouse.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/sdl/Mouse.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/sdl/Mouse.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Cursor.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Cursor.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Cursor.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Cursor.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Cursor.h love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Cursor.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Cursor.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Cursor.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Mouse.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Mouse.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Mouse.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Mouse.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Mouse.h love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Mouse.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/mouse/wrap_Mouse.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/mouse/wrap_Mouse.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Body.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Body.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Body.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Body.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Body.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Body.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Body.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Body.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Body.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Body.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Body.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Body.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Body.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Body.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Body.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Body.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/ChainShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/ChainShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/ChainShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/ChainShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/ChainShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/ChainShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/ChainShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/ChainShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/CircleShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/CircleShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/CircleShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/CircleShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/CircleShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/CircleShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/CircleShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/CircleShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Contact.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Contact.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Contact.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Contact.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Contact.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Contact.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Contact.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Contact.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/DistanceJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/DistanceJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/DistanceJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/DistanceJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/DistanceJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/DistanceJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/DistanceJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/DistanceJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/EdgeShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/EdgeShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/EdgeShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/EdgeShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/EdgeShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/EdgeShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/EdgeShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/EdgeShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Fixture.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Fixture.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Fixture.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Fixture.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Fixture.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Fixture.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Fixture.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Fixture.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/FrictionJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/FrictionJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/FrictionJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/FrictionJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/FrictionJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/FrictionJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/FrictionJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/FrictionJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/GearJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/GearJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/GearJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/GearJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/GearJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/GearJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/GearJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/GearJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Joint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Joint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Joint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Joint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Joint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Joint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Joint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Joint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MotorJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MotorJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MotorJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MotorJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -42,7 +42,7 @@ joint = (b2MotorJoint *) createJoint(&def); } -MotorJoint::MotorJoint(Body *body1, Body *body2, float correctionFactor) +MotorJoint::MotorJoint(Body *body1, Body *body2, float correctionFactor, bool collideConnected) : Joint(body1, body2) , joint(NULL) { @@ -50,6 +50,7 @@ def.Initialize(body1->body, body2->body); def.correctionFactor = correctionFactor; + def.collideConnected = collideConnected; joint = (b2MotorJoint *) createJoint(&def); } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MotorJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MotorJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MotorJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MotorJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -41,7 +41,7 @@ public: MotorJoint(Body *body1, Body* body2); - MotorJoint(Body *body1, Body* body2, float correctionFactor); + MotorJoint(Body *body1, Body* body2, float correctionFactor, bool collideConnected); virtual ~MotorJoint(); /// Set/get the target linear offset, in frame A, in meters. diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MouseJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MouseJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MouseJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MouseJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MouseJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MouseJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/MouseJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/MouseJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Physics.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Physics.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Physics.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Physics.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -268,9 +268,9 @@ return new MotorJoint(body1, body2); } -MotorJoint *Physics::newMotorJoint(Body *body1, Body *body2, float correctionFactor) +MotorJoint *Physics::newMotorJoint(Body *body1, Body *body2, float correctionFactor, bool collideConnected) { - return new MotorJoint(body1, body2, correctionFactor); + return new MotorJoint(body1, body2, correctionFactor, collideConnected); } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Physics.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Physics.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Physics.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Physics.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -257,7 +257,7 @@ * and body2. **/ MotorJoint *newMotorJoint(Body *body1, Body *body2); - MotorJoint *newMotorJoint(Body *body1, Body *body2, float correctionFactor); + MotorJoint *newMotorJoint(Body *body1, Body *body2, float correctionFactor, bool collideConnected); /** * Creates a new Fixture attaching shape to body. diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PolygonShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PolygonShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PolygonShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PolygonShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PolygonShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PolygonShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PolygonShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PolygonShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PrismaticJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PrismaticJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PrismaticJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PrismaticJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PrismaticJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PrismaticJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PrismaticJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PrismaticJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PulleyJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PulleyJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PulleyJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PulleyJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PulleyJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PulleyJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/PulleyJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/PulleyJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RevoluteJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RevoluteJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RevoluteJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RevoluteJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RevoluteJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RevoluteJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RevoluteJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RevoluteJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RopeJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RopeJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RopeJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RopeJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RopeJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RopeJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/RopeJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/RopeJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Shape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Shape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Shape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Shape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Shape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Shape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/Shape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/Shape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WeldJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WeldJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WeldJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WeldJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WeldJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WeldJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WeldJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WeldJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WheelJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WheelJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WheelJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WheelJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WheelJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WheelJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/WheelJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/WheelJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/World.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/World.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/World.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/World.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/World.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/World.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/World.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/World.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Body.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Body.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Body.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Body.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Body.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Body.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Body.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Body.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_ChainShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_ChainShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_ChainShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_ChainShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_ChainShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_ChainShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_ChainShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_ChainShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_CircleShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_CircleShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_CircleShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_CircleShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_CircleShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_CircleShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_CircleShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_CircleShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Contact.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Contact.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Contact.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Contact.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Contact.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Contact.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Contact.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Contact.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_DistanceJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_DistanceJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_DistanceJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_DistanceJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_DistanceJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_DistanceJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_DistanceJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_DistanceJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_EdgeShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_EdgeShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_EdgeShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_EdgeShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_EdgeShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_EdgeShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_EdgeShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_EdgeShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Fixture.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Fixture.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Fixture.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Fixture.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Fixture.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Fixture.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Fixture.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Fixture.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_FrictionJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_FrictionJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_FrictionJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_FrictionJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_FrictionJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_FrictionJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_FrictionJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_FrictionJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_GearJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_GearJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_GearJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_GearJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_GearJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_GearJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_GearJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_GearJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Joint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Joint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Joint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Joint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Joint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Joint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Joint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Joint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MotorJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MotorJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MotorJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MotorJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MotorJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MotorJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MotorJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MotorJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MouseJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MouseJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MouseJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MouseJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MouseJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MouseJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_MouseJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_MouseJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Physics.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Physics.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Physics.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Physics.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -419,8 +419,9 @@ if (!lua_isnoneornil(L, 3)) { float correctionFactor = (float)luaL_checknumber(L, 3); + bool collideConnected = luax_optboolean(L, 4, false); luax_catchexcept(L, [&]() { - j = instance()->newMotorJoint(body1, body2, correctionFactor); + j = instance()->newMotorJoint(body1, body2, correctionFactor, collideConnected); }); } else diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Physics.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Physics.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Physics.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Physics.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PolygonShape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PolygonShape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PolygonShape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PolygonShape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PolygonShape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PolygonShape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PolygonShape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PolygonShape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PrismaticJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PrismaticJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PrismaticJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PrismaticJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PrismaticJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PrismaticJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PrismaticJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PrismaticJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PulleyJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PulleyJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PulleyJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PulleyJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PulleyJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PulleyJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_PulleyJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_PulleyJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RevoluteJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RevoluteJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RevoluteJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RevoluteJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RevoluteJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RevoluteJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RevoluteJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RevoluteJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RopeJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RopeJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RopeJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RopeJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RopeJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RopeJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_RopeJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_RopeJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Shape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Shape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Shape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Shape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Shape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Shape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_Shape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_Shape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WeldJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WeldJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WeldJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WeldJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WeldJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WeldJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WeldJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WeldJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WheelJoint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WheelJoint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WheelJoint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WheelJoint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WheelJoint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WheelJoint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_WheelJoint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_WheelJoint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_World.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_World.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_World.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_World.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_World.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_World.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/box2d/wrap_World.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/box2d/wrap_World.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Joint.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Joint.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Joint.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Joint.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Joint.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Joint.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Joint.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Joint.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Shape.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Shape.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Shape.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Shape.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Shape.h love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Shape.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/physics/Shape.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/physics/Shape.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/Decoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/Decoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/Decoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/Decoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/CoreAudioDecoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/CoreAudioDecoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/CoreAudioDecoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/CoreAudioDecoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/CoreAudioDecoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/CoreAudioDecoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/CoreAudioDecoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/CoreAudioDecoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Decoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Decoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Decoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Decoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Decoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Decoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Decoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Decoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/FLACDecoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/FLACDecoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/FLACDecoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/FLACDecoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/FLACDecoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/FLACDecoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/FLACDecoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/FLACDecoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/GmeDecoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/GmeDecoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/GmeDecoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/GmeDecoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/GmeDecoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/GmeDecoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/GmeDecoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/GmeDecoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/ModPlugDecoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/ModPlugDecoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/ModPlugDecoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/ModPlugDecoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/ModPlugDecoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/ModPlugDecoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/ModPlugDecoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/ModPlugDecoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Mpg123Decoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Mpg123Decoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Mpg123Decoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Mpg123Decoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Mpg123Decoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Mpg123Decoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Mpg123Decoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Mpg123Decoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Sound.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Sound.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Sound.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Sound.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Sound.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Sound.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/Sound.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/Sound.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/VorbisDecoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/VorbisDecoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/VorbisDecoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/VorbisDecoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/VorbisDecoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/VorbisDecoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/VorbisDecoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/VorbisDecoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/WaveDecoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/WaveDecoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/WaveDecoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/WaveDecoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/WaveDecoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/WaveDecoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/lullaby/WaveDecoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/lullaby/WaveDecoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/Sound.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/Sound.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/Sound.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/Sound.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/SoundData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/SoundData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/SoundData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/SoundData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/SoundData.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/SoundData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/SoundData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/SoundData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/Sound.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/Sound.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/Sound.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/Sound.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Decoder.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Decoder.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Decoder.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Decoder.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Decoder.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Decoder.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Decoder.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Decoder.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Sound.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Sound.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Sound.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Sound.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_SoundData.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_SoundData.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_SoundData.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_SoundData.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_SoundData.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_SoundData.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_SoundData.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_SoundData.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_SoundData.lua love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_SoundData.lua --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_SoundData.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_SoundData.lua 2016-02-13 14:37:39.000000000 +0000 @@ -3,7 +3,7 @@ -- There is a matching delimiter at the bottom of the file. --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -75,6 +75,8 @@ -- Overwrite existing functions with new FFI versions. function SoundData:getSample(i) + if type(i) ~= "number" then error("bad argument #1 to SoundData:getSample (expected number)", 2) end + local p = objectcache[self] if not (i >= 0 and i < p.size/p.bytedepth) then @@ -91,6 +93,9 @@ end function SoundData:setSample(i, sample) + if type(i) ~= "number" then error("bad argument #1 to SoundData:setSample (expected number)", 2) end + if type(sample) ~= "number" then error("bad argument #2 to SoundData:setSample (expected number)", 2) end + local p = objectcache[self] if not (i >= 0 and i < p.size/p.bytedepth) then diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Sound.h love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Sound.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/sound/wrap_Sound.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/sound/wrap_Sound.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/system/sdl/System.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/system/sdl/System.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/system/sdl/System.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/system/sdl/System.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/system/sdl/System.h love-unstable-0.10.1~pre2723ppa1/src/modules/system/sdl/System.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/system/sdl/System.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/system/sdl/System.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/system/System.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/system/System.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/system/System.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/system/System.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/system/System.h love-unstable-0.10.1~pre2723ppa1/src/modules/system/System.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/system/System.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/system/System.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/system/wrap_System.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/system/wrap_System.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/system/wrap_System.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/system/wrap_System.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/system/wrap_System.h love-unstable-0.10.1~pre2723ppa1/src/modules/system/wrap_System.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/system/wrap_System.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/system/wrap_System.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/Channel.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/thread/Channel.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/Channel.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/Channel.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/Channel.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/Channel.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/Channel.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/Channel.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/LuaThread.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/thread/LuaThread.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/LuaThread.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/LuaThread.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/LuaThread.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/LuaThread.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/LuaThread.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/LuaThread.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/Thread.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/Thread.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/Thread.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/Thread.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/Thread.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/Thread.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/Thread.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/Thread.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/threads.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/threads.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/threads.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/threads.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/threads.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/threads.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/sdl/threads.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/sdl/threads.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/Thread.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/Thread.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/Thread.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/Thread.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/ThreadModule.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/thread/ThreadModule.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/ThreadModule.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/ThreadModule.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/ThreadModule.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/ThreadModule.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/ThreadModule.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/ThreadModule.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/threads.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/thread/threads.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/threads.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/threads.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/threads.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/threads.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/threads.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/threads.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/wrap_Channel.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/wrap_Channel.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/wrap_Channel.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/wrap_Channel.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/wrap_LuaThread.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/wrap_LuaThread.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/wrap_LuaThread.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/wrap_LuaThread.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/thread/wrap_ThreadModule.h love-unstable-0.10.1~pre2723ppa1/src/modules/thread/wrap_ThreadModule.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/thread/wrap_ThreadModule.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/thread/wrap_ThreadModule.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/timer/sdl/Timer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/timer/sdl/Timer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/timer/sdl/Timer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/timer/sdl/Timer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/timer/sdl/Timer.h love-unstable-0.10.1~pre2723ppa1/src/modules/timer/sdl/Timer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/timer/sdl/Timer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/timer/sdl/Timer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/timer/Timer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/timer/Timer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/timer/Timer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/timer/Timer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/timer/Timer.h love-unstable-0.10.1~pre2723ppa1/src/modules/timer/Timer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/timer/Timer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/timer/Timer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/timer/wrap_Timer.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/timer/wrap_Timer.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/timer/wrap_Timer.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/timer/wrap_Timer.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/timer/wrap_Timer.h love-unstable-0.10.1~pre2723ppa1/src/modules/timer/wrap_Timer.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/timer/wrap_Timer.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/timer/wrap_Timer.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/touch/sdl/Touch.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/touch/sdl/Touch.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/touch/sdl/Touch.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/touch/sdl/Touch.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -23,6 +23,9 @@ #include "common/Exception.h" #include "Touch.h" +// C++ +#include + namespace love { namespace touch @@ -30,34 +33,20 @@ namespace sdl { -std::vector Touch::getTouches() const -{ - std::vector ids; - ids.reserve(touches.size()); - - for (const auto &touch : touches) - ids.push_back(touch.first); - - return ids; -} - -void Touch::getPosition(int64 id, double &x, double &y) const +const std::vector &Touch::getTouches() const { - const auto it = touches.find(id); - if (it == touches.end()) - throw love::Exception("Invalid active touch ID: %d", id); - - x = it->second.x; - y = it->second.y; + return touches; } -double Touch::getPressure(int64 id) const +const Touch::TouchInfo &Touch::getTouch(int64 id) const { - const auto it = touches.find(id); - if (it == touches.end()) - throw love::Exception("Invalid active touch ID: %d", id); + for (const auto &touch : touches) + { + if (touch.id == id) + return touch; + } - return it->second.pressure; + throw love::Exception("Invalid active touch ID: %d", id); } const char *Touch::getName() const @@ -67,14 +56,28 @@ void Touch::onEvent(Uint32 eventtype, const TouchInfo &info) { + auto compare = [&](const TouchInfo &touch) -> bool + { + return touch.id == info.id; + }; + switch (eventtype) { case SDL_FINGERDOWN: + touches.erase(std::remove_if(touches.begin(), touches.end(), compare), touches.end()); + touches.push_back(info); + break; case SDL_FINGERMOTION: - touches[info.id] = info; + { + for (TouchInfo &touch : touches) + { + if (touch.id == info.id) + touch = info; + } break; + } case SDL_FINGERUP: - touches.erase(info.id); + touches.erase(std::remove_if(touches.begin(), touches.end(), compare), touches.end()); break; default: break; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/touch/sdl/Touch.h love-unstable-0.10.1~pre2723ppa1/src/modules/touch/sdl/Touch.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/touch/sdl/Touch.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/touch/sdl/Touch.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -24,9 +24,6 @@ // LOVE #include "touch/Touch.h" -// C++ -#include - // SDL #include @@ -43,9 +40,8 @@ virtual ~Touch() {} - std::vector getTouches() const override; - void getPosition(int64 id, double &x, double &y) const override; - double getPressure(int64 id) const override; + const std::vector &getTouches() const override; + const TouchInfo &getTouch(int64 id) const override; // Implements Module. const char *getName() const override; @@ -59,8 +55,8 @@ private: - // All current touches, indexed by their IDs. - std::map touches; + // All current touches. + std::vector touches; }; // Touch diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/touch/Touch.h love-unstable-0.10.1~pre2723ppa1/src/modules/touch/Touch.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/touch/Touch.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/touch/Touch.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -55,19 +55,14 @@ virtual ModuleType getModuleType() const { return M_TOUCH; } /** - * Gets a list of the IDs of all currently active touches. + * Gets all currently active touches. **/ - virtual std::vector getTouches() const = 0; + virtual const std::vector &getTouches() const = 0; /** - * Gets the position in pixels of a specific touch, using its ID. + * Gets a specific touch, using its ID. **/ - virtual void getPosition(int64 id, double &x, double &y) const = 0; - - /** - * Gets the pressure of a specific touch, using its ID. - **/ - virtual double getPressure(int64 id) const = 0; + virtual const TouchInfo &getTouch(int64 id) const = 0; }; // Touch diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/touch/wrap_Touch.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/touch/wrap_Touch.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/touch/wrap_Touch.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/touch/wrap_Touch.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -42,18 +42,18 @@ int w_getTouches(lua_State *L) { - std::vector ids = instance()->getTouches(); + const std::vector &touches = instance()->getTouches(); - lua_createtable(L, (int) ids.size(), 0); + lua_createtable(L, (int) touches.size(), 0); - for (size_t i = 0; i < ids.size(); i++) + for (size_t i = 0; i < touches.size(); i++) { // This is a bit hackish and we lose the higher 32 bits of the id on // 32-bit systems, but SDL only ever gives id's that at most use as many // bits as can fit in a pointer (for now.) // We use lightuserdata instead of a lua_Number (double) because doubles // can't represent all possible id values on 64-bit systems. - lua_pushlightuserdata(L, (void *) (intptr_t) ids[i]); + lua_pushlightuserdata(L, (void *) (intptr_t) touches[i].id); lua_rawseti(L, -2, (int) i + 1); } @@ -64,12 +64,11 @@ { int64 id = luax_checktouchid(L, 1); - double x = 0; - double y = 0; - luax_catchexcept(L, [&]() { instance()->getPosition(id, x, y); }); + Touch::TouchInfo touch = {}; + luax_catchexcept(L, [&]() { touch = instance()->getTouch(id); }); - lua_pushnumber(L, x); - lua_pushnumber(L, y); + lua_pushnumber(L, touch.x); + lua_pushnumber(L, touch.y); return 2; } @@ -77,9 +76,11 @@ int w_getPressure(lua_State *L) { int64 id = luax_checktouchid(L, 1); - double pressure = 0.0; - luax_catchexcept(L, [&](){ pressure = instance()->getPressure(id); }); - lua_pushnumber(L, pressure); + + Touch::TouchInfo touch = {}; + luax_catchexcept(L, [&](){ touch = instance()->getTouch(id); }); + + lua_pushnumber(L, touch.pressure); return 1; } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/touch/wrap_Touch.h love-unstable-0.10.1~pre2723ppa1/src/modules/touch/wrap_Touch.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/touch/wrap_Touch.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/touch/wrap_Touch.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/Video.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/Video.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/Video.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/Video.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/Video.h love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/Video.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/Video.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/Video.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/VideoStream.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/VideoStream.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/VideoStream.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/VideoStream.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -120,6 +120,11 @@ return sizeof(Frame); } +bool VideoStream::isPlaying() const +{ + return frameSync->isPlaying() && !eos; +} + void VideoStream::readPage() { char *syncBuffer = nullptr; @@ -266,13 +271,19 @@ void VideoStream::seekDecoder(double target) { + if (target < 0.01) + { + rewind(); + return; + } + double low = 0; double high = file->getSize(); while (high-low > 0.0001) { // Determine our next binary search position - double pos = (high-low)/2+low; + double pos = (high+low)/2; file->seek(pos); // Break sync @@ -280,12 +291,18 @@ ogg_sync_pageseek(&sync, &page); // Read a packet - readPacket(true); + readPacket(false); + if (eos) + return; // Determine if this is the right place double curTime = th_granule_time(decoder, packet.granulepos); - if (curTime > target && th_granule_time(decoder, packet.granulepos-1) < target) - break; + double nextTime = th_granule_time(decoder, packet.granulepos+1); + + if (curTime == -1) + continue; // Invalid granule position (magic?) + else if (curTime <= target && nextTime > target) + break; // the current frame should be displaying right now else if (curTime > target) high = pos; else @@ -306,12 +323,7 @@ // Seeking backwards if (position < lastFrame) - { - if (position < 0.01) - rewind(); - else - seekDecoder(position); - } + seekDecoder(position); // If we're at the end of the stream, or if we're displaying the right frame // stop here diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/VideoStream.h love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/VideoStream.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/theora/VideoStream.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/theora/VideoStream.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -56,6 +56,8 @@ const std::string &getFilename() const; void setSync(FrameSync *frameSync); + bool isPlaying() const; + void threadedFillBackBuffer(double dt); private: diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/Video.h love-unstable-0.10.1~pre2723ppa1/src/modules/video/Video.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/Video.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/Video.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/VideoStream.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/video/VideoStream.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/VideoStream.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/VideoStream.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -52,12 +52,12 @@ frameSync->seek(offset); } -double VideoStream::tell() +double VideoStream::tell() const { return frameSync->tell(); } -bool VideoStream::isPlaying() +bool VideoStream::isPlaying() const { return frameSync->isPlaying(); } diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/VideoStream.h love-unstable-0.10.1~pre2723ppa1/src/modules/video/VideoStream.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/VideoStream.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/VideoStream.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -44,8 +44,8 @@ virtual void play(); virtual void pause(); virtual void seek(double offset); - virtual double tell(); - virtual bool isPlaying(); + virtual double tell() const; + virtual bool isPlaying() const; class FrameSync; class DeltaSync; diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_Video.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_Video.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_Video.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_Video.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_Video.h love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_Video.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_Video.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_Video.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_VideoStream.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_VideoStream.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_VideoStream.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_VideoStream.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_VideoStream.h love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_VideoStream.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/video/wrap_VideoStream.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/video/wrap_VideoStream.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/window/sdl/Window.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/window/sdl/Window.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/window/sdl/Window.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/window/sdl/Window.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -61,7 +61,6 @@ , window(nullptr) , context(nullptr) , displayedWindowError(false) - , displayedContextError(false) , hasSDL203orEarlier(false) { if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) @@ -231,7 +230,16 @@ // OpenGL ES 3+ contexts are only properly supported in SDL 2.0.4+. if (hasSDL203orEarlier) - attribslist.erase(attribslist.begin() + 1); + { + auto it = attribslist.begin(); + while (it != attribslist.end()) + { + if (it->gles && it->versionMajor >= 3) + it = attribslist.erase(it); + else + ++it; + } + } // Move OpenGL ES to the front of the list if we should prefer GLES. if (preferGLES) @@ -342,42 +350,26 @@ if (!context || !window) { - if (!windowerror.empty()) - { - std::string title = "Unable to create window"; - std::string message = "SDL error: " + windowerror; + std::string title = "Unable to create OpenGL window"; + std::string message = "This program requires a graphics card and video drivers which support OpenGL 2.1 or OpenGL ES 2."; - std::cerr << title << std::endl << message << std::endl; + if (!glversion.empty()) + message += "\n\nDetected OpenGL version:\n" + glversion; + else if (!contexterror.empty()) + message += "\n\nOpenGL context creation error: " + contexterror; + else if (!windowerror.empty()) + message += "\n\nSDL window creation error: " + windowerror; - // Display a message box with the error, but only once. - if (!displayedWindowError) - { - showMessageBox(title, message, MESSAGEBOX_ERROR, false); - displayedWindowError = true; - } - } - else if (!context) - { - std::string title = "Unable to initialize OpenGL"; - std::string message = "This program requires a graphics card and video drivers which support OpenGL 2.1 or OpenGL ES 2."; - - if (!contexterror.empty()) - message += "\n\nOpenGL context creation error: " + contexterror; - if (!glversion.empty()) - message += " \n\nDetected OpenGL version: " + glversion; + std::cerr << title << std::endl << message << std::endl; - std::cerr << title << std::endl << message << std::endl; - - // Display a message box with the error, but only once. - if (!displayedContextError) - { - showMessageBox(title, message, MESSAGEBOX_ERROR, true); - displayedContextError = true; - } + // Display a message box with the error, but only once. + if (!displayedWindowError) + { + showMessageBox(title, message, MESSAGEBOX_ERROR, false); + displayedWindowError = true; } close(); - return false; } @@ -541,7 +533,7 @@ } #ifdef LOVE_ANDROID - curMode.settings.fullscreen = love::android::getImmersive(); + settings.fullscreen = love::android::getImmersive(); #endif // SDL_GetWindowMinimumSize gives back 0,0 sometimes... diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/window/sdl/Window.h love-unstable-0.10.1~pre2723ppa1/src/modules/window/sdl/Window.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/window/sdl/Window.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/window/sdl/Window.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -146,8 +146,6 @@ SDL_GLContext context; bool displayedWindowError; - bool displayedContextError; - bool hasSDL203orEarlier; }; // Window diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/window/Window.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/window/Window.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/window/Window.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/window/Window.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/window/Window.h love-unstable-0.10.1~pre2723ppa1/src/modules/window/Window.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/window/Window.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/window/Window.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/window/wrap_Window.cpp love-unstable-0.10.1~pre2723ppa1/src/modules/window/wrap_Window.cpp --- love-unstable-0.10.0~pre2657ppa2/src/modules/window/wrap_Window.cpp 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/window/wrap_Window.cpp 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/modules/window/wrap_Window.h love-unstable-0.10.1~pre2723ppa1/src/modules/window/wrap_Window.h --- love-unstable-0.10.0~pre2657ppa2/src/modules/window/wrap_Window.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/modules/window/wrap_Window.h 2016-02-13 14:37:39.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/scripts/auto.lua love-unstable-0.10.1~pre2723ppa1/src/scripts/auto.lua --- love-unstable-0.10.0~pre2657ppa2/src/scripts/auto.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/scripts/auto.lua 2016-02-13 14:37:39.000000000 +0000 @@ -7,7 +7,7 @@ local max_width = 18 local pattern = [[ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff -Nru love-unstable-0.10.0~pre2657ppa2/src/scripts/boot.lua love-unstable-0.10.1~pre2723ppa1/src/scripts/boot.lua --- love-unstable-0.10.0~pre2657ppa2/src/scripts/boot.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/scripts/boot.lua 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -374,6 +374,7 @@ console = false, -- Only relevant for windows. identity = false, appendidentity = false, + externalstorage = false, -- Only relevant for Android. accelerometerjoystick = true, -- Only relevant for Android / iOS. gammacorrect = false, } @@ -493,6 +494,7 @@ end if love.filesystem then + love.filesystem._setAndroidSaveExternal(c.externalstorage) love.filesystem.setIdentity(c.identity or love.filesystem.getIdentity(), c.appendidentity) if love.filesystem.isFile("main.lua") then require("main") @@ -584,6 +586,9 @@ love.mouse.setVisible(true) love.mouse.setGrabbed(false) love.mouse.setRelativeMode(false) + if love.mouse.hasCursor() then + love.mouse.setCursor() + end end if love.joystick then -- Stop all joystick vibrations. diff -Nru love-unstable-0.10.0~pre2657ppa2/src/scripts/boot.lua.h love-unstable-0.10.1~pre2723ppa1/src/scripts/boot.lua.h --- love-unstable-0.10.0~pre2657ppa2/src/scripts/boot.lua.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/scripts/boot.lua.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -27,7 +27,7 @@ 0x2d, 0x2d, 0x5b, 0x5b, 0x0a, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x36, - 0x2d, 0x32, 0x30, 0x31, 0x35, 0x20, 0x4c, 0x4f, 0x56, 0x45, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, + 0x2d, 0x32, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x4f, 0x56, 0x45, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x54, 0x65, 0x61, 0x6d, 0x0a, 0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x20, 0x27, 0x61, 0x73, 0x2d, 0x69, 0x73, 0x27, 0x2c, 0x20, 0x77, @@ -684,6 +684,10 @@ 0x2c, 0x0a, 0x09, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x2c, 0x0a, + 0x09, 0x09, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, + 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x4f, 0x6e, 0x6c, 0x79, 0x20, 0x72, + 0x65, 0x6c, 0x65, 0x76, 0x61, 0x6e, 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x41, 0x6e, 0x64, 0x72, 0x6f, 0x69, + 0x64, 0x2e, 0x0a, 0x09, 0x09, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x4f, 0x6e, 0x6c, 0x79, 0x20, 0x72, 0x65, 0x6c, 0x65, 0x76, 0x61, 0x6e, 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x41, @@ -909,6 +913,10 @@ 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, + 0x5f, 0x73, 0x65, 0x74, 0x41, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x53, 0x61, 0x76, 0x65, 0x45, 0x78, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x28, 0x63, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x73, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x29, 0x0a, + 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x73, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x28, 0x63, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x20, 0x6f, 0x72, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x67, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x28, @@ -1064,6 +1072,11 @@ 0x61, 0x62, 0x62, 0x65, 0x64, 0x28, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x29, 0x0a, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2e, 0x73, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x28, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x29, 0x0a, + 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2e, 0x68, 0x61, + 0x73, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x28, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2e, 0x73, 0x65, 0x74, 0x43, + 0x75, 0x72, 0x73, 0x6f, 0x72, 0x28, 0x29, 0x0a, + 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, diff -Nru love-unstable-0.10.0~pre2657ppa2/src/scripts/nogame.lua love-unstable-0.10.1~pre2723ppa1/src/scripts/nogame.lua --- love-unstable-0.10.0~pre2657ppa2/src/scripts/nogame.lua 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/scripts/nogame.lua 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ --[[ -Copyright (c) 2006-2015 LOVE Development Team +Copyright (c) 2006-2016 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -867,11 +867,13 @@ local c = str:sub(i, i) if c ~= " " then local piece = self.pieces[idx + i] - piece.quad = GLYPHS[c] - piece.r = 0 - piece.rv = 0 - piece.color.prev = INITIAL_TEXT_COLOR - piece.color.next = INITIAL_TEXT_COLOR + if piece then + piece.quad = GLYPHS[c] + piece.r = 0 + piece.rv = 0 + piece.color.prev = INITIAL_TEXT_COLOR + piece.color.next = INITIAL_TEXT_COLOR + end end end end diff -Nru love-unstable-0.10.0~pre2657ppa2/src/scripts/nogame.lua.h love-unstable-0.10.1~pre2723ppa1/src/scripts/nogame.lua.h --- love-unstable-0.10.0~pre2657ppa2/src/scripts/nogame.lua.h 2015-12-19 13:35:01.000000000 +0000 +++ love-unstable-0.10.1~pre2723ppa1/src/scripts/nogame.lua.h 2016-02-13 14:37:40.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2015 LOVE Development Team + * Copyright (c) 2006-2016 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -27,7 +27,7 @@ 0x2d, 0x2d, 0x5b, 0x5b, 0x0a, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x36, - 0x2d, 0x32, 0x30, 0x31, 0x35, 0x20, 0x4c, 0x4f, 0x56, 0x45, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, + 0x2d, 0x32, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x4f, 0x56, 0x45, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x54, 0x65, 0x61, 0x6d, 0x0a, 0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x20, 0x27, 0x61, 0x73, 0x2d, 0x69, 0x73, 0x27, 0x2c, 0x20, 0x77, @@ -3434,16 +3434,18 @@ 0x09, 0x09, 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x70, 0x69, 0x65, 0x63, 0x65, 0x20, 0x3d, 0x20, 0x73, 0x65, 0x6c, 0x66, 0x2e, 0x70, 0x69, 0x65, 0x63, 0x65, 0x73, 0x5b, 0x69, 0x64, 0x78, 0x20, 0x2b, 0x20, 0x69, 0x5d, 0x0a, - 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x71, 0x75, 0x61, 0x64, 0x20, 0x3d, 0x20, - 0x47, 0x4c, 0x59, 0x50, 0x48, 0x53, 0x5b, 0x63, 0x5d, 0x0a, - 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x72, 0x20, 0x3d, 0x20, 0x30, 0x0a, - 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x72, 0x76, 0x20, 0x3d, 0x20, 0x30, 0x0a, - 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x2e, 0x70, - 0x72, 0x65, 0x76, 0x20, 0x3d, 0x20, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x4c, 0x5f, 0x54, 0x45, 0x58, 0x54, - 0x5f, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x0a, - 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x2e, 0x6e, - 0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x4c, 0x5f, 0x54, 0x45, 0x58, 0x54, - 0x5f, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x70, 0x69, 0x65, 0x63, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x71, 0x75, 0x61, 0x64, 0x20, 0x3d, + 0x20, 0x47, 0x4c, 0x59, 0x50, 0x48, 0x53, 0x5b, 0x63, 0x5d, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x72, 0x20, 0x3d, 0x20, 0x30, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x72, 0x76, 0x20, 0x3d, 0x20, 0x30, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x2e, + 0x70, 0x72, 0x65, 0x76, 0x20, 0x3d, 0x20, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x4c, 0x5f, 0x54, 0x45, 0x58, + 0x54, 0x5f, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x70, 0x69, 0x65, 0x63, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x2e, + 0x6e, 0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x4c, 0x5f, 0x54, 0x45, 0x58, + 0x54, 0x5f, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x0a, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,