Merge branch 'master' into sample-simpleopengl-minor-improvements

2020-04-16 08:30:30 +02:00
parent 2e65b11e96 4b544f8984
commit 20c125218d
102 changed files with 4690 additions and 1898 deletions
--- a/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
+++ b/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
@@ -278,7 +278,7 @@ void do_motion (void)
 	static int frames = 0;

 	int time = glutGet(GLUT_ELAPSED_TIME);
-	angle += (float)((time-prev_time)*0.01);
+	angle += static_cast<float>((time-prev_time)*0.01);
 	prev_time = time;

 	frames += 1;