From de82efa9bf794ea195c4d1b3da229500c8a213e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= Date: Mon, 30 Jan 2023 11:10:00 +0800 Subject: update submodules and docs --- meta/3rd/love2d/library/love/math.lua | 15 ++++++++++++++- meta/3rd/lovr/library/lovr/filesystem.lua | 6 +++++- meta/3rd/lovr/library/lovr/headset.lua | 22 ++++++++++++++++++---- meta/3rd/lovr/library/lovr/math.lua | 2 +- 4 files changed, 38 insertions(+), 7 deletions(-) (limited to 'meta/3rd') diff --git a/meta/3rd/love2d/library/love/math.lua b/meta/3rd/love2d/library/love/math.lua index 2021b492..e8397cb5 100644 --- a/meta/3rd/love2d/library/love/math.lua +++ b/meta/3rd/love2d/library/love/math.lua @@ -532,6 +532,19 @@ function Transform:clone() end --- ---@return number e1_1 # The first column of the first row of the matrix. ---@return number e1_2 # The second column of the first row of the matrix. +---@return number e1_3 # The third column of the first row of the matrix. +---@return number e1_4 # The fourth column of the first row of the matrix. +---@return number e2_1 # The first column of the second row of the matrix. +---@return number e2_2 # The second column of the second row of the matrix. +---@return number e2_3 # The third column of the second row of the matrix. +---@return number e2_4 # The fourth column of the second row of the matrix. +---@return number e3_1 # The first column of the third row of the matrix. +---@return number e3_2 # The second column of the third row of the matrix. +---@return number e3_3 # The third column of the third row of the matrix. +---@return number e3_4 # The fourth column of the third row of the matrix. +---@return number e4_1 # The first column of the fourth row of the matrix. +---@return number e4_2 # The second column of the fourth row of the matrix. +---@return number e4_3 # The third column of the fourth row of the matrix. ---@return number e4_4 # The fourth column of the fourth row of the matrix. function Transform:getMatrix() end @@ -605,7 +618,7 @@ function Transform:scale(sx, sy) end --- ---[Open in Browser](https://love2d.org/wiki/Transform:setMatrix) --- ----@overload fun(self: love.Transform, layout: love.MatrixLayout, e1_1: number, e1_2: number, ..., e4_4: number):love.Transform +---@overload fun(self: love.Transform, layout: love.MatrixLayout, e1_1: number, e1_2: number, e1_3: number, e1_4: number, e2_1: number, e2_2: number, e2_3: number, e2_4: number, e3_1: number, e3_2: number, e3_3: number, e3_4: number, e4_1: number, e4_2: number, e4_3: number, e4_4: number):love.Transform ---@overload fun(self: love.Transform, layout: love.MatrixLayout, matrix: table):love.Transform ---@overload fun(self: love.Transform, layout: love.MatrixLayout, matrix: table):love.Transform ---@param e1_1 number # The first column of the first row of the matrix. diff --git a/meta/3rd/lovr/library/lovr/filesystem.lua b/meta/3rd/lovr/library/lovr/filesystem.lua index cbac0b29..ff6f2ad9 100644 --- a/meta/3rd/lovr/library/lovr/filesystem.lua +++ b/meta/3rd/lovr/library/lovr/filesystem.lua @@ -269,7 +269,11 @@ function lovr.filesystem.remove(path) end --- ---Set the name of the save directory. --- ----@param identity string # The new name of the save directory. +---This function can only be called once and is called automatically at startup, so this function normally isn't called manually. +--- +---However, the identity can be changed by setting the `t.identity` option in `lovr.conf`. +--- +---@param identity string # The name of the save directory. function lovr.filesystem.setIdentity(identity) end --- diff --git a/meta/3rd/lovr/library/lovr/headset.lua b/meta/3rd/lovr/library/lovr/headset.lua index 0c26709e..8a7372c2 100644 --- a/meta/3rd/lovr/library/lovr/headset.lua +++ b/meta/3rd/lovr/library/lovr/headset.lua @@ -612,12 +612,26 @@ function lovr.headset.wasReleased(device, button) end --- ---Different types of input devices supported by the `lovr.headset` module. --- +--- +---### NOTE: +---The difference between `hand/left` and `hand/left/point` is the first represents an object held in the hand, whereas the second represents the laser pointer used to aim. +--- +---Drawing a controller model would use `hand/left`, whereas drawing a pointer or aiming would use `hand/left/point`. +--- ---@alias lovr.Device --- ---The headset. --- ---| "head" --- +---A shorthand for hand/left. +--- +---| "left" +--- +---A shorthand for hand/right. +--- +---| "right" +--- ---The left controller. --- ---| "hand/left" @@ -626,13 +640,13 @@ function lovr.headset.wasReleased(device, button) end --- ---| "hand/right" --- ----A shorthand for hand/left. +---The left controller pointer (pose only). --- ----| "left" +---| "hand/left/point" --- ----A shorthand for hand/right. +---The right controller pointer (pose only). --- ----| "right" +---| "hand/right/point" --- ---A device tracking the left elbow. --- diff --git a/meta/3rd/lovr/library/lovr/math.lua b/meta/3rd/lovr/library/lovr/math.lua index 907f4850..1b3a401d 100644 --- a/meta/3rd/lovr/library/lovr/math.lua +++ b/meta/3rd/lovr/library/lovr/math.lua @@ -528,7 +528,7 @@ function Mat4:transpose() end --- ---Returns the components of matrix, either as 10 separated numbers representing the position, scale, and rotation, or as 16 raw numbers representing the individual components of the matrix in column-major order. --- ----@param raw boolean # Whether to return the 16 raw components. +---@param raw? boolean # Whether to return the 16 raw components. function Mat4:unpack(raw) end --- -- cgit v1.2.3