diff options
Diffstat (limited to 'examples/shapes')
| -rw-r--r-- | examples/shapes/shapes_basic_shapes.c | 4 | ||||
| -rw-r--r-- | examples/shapes/shapes_bouncing_ball.c | 4 | ||||
| -rw-r--r-- | examples/shapes/shapes_collision_area.c | 6 | ||||
| -rw-r--r-- | examples/shapes/shapes_colors_palette.c | 6 | ||||
| -rw-r--r-- | examples/shapes/shapes_draw_circle_sector.c | 8 | ||||
| -rw-r--r-- | examples/shapes/shapes_draw_rectangle_rounded.c | 16 | ||||
| -rw-r--r-- | examples/shapes/shapes_draw_ring.c | 10 | ||||
| -rw-r--r-- | examples/shapes/shapes_easings_ball_anim.c | 8 | ||||
| -rw-r--r-- | examples/shapes/shapes_easings_box_anim.c | 16 | ||||
| -rw-r--r-- | examples/shapes/shapes_easings_rectangle_array.c | 10 |
10 files changed, 44 insertions, 44 deletions
diff --git a/examples/shapes/shapes_basic_shapes.c b/examples/shapes/shapes_basic_shapes.c index 086de774..7b48d436 100644 --- a/examples/shapes/shapes_basic_shapes.c +++ b/examples/shapes/shapes_basic_shapes.c @@ -59,8 +59,8 @@ int main(void) (Vector2){screenWidth/4.0f*3.0f + 20.0f, 230.0f}, DARKBLUE); // Polygon shapes and lines - DrawPoly((Vector2){screenWidth/4*3, 320}, 6, 80, 0, BROWN); - DrawPolyLinesEx((Vector2){screenWidth/4*3, 320}, 6, 80, 0, 6, BEIGE); + DrawPoly((Vector2){screenWidth/4.0f*3, 320}, 6, 80, 0, BROWN); + DrawPolyLinesEx((Vector2){screenWidth/4.0f*3, 320}, 6, 80, 0, 6, BEIGE); // NOTE: We draw all LINES based shapes together to optimize internal drawing, // this way, all LINES are rendered in a single draw pass diff --git a/examples/shapes/shapes_bouncing_ball.c b/examples/shapes/shapes_bouncing_ball.c index 9f01ff14..1f8ab8d9 100644 --- a/examples/shapes/shapes_bouncing_ball.c +++ b/examples/shapes/shapes_bouncing_ball.c @@ -20,7 +20,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - bouncing ball"); - Vector2 ballPosition = { GetScreenWidth()/2, GetScreenHeight()/2 }; + Vector2 ballPosition = { GetScreenWidth()/2.0f, GetScreenHeight()/2.0f }; Vector2 ballSpeed = { 5.0f, 4.0f }; int ballRadius = 20; @@ -55,7 +55,7 @@ int main(void) ClearBackground(RAYWHITE); - DrawCircleV(ballPosition, ballRadius, MAROON); + DrawCircleV(ballPosition, (float)ballRadius, MAROON); DrawText("PRESS SPACE to PAUSE BALL MOVEMENT", 10, GetScreenHeight() - 25, 20, LIGHTGRAY); // On pause, we draw a blinking message diff --git a/examples/shapes/shapes_collision_area.c b/examples/shapes/shapes_collision_area.c index c7fb590a..c5946b63 100644 --- a/examples/shapes/shapes_collision_area.c +++ b/examples/shapes/shapes_collision_area.c @@ -22,11 +22,11 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - collision area"); // Box A: Moving box - Rectangle boxA = { 10, GetScreenHeight()/2 - 50, 200, 100 }; + Rectangle boxA = { 10, GetScreenHeight()/2.0f - 50, 200, 100 }; int boxASpeedX = 4; // Box B: Mouse moved box - Rectangle boxB = { GetScreenWidth()/2 - 30, GetScreenHeight()/2 - 30, 60, 60 }; + Rectangle boxB = { GetScreenWidth()/2.0f - 30, GetScreenHeight()/2.0f - 30, 60, 60 }; Rectangle boxCollision = { 0 }; // Collision rectangle @@ -58,7 +58,7 @@ int main(void) else if (boxB.x <= 0) boxB.x = 0; if ((boxB.y + boxB.height) >= GetScreenHeight()) boxB.y = GetScreenHeight() - boxB.height; - else if (boxB.y <= screenUpperLimit) boxB.y = screenUpperLimit; + else if (boxB.y <= screenUpperLimit) boxB.y = (float)screenUpperLimit; // Check boxes collision collision = CheckCollisionRecs(boxA, boxB); diff --git a/examples/shapes/shapes_colors_palette.c b/examples/shapes/shapes_colors_palette.c index 0865d581..e9bbad76 100644 --- a/examples/shapes/shapes_colors_palette.c +++ b/examples/shapes/shapes_colors_palette.c @@ -79,10 +79,10 @@ int main(void) if (IsKeyDown(KEY_SPACE) || colorState[i]) { - DrawRectangle(colorsRecs[i].x, colorsRecs[i].y + colorsRecs[i].height - 26, colorsRecs[i].width, 20, BLACK); + DrawRectangle((int)colorsRecs[i].x, (int)(colorsRecs[i].y + colorsRecs[i].height - 26), (int)colorsRecs[i].width, 20, BLACK); DrawRectangleLinesEx(colorsRecs[i], 6, Fade(BLACK, 0.3f)); - DrawText(colorNames[i], colorsRecs[i].x + colorsRecs[i].width - MeasureText(colorNames[i], 10) - 12, - colorsRecs[i].y + colorsRecs[i].height - 20, 10, colors[i]); + DrawText(colorNames[i], (int)(colorsRecs[i].x + colorsRecs[i].width - MeasureText(colorNames[i], 10) - 12), + (int)(colorsRecs[i].y + colorsRecs[i].height - 20), 10, colors[i]); } } diff --git a/examples/shapes/shapes_draw_circle_sector.c b/examples/shapes/shapes_draw_circle_sector.c index 787b1d4a..101c5378 100644 --- a/examples/shapes/shapes_draw_circle_sector.c +++ b/examples/shapes/shapes_draw_circle_sector.c @@ -25,7 +25,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - draw circle sector"); - Vector2 center = {(GetScreenWidth() - 300)/2, GetScreenHeight()/2 }; + Vector2 center = {(GetScreenWidth() - 300)/2.0f, GetScreenHeight()/2.0f }; float outerRadius = 180.0f; float startAngle = 0.0f; @@ -53,8 +53,8 @@ int main(void) DrawLine(500, 0, 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.6f)); DrawRectangle(500, 0, GetScreenWidth() - 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.3f)); - DrawCircleSector(center, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.3)); - DrawCircleSectorLines(center, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.6)); + DrawCircleSector(center, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.3f)); + DrawCircleSectorLines(center, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.6f)); // Draw GUI controls //------------------------------------------------------------------------------ @@ -62,7 +62,7 @@ int main(void) endAngle = GuiSliderBar((Rectangle){ 600, 70, 120, 20}, "EndAngle", NULL, endAngle, 0, 720); outerRadius = GuiSliderBar((Rectangle){ 600, 140, 120, 20}, "Radius", NULL, outerRadius, 0, 200); - segments = GuiSliderBar((Rectangle){ 600, 170, 120, 20}, "Segments", NULL, segments, 0, 100); + segments = (int)GuiSliderBar((Rectangle){ 600, 170, 120, 20}, "Segments", NULL, (float)segments, 0, 100); //------------------------------------------------------------------------------ minSegments = (int)ceilf((endAngle - startAngle) / 90); diff --git a/examples/shapes/shapes_draw_rectangle_rounded.c b/examples/shapes/shapes_draw_rectangle_rounded.c index cc364980..d02b1328 100644 --- a/examples/shapes/shapes_draw_rectangle_rounded.c +++ b/examples/shapes/shapes_draw_rectangle_rounded.c @@ -43,7 +43,7 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - Rectangle rec = { (GetScreenWidth() - width - 250)/2, (GetScreenHeight() - height)/2, width, height }; + Rectangle rec = { ((float)GetScreenWidth() - width - 250)/2, (GetScreenHeight() - height)/2.0f, (float)width, (float)height }; //---------------------------------------------------------------------------------- // Draw @@ -55,17 +55,17 @@ int main(void) DrawLine(560, 0, 560, GetScreenHeight(), Fade(LIGHTGRAY, 0.6f)); DrawRectangle(560, 0, GetScreenWidth() - 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.3f)); - if (drawRect) DrawRectangleRec(rec, Fade(GOLD, 0.6)); - if (drawRoundedRect) DrawRectangleRounded(rec, roundness, segments, Fade(MAROON, 0.2)); - if (drawRoundedLines) DrawRectangleRoundedLines(rec,roundness, segments, lineThick, Fade(MAROON, 0.4)); + if (drawRect) DrawRectangleRec(rec, Fade(GOLD, 0.6f)); + if (drawRoundedRect) DrawRectangleRounded(rec, roundness, segments, Fade(MAROON, 0.2f)); + if (drawRoundedLines) DrawRectangleRoundedLines(rec,roundness, segments, (float)lineThick, Fade(MAROON, 0.4f)); // Draw GUI controls //------------------------------------------------------------------------------ - width = GuiSliderBar((Rectangle){ 640, 40, 105, 20 }, "Width", NULL, width, 0, GetScreenWidth() - 300); - height = GuiSliderBar((Rectangle){ 640, 70, 105, 20 }, "Height", NULL, height, 0, GetScreenHeight() - 50); + width = (int)GuiSliderBar((Rectangle){ 640, 40, 105, 20 }, "Width", NULL, (float)width, 0, (float)GetScreenWidth() - 300); + height = (int)GuiSliderBar((Rectangle){ 640, 70, 105, 20 }, "Height", NULL, (float)height, 0, (float)GetScreenHeight() - 50); roundness = GuiSliderBar((Rectangle){ 640, 140, 105, 20 }, "Roundness", NULL, roundness, 0.0f, 1.0f); - lineThick = GuiSliderBar((Rectangle){ 640, 170, 105, 20 }, "Thickness", NULL, lineThick, 0, 20); - segments = GuiSliderBar((Rectangle){ 640, 240, 105, 20}, "Segments", NULL, segments, 0, 60); + lineThick = (int)GuiSliderBar((Rectangle){ 640, 170, 105, 20 }, "Thickness", NULL, (float)lineThick, 0, 20); + segments = (int)GuiSliderBar((Rectangle){ 640, 240, 105, 20}, "Segments", NULL, (float)segments, 0, 60); drawRoundedRect = GuiCheckBox((Rectangle){ 640, 320, 20, 20 }, "DrawRoundedRect", drawRoundedRect); drawRoundedLines = GuiCheckBox((Rectangle){ 640, 350, 20, 20 }, "DrawRoundedLines", drawRoundedLines); diff --git a/examples/shapes/shapes_draw_ring.c b/examples/shapes/shapes_draw_ring.c index cd4c1f09..de97a014 100644 --- a/examples/shapes/shapes_draw_ring.c +++ b/examples/shapes/shapes_draw_ring.c @@ -25,7 +25,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - draw ring"); - Vector2 center = {(GetScreenWidth() - 300)/2, GetScreenHeight()/2 }; + Vector2 center = {(GetScreenWidth() - 300)/2.0f, GetScreenHeight()/2.0f }; float innerRadius = 80.0f; float outerRadius = 190.0f; @@ -59,9 +59,9 @@ int main(void) DrawLine(500, 0, 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.6f)); DrawRectangle(500, 0, GetScreenWidth() - 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.3f)); - if (drawRing) DrawRing(center, innerRadius, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.3)); - if (drawRingLines) DrawRingLines(center, innerRadius, outerRadius, startAngle, endAngle, segments, Fade(BLACK, 0.4)); - if (drawCircleLines) DrawCircleSectorLines(center, outerRadius, startAngle, endAngle, segments, Fade(BLACK, 0.4)); + if (drawRing) DrawRing(center, innerRadius, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.3f)); + if (drawRingLines) DrawRingLines(center, innerRadius, outerRadius, startAngle, endAngle, segments, Fade(BLACK, 0.4f)); + if (drawCircleLines) DrawCircleSectorLines(center, outerRadius, startAngle, endAngle, segments, Fade(BLACK, 0.4f)); // Draw GUI controls //------------------------------------------------------------------------------ @@ -71,7 +71,7 @@ int main(void) innerRadius = GuiSliderBar((Rectangle){ 600, 140, 120, 20 }, "InnerRadius", NULL, innerRadius, 0, 100); outerRadius = GuiSliderBar((Rectangle){ 600, 170, 120, 20 }, "OuterRadius", NULL, outerRadius, 0, 200); - segments = GuiSliderBar((Rectangle){ 600, 240, 120, 20 }, "Segments", NULL, segments, 0, 100); + segments = (int)GuiSliderBar((Rectangle){ 600, 240, 120, 20 }, "Segments", NULL, (float)segments, 0, 100); drawRing = GuiCheckBox((Rectangle){ 600, 320, 20, 20 }, "Draw Ring", drawRing); drawRingLines = GuiCheckBox((Rectangle){ 600, 350, 20, 20 }, "Draw RingLines", drawRingLines); diff --git a/examples/shapes/shapes_easings_ball_anim.c b/examples/shapes/shapes_easings_ball_anim.c index 579d04dd..7e1d081e 100644 --- a/examples/shapes/shapes_easings_ball_anim.c +++ b/examples/shapes/shapes_easings_ball_anim.c @@ -41,7 +41,7 @@ int main(void) if (state == 0) // Move ball position X with easing { framesCounter++; - ballPositionX = EaseElasticOut(framesCounter, -100, screenWidth/2 + 100, 120); + ballPositionX = (int)EaseElasticOut((float)framesCounter, -100, screenWidth/2.0f + 100, 120); if (framesCounter >= 120) { @@ -52,7 +52,7 @@ int main(void) else if (state == 1) // Increase ball radius with easing { framesCounter++; - ballRadius = EaseElasticIn(framesCounter, 20, 500, 200); + ballRadius = (int)EaseElasticIn((float)framesCounter, 20, 500, 200); if (framesCounter >= 200) { @@ -63,7 +63,7 @@ int main(void) else if (state == 2) // Change ball alpha with easing (background color blending) { framesCounter++; - ballAlpha = EaseCubicOut(framesCounter, 0.0f, 1.0f, 200); + ballAlpha = EaseCubicOut((float)framesCounter, 0.0f, 1.0f, 200); if (framesCounter >= 200) { @@ -93,7 +93,7 @@ int main(void) ClearBackground(RAYWHITE); if (state >= 2) DrawRectangle(0, 0, screenWidth, screenHeight, GREEN); - DrawCircle(ballPositionX, 200, ballRadius, Fade(RED, 1.0f - ballAlpha)); + DrawCircle(ballPositionX, 200, (float)ballRadius, Fade(RED, 1.0f - ballAlpha)); if (state == 3) DrawText("PRESS [ENTER] TO PLAY AGAIN!", 240, 200, 20, BLACK); diff --git a/examples/shapes/shapes_easings_box_anim.c b/examples/shapes/shapes_easings_box_anim.c index 7812bd53..e7024f41 100644 --- a/examples/shapes/shapes_easings_box_anim.c +++ b/examples/shapes/shapes_easings_box_anim.c @@ -23,7 +23,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - easings box anim"); // Box variables to be animated with easings - Rectangle rec = { GetScreenWidth()/2, -100, 100, 100 }; + Rectangle rec = { GetScreenWidth()/2.0f, -100, 100, 100 }; float rotation = 0.0f; float alpha = 1.0f; @@ -46,7 +46,7 @@ int main(void) // NOTE: Remember that 3rd parameter of easing function refers to // desired value variation, do not confuse it with expected final value! - rec.y = EaseElasticOut(framesCounter, -100, GetScreenHeight()/2 + 100, 120); + rec.y = EaseElasticOut((float)framesCounter, -100, GetScreenHeight()/2.0f + 100, 120); if (framesCounter >= 120) { @@ -57,8 +57,8 @@ int main(void) case 1: // Scale box to an horizontal bar { framesCounter++; - rec.height = EaseBounceOut(framesCounter, 100, -90, 120); - rec.width = EaseBounceOut(framesCounter, 100, GetScreenWidth(), 120); + rec.height = EaseBounceOut((float)framesCounter, 100, -90, 120); + rec.width = EaseBounceOut((float)framesCounter, 100, (float)GetScreenWidth(), 120); if (framesCounter >= 120) { @@ -69,7 +69,7 @@ int main(void) case 2: // Rotate horizontal bar rectangle { framesCounter++; - rotation = EaseQuadOut(framesCounter, 0.0f, 270.0f, 240); + rotation = EaseQuadOut((float)framesCounter, 0.0f, 270.0f, 240); if (framesCounter >= 240) { @@ -80,7 +80,7 @@ int main(void) case 3: // Increase bar size to fill all screen { framesCounter++; - rec.height = EaseCircOut(framesCounter, 10, GetScreenWidth(), 120); + rec.height = EaseCircOut((float)framesCounter, 10, (float)GetScreenWidth(), 120); if (framesCounter >= 120) { @@ -91,7 +91,7 @@ int main(void) case 4: // Fade out animation { framesCounter++; - alpha = EaseSineOut(framesCounter, 1.0f, -1.0f, 160); + alpha = EaseSineOut((float)framesCounter, 1.0f, -1.0f, 160); if (framesCounter >= 160) { @@ -105,7 +105,7 @@ int main(void) // Reset animation at any moment if (IsKeyPressed(KEY_SPACE)) { - rec = (Rectangle){ GetScreenWidth()/2, -100, 100, 100 }; + rec = (Rectangle){ GetScreenWidth()/2.0f, -100, 100, 100 }; rotation = 0.0f; alpha = 1.0f; state = 0; diff --git a/examples/shapes/shapes_easings_rectangle_array.c b/examples/shapes/shapes_easings_rectangle_array.c index eb782cd1..bdd45949 100644 --- a/examples/shapes/shapes_easings_rectangle_array.c +++ b/examples/shapes/shapes_easings_rectangle_array.c @@ -39,8 +39,8 @@ int main(void) { for (int x = 0; x < MAX_RECS_X; x++) { - recs[y*MAX_RECS_X + x].x = RECS_WIDTH/2 + RECS_WIDTH*x; - recs[y*MAX_RECS_X + x].y = RECS_HEIGHT/2 + RECS_HEIGHT*y; + recs[y*MAX_RECS_X + x].x = RECS_WIDTH/2.0f + RECS_WIDTH*x; + recs[y*MAX_RECS_X + x].y = RECS_HEIGHT/2.0f + RECS_HEIGHT*y; recs[y*MAX_RECS_X + x].width = RECS_WIDTH; recs[y*MAX_RECS_X + x].height = RECS_HEIGHT; } @@ -64,15 +64,15 @@ int main(void) for (int i = 0; i < MAX_RECS_X*MAX_RECS_Y; i++) { - recs[i].height = EaseCircOut(framesCounter, RECS_HEIGHT, -RECS_HEIGHT, PLAY_TIME_IN_FRAMES); - recs[i].width = EaseCircOut(framesCounter, RECS_WIDTH, -RECS_WIDTH, PLAY_TIME_IN_FRAMES); + recs[i].height = EaseCircOut((float)framesCounter, RECS_HEIGHT, -RECS_HEIGHT, PLAY_TIME_IN_FRAMES); + recs[i].width = EaseCircOut((float)framesCounter, RECS_WIDTH, -RECS_WIDTH, PLAY_TIME_IN_FRAMES); if (recs[i].height < 0) recs[i].height = 0; if (recs[i].width < 0) recs[i].width = 0; if ((recs[i].height == 0) && (recs[i].width == 0)) state = 1; // Finish playing - rotation = EaseLinearIn(framesCounter, 0.0f, 360.0f, PLAY_TIME_IN_FRAMES); + rotation = EaseLinearIn((float)framesCounter, 0.0f, 360.0f, PLAY_TIME_IN_FRAMES); } } else if ((state == 1) && IsKeyPressed(KEY_SPACE)) |
