From 539ed1034d5f8b0970e396270c52c75f07fe3123 Mon Sep 17 00:00:00 2001 From: Volodymyr Patuta Date: Wed, 23 Dec 2020 19:14:37 +0100 Subject: [PATCH] decreased frustrum values to be able to zoom to planets/lunes that are small, 0 to see the Sun --- window.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/window.c b/window.c index eb2f6c2..f89fff8 100644 --- a/window.c +++ b/window.c @@ -152,7 +152,7 @@ void draw(void) { * vecteurs se trouvent dans la bibliothèque GL4Dummies, dans le * fichier gl4dm.h */ /* charger un frustum dans projMat */ - MFRUSTUM(projMat, -0.05f, 0.05f, -0.05f, 0.05f, 0.1f, 1000.0f); + MFRUSTUM(projMat, -0.005f, 0.005f, -0.005f, 0.005f, 0.01f, 1000.0f); /* charger la matrice identité dans model-view */ MIDENTITY(mvMat); /* on place la caméra en arrière-haut, elle regarde le centre de la scène */ @@ -203,7 +203,7 @@ void draw(void) { rotate(nmv, (a / 365.2425f), 0.0f, 1.0f, 0.0f); translate(nmv, 11.0f, 1.0f, 0.0f); rotate(nmv, a, 0.0f, 1.0f, 0.0f); - /*scale(nmv, (1/108.0f) * 12.0f / 30, (1/108.0f) * 12.0f / 30, (1/108.0f) * 12.0f / 30);*/ + scale(nmv, (1/108.0f) * 12.0f / 20, (1/108.0f) * 12.0f / 20, (1/108.0f) * 12.0f / 20); transform_n_raster(_moon, nmv, projMat); // MARS @@ -315,6 +315,17 @@ void key(int keycode) { break; case GL4DK_z: break; + case GL4DK_0: + _cam.x = 0; + _cam.y = 1.0f; + _cam.z = 10; + _cam.theta = 0; + /*_cam = {0, 1.0f, 10, 0};*/ + break; + case GL4DK_1: + break; + case GL4DK_2: + break; case GL4DK_t: /* 't' la texture */ _use_tex = !_use_tex; if(_use_tex) {