src/liblove/Data.cpp src/liblove/Data.h src/liblove/filesystem/File.cpp src/liblove/filesystem/File.h src/liblove/filesystem/wFile.h src/liblove/filesystem/wfilesystem.h src/liblove/graphics/Drawable.cpp src/liblove/graphics/Drawable.h src/liblove/graphics/Volatile.cpp src/liblove/graphics/Volatile.h src/liblove/graphics/wAnimation.h src/liblove/graphics/wColor.h src/liblove/graphics/wDrawable.h src/liblove/graphics/wFont.h src/liblove/graphics/wImage.h src/liblove/graphics/wParticleSystem.h src/liblove/graphics/wgraphics.h src/liblove/image/ImageData.cpp src/liblove/image/ImageData.h src/liblove/image/wImageData.h src/liblove/image/wimage.h src/liblove/joystick/wjoystick.h src/liblove/keyboard/wkeyboard.h src/liblove/mouse/wmouse.h src/liblove/physics/wBody.h src/liblove/physics/wCircleShape.h src/liblove/physics/wContact.h src/liblove/physics/wDistanceJoint.h src/liblove/physics/wJoint.h src/liblove/physics/wMouseJoint.h src/liblove/physics/wPolygonShape.h src/liblove/physics/wPrismaticJoint.h src/liblove/physics/wRevoluteJoint.h src/liblove/physics/wShape.h src/liblove/physics/wWorld.h src/liblove/physics/wphysics.h src/liblove/system/wsystem.h src/liblove/timer/wtimer.h src/love_devil/ImageData.cpp src/love_devil/ImageData.h src/love_devil/love_devil.cpp src/love_devil/love_devil.h @@ -1874,7 +1874,7 @@ <param name="x" brief="The x-component of the center of mass in local coordinates." /> <param name="y" brief="The y-component of the center of mass in local coordinates." /> <param name="m" brief="The mass." /> - <param name="i" brief="The interia." /> + <param name="i" brief="The inertia." /> </overload> </func> @@ -2329,7 +2329,7 @@ <type name="DistanceJoint" brief="Maintains a certain distance between Bodies."> -  +  + JOINT END --> <func name="getLength" brief="Gets the equilibrium distance between the two Bodies."> <overload> @@ -2422,7 +2422,7 @@ </type> <type name="RevoluteJoint" brief="Allow two Bodies to revolve around a shared point."> -  +  + JOINT END --> <func name="getAngle" brief="Get the current joint angle."> <overload> @@ -2579,7 +2579,7 @@ </type> <type name="PrismaticJoint" brief="Restricts relative motion between Bodies to one shared axis."> -  +  + JOINT END --> <func name="getTranslation" brief="Get the current joint translation."> @@ -2738,7 +2738,7 @@ </type> <type name="MouseJoint" brief="For controlling objects with the mouse."> -  +  + JOINT END --> <func name="getTarget" brief="Gets the target point."> <overload> docs2/data.xml @@ -142,24 +142,200 @@ <References> </References> <Files> - <File - RelativePath="..\..\..\src\liblove\constants.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\Drawable.cpp" + <Filter + Name="filesystem" + > + <File + RelativePath="..\..\..\src\liblove\filesystem\File.cpp" + > + </File> + <File + RelativePath="..\..\..\src\liblove\filesystem\File.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\filesystem\wFile.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\filesystem\wfilesystem.h" + > + </File> + </Filter> + <Filter + Name="graphics" + > + <File + RelativePath="..\..\..\src\liblove\graphics\Drawable.cpp" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\Drawable.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\Volatile.cpp" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\Volatile.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wAnimation.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wColor.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wDrawable.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wFont.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wgraphics.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wImage.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\graphics\wParticleSystem.h" + > + </File> + </Filter> + <Filter + Name="image" + > + <File + RelativePath="..\..\..\src\liblove\image\ImageData.cpp" + > + </File> + <File + RelativePath="..\..\..\src\liblove\image\ImageData.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\image\wimage.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\image\wImageData.h" + > + </File> + </Filter> + <Filter + Name="joystick" + > + <File + RelativePath="..\..\..\src\liblove\joystick\wjoystick.h" + > + </File> + </Filter> + <Filter + Name="keyboard" + > + <File + RelativePath="..\..\..\src\liblove\keyboard\wkeyboard.h" + > + </File> + </Filter> + <Filter + Name="mouse" + > + <File + RelativePath="..\..\..\src\liblove\mouse\wmouse.h" + > + </File> + </Filter> + <Filter + Name="physics" + > + <File + RelativePath="..\..\..\src\liblove\physics\wBody.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wCircleShape.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wContact.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wDistanceJoint.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wJoint.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wMouseJoint.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wphysics.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wPolygonShape.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wPrismaticJoint.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wRevoluteJoint.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wShape.h" + > + </File> + <File + RelativePath="..\..\..\src\liblove\physics\wWorld.h" + > + </File> + </Filter> + <Filter + Name="system" + > + <File + RelativePath="..\..\..\src\liblove\system\wsystem.h" + > + </File> + </Filter> + <Filter + Name="timer" + > + <File + RelativePath="..\..\..\src\liblove\timer\wtimer.h" + > + </File> + </Filter> + <File + RelativePath="..\..\..\src\liblove\config.h" > </File> <File - RelativePath="..\..\..\src\liblove\Drawable.h" + RelativePath="..\..\..\src\liblove\constants.h" > </File> <File - RelativePath="..\..\..\src\liblove\File.cpp" + RelativePath="..\..\..\src\liblove\Data.cpp" > </File> <File - RelativePath="..\..\..\src\liblove\File.h" + RelativePath="..\..\..\src\liblove\Data.h" > </File> <File @@ -215,118 +391,6 @@ > </File> <File - RelativePath="..\..\..\src\liblove\Volatile.cpp" - > - </File> - <File - RelativePath="..\..\..\src\liblove\Volatile.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wAnimation.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wBody.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wCircleShape.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wColor.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wContact.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wDistanceJoint.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wDrawable.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wFile.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wfilesystem.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wFont.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wgraphics.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wImage.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wJoint.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wjoystick.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wkeyboard.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wmouse.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wMouseJoint.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wParticleSystem.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wphysics.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wPolygonShape.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wPrismaticJoint.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wRevoluteJoint.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wShape.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wsystem.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wtimer.h" - > - </File> - <File - RelativePath="..\..\..\src\liblove\wWorld.h" - > - </File> - <File RelativePath="..\..\..\src\liblove\wwrap.h" > </File> platform/msvc2008/liblove/liblove.vcproj @@ -132,7 +132,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="liblove.lib lua.lib SDLmain-d.lib SDL-d.lib opengl32.lib glu32.lib DevIL.lib freetype.lib physfs.lib ws2_32.lib" + AdditionalDependencies="liblove.lib lua.lib SDLmain.lib SDL.lib opengl32.lib glu32.lib DevIL.lib freetype.lib physfs.lib ws2_32.lib" AdditionalLibraryDirectories="lib;Release" GenerateDebugInformation="true" SubSystem="2" @@ -230,10 +230,6 @@ > </File> <File - RelativePath="..\..\src\love_opengl\GLee.c" - > - </File> - <File RelativePath="..\..\src\love_opengl\Image.cpp" > <FileConfiguration @@ -250,14 +246,6 @@ > </File> <File - RelativePath="..\..\src\love_opengl\ImageFont.cpp" - > - </File> - <File - RelativePath="..\..\src\love_opengl\ImageFont.h" - > - </File> - <File RelativePath="..\..\src\love_opengl\love_opengl.cpp" > <FileConfiguration @@ -371,236 +359,24 @@ </File> </Filter> <Filter - Name="box2d" + Name="devil" > <File - RelativePath="..\..\src\love_box2d\Body.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Body.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\CircleShape.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\CircleShape.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Contact.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Contact.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\DistanceJoint.cpp" + RelativePath="..\..\src\love_devil\ImageData.cpp" > </File> <File - RelativePath="..\..\src\love_box2d\DistanceJoint.h" + RelativePath="..\..\src\love_devil\ImageData.h" > </File> <File - RelativePath="..\..\src\love_box2d\Joint.cpp" + RelativePath="..\..\src\love_devil\love_devil.cpp" > </File> <File - RelativePath="..\..\src\love_box2d\Joint.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\love_box2d.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\love_box2d.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\MouseJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\MouseJoint.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\PolygonShape.cpp" + RelativePath="..\..\src\love_devil\love_devil.h" > </File> - <File - RelativePath="..\..\src\love_box2d\PolygonShape.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\PrismaticJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\PrismaticJoint.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\RevoluteJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\RevoluteJoint.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Shape.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Shape.h" - > - </File> - <File - RelativePath="..\..\src\love_box2d\World.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\World.h" - > - </File> - <Filter - Name="box2d" - > - <File - RelativePath="..\..\src\love_box2d\Source\Common\b2BlockAllocator.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\b2Body.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2BroadPhase.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2CircleContact.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\Shapes\b2CircleShape.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2CollideCircle.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2CollidePoly.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2Collision.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2Contact.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\b2ContactManager.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2ContactSolver.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2Distance.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2DistanceJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2GearJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\b2Island.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2Joint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Common\b2Math.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2MouseJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2PairManager.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2PolyContact.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\Shapes\b2PolygonShape.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2PrismaticJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2PulleyJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2RevoluteJoint.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Common\b2Settings.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\Shapes\b2Shape.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Common\b2StackAllocator.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Collision\b2TimeOfImpact.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\b2World.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\Source\Dynamics\b2WorldCallbacks.cpp" - > - </File> - <File - RelativePath="..\..\src\love_box2d\graham\GrahamScanConvexHull.cpp" - > - </File> - </Filter> </Filter> <Filter Name="sdlkeyboard" @@ -842,6 +618,238 @@ > </File> </Filter> + <Filter + Name="box2d" + > + <File + RelativePath="..\..\src\love_box2d\Body.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Body.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\CircleShape.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\CircleShape.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Contact.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Contact.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\DistanceJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\DistanceJoint.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Joint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Joint.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\love_box2d.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\love_box2d.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\MouseJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\MouseJoint.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\PolygonShape.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\PolygonShape.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\PrismaticJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\PrismaticJoint.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\RevoluteJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\RevoluteJoint.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Shape.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Shape.h" + > + </File> + <File + RelativePath="..\..\src\love_box2d\World.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\World.h" + > + </File> + <Filter + Name="box2d" + > + <File + RelativePath="..\..\src\love_box2d\Source\Common\b2BlockAllocator.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\b2Body.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2BroadPhase.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2CircleContact.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\Shapes\b2CircleShape.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2CollideCircle.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2CollidePoly.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2Collision.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2Contact.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\b2ContactManager.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2ContactSolver.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2Distance.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2DistanceJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2GearJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\b2Island.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2Joint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Common\b2Math.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2MouseJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2PairManager.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2PolyAndCircleContact.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Contacts\b2PolyContact.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\Shapes\b2PolygonShape.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2PrismaticJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2PulleyJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\Joints\b2RevoluteJoint.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Common\b2Settings.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\Shapes\b2Shape.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Common\b2StackAllocator.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Collision\b2TimeOfImpact.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\b2World.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\Source\Dynamics\b2WorldCallbacks.cpp" + > + </File> + <File + RelativePath="..\..\src\love_box2d\graham\GrahamScanConvexHull.cpp" + > + </File> + </Filter> + </Filter> <File RelativePath="..\..\src\love.cpp" > platform/msvc2008/love.vcproj @@ -18,6 +18,6 @@ // Define this to include extra code which // ensures LOVE 0.5.0 compatibility. -#define LOVE_COMPAT_050 +//#define LOVE_COMPAT_050 #endif // LOVE_CONFIG_H src/liblove/config.h @@ -160,14 +160,19 @@ namespace love return 0; } - int luax_strtofile(lua_State * L, int idx) + int luax_convobj(lua_State * L, int idx, const char * mod, const char * fn) { // Convert string to a file. - luax_getfunction(L, "filesystem", "newFile"); - lua_pushvalue(L, idx); // The string argument. + luax_getfunction(L, mod, fn); + lua_pushvalue(L, idx); // The initial argument. lua_call(L, 1, 1); // Call the function, one arg, one return value. - lua_replace(L, idx); // Replace the string argument with the File. + lua_replace(L, idx); // Replace the initial argument with the new object. return 0; } + int luax_strtofile(lua_State * L, int idx) + { + return luax_convobj(L, idx, "filesystem", "newFile"); + } + } // love src/liblove/luax.cpp @@ -48,6 +48,15 @@ namespace love int luax_getfunction(lua_State * L, const char * mod, const char * fn); /** + * Converts an object into another object + * by the specified function mod.fn. The function must accept + * a single file as a parameter, and return one value. + * + * Note that the initial object is converted, i.e. replaced. + **/ + int luax_convobj(lua_State * L, int idx, const char * mod, const char * fn); + + /** * Converts a string into a File object. Note that the * string is replaced by the new File object at the * specified index, and NOT pushed onto the stack. src/liblove/luax.h @@ -22,6 +22,7 @@ namespace love LOVE_OBJECT_ID = 0, LOVE_FILE_ID, LOVE_DRAWABLE_ID, + LOVE_DATA_ID, // Module specific types. @@ -32,6 +33,9 @@ namespace love LOVE_FONT_ID, LOVE_PARTICLE_SYSTEM_ID, + // Image + LOVE_IMAGE_DATA_ID, + // Physics LOVE_WORLD_ID, LOVE_CONTACT_ID, @@ -50,6 +54,7 @@ namespace love LOVE_OPENGL_ID, LOVE_DIRECT3D_ID, LOVE_BOX2D_ID, + LOVE_DEVIL_ID, // Count the number of bits needed. LOVE_BIT_SIZE @@ -60,6 +65,7 @@ namespace love static const bits LOVE_OBJECT_BITS = bits(1) << LOVE_OBJECT_ID; static const bits LOVE_FILE_BITS = (bits(1) << LOVE_FILE_ID) | LOVE_OBJECT_BITS; static const bits LOVE_DRAWABLE_BITS = (bits(1) << LOVE_DRAWABLE_ID) | LOVE_OBJECT_BITS; + static const bits LOVE_DATA_BITS = (bits(1) << LOVE_DATA_ID) | LOVE_OBJECT_BITS; // Graphics. static const bits LOVE_IMAGE_BITS = (bits(1) << LOVE_IMAGE_ID) | LOVE_DRAWABLE_BITS; @@ -68,6 +74,9 @@ namespace love static const bits LOVE_FONT_BITS = (bits(1) << LOVE_FONT_ID) | LOVE_OBJECT_BITS; static const bits LOVE_PARTICLE_SYSTEM_BITS = (bits(1) << LOVE_PARTICLE_SYSTEM_ID) | LOVE_DRAWABLE_BITS; + // Image. + static const bits LOVE_IMAGE_DATA_BITS = (bits(1) << LOVE_IMAGE_DATA_ID) | LOVE_DATA_BITS; + // Physics. static const bits LOVE_WORLD_BITS = (bits(1) << LOVE_WORLD_ID) | LOVE_OBJECT_BITS; static const bits LOVE_CONTACT_BITS = (bits(1) << LOVE_CONTACT_ID) | LOVE_OBJECT_BITS; @@ -85,6 +94,7 @@ namespace love static const bits LOVE_OPENGL_BITS = bits(1) << LOVE_OPENGL_ID; static const bits LOVE_DIRECT3D_BITS = bits(1) << LOVE_DIRECT3D_ID; static const bits LOVE_BOX2D_BITS = bits(1) << LOVE_BOX2D_ID; + static const bits LOVE_DEVIL_BITS = bits(1) << LOVE_DEVIL_ID; // Wraps all userdata pointers. struct userdata src/liblove/types.h @@ -29,6 +29,7 @@ #include "love_sdlmouse/love_sdlmouse.h" #include "love_sdlkeyboard/love_sdlkeyboard.h" #include "love_box2d/love_box2d.h" +#include "love_devil/love_devil.h" int luaopen_love(lua_State * L) { @@ -79,6 +80,7 @@ int luaopen_love(lua_State * L) love::sdlmouse::luainfo(L); love::sdlkeyboard::luainfo(L); love::box2d::luainfo(L); + love::devil::luainfo(L); return 0; } @@ -121,7 +123,7 @@ int main(int argc, char ** argv) // which gets everything started. // TODO: This is obviously test code. - luaL_dofile(L, "test.lua"); + luaL_dofile(L, "../../src/lua/love.lua"); lua_close(L); printf("(press key)\n"); getchar(); src/love.cpp @@ -17,7 +17,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE box2d #define LOVE_WRAP_BITS LOVE_BOX2D_BITS -#include "../liblove/wphysics.h" +#include "../liblove/physics/wphysics.h" namespace love { src/love_box2d/love_box2d.cpp @@ -10,6 +10,9 @@ #include "Animation.h" +// LOVE +#include "../liblove/constants.h" + // STD #include <cmath> src/love_opengl/Animation.cpp @@ -12,7 +12,7 @@ #define LOVE_OPENGL_ANIMATION_H // LOVE -#include "../liblove/Drawable.h" +#include "../liblove/graphics/Drawable.h" // Module. #include "Image.h" src/love_opengl/Animation.h @@ -9,8 +9,8 @@ #define LOVE_OPENGL_FONT_H // LOVE -#include "../liblove/File.h" -#include "../liblove/Volatile.h" +#include "../liblove/filesystem/File.h" +#include "../liblove/graphics/Volatile.h" namespace love { src/love_opengl/Font.h @@ -30,7 +30,7 @@ namespace opengl } Image::Image(Texture * texture) - : x(0), y(0), width(texture->width), height(texture->height) + : x(0), y(0), width((float)texture->width), height((float)texture->height) { texture->retain(); this->texture = texture; @@ -46,8 +46,8 @@ namespace opengl w2, -h2 }; - float tw = width/texture->textureWidth; - float th = height/texture->textureHeight; + float tw = width/texture->width; + float th = height/texture->height; const float temp_texels [] = { @@ -78,10 +78,10 @@ namespace opengl w2, -h2 }; - float tx = this->x/(texture->textureWidth); - float ty = this->y/(texture->textureHeight); - float tw = this->width/(texture->textureWidth); - float th = this->height/(texture->textureHeight); + float tx = this->x/(texture->width); + float ty = this->y/(texture->height); + float tw = this->width/(texture->width); + float th = this->height/(texture->height); const float temp_texels [] = { src/love_opengl/Image.cpp @@ -13,7 +13,7 @@ // LOVE #include "../liblove/config.h" -#include "../liblove/Drawable.h" +#include "../liblove/graphics/Drawable.h" // Module #include "Texture.h" src/love_opengl/Image.h @@ -179,11 +179,11 @@ namespace opengl texture->bind(); - float xTex = x/(float)texture->getTextureWidth(); - float yTex = y/(float)texture->getTextureHeight(); + float xTex = x/(float)texture->getWidth(); + float yTex = y/(float)texture->getHeight(); - float wTex = w/(float)texture->getTextureWidth(); - float hTex = h/(float)texture->getTextureHeight(); + float wTex = w/(float)texture->getWidth(); + float hTex = h/(float)texture->getHeight(); glBegin(GL_QUADS); glTexCoord2f(xTex,yTex); glVertex2f(0,0); src/love_opengl/ImageFont.cpp @@ -12,7 +12,7 @@ #include "../liblove/math.h" #include "../liblove/constants.h" -#include "../liblove/Drawable.h" +#include "../liblove/graphics/Drawable.h" // Module #include "Color.h" src/love_opengl/ParticleSystem.h @@ -23,42 +23,21 @@ namespace love { namespace opengl { - // @todo why is this method even here? - int power_of_two(int i) - { - // @todo Less "while", more awesome. - // float exp = log(value) / log(2) // etc - int temp = 1; - while(temp < i) - temp *= 2; - return temp; - } - Texture::Texture(File * file) - : padding(0) + Texture::Texture(ImageData * data) { - file->retain(); - this->file = file; + this->data = data; + data->retain(); + width = data->getWidth(); + height = data->getHeight(); } Texture::~Texture() { - // We're done with the file. - file->release(); - + data->release(); unload(); } - int Texture::getTextureWidth() const - { - return textureWidth; - } - - int Texture::getTextureHeight() const - { - return textureHeight; - } - int Texture::getWidth() const { return (int)width; @@ -69,60 +48,24 @@ namespace opengl return (int)width; } - int Texture::getPadding() const - { - return padding; - } - void Texture::bind() const { glBindTexture(GL_TEXTURE_2D,texture); } - bool Texture::read() + bool Texture::load() { - if(!file->load()) - return false; - - // Generate DevIL image. - ilGenImages(1, &image); - - // Bind the image. - ilBindImage(image); - - // Try to load the image. - ILboolean success = ilLoadL(IL_TYPE_UNKNOWN, (void*)file->getData(), file->getSize()); - - // Check for errors - if(!success) - { - std::cerr << "Could not load image \"" << file->getFilename() << "\": " << getErrorString(ilGetError()) << "." << std::endl; - return false; - } - - this->width = (float)ilGetInteger(IL_IMAGE_WIDTH); - this->height = (float)ilGetInteger(IL_IMAGE_HEIGHT); - this->origin = ilGetInteger(IL_IMAGE_ORIGIN); - - this->textureWidth = (int)width; - this->textureHeight = (int)height; - - ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE); - - return true; + return loadVolatile(); } - rgba * Texture::getData() const + void Texture::unload() { - return (rgba *)ilGetData(); + unloadVolatile(); } - bool Texture::lock() + bool Texture::loadVolatile() { - padTwoPower(); - - // Pass on to OGL - glGenTextures(1,(GLuint*)&texture); + glGenTextures(1,&texture); glBindTexture(GL_TEXTURE_2D, texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); @@ -130,59 +73,15 @@ namespace opengl glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, (GLsizei)textureWidth, (GLsizei)textureHeight, 0, - ilGetInteger(IL_IMAGE_FORMAT), ilGetInteger(IL_IMAGE_TYPE), ilGetData()); - - // Check for errors - if(texture == 0) - return false; - - return true; - } - - void Texture::free() - { - // Delete DevIL-data (no longer needed) - ilDeleteImages(1, &image); - - // Unload the file. - file->unload(); - } - - bool Texture::load() - { - // Read file. - if(!read()) - return false; - - // Send to hardware - if(!lock()) - return false; - - // Free local data. - free(); - - // HW texture will be removed in unload. - return true; - } - - void Texture::unload() - { - unloadVolatile(); - } - - bool Texture::loadVolatile() - { - // Read file. - if(!read()) - return false; - - // Send to hardware - if(!lock()) - return false; - - // Free local data. - free(); + glTexImage2D(GL_TEXTURE_2D, + 0, + GL_RGBA8, + (GLsizei)width, + (GLsizei)height, + 0, + GL_RGBA, + GL_UNSIGNED_BYTE, + data->getData()); return true; } @@ -191,247 +90,9 @@ namespace opengl { // Delete the hardware texture. if(texture != 0) - glDeleteTextures(1, (GLuint*)&texture); - } - - void Texture::padTwoPower() - { - // Bind the image. - ilBindImage(image); - - // Get twopower of width and height - ILuint width = power_of_two((int)this->width); - ILuint height = power_of_two((int)this->height); - - // No change needed? - if(width == this->width && height == this->height) - return; - - // Get key data - ILuint depth = ilGetInteger(IL_IMAGE_DEPTH); - ILuint bpp = ilGetInteger(IL_IMAGE_BPP); - ILuint type = ilGetInteger(IL_IMAGE_TYPE); - ILuint format = ilGetInteger(IL_IMAGE_FORMAT); - - // Create new data. - int size = width * height * bpp; - - // Destination - rgba * d = new rgba[size]; - - // Source - rgba * s = (rgba *)ilGetData(); - - for(int i = 0; i<size; i++) - { - d[i].r = 0; - d[i].g = 0; - d[i].b = 0; - d[i].a = 0; - } - - for(int y=0;y<this->height;y++) - { - for(int x=0;x<this->width;x++) - { - int si = ((origin == IL_ORIGIN_LOWER_LEFT) ? (int)this->height - y - 1 : y) * (int)this->width + x; - int di = y * width + x; - - d[di].r = s[si].r; - d[di].g = s[si].g; - d[di].b = s[si].b; - d[di].a = s[si].a; - } - } - - // If origin was lower left, it's flipped by now. - origin = IL_ORIGIN_UPPER_LEFT; - - // Delete the old image. - ilDeleteImages(1, &image); - - // Generate new DevIL image. - ilGenImages(1, &image); - - // Bind the image. - ilBindImage(image); - - // Create the new image - ilTexImage(width, height, depth, bpp, format, type, (ILvoid*)d); - - // Set new "real" dimensions - this->textureWidth = width; - this->textureHeight = height; - - // Cleanup - delete [] d; - } - - bool pixel_in_range(rgba * data, int width, int height, int x, int y) - { - return (x >= 0 && y >= 0 && x < width && y < height); - } - - void pixel_commit(rgba & source, int & r, int & g, int & b, int & counter) - { - if(source.a != 0) - { - counter++; - r += source.r; - g += source.g; - b += source.b; - } - } - - void pixel_average_area(rgba * data, int width, int height, int x, int y) - { - int p = 0; // Number of neighbor pixels with alpha != 0 - int r = 0, g = 0, b = 0; - - if(pixel_in_range(data, width, height, x-1, y-1)) pixel_commit(data[(y-1)*width+(x-1)], r, g, b, p); - if(pixel_in_range(data, width, height, x, y-1)) pixel_commit(data[(y-1)*width+(x)], r, g, b, p); - if(pixel_in_range(data, width, height, x+1, y-1)) pixel_commit(data[(y-1)*width+(x+1)], r, g, b, p); - if(pixel_in_range(data, width, height, x-1, y)) pixel_commit(data[(y)*width+(x-1)], r, g, b, p); - if(pixel_in_range(data, width, height, x+1, y)) pixel_commit(data[(y)*width+(x+1)], r, g, b, p); - if(pixel_in_range(data, width, height, x-1, y+1)) pixel_commit(data[(y+1)*width+(x-1)], r, g, b, p); - if(pixel_in_range(data, width, height, x, y+1)) pixel_commit(data[(y+1)*width+(x)], r, g, b, p); - if(pixel_in_range(data, width, height, x+1, y+1))pixel_commit(data[(y+1)*width+(x+1)], r, g, b, p); - - if(p == 0) p = 1; - - data[y*width+x].r = r/p; - data[y*width+x].g = g/p; - data[y*width+x].b = b/p; - - } - - void Texture::optimize() - { - // Get the width and height of the data. - int width = (int)this->width; - int height = (int)this->height; - - // Source - rgba * s = (rgba *)ilGetData(); - - for(int y=0;y<this->height;y++) - { - for(int x=0;x<this->width;x++) - { - if(s[y*width+x].a == 0) - { - pixel_average_area(s, width, height, x, y); - } - } - } - - } - - void Texture::pad(int size) - { - - padding = size; - - // Bind the image. - ilBindImage(image); - - // Get the width and height of the data. - int old_width = (int)this->width; - int old_height = (int)this->height; - - int new_width = old_width + size*2; - int new_height = old_height + size*2; - - ILuint bpp = ilGetInteger(IL_IMAGE_BPP); - - // Destination - int new_size = new_width * new_height * bpp; - rgba * d = new rgba[new_size]; - - // Source - rgba * s = (rgba *)ilGetData(); - - for(int i = 0; i<new_size; i++) - { - d[i].r = 0; - d[i].g = 0; - d[i].b = 0; - d[i].a = 0; - } - - for(int x = 0;x<old_width;x++) - { - for(int y = 0;y<old_height;y++) - { - int si = ((origin == IL_ORIGIN_LOWER_LEFT) ? old_height - y - 1 : y)*old_width+x; - int di = (y+size)*new_width+(x+size); - d[di] = s[si]; - } - } - - // If origin was lower left, it's flipped by now. - origin = IL_ORIGIN_UPPER_LEFT; - - // Set the new image data. - setPixels(d, new_width, new_height); - } - - void Texture::setPixels(rgba * data, int width, int height) - { - - // Bind the image. - ilBindImage(image); - - // Get some image data. - ILuint depth = ilGetInteger(IL_IMAGE_DEPTH); - ILuint bpp = ilGetInteger(IL_IMAGE_BPP); - ILuint type = ilGetInteger(IL_IMAGE_TYPE); - ILuint format = ilGetInteger(IL_IMAGE_FORMAT); - //ILuint origin = ilGetInteger(IL_IMAGE_ORIGIN); - - // Delete the old image. - ilDeleteImages(1, &image); - - // Generate new DevIL image. - ilGenImages(1, &image); - - // Bind the new image. - ilBindImage(image); - - // Create the new image - ilTexImage(width, height, depth, bpp, format, type, (ILvoid*)data); - - // Set the new image dimensions. - this->textureWidth = width; - this->textureHeight = height; - this->width = (float)width; - this->height = (float)height; - } - - const char * Texture::getErrorString(int error) - { - switch(error) { - case IL_INVALID_ENUM: return "IL_INVALID_ENUM"; - case IL_OUT_OF_MEMORY: return "IL_OUT_OF_MEMORY"; - case IL_FORMAT_NOT_SUPPORTED: return "IL_FORMAT_NOT_SUPPORTED"; - case IL_INTERNAL_ERROR: return "IL_INTERNAL_ERROR"; - case IL_INVALID_VALUE: return "IL_INVALID_VALUE"; - case IL_ILLEGAL_OPERATION: return "IL_ILLEGAL_OPERATION"; - case IL_ILLEGAL_FILE_VALUE: return "IL_ILLEGAL_FILE_VALUE"; - case IL_INVALID_FILE_HEADER: return "IL_INVALID_FILE_HEADER"; - case IL_INVALID_PARAM: return "IL_INVALID_PARAM"; - case IL_COULD_NOT_OPEN_FILE: return "IL_COULD_NOT_OPEN_FILE"; - case IL_INVALID_EXTENSION: return "IL_INVALID_EXTENSION"; - case IL_FILE_ALREADY_EXISTS: return "IL_FILE_ALREADY_EXISTS"; - case IL_OUT_FORMAT_SAME: return "IL_OUT_FORMAT_SAME"; - case IL_STACK_OVERFLOW: return "IL_STACK_OVERFLOW"; - case IL_STACK_UNDERFLOW: return "IL_STACK_UNDERFLOW"; - case IL_INVALID_CONVERSION: return "IL_INVALID_CONVERSION"; - case IL_BAD_DIMENSIONS: return "IL_BAD_DIMENSIONS"; - case IL_FILE_READ_ERROR: return "IL_FILE_READ_ERROR"; - default: - return 0; + glDeleteTextures(1, &texture); + texture = 0; } } src/love_opengl/Texture.cpp @@ -13,19 +13,13 @@ // LOVE #include "../liblove/Object.h" -#include "../liblove/File.h" -#include "../liblove/Volatile.h" +#include "../liblove/image/ImageData.h" +#include "../liblove/graphics/Volatile.h" namespace love { namespace opengl { - // Pixel format structures. Luminance-Alpha and RGB(A). - // These might be useful to subclasses that need to convert images - // to power-of-two textures, and need to work with pixel data in general. - struct la { unsigned char l, a; }; - struct rgb { unsigned char r, g, b; }; - struct rgba { unsigned char r, g, b, a; }; class Texture : public Object, public Volatile { @@ -34,27 +28,13 @@ namespace opengl private: - File * file; - - // Size of the loaded image file. These are the - // dimensions the user needs to deal with. - float width; - float height; + ImageData * data; // The size of the actual texture in hardware // memory. This may be different to normal width/height // due to power-of-two conversion. - int textureWidth; - int textureHeight; - - // The image's padding. - int padding; - - // The origin of the loaded image. - int origin; - - // DevIL image identifier. - unsigned int image; + int width; + int height; // OpenGL texture identifier. unsigned int texture; @@ -64,43 +44,16 @@ namespace opengl /** * Creates a new Image. Not that anything is ready to use * before load is called. - * @param file The file from which to load the image. **/ - Texture(File * file); + Texture(ImageData * data); virtual ~Texture(); - /** - * Gets the actual width of the hardware texture. - **/ - int getTextureWidth() const; - - /** - * Gets the actual height of the hardware texture. - **/ - int getTextureHeight() const; - int getWidth() const; int getHeight() const; - - /** - * Get the amout of padding in the image. (If - * pad has been called). - **/ - int getPadding() const; - /** - * Gets a pointer to the data. - **/ - rgba * getData() const; - void bind() const; - bool read(); - bool lock(); - void free(); - void optimize(); - void pad(int size = 1); - + // From Resource bool load(); void unload(); @@ -108,32 +61,6 @@ namespace opengl // From Volatile bool loadVolatile(); void unloadVolatile(); - - private: - - /** - * Pads the image to a power of two texture. - * Useful for < OGL2.0, which only supports these. - **/ - void padTwoPower(); - - /** - * Replace the current pixel data with this one. Assumes that - * the image format, BPP, etc is the same. - * @param data The new image data. - * @param width The width of the new image data. - * @param height The height of the new image data. - * - * @note Does not delete the image data, so remember to do - * so yourself. - **/ - void setPixels(rgba * data, int width, int height); - - /** - * Returns string representations of DevIL error codes. - * @error The error code. - **/ - static const char * getErrorString(int error); }; // Texture src/love_opengl/Texture.h @@ -28,7 +28,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE opengl #define LOVE_WRAP_BITS LOVE_OPENGL_BITS -#include "../liblove/wgraphics.h" +#include "../liblove/graphics/wgraphics.h" namespace love { @@ -410,31 +410,13 @@ namespace opengl return 4; } - Image * newImage(File * file, int mode) + Image * newImage(ImageData * data) { - Texture * texture = new Texture(file); + Texture * texture = new Texture(data); - // Read the image. - if(!texture->read()) - { - std::cerr << "Could not load image \"" << file->getFilename() << "\"."; - texture->release(); - return 0; - } - - // Optionally pad. - if(mode == IMAGE_PAD || mode == IMAGE_PAD_AND_OPTIMIZE) - texture->pad(); - - // Optionally optimize. - if(mode == IMAGE_OPTIMIZE || mode == IMAGE_PAD_AND_OPTIMIZE) - texture->optimize(); - - // Lock the image. - if(!texture->lock()) + if(!texture->load()) { - std::cerr << "Could not lock image \"" << file->getFilename() << "\"."; - texture->release(); + delete texture; return 0; } src/love_opengl/love_opengl.cpp @@ -13,7 +13,7 @@ // LOVE #include "../liblove/config.h" -#include "../liblove/File.h" +#include "../liblove/filesystem/File.h" #include "../liblove/luax.h" #include "../liblove/types.h" @@ -142,7 +142,8 @@ namespace opengl /** * Creates an Image object with padding and/or optimization. **/ - Image * newImage(File * file, int mode = IMAGE_NORMAL); + Image * newImage(File * file); + Image * newImage(ImageData * data); Image * newImage(Image * image, float x, float y, float w, float h); /** src/love_opengl/love_opengl.h @@ -9,7 +9,7 @@ #define LOVE_PHYSFS_FILE_H // LOVE -#include "../liblove/File.h" +#include "../liblove/filesystem/File.h" // PhysFS #include <physfs.h> src/love_physfs/File.h @@ -19,7 +19,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE physfs #define LOVE_WRAP_BITS LOVE_PHYSFS_BITS -#include "../liblove/wfilesystem.h" +#include "../liblove/filesystem/wfilesystem.h" // For great CWD. (Current Working Directory) // Using this instead of boost::filesystem which totally src/love_physfs/love_physfs.cpp @@ -18,7 +18,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE sdljoystick -#include "../liblove/wjoystick.h" +#include "../liblove/joystick/wjoystick.h" namespace love { src/love_sdljoystick/love_sdljoystick.cpp @@ -15,7 +15,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE sdlkeyboard -#include "../liblove/wkeyboard.h" +#include "../liblove/keyboard/wkeyboard.h" namespace love { src/love_sdlkeyboard/love_sdlkeyboard.cpp @@ -15,7 +15,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE sdlmouse -#include "../liblove/wmouse.h" +#include "../liblove/mouse/wmouse.h" namespace love { src/love_sdlmouse/love_sdlmouse.cpp @@ -15,7 +15,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE sdlsystem -#include "../liblove/wsystem.h" +#include "../liblove/system/wsystem.h" namespace love { src/love_sdlsystem/love_sdlsystem.cpp @@ -15,7 +15,7 @@ // Include the wrapper code. #define LOVE_WRAP_NAMESPACE sdltimer -#include "../liblove/wtimer.h" +#include "../liblove/timer/wtimer.h" namespace love { src/love_sdltimer/love_sdltimer.cpp @@ -1,192 +1,77 @@ +-- Make sure love table exists. +if not love then love = {} end -love.setup = {} - -function love.setup.getSource() - - if not arg[0] then return nil end - - -- Get the working directory. - local wd = string.gsub(love.filesystem.getWorkingDirectory(), "\\", "/") - - -- Get the argument. - local a = string.gsub(arg[0], "\\", "/") - - local absolute = string.sub(a,1,1) == "/" or string.find(string.sub(a,1,3), "%a:/") - - if absolute then - return a - else - return wd .. "/" .. a - end - -end - --- Removes trailing and leading whitespace --- from a string. -function love.setup.trim(s) - return (s:gsub("^%s*(.-)%s*$", "%1")) -end - -function love.setup.getConf() - - local conf = { - - ["width"] = 800, - ["height"] = 600, - ["fullscreen"] = false, - ["vsync"] = true, - ["fsaa"] = 0, - ["display_auto"] = true, - - ["title"] = "Untitled Game", - ["author"] = "Unknown Author", - - ["disable_graphics"] = false, - ["disable_audio"] = false, - ["disable_physics"] = false, - ["disable_keyboard"] = false, - ["disable_mouse"] = false, - ["disable_timer"] = false, - ["disable_joystick"] = false, - ["disable_luasocket"] = false, - - ["love_version"] = "0.6.0", - } - - -- Read the file, if any. - if love.filesystem.exists("game.conf") then - for line in love.filesystem.lines("game.conf") do - local u1, u2, key, value = string.find(line, "([%w_ ]+)=(.+)") - - -- Remove leading/trailing whitespace. - key = love.setup.trim(key) - value = love.setup.trim(value) - - -- Overwrite default values in conf table. - conf[key] = value - end +function love.insmod(name, provides) + if love.__mod[provides] and love.__mod[provides][name] then + love.__mod[provides][name].open() + print("Opened " .. provides .. " module " .. name .. ".") end - - return conf -end - -function love.setup.filesystem() - - local source = love.setup.getSource() - - if source then - print("Source is: " .. source) - love.filesystem.setSource(source) - love.filesystem.setIdentity("test9000") - else - print("There is no source: load nogame.") - return false - end - return true end function love.init() - -- These are ALWAYS required. - require("love_sdlsystem") - require("love_physfs") - - -- Setup the filesystem folders. - if not love.setup.filesystem() then - return false + if love.__args then + for i,v in pairs(love.__args) do + print(i,v) + end end - -- Read the config file. - local conf = love.setup.getConf() - - -- These are all optional. - require("love_opengl") - require("love_sdlkeyboard") - require("love_sdltimer") - require("love_sdlmouse") - require("love_sdljoystick") - require("love_luasocket") - require("love_box2d") - - -- Auto-configure display, unless otherwise specified. - if conf["display_auto"] then - love.graphics.setMode( - conf["width"], - conf["height"], - conf["fullscreen"], - conf["vsync"], - conf["fsaa"]) + love.insmod("sdltimer", "timer") + love.insmod("devil", "image") + love.insmod("opengl", "graphics") + love.insmod("sdlsystem", "system") + + if love.graphics.checkMode(800, 600, false) then + print("800x600 is supported") + love.graphics.setMode(800, 600, false, false) end - -- Parse main file, unless a love.main has been preloaded. - if not love.main and love.filesystem.exists("main.lua") then - love.main = love.filesystem.load("main.lua") - end - - -- Call love.main. - if love.main then - love.main() - end + formats = love.image.getFormats() + print(formats) + data = love.image.newImageData(128, 128) + up = function (x, y, r, g, b, a) + local g = (x/128)*255 + return g, g, g, 255 + end - love.setup = nil - collectgarbage() + data:mapPixel(up) - -- Call love.run. - local result = xpcall(love.run, - function (msg) - print(msg, debug.traceback()) - end) + image = love.graphics.newImage(data) - return result + love.run() end function love.run() - if load then load() end - -- Main loop time. while true do - love.timer.step() - if update then update(love.timer.getDelta()) end + --love.timer.step() + --if update then update(love.timer.getDelta()) end + love.graphics.clear() - if draw then draw() end + + love.graphics.draw(image, 200, 200) -- Process events. for e,a,b,c in love.system.events() do if e == love.event_quit then return end - love.handlers[e](a,b,c) + print(e, a, b, c) + --love.handlers[e](a,b,c) end - + love.graphics.present() end end --- Standard callback handlers. -love.handlers = { - [love.event_keypressed] = function (b) - if keypressed then keypressed(b) end - end, - [love.event_keyreleased] = function (b) - if keyreleased then keyreleased(b) end - end, - [love.event_mousepressed] = function (x,y,b) - if mousepressed then mousepressed(x,y,b) end - end, - [love.event_mousereleased] = function (x,y,b) - if mousereleased then mousereleased(x,y,b) end - end, - [love.event_joystickpressed] = function (j,b) - if joystickpressed then joystickpressed(j,b) end - end, - [love.event_joystickreleased] = function (j,b) - if joystickreleased then joystickreleased(j,b) end - end, - [love.event_quit] = function () - return - end, -} +local result = xpcall(love.init, + function (msg) + print(msg, debug.traceback()) + end) + + +print("Done.") src/lua/love.lua tools/installer/left.bmp tools/installer/top.bmp src/liblove/Drawable.cpp src/liblove/Drawable.h src/liblove/File.cpp src/liblove/File.h src/liblove/Volatile.cpp src/liblove/Volatile.h src/liblove/wAnimation.h src/liblove/wBody.h src/liblove/wCircleShape.h src/liblove/wColor.h src/liblove/wContact.h src/liblove/wDistanceJoint.h src/liblove/wDrawable.h src/liblove/wFile.h src/liblove/wFont.h src/liblove/wImage.h src/liblove/wJoint.h src/liblove/wMouseJoint.h src/liblove/wParticleSystem.h src/liblove/wPolygonShape.h src/liblove/wPrismaticJoint.h src/liblove/wRevoluteJoint.h src/liblove/wShape.h src/liblove/wWorld.h src/liblove/wfilesystem.h src/liblove/wgraphics.h src/liblove/wjoystick.h src/liblove/wkeyboard.h src/liblove/wmouse.h src/liblove/wphysics.h src/liblove/wsystem.h src/liblove/wtimer.h e2137ebb020eb0e3785620b884630bf6e2ab7419 prerude prerude@3494dbca-881a-0410-bd34-8ecbaf855390 http://github.com/JackDanger/love/commit/126ae5548965ac76e5352ec79666091bce894bcc 126ae5548965ac76e5352ec79666091bce894bcc

2008-12-16T03:48:14-08:00

Added love_devil. Restructured liblove. git-svn-id: https://love.svn.sf.net/svnroot/love/trunk@673 3494dbca-881a-0410-bd34-8ecbaf855390 b99f1cd9e11f5abec27a9221bf8ef18c6ab4a85c prerude prerude@3494dbca-881a-0410-bd34-8ecbaf855390