aboutsummaryrefslogtreecommitdiff
path: root/examples/models
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2019-06-05 12:58:53 +0200
committerRay <raysan5@gmail.com>2019-06-05 12:58:53 +0200
commit03720b30a135d9acab1f008c7ffb2aa46f8dbffb (patch)
tree0b70d4dc35e9cdb8bb9cf668764915be51d5cd8a /examples/models
parentddaa4a304d5a8fe8bf7fc6d4d94a2bcd01298119 (diff)
downloadraylib-03720b30a135d9acab1f008c7ffb2aa46f8dbffb.tar.gz
raylib-03720b30a135d9acab1f008c7ffb2aa46f8dbffb.zip
Review contributed example
Diffstat (limited to 'examples/models')
-rw-r--r--examples/models/models_waving_cubes.c47
1 files changed, 27 insertions, 20 deletions
diff --git a/examples/models/models_waving_cubes.c b/examples/models/models_waving_cubes.c
index 0fefbcf2..f6309bd6 100644
--- a/examples/models/models_waving_cubes.c
+++ b/examples/models/models_waving_cubes.c
@@ -5,7 +5,9 @@
* This example has been created using raylib 2.5 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
-* Copyright (c) 2019 Ramon Santamaria (@raysan5)
+* Example contributed by Codecat (@codecat) and reviewed by Ramon Santamaria (@raysan5)
+*
+* Copyright (c) 2019 Codecat (@codecat) and Ramon Santamaria (@raysan5)
*
********************************************************************************************/
@@ -23,7 +25,7 @@ int main()
InitWindow(screenWidth, screenHeight, "raylib [models] example - waving cubes");
// Initialize the camera
- Camera3D camera;
+ Camera3D camera = { 0 };
camera.position = (Vector3){ 30.0f, 20.0f, 30.0f };
camera.target = (Vector3){ 0.0f, 0.0f, 0.0f };
camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };
@@ -40,16 +42,18 @@ int main()
while (!WindowShouldClose()) // Detect window close button or ESC key
{
// Update
+ //----------------------------------------------------------------------------------
double time = GetTime();
// Calculate time scale for cube position and size
- float scale = (2.0f + (float)sin(time)) * 0.7f;
+ float scale = (2.0f + (float)sin(time))*0.7f;
// Move camera around the scene
- double cameraTime = time * 0.3;
- camera.position.x = (float)cos(cameraTime) * 40.0f;
- camera.position.z = (float)sin(cameraTime) * 40.0f;
-
+ double cameraTime = time*0.3;
+ camera.position.x = (float)cos(cameraTime)*40.0f;
+ camera.position.z = (float)sin(cameraTime)*40.0f;
+ //----------------------------------------------------------------------------------
+
// Draw
//----------------------------------------------------------------------------------
BeginDrawing();
@@ -60,37 +64,40 @@ int main()
DrawGrid(10, 5.0f);
- for (int x = 0; x < numBlocks; x++) {
- for (int y = 0; y < numBlocks; y++) {
- for (int z = 0; z < numBlocks; z++) {
+ for (int x = 0; x < numBlocks; x++)
+ {
+ for (int y = 0; y < numBlocks; y++)
+ {
+ for (int z = 0; z < numBlocks; z++)
+ {
// Scale of the blocks depends on x/y/z positions
- float blockScale = (x + y + z) / 30.0f;
+ float blockScale = (x + y + z)/30.0f;
// Scatter makes the waving effect by adding blockScale over time
- float scatter = sinf(blockScale * 20.0f + (float)(time * 4.0f));
+ float scatter = sinf(blockScale*20.0f + (float)(time*4.0f));
// Calculate the cube position
Vector3 cubePos = {
- (float)(x - numBlocks / 2) * (scale * 3.0f) + scatter,
- (float)(y - numBlocks / 2) * (scale * 2.0f) + scatter,
- (float)(z - numBlocks / 2) * (scale * 3.0f) + scatter
+ (float)(x - numBlocks/2)*(scale*3.0f) + scatter,
+ (float)(y - numBlocks/2)*(scale*2.0f) + scatter,
+ (float)(z - numBlocks/2)*(scale*3.0f) + scatter
};
// Pick a color with a hue depending on cube position for the rainbow color effect
- Color cubeColor = ColorFromHSV((Vector3){ (float)(((x + y + z) * 18) % 360), 0.75f, 0.9f });
+ Color cubeColor = ColorFromHSV((Vector3){ (float)(((x + y + z)*18)%360), 0.75f, 0.9f });
// Calculate cube size
- float cubeSize = (2.4f - scale) * blockScale;
+ float cubeSize = (2.4f - scale)*blockScale;
// And finally, draw the cube!
DrawCube(cubePos, cubeSize, cubeSize, cubeSize, cubeColor);
}
}
}
-
- DrawFPS(10, 10);
-
+
EndMode3D();
+
+ DrawFPS(10, 10);
EndDrawing();
//----------------------------------------------------------------------------------