mirror of
https://github.com/love2d/love.git
synced 2026-08-16 00:02:12 +02:00
Alex Szpakowski
2844499ef7
Added new love.graphics.newMesh variants: newMesh(vertexformat, vertices [, drawmode, meshusage]) and newMesh(vertexformat, numvertices [, drawmode, meshusage]).
Replaced the regular love.graphics.newMesh variants with newMesh(vertices [, drawmode, meshusage]) and newMesh(numvertices [, drawmode, meshusage]). To use an image or canvas with a mesh, use Mesh:setTexture.
vertexformat is a table with the following prototype:
{
{attributename, datatype, components},
{attributename, datatype, components},
...
}
Where attributename is the name of the vertex attribute (can be the built-in names 'VertexPosition', 'VertexTexCoord', or 'VertexColor', or a custom name for use in a vertex shader), datatype is the type of values used for the attribute ('float' or 'byte'), and components is the number of components in the vertex attribute (between 1 and 4.)
The vertex format is used to determine the layout of the vertices in the mesh, for example the 'regular' newMesh variants use this vertex format:
format = {
{"VertexPosition", "float", 2},
{"VertexTexCoord", "float", 2},
{"VertexColor", "byte", 4},
}
The mesh usage parameter accepts the same constants as the spritebatch usage hint in love.graphics.newSpriteBatch - "dynamic", "static", and "stream".
Mesh:setVertex now sets *all* vertex attributes for a specific vertex in the Mesh.
Added Mesh:setVertexAttribute(vertexindex, attributeindex, attributevalue1, ...), which sets the values for a specific vertex attribute in a specific vertex in the Mesh (resolves issue #784.)
Added Mesh:getVertexFormat and Mesh:flush.
Added Mesh:setAttributeEnabled(attributename, enable) and Mesh:isAttributeEnabled(attributename), to enable or disable the use of a specific attribute when drawing the Mesh.
Added Mesh:attachAttribute(attributename, mesh), which makes the Mesh use a vertex attribute from another mesh when drawing the Mesh. This can be used to separate out vertex attributes which are updated at different rates into different meshes, and to share vertex data between multiple meshes.
Removed Mesh:setVertices, Mesh:getVertices, and Mesh:setVertexColors.
123 lines
3.0 KiB
C++
123 lines
3.0 KiB
C++
/**
|
|
* Copyright (c) 2006-2015 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 "wrap_Sound.h"
|
|
|
|
#include "filesystem/wrap_Filesystem.h"
|
|
|
|
// Implementations.
|
|
#include "lullaby/Sound.h"
|
|
|
|
namespace love
|
|
{
|
|
namespace sound
|
|
{
|
|
|
|
#define instance() (Module::getInstance<Sound>(Module::M_SOUND))
|
|
|
|
int w_newSoundData(lua_State *L)
|
|
{
|
|
SoundData *t = 0;
|
|
|
|
if (lua_isnumber(L, 1))
|
|
{
|
|
int samples = luaL_checkint(L, 1);
|
|
int sampleRate = luaL_optint(L, 2, Decoder::DEFAULT_SAMPLE_RATE);
|
|
int bitDepth = luaL_optint(L, 3, Decoder::DEFAULT_BIT_DEPTH);
|
|
int channels = luaL_optint(L, 4, Decoder::DEFAULT_CHANNELS);
|
|
|
|
luax_catchexcept(L, [&](){ t = instance()->newSoundData(samples, sampleRate, bitDepth, channels); });
|
|
}
|
|
// Must be string or decoder.
|
|
else
|
|
{
|
|
// Convert to Decoder, if necessary.
|
|
if (!luax_istype(L, 1, SOUND_DECODER_ID))
|
|
{
|
|
w_newDecoder(L);
|
|
lua_replace(L, 1);
|
|
}
|
|
|
|
luax_catchexcept(L, [&](){ t = instance()->newSoundData(luax_checkdecoder(L, 1)); });
|
|
}
|
|
|
|
luax_pushtype(L, SOUND_SOUND_DATA_ID, t);
|
|
t->release();
|
|
return 1;
|
|
}
|
|
|
|
int w_newDecoder(lua_State *L)
|
|
{
|
|
love::filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
|
|
int bufferSize = luaL_optint(L, 2, Decoder::DEFAULT_BUFFER_SIZE);
|
|
|
|
Decoder *t = nullptr;
|
|
luax_catchexcept(L,
|
|
[&]() { t = instance()->newDecoder(data, bufferSize); },
|
|
[&](bool) { data->release(); }
|
|
);
|
|
|
|
if (t == nullptr)
|
|
return luaL_error(L, "Extension \"%s\" not supported.", data->getExtension().c_str());
|
|
|
|
luax_pushtype(L, SOUND_DECODER_ID, t);
|
|
t->release();
|
|
return 1;
|
|
}
|
|
|
|
// List of functions to wrap.
|
|
static const luaL_Reg functions[] =
|
|
{
|
|
{ "newSoundData", w_newSoundData },
|
|
{ "newDecoder", w_newDecoder },
|
|
{ 0, 0 }
|
|
};
|
|
|
|
static const lua_CFunction types[] =
|
|
{
|
|
luaopen_sounddata,
|
|
luaopen_decoder,
|
|
0
|
|
};
|
|
|
|
extern "C" int luaopen_love_sound(lua_State *L)
|
|
{
|
|
Sound *instance = instance();
|
|
if (instance == nullptr)
|
|
{
|
|
luax_catchexcept(L, [&](){ instance = new lullaby::Sound(); });
|
|
}
|
|
else
|
|
instance->retain();
|
|
|
|
|
|
WrappedModule w;
|
|
w.module = instance;
|
|
w.name = "sound";
|
|
w.type = MODULE_SOUND_ID;
|
|
w.functions = functions;
|
|
w.types = types;
|
|
|
|
return luax_register_module(L, w);
|
|
}
|
|
|
|
} // sound
|
|
} // love
|