diff --git a/platform/macosx/love-framework.xcodeproj/project.pbxproj b/platform/macosx/love-framework.xcodeproj/project.pbxproj index 9ec6def61..0f8977a3d 100644 --- a/platform/macosx/love-framework.xcodeproj/project.pbxproj +++ b/platform/macosx/love-framework.xcodeproj/project.pbxproj @@ -108,10 +108,8 @@ FA08F61316C753E700F007B5 /* wrap_GlyphData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B4E22F1388E2B2E76E3377B /* wrap_GlyphData.cpp */; }; FA08F61416C753E700F007B5 /* wrap_Rasterizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 11745DE315E859F71E881D76 /* wrap_Rasterizer.cpp */; }; FA08F61516C753F600F007B5 /* Drawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58BA2BB460AF3C591B22690E /* Drawable.cpp */; }; - FA08F61616C753F600F007B5 /* DrawQable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346C3C7F62FA35DA2C9C4F69 /* DrawQable.cpp */; }; FA08F61716C753F600F007B5 /* Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03F17FF546D637744E263961 /* Graphics.cpp */; }; FA08F61816C753F600F007B5 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58CC50E70A375FDF53EF01B6 /* Image.cpp */; }; - FA08F61916C753F600F007B5 /* Quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D3B224C2F9D2359288028FD /* Quad.cpp */; }; FA08F61A16C753F600F007B5 /* Volatile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B731754147B27AF73AC5358 /* Volatile.cpp */; }; FA08F61B16C7541400F007B5 /* Canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD52074367950B735707CE1 /* Canvas.cpp */; }; FA08F61C16C7541400F007B5 /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 583037E9238A6EF00DD20B1A /* Font.cpp */; }; @@ -120,7 +118,6 @@ FA08F61F16C7541400F007B5 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D6030A0B8F7397715062B9 /* Image.cpp */; }; FA08F62016C7541400F007B5 /* OpenGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E406F8328543EC63EB922C6 /* OpenGL.cpp */; }; FA08F62116C7541400F007B5 /* ParticleSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48A206C9004150640C432100 /* ParticleSystem.cpp */; }; - FA08F62216C7541400F007B5 /* Quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74504EB554D871C36DD55F17 /* Quad.cpp */; }; FA08F62316C7541400F007B5 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA577A8516C71CF000860150 /* Shader.cpp */; }; FA08F62416C7541400F007B5 /* SpriteBatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D700D182EAA46273D1E2CC4 /* SpriteBatch.cpp */; }; FA08F62516C7541400F007B5 /* VertexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 426B1C4475DC54505B824B7F /* VertexBuffer.cpp */; }; @@ -129,7 +126,6 @@ FA08F62816C7541400F007B5 /* wrap_Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9810F758AC1D1E4B6431FD /* wrap_Graphics.cpp */; }; FA08F62916C7541400F007B5 /* wrap_Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14AE68E14C2C74526A612FA0 /* wrap_Image.cpp */; }; FA08F62A16C7541400F007B5 /* wrap_ParticleSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F42052D7C8271A1105541DE /* wrap_ParticleSystem.cpp */; }; - FA08F62B16C7541400F007B5 /* wrap_Quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162283C11024AC35897618C /* wrap_Quad.cpp */; }; FA08F62C16C7541400F007B5 /* wrap_Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA577A8716C71CF000860150 /* wrap_Shader.cpp */; }; FA08F62D16C7541400F007B5 /* wrap_SpriteBatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02C16FDB537A702F4D42534E /* wrap_SpriteBatch.cpp */; }; FA08F62E16C7542600F007B5 /* ImageData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78115E763B723C0C40AD47CF /* ImageData.cpp */; }; @@ -233,6 +229,12 @@ FAAC6B02170A373B008A61C5 /* CompressedData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAAC6B00170A373A008A61C5 /* CompressedData.cpp */; }; FAAC6B03170A373B008A61C5 /* CompressedData.h in Headers */ = {isa = PBXBuildFile; fileRef = FAAC6B01170A373A008A61C5 /* CompressedData.h */; }; FAAFF04416CB11C700CCDE45 /* OpenAL-Soft.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAAFF04316CB11C700CCDE45 /* OpenAL-Soft.framework */; }; + FAC86E631724552C00EED715 /* wrap_Geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC86E611724552C00EED715 /* wrap_Geometry.cpp */; }; + FAC86E641724552C00EED715 /* wrap_Geometry.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC86E621724552C00EED715 /* wrap_Geometry.h */; }; + FAC86E691724555D00EED715 /* DrawGable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC86E651724555D00EED715 /* DrawGable.cpp */; }; + FAC86E6A1724555D00EED715 /* DrawGable.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC86E661724555D00EED715 /* DrawGable.h */; }; + FAC86E6B1724555D00EED715 /* Geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC86E671724555D00EED715 /* Geometry.cpp */; }; + FAC86E6C1724555D00EED715 /* Geometry.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC86E681724555D00EED715 /* Geometry.h */; }; FAE010DB170DDE99006F29D0 /* ddsinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE010D8170DDE99006F29D0 /* ddsinfo.h */; }; FAE010DC170DDE99006F29D0 /* ddsparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE010D9170DDE99006F29D0 /* ddsparse.cpp */; }; FAE010DD170DDE99006F29D0 /* ddsparse.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE010DA170DDE99006F29D0 /* ddsparse.h */; }; @@ -371,7 +373,6 @@ 1CAA69E00D0808BA2108238B /* wrap_ChainShape.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_ChainShape.cpp; sourceTree = ""; }; 1CD02D1975803957282F28AB /* auxiliar.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = auxiliar.c; sourceTree = ""; }; 1CE84F1F19BC2AA412C638B1 /* timeout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = timeout.h; sourceTree = ""; }; - 1D824A63414874DE584B59B2 /* Quad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Quad.h; sourceTree = ""; }; 1DA41DFF0869489411A71AFC /* Image.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = ""; }; 1E22646A710E5EFC27FE3932 /* FrictionJoint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FrictionJoint.cpp; sourceTree = ""; }; 1E27263847302FCA1F843B47 /* b2PrismaticJoint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = b2PrismaticJoint.cpp; sourceTree = ""; }; @@ -435,7 +436,6 @@ 2FF26CC52C28773750B812D9 /* PolygonShape.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PolygonShape.h; sourceTree = ""; }; 30E466F441EE727658716873 /* Module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Module.cpp; sourceTree = ""; }; 30ED4BB03C5F11254AF12E98 /* Sound.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Sound.cpp; sourceTree = ""; }; - 30FC314F4137398F63961338 /* wrap_Quad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrap_Quad.h; sourceTree = ""; }; 31871B8B7E1A697A73576040 /* b2PolygonAndCircleContact.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = b2PolygonAndCircleContact.cpp; sourceTree = ""; }; 31A444CF0B4E6DA450120730 /* File.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = ""; }; 31B85B507F466FE158A3718E /* wrap_ImageData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrap_ImageData.h; sourceTree = ""; }; @@ -450,7 +450,6 @@ 33FD508B0754314530A35EF3 /* StringMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StringMap.h; sourceTree = ""; }; 340345481F165F8945C716AE /* wrap_FrictionJoint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_FrictionJoint.cpp; sourceTree = ""; }; 343E66751EBA75264C3400FA /* b2Draw.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = b2Draw.h; sourceTree = ""; }; - 346C3C7F62FA35DA2C9C4F69 /* DrawQable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DrawQable.cpp; sourceTree = ""; }; 34A36BB617BC5CCA5B870EA6 /* DistanceJoint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DistanceJoint.cpp; sourceTree = ""; }; 350C47C774835EA552130431 /* Object.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Object.h; sourceTree = ""; }; 3512460642B046876D687B22 /* wrap_FileData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrap_FileData.h; sourceTree = ""; }; @@ -482,7 +481,6 @@ 3C965422252F672D3FF6598C /* CircleShape.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CircleShape.h; sourceTree = ""; }; 3CDA3E9B364F17A902384AAC /* wrap_Font.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrap_Font.h; sourceTree = ""; }; 3CFE5C4A12D5675E7C9C7BF9 /* Image.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = ""; }; - 3D3B224C2F9D2359288028FD /* Quad.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Quad.cpp; sourceTree = ""; }; 3D8460B2486A372825213933 /* Vector.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Vector.h; sourceTree = ""; }; 3DFF31EE26405E554C610C8F /* wrap_WeldJoint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_WeldJoint.cpp; sourceTree = ""; }; 3EA80A4E0CE0014052076037 /* Joint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Joint.cpp; sourceTree = ""; }; @@ -492,7 +490,6 @@ 40F412FF29F65F5A3D511B98 /* wrap_EdgeShape.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_EdgeShape.cpp; sourceTree = ""; }; 411B061C49172C971C622125 /* Object.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Object.cpp; sourceTree = ""; }; 415E1438178736BE0EA908D5 /* select.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = select.c; sourceTree = ""; }; - 4162283C11024AC35897618C /* wrap_Quad.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Quad.cpp; sourceTree = ""; }; 426B1C4475DC54505B824B7F /* VertexBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VertexBuffer.cpp; sourceTree = ""; }; 427B4B2517C0516844370E3D /* b2CollidePolygon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = b2CollidePolygon.cpp; sourceTree = ""; }; 439E46D768A266780E894800 /* Joystick.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Joystick.h; sourceTree = ""; }; @@ -655,7 +652,6 @@ 74003CB27FA762A021183AD5 /* GlyphData.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphData.cpp; sourceTree = ""; }; 74215662418726B35C581E55 /* Thread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Thread.h; sourceTree = ""; }; 7423362764CF57574BB16CDA /* Window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = ""; }; - 74504EB554D871C36DD55F17 /* Quad.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Quad.cpp; sourceTree = ""; }; 74EE403977734BA53DDF16F0 /* core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = ""; }; 753F0B42534106D6545926C8 /* Memoizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Memoizer.h; sourceTree = ""; }; 755C2B980C106EA7423E7E5E /* EdgeShape.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = EdgeShape.cpp; sourceTree = ""; }; @@ -682,10 +678,8 @@ 7BAB25936D207169591A666A /* wrap_GearJoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrap_GearJoint.h; sourceTree = ""; }; 7CA02BF51EBA65C263E15250 /* unchecked.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = unchecked.h; sourceTree = ""; }; 7CC5707C79175FA6427B3D62 /* Audio.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Audio.cpp; sourceTree = ""; }; - 7D13274605967A612D770598 /* Quad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Quad.h; sourceTree = ""; }; 7D48236B78EA06D346A86E3F /* smtp.lua.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = smtp.lua.h; sourceTree = ""; }; 7D9B03C2438B748D0DE93DD5 /* utf8.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = ""; }; - 7E1316A41EA850403C0C7343 /* DrawQable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DrawQable.h; sourceTree = ""; }; 7E4B280637927B532B456D5E /* Event.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = ""; }; 7E7A068041FD553876712F05 /* b2CollideCircle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = b2CollideCircle.cpp; sourceTree = ""; }; 7EC570BC74C369747ED0183A /* Window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = ""; }; @@ -728,6 +722,12 @@ FAAC6B00170A373A008A61C5 /* CompressedData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompressedData.cpp; sourceTree = ""; }; FAAC6B01170A373A008A61C5 /* CompressedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompressedData.h; sourceTree = ""; }; FAAFF04316CB11C700CCDE45 /* OpenAL-Soft.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "OpenAL-Soft.framework"; path = "/Library/Frameworks/OpenAL-Soft.framework"; sourceTree = ""; }; + FAC86E611724552C00EED715 /* wrap_Geometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Geometry.cpp; sourceTree = ""; }; + FAC86E621724552C00EED715 /* wrap_Geometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Geometry.h; sourceTree = ""; }; + FAC86E651724555D00EED715 /* DrawGable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawGable.cpp; sourceTree = ""; }; + FAC86E661724555D00EED715 /* DrawGable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawGable.h; sourceTree = ""; }; + FAC86E671724555D00EED715 /* Geometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geometry.cpp; sourceTree = ""; }; + FAC86E681724555D00EED715 /* Geometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geometry.h; sourceTree = ""; }; FAE010D8170DDE99006F29D0 /* ddsinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ddsinfo.h; sourceTree = ""; }; FAE010D9170DDE99006F29D0 /* ddsparse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ddsparse.cpp; sourceTree = ""; }; FAE010DA170DDE99006F29D0 /* ddsparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ddsparse.h; sourceTree = ""; }; @@ -1332,15 +1332,15 @@ 4941079838020ECA049B5C21 /* Color.h */, 58BA2BB460AF3C591B22690E /* Drawable.cpp */, 5D93601669875EE06721689E /* Drawable.h */, - 346C3C7F62FA35DA2C9C4F69 /* DrawQable.cpp */, - 7E1316A41EA850403C0C7343 /* DrawQable.h */, + FAC86E651724555D00EED715 /* DrawGable.cpp */, + FAC86E661724555D00EED715 /* DrawGable.h */, + FAC86E671724555D00EED715 /* Geometry.cpp */, + FAC86E681724555D00EED715 /* Geometry.h */, 03F17FF546D637744E263961 /* Graphics.cpp */, 777352284E262F48543E6E7F /* Graphics.h */, 58CC50E70A375FDF53EF01B6 /* Image.cpp */, 1DA41DFF0869489411A71AFC /* Image.h */, 75093EE94918576801F50993 /* opengl */, - 3D3B224C2F9D2359288028FD /* Quad.cpp */, - 7D13274605967A612D770598 /* Quad.h */, 4B731754147B27AF73AC5358 /* Volatile.cpp */, 0CFF64090F0F4F481BB80CF0 /* Volatile.h */, ); @@ -1524,8 +1524,6 @@ 2C87695707B046B536F347D8 /* OpenGL.h */, 48A206C9004150640C432100 /* ParticleSystem.cpp */, 53EE57FF4DBD52BB22701160 /* ParticleSystem.h */, - 74504EB554D871C36DD55F17 /* Quad.cpp */, - 1D824A63414874DE584B59B2 /* Quad.h */, FA577A8516C71CF000860150 /* Shader.cpp */, FA577A8616C71CF000860150 /* Shader.h */, 4D700D182EAA46273D1E2CC4 /* SpriteBatch.cpp */, @@ -1536,14 +1534,14 @@ 3AFB3A18384A2D22352262B1 /* wrap_Canvas.h */, 7A3B52AF1FBE73FC36AD50C8 /* wrap_Font.cpp */, 3CDA3E9B364F17A902384AAC /* wrap_Font.h */, + FAC86E611724552C00EED715 /* wrap_Geometry.cpp */, + FAC86E621724552C00EED715 /* wrap_Geometry.h */, 1A9810F758AC1D1E4B6431FD /* wrap_Graphics.cpp */, 05DF237B657042515F3B4E52 /* wrap_Graphics.h */, 14AE68E14C2C74526A612FA0 /* wrap_Image.cpp */, 78A2127828793F7A778D7932 /* wrap_Image.h */, 5F42052D7C8271A1105541DE /* wrap_ParticleSystem.cpp */, 678E42771C9B415628A3234D /* wrap_ParticleSystem.h */, - 4162283C11024AC35897618C /* wrap_Quad.cpp */, - 30FC314F4137398F63961338 /* wrap_Quad.h */, FA577A8716C71CF000860150 /* wrap_Shader.cpp */, FA577A8816C71CF000860150 /* wrap_Shader.h */, 02C16FDB537A702F4D42534E /* wrap_SpriteBatch.cpp */, @@ -1719,6 +1717,9 @@ FAEC808F1711E76C0057279A /* CompressedData.h in Headers */, FA636D8B171B70920065623F /* RandomGenerator.h in Headers */, FA636D8F171B72A70065623F /* wrap_RandomGenerator.h in Headers */, + FAC86E641724552C00EED715 /* wrap_Geometry.h in Headers */, + FAC86E6A1724555D00EED715 /* DrawGable.h in Headers */, + FAC86E6C1724555D00EED715 /* Geometry.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1883,10 +1884,8 @@ FA08F61316C753E700F007B5 /* wrap_GlyphData.cpp in Sources */, FA08F61416C753E700F007B5 /* wrap_Rasterizer.cpp in Sources */, FA08F61516C753F600F007B5 /* Drawable.cpp in Sources */, - FA08F61616C753F600F007B5 /* DrawQable.cpp in Sources */, FA08F61716C753F600F007B5 /* Graphics.cpp in Sources */, FA08F61816C753F600F007B5 /* Image.cpp in Sources */, - FA08F61916C753F600F007B5 /* Quad.cpp in Sources */, FA08F61A16C753F600F007B5 /* Volatile.cpp in Sources */, FA08F61B16C7541400F007B5 /* Canvas.cpp in Sources */, FA08F61C16C7541400F007B5 /* Font.cpp in Sources */, @@ -1895,7 +1894,6 @@ FA08F61F16C7541400F007B5 /* Image.cpp in Sources */, FA08F62016C7541400F007B5 /* OpenGL.cpp in Sources */, FA08F62116C7541400F007B5 /* ParticleSystem.cpp in Sources */, - FA08F62216C7541400F007B5 /* Quad.cpp in Sources */, FA08F62316C7541400F007B5 /* Shader.cpp in Sources */, FA08F62416C7541400F007B5 /* SpriteBatch.cpp in Sources */, FA08F62516C7541400F007B5 /* VertexBuffer.cpp in Sources */, @@ -1904,7 +1902,6 @@ FA08F62816C7541400F007B5 /* wrap_Graphics.cpp in Sources */, FA08F62916C7541400F007B5 /* wrap_Image.cpp in Sources */, FA08F62A16C7541400F007B5 /* wrap_ParticleSystem.cpp in Sources */, - FA08F62B16C7541400F007B5 /* wrap_Quad.cpp in Sources */, FA08F62C16C7541400F007B5 /* wrap_Shader.cpp in Sources */, FA08F62D16C7541400F007B5 /* wrap_SpriteBatch.cpp in Sources */, FA08F62E16C7542600F007B5 /* ImageData.cpp in Sources */, @@ -2002,6 +1999,9 @@ FAEC808E1711E76C0057279A /* CompressedData.cpp in Sources */, FA636D8A171B70920065623F /* RandomGenerator.cpp in Sources */, FA636D8E171B72A70065623F /* wrap_RandomGenerator.cpp in Sources */, + FAC86E631724552C00EED715 /* wrap_Geometry.cpp in Sources */, + FAC86E691724555D00EED715 /* DrawGable.cpp in Sources */, + FAC86E6B1724555D00EED715 /* Geometry.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/modules/graphics/DrawQable.cpp b/src/modules/graphics/DrawQable.cpp deleted file mode 100644 index a58a61291..000000000 --- a/src/modules/graphics/DrawQable.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#include "DrawQable.h" - -namespace love -{ -namespace graphics -{ - -DrawQable::~DrawQable() -{ -} - -} // graphics -} // love diff --git a/src/modules/graphics/DrawQable.h b/src/modules/graphics/DrawQable.h deleted file mode 100644 index e6fcec14a..000000000 --- a/src/modules/graphics/DrawQable.h +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#ifndef LOVE_GRAPHICS_DRAWQABLE_H -#define LOVE_GRAPHICS_DRAWQABLE_H - -// LOVE -#include "Drawable.h" -#include "Quad.h" - -namespace love -{ -namespace graphics -{ - -/** - * A DrawQable is anything that be drawn in part with a Quad. - **/ -class DrawQable : public Drawable -{ -public: - - /** - * Destructor. - **/ - virtual ~DrawQable(); - - /** - * Draws the object with the specified transformation. - * - * @param quad The Quad to use to draw the object. - * @param x The position of the object along the x-axis. - * @param y The position of the object along the y-axis. - * @param angle The angle of the object (in radians). - * @param sx The scale factor along the x-axis. - * @param sy The scale factor along the y-axis. - * @param ox The origin offset along the x-axis. - * @param oy The origin offset along the y-axis. - * @param kx Shear along the x-axis. - * @param ky Shear along the y-axis. - **/ - virtual void drawq(Quad *quad, float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky) const = 0; -}; - -} // graphics -} // love - -#endif // LOVE_GRAPHICS_DRAWQABLE_H diff --git a/src/modules/graphics/Quad.cpp b/src/modules/graphics/Quad.cpp deleted file mode 100644 index 8394db60a..000000000 --- a/src/modules/graphics/Quad.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#include "Quad.h" - -namespace love -{ -namespace graphics -{ - -Quad::Quad() -{ -} - -Quad::~Quad() -{ -} - -} // graphics -} // love diff --git a/src/modules/graphics/Quad.h b/src/modules/graphics/Quad.h deleted file mode 100644 index ef7e7477b..000000000 --- a/src/modules/graphics/Quad.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#ifndef LOVE_GRAPHICS_QUAD_H -#define LOVE_GRAPHICS_QUAD_H - -// LOVE -#include "common/Object.h" -#include "common/math.h" - -namespace love -{ -namespace graphics -{ - -class Quad : public Object -{ -public: - - struct Viewport - { - float x, y, w, h; - }; - - Quad(); - - virtual ~Quad(); - - virtual void refresh(const Viewport &v, float sw, float sh) = 0; - - virtual void setViewport(const Viewport &v) = 0; - virtual Viewport getViewport() const = 0; - - virtual void flip(bool x, bool y) = 0; - - /** - * Gets a pointer to the vertices. - **/ - virtual const vertex *getVertices() const = 0; -}; -} // graphics -} // love - -#endif // LOVE_GRAPHICS_QUAD_H diff --git a/src/modules/graphics/opengl/Quad.cpp b/src/modules/graphics/opengl/Quad.cpp deleted file mode 100644 index 20f1e0de8..000000000 --- a/src/modules/graphics/opengl/Quad.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#include "Quad.h" -#include "common/Matrix.h" - -// OpenGL -#include "OpenGL.h" - -// STD -#include // For memcpy - -namespace love -{ -namespace graphics -{ -namespace opengl -{ - -Quad::Quad(const Viewport &v, float sw, float sh) - : sw(sw) - , sh(sh) -{ - memset(vertices, 255, sizeof(vertex)*NUM_VERTICES); - refresh(v, sw, sh); -} - -Quad::~Quad() -{ -} - -void Quad::refresh(const Viewport &v, float sw, float sh) -{ - if (!(GLEE_VERSION_2_0 || GLEE_ARB_texture_non_power_of_two)) - { - sw = next_p2(sw); - sh = next_p2(sh); - } - viewport = v; - - vertices[0].x = 0; - vertices[0].y = 0; - vertices[1].x = 0; - vertices[1].y = v.h; - vertices[2].x = v.w; - vertices[2].y = v.h; - vertices[3].x = v.w; - vertices[3].y = 0; - - vertices[0].s = v.x/sw; - vertices[0].t = v.y/sh; - vertices[1].s = v.x/sw; - vertices[1].t = (v.y+v.h)/sh; - vertices[2].s = (v.x+v.w)/sw; - vertices[2].t = (v.y+v.h)/sh; - vertices[3].s = (v.x+v.w)/sw; - vertices[3].t = v.y/sh; -} - -void Quad::setViewport(const Quad::Viewport &v) -{ - refresh(v, sw, sh); -} - -Quad::Viewport Quad::getViewport() const -{ - return viewport; -} - -void Quad::flip(bool x, bool y) -{ - vertex temp[4]; - if (x) - { - memcpy(temp, vertices, sizeof(vertex)*NUM_VERTICES); - vertices[0].s = temp[3].s; - vertices[0].t = temp[3].t; - vertices[1].s = temp[2].s; - vertices[1].t = temp[2].t; - vertices[2].s = temp[1].s; - vertices[2].t = temp[1].t; - vertices[3].s = temp[0].s; - vertices[3].t = temp[0].t; - } - if (y) - { - memcpy(temp, vertices, sizeof(vertex)*NUM_VERTICES); - vertices[0].s = temp[1].s; - vertices[0].t = temp[1].t; - vertices[1].s = temp[0].s; - vertices[1].t = temp[0].t; - vertices[2].s = temp[3].s; - vertices[2].t = temp[3].t; - vertices[3].s = temp[2].s; - vertices[3].t = temp[2].t; - } -} - -const vertex *Quad::getVertices() const -{ - return vertices; -} - -} // opengl -} // graphics -} // love diff --git a/src/modules/graphics/opengl/Quad.h b/src/modules/graphics/opengl/Quad.h deleted file mode 100644 index a6289fd57..000000000 --- a/src/modules/graphics/opengl/Quad.h +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#ifndef LOVE_GRAPHICS_OPENGL_QUAD_H -#define LOVE_GRAPHICS_OPENGL_QUAD_H - -// LOVE -#include "common/math.h" -#include - -namespace love -{ -namespace graphics -{ -namespace opengl -{ - -class Quad : public love::graphics::Quad -{ -public: - - /** - * Creates a new Quad of size (w,h), using (x,y) as the top-left - * anchor point in the source image. The size of the source image is - * is specified by (sw,sh). - * - * @param sw Width of the source image. - * @param sh Height of the source image. - **/ - Quad(const Viewport &v, float sw, float sh); - - virtual ~Quad(); - - void refresh(const Viewport &v, float sw, float sh); - - void setViewport(const Viewport &v); - Viewport getViewport() const; - - void flip(bool x, bool y); - - /** - * Gets a pointer to the vertices. - **/ - const vertex *getVertices() const; - -protected: - - static const unsigned int NUM_VERTICES = 4; - vertex vertices[NUM_VERTICES]; - - Viewport viewport; - float sw, sh; -}; - -} // opengl -} // graphics -} // love - -#endif // LOVE_GRAPHICS_OPENGL_QUAD_H diff --git a/src/modules/graphics/opengl/wrap_Quad.cpp b/src/modules/graphics/opengl/wrap_Quad.cpp deleted file mode 100644 index 7055e0943..000000000 --- a/src/modules/graphics/opengl/wrap_Quad.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -// LOVE -#include "wrap_Quad.h" - -namespace love -{ -namespace graphics -{ -namespace opengl -{ - -Quad *luax_checkquad(lua_State *L, int idx) -{ - return luax_checktype(L, idx, "Quad", GRAPHICS_QUAD_T); -} - -int w_Quad_flip(lua_State *L) -{ - Quad *quad = luax_checktype(L, 1, "Quad", GRAPHICS_QUAD_T); - quad->flip(luax_toboolean(L, 2), luax_toboolean(L, 3)); - return 0; -} - -int w_Quad_setViewport(lua_State *L) -{ - Quad *quad = luax_checktype(L, 1, "Quad", GRAPHICS_QUAD_T); - Quad::Viewport v; - v.x = (float) luaL_checknumber(L, 2); - v.y = (float) luaL_checknumber(L, 3); - v.w = (float) luaL_checknumber(L, 4); - v.h = (float) luaL_checknumber(L, 5); - quad->setViewport(v); - return 0; -} - -int w_Quad_getViewport(lua_State *L) -{ - Quad *quad = luax_checktype(L, 1, "Quad", GRAPHICS_QUAD_T); - Quad::Viewport v = quad->getViewport(); - lua_pushnumber(L, v.x); - lua_pushnumber(L, v.y); - lua_pushnumber(L, v.w); - lua_pushnumber(L, v.h); - return 4; -} - -static const luaL_Reg w_Quad_functions[] = -{ - { "flip", w_Quad_flip }, - { "setViewport", w_Quad_setViewport }, - { "getViewport", w_Quad_getViewport }, - { 0, 0 } -}; - -extern "C" int luaopen_quad(lua_State *L) -{ - return luax_register_type(L, "Quad", w_Quad_functions); -} - -} // opengl -} // graphics -} // love diff --git a/src/modules/graphics/opengl/wrap_Quad.h b/src/modules/graphics/opengl/wrap_Quad.h deleted file mode 100644 index fe620943e..000000000 --- a/src/modules/graphics/opengl/wrap_Quad.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (c) 2006-2013 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 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. - **/ - -#ifndef LOVE_GRAPHICS_OPENGL_WRAP_QUAD_H -#define LOVE_GRAPHICS_OPENGL_WRAP_QUAD_H - -// LOVE -#include "common/runtime.h" -#include "Quad.h" - -namespace love -{ -namespace graphics -{ -namespace opengl -{ - -Quad *luax_checkquad(lua_State *L, int idx); -int w_Quad_flip(lua_State *L); -int w_Quad_setViewport(lua_State *L); -int w_Quad_getViewport(lua_State *L); -extern "C" int luaopen_quad(lua_State *L); - -} // opengl -} // graphics -} // love - -#endif // LOVE_GRAPHICS_OPENGL_WRAP_QUAD_H