diff options
m--------- | 3rd/bee.lua | 0 | ||||
m--------- | 3rd/lovr-api | 0 | ||||
m--------- | 3rd/luamake | 0 | ||||
-rw-r--r-- | meta/3rd/love2d/library/love.lua | 46 | ||||
-rw-r--r-- | meta/3rd/love2d/library/love/graphics.lua | 36 | ||||
-rw-r--r-- | meta/3rd/love2d/library/love/physics.lua | 4 | ||||
-rw-r--r-- | meta/3rd/lovr/library/lovr/filesystem.lua | 4 | ||||
-rw-r--r-- | meta/3rd/lovr/library/lovr/physics.lua | 38 |
8 files changed, 105 insertions, 23 deletions
diff --git a/3rd/bee.lua b/3rd/bee.lua -Subproject 992cc577800a470366980d895d4a7cd103a30c3 +Subproject 0b9b48ac30a0cb25bedb630776401c0bbb49066 diff --git a/3rd/lovr-api b/3rd/lovr-api -Subproject ec774d0fc127d6aef231a3de8aae3d63031c058 +Subproject 7f9097dfbfd4aa7206b75b330aaad83f5dda56f diff --git a/3rd/luamake b/3rd/luamake -Subproject 3f37edc364ba92dd92d3f4569a6b53bea0f4907 +Subproject fa4ebb575b9c1cdccff7d6a456673f2f4e029e9 diff --git a/meta/3rd/love2d/library/love.lua b/meta/3rd/love2d/library/love.lua index 8c2e3f18..fcdcc98e 100644 --- a/meta/3rd/love2d/library/love.lua +++ b/meta/3rd/love2d/library/love.lua @@ -1,13 +1,18 @@ ---@meta -- version: 11.4 - +--- +---[Open in Browser](https://love2d.org/wiki/love) +--- ---@class love love = {} --- ---Gets the current running version of LÖVE. --- +--- +---[Open in Browser](https://love2d.org/wiki/love.getVersion) +--- ---@return number major # The major version of LÖVE, i.e. 0 for version 0.9.1. ---@return number minor # The minor version of LÖVE, i.e. 9 for version 0.9.1. ---@return number revision # The revision version of LÖVE, i.e. 1 for version 0.9.1. @@ -19,12 +24,18 @@ function love.getVersion() end --- ---When deprecation output is enabled, the first use of a formally deprecated LÖVE API will show a message at the bottom of the screen for a short time, and print the message to the console. --- +--- +---[Open in Browser](https://love2d.org/wiki/love.hasDeprecationOutput) +--- ---@return boolean enabled # Whether deprecation output is enabled. function love.hasDeprecationOutput() end --- ---Gets whether the given version is compatible with the current running version of LÖVE. --- +--- +---[Open in Browser](https://love2d.org/wiki/love.isVersionCompatible) +--- ---@overload fun(major: number, minor: number, revision: number):boolean ---@param version string # The version to check (for example '11.3' or '0.10.2'). ---@return boolean compatible # Whether the given version is compatible with the current running version of LÖVE. @@ -35,18 +46,27 @@ function love.isVersionCompatible(version) end --- ---When deprecation output is enabled, the first use of a formally deprecated LÖVE API will show a message at the bottom of the screen for a short time, and print the message to the console. --- +--- +---[Open in Browser](https://love2d.org/wiki/love.setDeprecationOutput) +--- ---@param enable boolean # Whether to enable or disable deprecation output. function love.setDeprecationOutput(enable) end --- ---The superclass of all data. --- +--- +---[Open in Browser](https://love2d.org/wiki/love) +--- ---@class love.Data: love.Object local Data = {} --- ---Creates a new copy of the Data object. --- +--- +---[Open in Browser](https://love2d.org/wiki/Data:clone) +--- ---@return love.Data clone # The new copy. function Data:clone() end @@ -55,30 +75,45 @@ function Data:clone() end --- ---This function should be preferred instead of Data:getPointer because the latter uses light userdata which can't store more all possible memory addresses on some new ARM64 architectures, when LuaJIT is used. --- +--- +---[Open in Browser](https://love2d.org/wiki/Data:getFFIPointer) +--- ---@return ffi.cdata* pointer # A raw void* pointer to the Data, or nil if FFI is unavailable. function Data:getFFIPointer() end --- ---Gets a pointer to the Data. Can be used with libraries such as LuaJIT's FFI. --- +--- +---[Open in Browser](https://love2d.org/wiki/Data:getPointer) +--- ---@return lightuserdata pointer # A raw pointer to the Data. function Data:getPointer() end --- ---Gets the Data's size in bytes. --- +--- +---[Open in Browser](https://love2d.org/wiki/Data:getSize) +--- ---@return number size # The size of the Data in bytes. function Data:getSize() end --- ---Gets the full Data as a string. --- +--- +---[Open in Browser](https://love2d.org/wiki/Data:getString) +--- ---@return string data # The raw data. function Data:getString() end --- ---The superclass of all LÖVE types. --- +--- +---[Open in Browser](https://love2d.org/wiki/love) +--- ---@class love.Object local Object = {} @@ -87,18 +122,27 @@ local Object = {} --- ---This method can be used to immediately clean up resources without waiting for Lua's garbage collector. --- +--- +---[Open in Browser](https://love2d.org/wiki/Object:release) +--- ---@return boolean success # True if the object was released by this call, false if it had been previously released. function Object:release() end --- ---Gets the type of the object as a string. --- +--- +---[Open in Browser](https://love2d.org/wiki/Object:type) +--- ---@return string type # The type as a string. function Object:type() end --- ---Checks whether an object is of a certain type. If the object has the type with the specified name in its hierarchy, this function will return true. --- +--- +---[Open in Browser](https://love2d.org/wiki/Object:typeOf) +--- ---@param name string # The name of the type to check for. ---@return boolean b # True if the object is of the specified type, false otherwise. function Object:typeOf(name) end diff --git a/meta/3rd/love2d/library/love/graphics.lua b/meta/3rd/love2d/library/love/graphics.lua index bb37237d..b0c991c9 100644 --- a/meta/3rd/love2d/library/love/graphics.lua +++ b/meta/3rd/love2d/library/love/graphics.lua @@ -731,13 +731,13 @@ function love.graphics.newFont(filename) end --- ---[Open in Browser](https://love2d.org/wiki/love.graphics.newImage) --- ----@overload fun(fileData: love.FileData, flags?: table):love.Image ----@overload fun(imageData: love.ImageData, flags?: table):love.Image ----@overload fun(compressedImageData: love.CompressedImageData, flags?: table):love.Image +---@overload fun(fileData: love.FileData, settings?: table):love.Image +---@overload fun(imageData: love.ImageData, settings?: table):love.Image +---@overload fun(compressedImageData: love.CompressedImageData, settings?: table):love.Image ---@param filename string # The filepath to the image file. ----@param flags? {dpiscale: number, linear: boolean, mipmaps: boolean} # A table containing the following fields: +---@param settings? {dpiscale: number, linear: boolean, mipmaps: boolean} # A table containing the following fields: ---@return love.Image image # A new Image object which can be drawn on screen. -function love.graphics.newImage(filename, flags) end +function love.graphics.newImage(filename, settings) end --- ---Creates a new specifically formatted image. @@ -1074,8 +1074,7 @@ function love.graphics.scale(sx, sy) end --- ---[Open in Browser](https://love2d.org/wiki/love.graphics.setBackgroundColor) --- ----@overload fun() ----@overload fun() +---@overload fun(rgba: table) ---@param red number # The red component (0-1). ---@param green number # The green component (0-1). ---@param blue number # The blue component (0-1). @@ -2243,18 +2242,19 @@ function ParticleSystem:setBufferSize(size) end --- ---[Open in Browser](https://love2d.org/wiki/ParticleSystem:setColors) --- +---@overload fun(self: love.ParticleSystem, rgba1: table, rgba2: table, rgba8: table) ---@param r1 number # First color, red component (0-1). ---@param g1 number # First color, green component (0-1). ---@param b1 number # First color, blue component (0-1). ----@param a1 number # First color, alpha component (0-1). ----@param r2 number # Second color, red component (0-1). ----@param g2 number # Second color, green component (0-1). ----@param b2 number # Second color, blue component (0-1). ----@param a2 number # Second color, alpha component (0-1). ----@param r8 number # Eighth color, red component (0-1). ----@param g8 number # Eighth color, green component (0-1). ----@param b8 number # Eighth color, blue component (0-1). ----@param a8 number # Eighth color, alpha component (0-1). +---@param a1? number # First color, alpha component (0-1). +---@param r2? number # Second color, red component (0-1). +---@param g2? number # Second color, green component (0-1). +---@param b2? number # Second color, blue component (0-1). +---@param a2? number # Second color, alpha component (0-1). +---@param r8? number # Eighth color, red component (0-1). +---@param g8? number # Eighth color, green component (0-1). +---@param b8? number # Eighth color, blue component (0-1). +---@param a8? number # Eighth color, alpha component (0-1). function ParticleSystem:setColors(r1, g1, b1, a1, r2, g2, b2, a2, r8, g8, b8, a8) end --- @@ -2420,8 +2420,8 @@ function ParticleSystem:setSizeVariation(variation) end ---[Open in Browser](https://love2d.org/wiki/ParticleSystem:setSizes) --- ---@param size1 number # The first size. ----@param size2 number # The second size. ----@param size8 number # The eighth size. +---@param size2? number # The second size. +---@param size8? number # The eighth size. function ParticleSystem:setSizes(size1, size2, size8) end --- diff --git a/meta/3rd/love2d/library/love/physics.lua b/meta/3rd/love2d/library/love/physics.lua index 448d27f7..616e4791 100644 --- a/meta/3rd/love2d/library/love/physics.lua +++ b/meta/3rd/love2d/library/love/physics.lua @@ -3145,8 +3145,8 @@ function World:rayCast(fixture, x, y, xn, yn, fraction) end --- ---@param beginContact function # Gets called when two fixtures begin to overlap. ---@param endContact function # Gets called when two fixtures cease to overlap. This will also be called outside of a world update, when colliding objects are destroyed. ----@param preSolve function # Gets called before a collision gets resolved. ----@param postSolve function # Gets called after the collision has been resolved. +---@param preSolve? function # Gets called before a collision gets resolved. +---@param postSolve? function # Gets called after the collision has been resolved. function World:setCallbacks(beginContact, endContact, preSolve, postSolve) end --- diff --git a/meta/3rd/lovr/library/lovr/filesystem.lua b/meta/3rd/lovr/library/lovr/filesystem.lua index cbdb25aa..cbac0b29 100644 --- a/meta/3rd/lovr/library/lovr/filesystem.lua +++ b/meta/3rd/lovr/library/lovr/filesystem.lua @@ -310,8 +310,8 @@ function lovr.filesystem.unmount(path) end --- ---If the file already has data in it, it will be replaced with the new content. --- ----@overload fun(filename: string, blob: lovr.Blob):number +---@overload fun(filename: string, blob: lovr.Blob):boolean ---@param filename string # The file to write to. ---@param content string # A string to write to the file. ----@return number bytes # The number of bytes written. +---@return boolean success # Whether the write was successful. function lovr.filesystem.write(filename, content) end diff --git a/meta/3rd/lovr/library/lovr/physics.lua b/meta/3rd/lovr/library/lovr/physics.lua index 661b49cd..4563a328 100644 --- a/meta/3rd/lovr/library/lovr/physics.lua +++ b/meta/3rd/lovr/library/lovr/physics.lua @@ -103,6 +103,19 @@ function lovr.physics.newDistanceJoint(colliderA, colliderB, x1, y1, z1, x2, y2, function lovr.physics.newHingeJoint(colliderA, colliderB, x, y, z, ax, ay, az) end --- +---Creates a new MeshShape. +--- +--- +---### NOTE: +---A Shape can be attached to a Collider using `Collider:addShape`. +--- +---@overload fun(model: lovr.Model):lovr.MeshShape +---@param vertices table # The table of vertices in the mesh. Each vertex is a table with 3 numbers. +---@param indices table # A table of triangle indices representing how the vertices are connected in the Mesh. +---@return lovr.MeshShape mesh # The new MeshShape. +function lovr.physics.newMeshShape(vertices, indices) end + +--- ---Creates a new SliderJoint. --- --- @@ -129,6 +142,19 @@ function lovr.physics.newSliderJoint(colliderA, colliderB, ax, ay, az) end function lovr.physics.newSphereShape(radius) end --- +---Creates a new TerrainShape. +--- +--- +---### NOTE: +---A Shape can be attached to a Collider using `Collider:addShape`. For immobile terrain use the `Collider:setKinematic`. +--- +---@overload fun(scale: number, heightmap: lovr.Image, stretch?: number):lovr.TerrainShape +---@overload fun(scale: number, callback: function, samples?: number):lovr.TerrainShape +---@param scale number # The width and depth of the terrain, in meters. +---@return lovr.TerrainShape terrain # The new TerrainShape. +function lovr.physics.newTerrainShape(scale) end + +--- ---Creates a new physics World, which tracks the overall physics simulation, holds collider objects, and resolves collisions between them. --- --- @@ -1033,6 +1059,12 @@ function Joint:setEnabled(enabled) end function Joint:setUserData(data) end --- +---A type of `Shape` that can be used for triangle meshes. +--- +---@class lovr.MeshShape +local MeshShape = {} + +--- ---A Shape is a physics object that can be attached to colliders to define their shape. --- ---@class lovr.Shape @@ -1268,6 +1300,12 @@ function SphereShape:getRadius() end function SphereShape:setRadius(radius) end --- +---A type of `Shape` that can be used for terrains and irregular surfaces. +--- +---@class lovr.TerrainShape +local TerrainShape = {} + +--- ---A World is an object that holds the colliders, joints, and shapes in a physics simulation. --- --- |