Sort includes outside src/gromacs

[alexxy/gromacs.git] / src / programs / view / molps.cpp

diff --git a/src/programs/view/molps.cpp b/src/programs/view/molps.cpp
index fd0c5d6ee548bcb1cf74ca7dbe1a93fccc4fa41d..977d3ae0b43537adf84fcca1a35cbe522320b193 100644 (file)
--- a/src/programs/view/molps.cpp
+++ b/src/programs/view/molps.cpp
@@ -34,24 +34,22 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
 #include <math.h>
-#include "sysstuff.h"
+#include <stdlib.h>
 #include <string.h>
-#include "smalloc.h"
-#include "macros.h"
-#include "xutil.h"
-#include "gmx_fatal.h"
+
+#include "gromacs/fileio/writeps.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/smalloc.h"
+
+#include "3dview.h"
 #include "buttons.h"
 #include "manager.h"
-#include "nmol.h"
 #include "nleg.h"
-
-#include "gromacs/fileio/writeps.h"
-#include "gromacs/math/3dview.h"
+#include "nmol.h"
+#include "xutil.h"
 
 #define MSIZE 4
 
@@ -197,7 +195,7 @@ static void draw_box(t_psdata ps, t_3dview *view, matrix box,
         {
             corner[i][j] = ivec[i][j]*box[j][j];
         }
-        m4_op(view->proj, corner[i], x4);
+        gmx_mat4_transform_point(view->proj, corner[i], x4);
         v4_to_iv2(x4, vec2[i], x0, y0, sx, sy);
     }
     ps_color(ps, 0, 0, 0.5);
@@ -237,13 +235,11 @@ void ps_draw_mol(t_psdata ps, t_manager *man)
 
     init_pbc(man->box);
 
-    /* create_visibility(man); */
-
     for (i = 0; (i < man->natom); i++)
     {
         if (man->bVis[i])
         {
-            m4_op(view->proj, man->x[i], x4);
+            gmx_mat4_transform_point(view->proj, man->x[i], x4);
             man->zz[i] = x4[ZZ];
             v4_to_iv2(x4, vec2[i], x0, y0, sx, sy);
         }