Skip to content

Commit

Permalink
Merge branch 'release/0.9.2d'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rm-code
rm-code committed Apr 2, 2015
2 parents 969c50e + 47f2c23 commit 71c6a6e
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 28 deletions.
57 changes: 54 additions & 3 deletions modules/Graphics.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4051,6 +4051,34 @@ return {
description = 'The new Mesh.'
}
}
},
{
arguments = {
{
type = 'number',
name = 'vertexcount',
description = 'The total number of vertices the Mesh will use. Each vertex is initialized to {0,0, 0,0, 255,255,255,255}.'
},
{
type = 'Texture',
name = 'texture',
default = 'nil',
description = 'The Image or Canvas to use when drawing the Mesh. May be nil to use no texture.'
},
{
type = 'MeshDrawMode',
name = 'mode',
default = '"fan"',
description = 'How the vertices are used when drawing. The default mode "fan" is sufficient for simple convex polygons.'
},
},
returns = {
{
type = 'Mesh',
name = 'mesh',
description = 'The new Mesh.'
}
}
}
}
},
Expand Down Expand Up @@ -4671,7 +4699,16 @@ return {
name = 'push',
description = 'Copies and pushes the current coordinate transformation to the transformation stack.\n\nThis function is always used to prepare for a corresponding pop operation later. It stores the current coordinate transformation state into the transformation stack and keeps it active. Later changes to the transformation can be undone by using the pop operation, which returns the coordinate transform to the state it was in before calling push.',
functions = {
{}
{},
{
arguments = {
{
type = 'StackType',
name = 'stack',
description = 'The type of stack to push (e.g. just transformation state, or all love.graphics state).'
},
}
}
}
},
{
Expand Down Expand Up @@ -5328,7 +5365,7 @@ return {
},
{
name = 'CanvasFormat',
description = '',
description = 'Canvas formats.',
constants = {
{
name = 'normal',
Expand Down Expand Up @@ -5414,7 +5451,7 @@ return {
},
{
name = 'strip',
description = 'The vertices create a series of connected triangles using vertices v1, v2, v3, then v3, v2, v4 (note the order), then v3, v4, v5 and so on.'
description = 'The vertices create a series of connected triangles using vertices 1, 2, 3, then 3, 2, 4 (note the order), then 3, 4, 5 and so on.'
},
{
name = 'triangles',
Expand Down Expand Up @@ -5576,6 +5613,20 @@ return {
}
}
},
{
name = 'StackType',
description = 'Graphics state stack types used with love.graphics.push.',
constants = {
{
name = 'transform',
description = 'The transformation stack (love.graphics.translate, love.graphics.rotate, etc.)'
},
{
name = 'all',
description = 'All love.graphics state, including transform state.'
}
}
},
{
name = 'TextureFormat',
description = 'Canvas and Image texture formats.\n\nThe HDR format is most useful when combined with pixel shaders. Effects such as tonemapped HDR with bloom can be accomplished, or the canvas can be used to store arbitrary non-color data such as positions which are then interpreted and used in a shader, as long as you draw the right things to the canvas.\n\nThe sRGB format should only be used when doing gamma-correct rendering, which is an advanced topic and it\'s easy to get color-spaces mixed up. If you\'re not sure whether you need this, you might want to avoid it.\n\nNot all systems support the HDR and sRGB formats. Use love.graphics.isSupported to check before creating the Canvas or Image.',
Expand Down
67 changes: 42 additions & 25 deletions modules/Thread.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,26 @@ return {
name = 'start',
description = 'Starts the thread.\n\nThreads can be restarted after they have completed their execution.',
functions = {
{}
{},
{
arguments = {
{
type = 'value',
name = 'arg1',
description = 'A string, number, boolean, LÖVE object, or simple table.'
},
{
type = 'value',
name = 'arg2',
description = 'A string, number, boolean, LÖVE object, or simple table.'
},
{
type = 'value',
name = '...',
description = 'You can continue passing values to the thread.'
}
}
}
}
},
{
Expand All @@ -37,6 +56,19 @@ return {
functions = {
{}
}
},
{
name = 'isRunning',
description = 'Returns whether the thread is currently running.\n\nThreads which are not running can be (re)started with Thread:start.',
functions = {
{
returns = {
type = 'boolean',
name = 'running',
description = 'True if the thread is running, false otherwise.'
}
}
}
}
},
supertypes = {
Expand Down Expand Up @@ -123,7 +155,7 @@ return {
description = 'Send a message to the thread Channel.\n\nThe value of the message can be a boolean, string, number, LÖVE userdata, or a simple flat table. Foreign userdata (Lua\'s files, LuaSocket, ENet, ...), functions, and tables inside tables are not supported.',
functions = {
{
returns = {
arguments = {
{
type = 'value',
name = 'value',
Expand All @@ -138,7 +170,7 @@ return {
description = 'Send a message to the thread Channel and wait for a thread to accept it.\n\nThe value of the message can be a boolean, string, number, LÖVE userdata, or a simple flat table. Foreign userdata (Lua\'s files, LuaSocket, ENet, ...), functions, and tables inside tables are not supported.',
functions = {
{
returns = {
arguments = {
{
type = 'value',
name = 'value',
Expand Down Expand Up @@ -198,15 +230,10 @@ return {
functions = {
{
arguments = {
{
type = 'string',
name = 'name',
description = 'The name of the thread.'
},
{
type = 'string',
name = 'filename',
description = 'The name of the File to use as source.'
description = 'The name of the Lua File to use as source.'
}
},
returns = {
Expand All @@ -220,14 +247,9 @@ return {
{
arguments = {
{
type = 'string',
name = 'name',
description = 'The name of the thread.'
},
{
type = 'File',
name = 'file',
description = 'The file to use as source.'
type = 'FileData',
name = 'fileData',
description = 'The FileData containing the Lua code to use as the source.'
}
},
returns = {
Expand All @@ -242,13 +264,8 @@ return {
arguments = {
{
type = 'string',
name = 'name',
description = 'The name of the thread.'
},
{
type = 'Data',
name = 'data',
description = 'The data to use as source.'
name = 'codestring',
description = 'A string containing the Lua code to use as the source.'
}
},
returns = {
Expand All @@ -262,4 +279,4 @@ return {
}
}
}
}
}

0 comments on commit 71c6a6e

Please sign in to comment.