From ca402e9d360d519e37e2fb1d8073ebec56b0014c Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 28 Aug 2015 14:16:28 +0200 Subject: New examples added (with some resources) --- examples/core_3d_picking.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'examples/core_3d_picking.c') diff --git a/examples/core_3d_picking.c b/examples/core_3d_picking.c index a7a96fa9..056dcd65 100644 --- a/examples/core_3d_picking.c +++ b/examples/core_3d_picking.c @@ -2,7 +2,7 @@ * * raylib [core] example - Picking in 3d mode * -* This example has been created using raylib 1.0 (www.raylib.com) +* This example has been created using raylib 1.3 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * * Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) @@ -23,23 +23,30 @@ int main() // Define the camera to look into our 3d world Camera camera = {{ 0.0, 10.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }}; - Vector3 cubePosition = { 0.0, 0.0, 0.0 }; + Vector3 cubePosition = { 0.0, 1.0, 0.0 }; - Ray pickingLine; + Ray ray; // Picking line ray - SetCameraMode(CAMERA_FREE); + SetCameraMode(CAMERA_FREE); // Set a free camera mode + SetCameraPosition(camera.position); // Set internal camera position to match our camera position - SetTargetFPS(60); + SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- // Main game loop - while (!WindowShouldClose()) // Detect window close button or ESC key + while (!WindowShouldClose()) // Detect window close button or ESC key { // Update //---------------------------------------------------------------------------------- - camera = UpdateCamera(0); + camera = UpdateCamera(0); // Update internal camera and our camera - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pickingLine = GetMouseRay(GetMousePosition(), camera); + if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + { + // NOTE: This function is NOT WORKING properly! + ray = GetMouseRay(GetMousePosition(), camera); + + // TODO: Check collision between ray and box + } //---------------------------------------------------------------------------------- // Draw @@ -50,14 +57,16 @@ int main() Begin3dMode(camera); - DrawCube(cubePosition, 2, 2, 2, RED); - DrawCubeWires(cubePosition, 2, 2, 2, MAROON); + DrawCube(cubePosition, 2, 2, 2, GRAY); + DrawCubeWires(cubePosition, 2, 2, 2, DARKGRAY); DrawGrid(10.0, 1.0); - DrawRay(pickingLine, MAROON); + DrawRay(ray, MAROON); End3dMode(); + + DrawText("Try selecting the box with mouse!", 240, 10, 20, GRAY); DrawFPS(10, 10); -- cgit v1.2.3 From ea45223f1ff0f0f3ebe7535548829681d2a7fa7d Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 28 Aug 2015 18:07:39 +0200 Subject: New examples added --- examples/core_3d_picking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/core_3d_picking.c') diff --git a/examples/core_3d_picking.c b/examples/core_3d_picking.c index 056dcd65..28503570 100644 --- a/examples/core_3d_picking.c +++ b/examples/core_3d_picking.c @@ -5,7 +5,7 @@ * This example has been created using raylib 1.3 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2015 Ramon Santamaria (Ray San - raysan@raysanweb.com) * ********************************************************************************************/ -- cgit v1.2.3 From 32330801c96ad017de1334922a8a88f08811e6f4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 30 Aug 2015 17:46:37 +0200 Subject: Updates some examples --- examples/core_3d_picking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/core_3d_picking.c') diff --git a/examples/core_3d_picking.c b/examples/core_3d_picking.c index 28503570..13839070 100644 --- a/examples/core_3d_picking.c +++ b/examples/core_3d_picking.c @@ -38,7 +38,7 @@ int main() { // Update //---------------------------------------------------------------------------------- - camera = UpdateCamera(0); // Update internal camera and our camera + UpdateCamera(&camera); // Update internal camera and our camera if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { -- cgit v1.2.3