diff --git a/Box/Main.cpp b/Box/Main.cpp index 05a28cbbd061b718e81ae136b47c494941b9b86a..4d081ffcab221461624dbc0b1b4fbd7dc6d17f06 100644 --- a/Box/Main.cpp +++ b/Box/Main.cpp @@ -1,4 +1,4 @@ -// $Id: Main.cpp,v 1.18 2002-05-18 09:14:33 geuzaine Exp $ +// $Id: Main.cpp,v 1.19 2002-05-18 09:16:52 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -46,11 +46,6 @@ int yyerrorstate; Context_T CTX ; Mesh M, *THEM=NULL, *LOCAL=NULL; -// Dummy definitions for link purposes. These should be removed as -// soon as the library structure will be cleaned. - -void set_r(int, double){} - // Print some help/info messages void Info (int level, char *arg0){ diff --git a/Common/Context.cpp b/Common/Context.cpp index fa7ac92bac6b912d5d7a4d06679021f433c8bc6c..62d5c53a58a22b6b5affdf1b3dfdf425aafb8887 100644 --- a/Common/Context.cpp +++ b/Common/Context.cpp @@ -1,4 +1,4 @@ -// $Id: Context.cpp,v 1.43 2002-05-18 07:56:47 geuzaine Exp $ +// $Id: Context.cpp,v 1.44 2002-05-18 09:16:52 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -50,12 +50,14 @@ void Context_T::buildRotmatrix(void){ double x, y, z; - extern void set_r(int i, double val); if(useTrackball){ build_rotmatrix(rot, quaternion); + +#ifndef _BLACKBOX // We should reconstruct the Euler angles from the rotation // matrix. I'm too lazy to do it :-( + extern void set_r(int i, double val); set_r(0, 0.); set_r(1, 0.); set_r(2, 0.); @@ -90,6 +92,8 @@ void Context_T::buildRotmatrix(void){ set_r(1, r1 * 180./(Pi)); // lazyyyyyy set_r(2, r2); */ +#endif + } else{ x = r[0] * Pi / 180.;