Browse Source

Merge branch 'dev'

Branimir Karadžić 10 years ago
parent
commit
78869dc0a7
2 changed files with 6 additions and 3 deletions
  1. 4 1
      examples/08-update/update.cpp
  2. 2 2
      examples/23-vectordisplay/vectordisplay.cpp

+ 4 - 1
examples/08-update/update.cpp

@@ -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);

+ 2 - 2
examples/23-vectordisplay/vectordisplay.cpp

@@ -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