From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/glx/winduprobot.c | 71 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

(limited to 'hacks/glx/winduprobot.c')

diff --git a/hacks/glx/winduprobot.c b/hacks/glx/winduprobot.c
index 148dd1f..237352d 100644
--- a/hacks/glx/winduprobot.c
+++ b/hacks/glx/winduprobot.c
@@ -39,7 +39,7 @@
  * https://www.youtube.com/watch?v=EZF4ZAAy49g
  */
 
-#define LABEL_FONT "-*-helvetica-bold-r-normal-*-*-240-*-*-*-*-*-*"
+#define LABEL_FONT "sans-serif bold 24"
 
 #define DEFAULTS	"*delay:	20000       \n" \
 			"*count:        25          \n" \
@@ -69,8 +69,6 @@
 #define WORDBUBBLES
 
 # define release_robot 0
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
 
 #define DEF_SPEED       "1.0"
 #define DEF_ROBOT_SIZE  "1.0"
@@ -380,33 +378,6 @@ init_robot (ModeInfo *mi)
 
   reshape_robot (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
 
-  glShadeModel(GL_SMOOTH);
-
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_NORMALIZE);
-  glEnable(GL_CULL_FACE);
-
-  if (!wire)
-    {
-      GLfloat pos[4] = {0.4, 0.2, 0.4, 0.0};
-/*      GLfloat amb[4] = {0.0, 0.0, 0.0, 1.0};*/
-      GLfloat amb[4] = {0.2, 0.2, 0.2, 1.0};
-      GLfloat dif[4] = {1.0, 1.0, 1.0, 1.0};
-      GLfloat spc[4] = {1.0, 1.0, 1.0, 1.0};
-
-      glEnable(GL_LIGHTING);
-      glEnable(GL_LIGHT0);
-      glEnable(GL_DEPTH_TEST);
-      glEnable(GL_CULL_FACE);
-
-      glLightfv(GL_LIGHT0, GL_POSITION, pos);
-      glLightfv(GL_LIGHT0, GL_AMBIENT,  amb);
-      glLightfv(GL_LIGHT0, GL_DIFFUSE,  dif);
-      glLightfv(GL_LIGHT0, GL_SPECULAR, spc);
-
-      glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    }
-
 # ifdef HAVE_TEXTURE
   if (!wire && do_texture)
     load_textures (mi);
@@ -2295,6 +2266,7 @@ draw_robot (ModeInfo *mi)
   robot_configuration *bp = &bps[MI_SCREEN(mi)];
   Display *dpy = MI_DISPLAY(mi);
   Window window = MI_WINDOW(mi);
+  int wire = MI_IS_WIREFRAME(mi);
   GLfloat robot_size;
   depth_sorter *sorted;
   int i;
@@ -2306,12 +2278,36 @@ draw_robot (ModeInfo *mi)
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+  glShadeModel(GL_SMOOTH);
+
+  glEnable(GL_DEPTH_TEST);
+  glEnable(GL_NORMALIZE);
+  glEnable(GL_CULL_FACE);
+
+  if (!wire)
+    {
+      GLfloat pos[4] = {0.4, 0.2, 0.4, 0.0};
+/*      GLfloat amb[4] = {0.0, 0.0, 0.0, 1.0};*/
+      GLfloat amb[4] = {0.2, 0.2, 0.2, 1.0};
+      GLfloat dif[4] = {1.0, 1.0, 1.0, 1.0};
+      GLfloat spc[4] = {1.0, 1.0, 1.0, 1.0};
+
+      glEnable(GL_LIGHTING);
+      glEnable(GL_LIGHT0);
+      glEnable(GL_DEPTH_TEST);
+      glEnable(GL_CULL_FACE);
+
+      glLightfv(GL_LIGHT0, GL_POSITION, pos);
+      glLightfv(GL_LIGHT0, GL_AMBIENT,  amb);
+      glLightfv(GL_LIGHT0, GL_DIFFUSE,  dif);
+      glLightfv(GL_LIGHT0, GL_SPECULAR, spc);
+
+      glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    }
+
   glPushMatrix ();
 
-# ifdef HAVE_MOBILE
   glRotatef (current_device_rotation(), 0, 0, 1);  /* right side up */
-# endif
-
   gltrackball_rotate (bp->user_trackball);
 
   glTranslatef (0, -20, 0);  /* Move the horizon down the screen */
@@ -2481,9 +2477,12 @@ free_robot (ModeInfo *mi)
 
   if (bp->user_trackball) gltrackball_free (bp->user_trackball);
   if (bp->walkers) free (bp->walkers);
-  if (robot_dome) free (robot_dome); robot_dome = 0;
-  if (robot_gear) free (robot_gear); robot_gear = 0;
-  if (ground) free (ground); ground = 0;
+  if (robot_dome) free (robot_dome);
+  robot_dome = 0;
+  if (robot_gear) free (robot_gear);
+  robot_gear = 0;
+  if (ground) free (ground);
+  ground = 0;
 
 # ifdef WORDBUBBLES
   if (bp->tc) textclient_close (bp->tc);
-- 
cgit v1.2.3-55-g7522