From: Andy Spencer <andy753421@gmail.com>
Date: Sun, 10 Mar 2013 03:24:25 +0000 (+0000)
Subject: Remove optional GLUT dependencies
X-Git-Url: http://pileus.org/git/?p=grits;a=commitdiff_plain;h=ca05387c80a2b4fd06074b2fdc3e46e752846abe

Remove optional GLUT dependencies

The teapot easter egg kept crashing, and I'm too lazy to fix it.
---

diff --git a/configure.ac b/configure.ac
index 4c584e7..7038d48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,11 +41,6 @@ AS_IF([test "$enable_gtk3" = "yes"],
 	[GTK_VERSION=gtk+-2.0])
 AC_SUBST(GTK_VERSION)
 
-# Check for glut for example plugin
-AC_CHECK_LIB(glut, glutSolidTeapot, GLUT_LIBS="-lglut")
-AM_CONDITIONAL(HAVE_GLUT, test "$GLUT_LIBS" != "")
-AC_SUBST(GLUT_LIBS)
-
 # Test for windowing system
 case "${host}" in
 	*mingw32*) SYS="WIN" ;;
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 5fc085d..9e8628c 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -24,15 +24,5 @@ test_la_SOURCES     = test.c test.h
 env_la_CPPFLAGS     = $(AM_CPPFLAGS)
 env_la_LDFLAGS      = $(AM_LDFLAGS)
 
-if HAVE_GLUT
-noinst_LTLIBRARIES  = teapot.la
-teapot_la_SOURCES   = \
-	$(top_srcdir)/examples/plugin/teapot.c \
-	$(top_srcdir)/examples/plugin/teapot.h
-teapot_la_LDFLAGS   = $(AM_LDFLAGS) -lglut -rpath $(libdir) # I hate you libtool
-env_la_CPPFLAGS    += -DHAVE_GLUT
-env_la_LDFLAGS     += -lglut
-endif
-
 test:
 	( cd ../; make test )
diff --git a/src/plugins/env.c b/src/plugins/env.c
index 717e9d7..64ba8e3 100644
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -28,10 +28,6 @@
 
 #include <grits.h>
 
-#ifdef HAVE_GLUT
-#include <GL/glut.h>
-#endif
-
 #include "env.h"
 
 /***********
@@ -156,37 +152,6 @@ static void compass_draw_compass(gdouble scale)
 	}
 }
 
-static gboolean compass_draw_teapot(gdouble scale, GritsPluginEnv *env)
-{
-	static int teatime = 0;
-#ifdef HAVE_GLUT
-	static int init, argc; char *argv[] = {"", NULL};
-	if (!init) {
-		teatime = grits_prefs_get_boolean(env->prefs, "grits/teatime", NULL);
-		glutInit(&argc, argv);
-		init = 1;
-		g_message("teatime=%d", teatime);
-	}
-
-	if (teatime) {
-		/* Setup lighting */
-		float light_ambient[]  = {0.1f, 0.1f, 0.0f, 1.0f};
-		float light_diffuse[]  = {0.9f, 0.9f, 0.9f, 1.0f};
-		float light_position[] = {-50.0f, -40.0f, -80.0f, 1.0f};
-		glLightfv(GL_LIGHT0, GL_AMBIENT,  light_ambient);
-		glLightfv(GL_LIGHT0, GL_DIFFUSE,  light_diffuse);
-		glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-
-		/* Draw teapot */
-		glRotatef(-90, 0, 0, 1);
-		glRotatef(-90, 1, 0, 0);
-		glColor4f(0.9, 0.9, 0.7, 1.0);
-		glutSolidTeapot(scale * 0.60);
-	}
-#endif
-	return teatime;
-}
-
 static void compass_expose(GritsCallback *compass, GritsOpenGL *opengl, gpointer _env)
 {
 	GritsPluginEnv *env = GRITS_PLUGIN_ENV(_env);
@@ -213,8 +178,7 @@ static void compass_expose(GritsCallback *compass, GritsOpenGL *opengl, gpointer
 	x = CLAMP(x, -66, 66);;
 	glRotatef(x, 1, 0, 0);
 	glRotatef(-z, 0, 0, 1);
-	if (!compass_draw_teapot(scale, env))
-		compass_draw_compass(scale);
+	compass_draw_compass(scale);
 }
 
 static gboolean compass_click(GritsCallback *compass, GdkEvent *evnet, GritsViewer *viewer)