scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-17 20:31:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
Branimir Karadžić 2015-03-29 21:17:30 -07:00
commit 78869dc0a7
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/08-update/update.cpp
View file

@ -495,7 +495,10 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::destroyTexture(textureCube);
bgfx::destroyIndexBuffer(ibh);
bgfx::destroyVertexBuffer(vbh);
bgfx::destroyProgram(program3d);
if (bgfx::isValid(program3d) )
{
bgfx::destroyProgram(program3d);
}
bgfx::destroyProgram(programCmp);
bgfx::destroyProgram(program);
bgfx::destroyUniform(u_time);

4
examples/23-vectordisplay/vectordisplay.cpp
View file

@ -361,10 +361,10 @@ void VectorDisplay::endDraw()
line->y0 = m_pendingPoints[i - 1].y;
line->x1 = m_pendingPoints[i].x;
line->y1 = m_pendingPoints[i].y;
line->a = atan2(line->y1 - line->y0, line->x1 - line->x0); // angle from positive x axis, increasing ccw, [-pi, pi]
line->a = atan2f(line->y1 - line->y0, line->x1 - line->x0); // angle from positive x axis, increasing ccw, [-pi, pi]
line->sin_a = sinf(line->a);
line->cos_a = cosf(line->a);
line->len = sqrt( (line->x1 - line->x0) * (line->x1 - line->x0) + (line->y1 - line->y0) * (line->y1 - line->y0) );
line->len = sqrtf( (line->x1 - line->x0) * (line->x1 - line->x0) + (line->y1 - line->y0) * (line->y1 - line->y0) );
// figure out what connections we have
line->has_prev = (!line->is_first