#include <grits.h>
-#ifdef HAVE_GLUT
-#include <GL/glut.h>
-#endif
-
#include "env.h"
/***********
}
}
-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);
grits_viewer_get_rotation(env->viewer, &x, &y, &z);
/* Setup projection */
- gint win_width = GTK_WIDGET(opengl)->allocation.width;
- gint win_height = GTK_WIDGET(opengl)->allocation.height;
- float scale = CLAMP(MIN(win_width,win_height)/2.0 * 0.1, 40, 100);
+ GtkAllocation alloc;
+ gtk_widget_get_allocation(GTK_WIDGET(opengl), &alloc);
+ float scale = CLAMP(MIN(alloc.width,alloc.height)/2.0 * 0.1, 40, 100);
float offset = scale + 20;
- glTranslatef(win_width - offset, offset, 0);
+ glTranslatef(alloc.width - offset, offset, 0);
/* Setup state */
glClear(GL_DEPTH_BUFFER_BIT);
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)
/* Info */
static void info_expose(GritsCallback *compass, GritsOpenGL *opengl, gpointer _env)
{
- gint win_width = GTK_WIDGET(opengl)->allocation.width;
- gint win_height = GTK_WIDGET(opengl)->allocation.height;
+ GtkAllocation alloc;
+ gtk_widget_get_allocation(GTK_WIDGET(opengl), &alloc);
/* Create cairo surface */
guint tex = 0;
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, tex);
glDisable(GL_CULL_FACE);
- glTranslatef(win_width - width, win_height - height, 0);
+ glTranslatef(alloc.width - width, alloc.height - height, 0);
glBegin(GL_QUADS);
glTexCoord2f(1, 0); glVertex3f(width, 0 , 0); // 0 - 3 0
glTexCoord2f(1, 1); glVertex3f(width, height, 0); // 1 - | |
/* Add compass */
GritsCallback *compass = grits_callback_new(compass_expose, env);
- grits_viewer_add(viewer, GRITS_OBJECT(compass), GRITS_LEVEL_HUD, FALSE);
+ grits_viewer_add(viewer, GRITS_OBJECT(compass), GRITS_LEVEL_HUD, TRUE);
g_signal_connect(compass, "clicked", G_CALLBACK(compass_click), viewer);
grits_object_set_cursor(GRITS_OBJECT(compass), GDK_CROSS);
env->refs = g_list_prepend(env->refs, compass);
/* Drop references */
if (env->viewer) {
for (GList *cur = env->refs; cur; cur = cur->next)
- grits_viewer_remove(env->viewer, cur->data);
- g_list_free_full(env->refs, g_object_unref);
+ grits_object_destroy_pointer(&cur->data);
g_object_unref(env->viewer);
g_object_unref(env->prefs);
glDeleteTextures(1, &env->tex);