From ddcbcbe7a67e5142234073593292d7be62ce7790 Mon Sep 17 00:00:00 2001 From: Daniel Bratsberg Date: Tue, 3 Oct 2023 17:26:38 +0200 Subject: [PATCH] Adds DrawModelPro() and DrawModelWiresPro(), accepting Matrixes as input This allows us to easily draw the same model with multiple transformations, in particular rotation around multiple axises without having to change the attributes of the model itself (which the Yaw, Pitch, Roll example does). This is particularly useful when loading one model and drawing it multiple times, such as in a game where you fight multiple enemies who all use the same model, but move and behave independently. --- examples/models/models_transformations.c | 190 +++++++++++++++++++++ examples/models/models_transformations.png | Bin 0 -> 17874 bytes src/raylib.h | 2 + src/rmodels.c | 18 +- 4 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 examples/models/models_transformations.c create mode 100644 examples/models/models_transformations.png diff --git a/examples/models/models_transformations.c b/examples/models/models_transformations.c new file mode 100644 index 000000000..1dcd85f72 --- /dev/null +++ b/examples/models/models_transformations.c @@ -0,0 +1,190 @@ +/******************************************************************************************* + * + * raylib [models] example - Draw some basic geometric shapes (cube, sphere, cylinder...) + * + * Example originally created with raylib 1.0, last time updated with raylib 3.5 + * + * Example licensed under an unmodified zlib/libpng license, which is an OSI-certified, + * BSD-like license that allows static linking with closed source software + * + * Copyright (c) 2014-2023 Ramon Santamaria (@raysan5) + * + ********************************************************************************************/ + +#include "raylib.h" +#include "raymath.h" + +// Transforms of the cube +Vector3 position = (Vector3){0.0f, 0.0f, 0.0f}; +Vector3 scale = (Vector3){1.0f, 1.0f, 1.0f}; +Vector3 rotation = (Vector3){0.0f, 0.0f, 0.0f}; + +// Define movement speed +const float translationSpeed = 0.2f; +const float scaleSpeed = 0.1f; +const float rotationSpeed = 2.0f; + +bool left() +{ + return IsKeyDown(KEY_A) || IsKeyDown(KEY_LEFT); +} + +bool right() +{ + return IsKeyDown(KEY_D) || IsKeyDown(KEY_RIGHT); +} + +bool up() +{ + return IsKeyDown(KEY_W) || IsKeyDown(KEY_UP); +} + +bool down() +{ + return IsKeyDown(KEY_S) || IsKeyDown(KEY_DOWN); +} + +bool in() +{ + return IsKeyDown(KEY_E) || IsKeyDown(KEY_PAGE_DOWN); +} + +bool out() +{ + return IsKeyDown(KEY_Q) || IsKeyDown(KEY_PAGE_UP); +} + +bool shouldScale() +{ + return IsKeyDown(KEY_LEFT_CONTROL); +} + +bool shouldMove() +{ + return IsKeyDown(KEY_LEFT_SHIFT); +} + +void handleInput() +{ + if (shouldMove()) + { + if (left()) + position.x -= translationSpeed; + else if (right()) + position.x += translationSpeed; + if (down()) + position.y -= translationSpeed; + else if (up()) + position.y += translationSpeed; + if (out()) + position.z += translationSpeed; + else if (in()) + position.z -= translationSpeed; + } + else if (shouldScale()) + { + if (left()) + scale.x -= scaleSpeed; + else if (right()) + scale.x += scaleSpeed; + if (down()) + scale.y -= scaleSpeed; + else if (up()) + scale.y += scaleSpeed; + if (out()) + scale.z += scaleSpeed; + else if (in()) + scale.z -= scaleSpeed; + } + else + { + if (left()) + rotation.x -= rotationSpeed; + else if (right()) + rotation.x += rotationSpeed; + if (down()) + rotation.y -= rotationSpeed; + else if (up()) + rotation.y += rotationSpeed; + if (out()) + rotation.z += rotationSpeed; + else if (in()) + rotation.z -= rotationSpeed; + } +} +//------------------------------------------------------------------------------------ +// Program main entry point +//------------------------------------------------------------------------------------ +int main(void) +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [models] example - model transformations"); + + // Generate a cube shaped model to play with + Model cube = LoadModelFromMesh(GenMeshCube(2.0f, 2.0f, 2.0f)); + + // Define the camera to look into our 3d world + Camera camera = {0}; + camera.position = (Vector3){0.0f, 10.0f, 10.0f}; + camera.target = (Vector3){0.0f, 0.0f, 0.0f}; + camera.up = (Vector3){0.0f, 1.0f, 0.0f}; + camera.fovy = 45.0f; + camera.projection = CAMERA_PERSPECTIVE; + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + handleInput(); + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + BeginMode3D(camera); + + // Set translation matrix + Matrix matTranslation = MatrixTranslate(position.x, position.y, position.z); + + // Multiply rotation matrices with each other, to rotate around each axis. + Matrix matRotX = MatrixRotate((Vector3){1.0f, 0.0f, 0.0f}, rotation.x * DEG2RAD); + Matrix matRotY = MatrixRotate((Vector3){0.0f, 1.0f, 0.0f}, rotation.y * DEG2RAD); + Matrix matRotZ = MatrixRotate((Vector3){0.0f, 0.0f, 1.0f}, rotation.z * DEG2RAD); + Matrix matRotCombined = MatrixMultiply(matRotX, matRotY); + matRotCombined = MatrixMultiply(matRotCombined, matRotZ); + + // Set scale matrix + Matrix matScale = MatrixScale(scale.x, scale.y, scale.z); + + DrawModelPro(cube, matTranslation, matRotCombined, matScale, RED); + DrawModelWiresPro(cube, matTranslation, matRotCombined, matScale, BLUE); + DrawGrid(10, 1.0f); // Draw a grid + + EndMode3D(); + + DrawFPS(10, 10); + + DrawText("Left Shift + W/A/S/D to translate", 10, 40, 20, BLUE); + DrawText("Left Ctrl + W/A/S/D to scale", 10, 70, 20, BLUE); + DrawText("W/A/S/D to rotate", 10, 100, 20, BLUE); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} \ No newline at end of file diff --git a/examples/models/models_transformations.png b/examples/models/models_transformations.png new file mode 100644 index 0000000000000000000000000000000000000000..338b3383ed3fc5ebbe4bebf21a83d26776ca8e30 GIT binary patch literal 17874 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 literal 0 HcmV?d00001 diff --git a/src/raylib.h b/src/raylib.h index f52f3460d..f6354ae76 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1469,8 +1469,10 @@ RLAPI BoundingBox GetModelBoundingBox(Model model); // Model drawing functions RLAPI void DrawModel(Model model, Vector3 position, float scale, Color tint); // Draw a model (with texture if set) RLAPI void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model with extended parameters +RLAPI void DrawModelPro(Model model, Matrix translation, Matrix rotation, Matrix scale, Color tint); // Draw a model with pro parameters RLAPI void DrawModelWires(Model model, Vector3 position, float scale, Color tint); // Draw a model wires (with texture if set) RLAPI void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model wires (with texture if set) with extended parameters +RLAPI void DrawModelWiresPro(Model model, Matrix translation, Matrix rotation, Matrix scale, Color tint); // Draw a model wires (with texture if set) with pro parameters RLAPI void DrawBoundingBox(BoundingBox box, Color color); // Draw bounding box (wires) RLAPI void DrawBillboard(Camera camera, Texture2D texture, Vector3 position, float size, Color tint); // Draw a billboard texture RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Color tint); // Draw a billboard texture defined by source diff --git a/src/rmodels.c b/src/rmodels.c index f9ceec137..66ea07dee 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -3430,7 +3430,13 @@ void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rota Matrix matRotation = MatrixRotate(rotationAxis, rotationAngle*DEG2RAD); Matrix matTranslation = MatrixTranslate(position.x, position.y, position.z); - Matrix matTransform = MatrixMultiply(MatrixMultiply(matScale, matRotation), matTranslation); + DrawModelPro(model, matTranslation, matRotation, matScale, tint); +} + +// Draw a model with pro parameters +void DrawModelPro(Model model, Matrix translation, Matrix rotation, Matrix scale, Color tint) +{ + Matrix matTransform = MatrixMultiply(MatrixMultiply(scale, rotation), translation); // Combine model transformation matrix (model.transform) with matrix generated by function parameters (matTransform) model.transform = MatrixMultiply(model.transform, matTransform); @@ -3471,6 +3477,16 @@ void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rlDisableWireMode(); } +// Draw a model wires (with texture if set) with pro parameters +void DrawModelWiresPro(Model model, Matrix translation, Matrix rotation, Matrix scale, Color tint) +{ + rlEnableWireMode(); + + DrawModelPro(model, translation, rotation, scale, tint); + + rlDisableWireMode(); +} + // Draw a billboard void DrawBillboard(Camera camera, Texture2D texture, Vector3 position, float size, Color tint) {