Add timeout for http servers

[grits] / src / objects / grits-object.c

diff --git a/src/objects/grits-object.c b/src/objects/grits-object.c
index f625e7a190fd0e76eddb1f0a7abfffd3b8cbbc3d..3cfd8026c6558d1ae172f1278ab4e7d25317a490 100644 (file)
--- a/src/objects/grits-object.c
+++ b/src/objects/grits-object.c
@@ -16,7 +16,7 @@
  */
 
 /**
- * SECTION:gis-object
+ * SECTION:grits-object
  * @short_description: Base class for drawing operations
  *
  * Objects in grits are things which can be added to the viewer and will be
@@ -24,8 +24,8 @@
  * level of detail which are used by the viewer to determine which objects
  * should be drawn.
  *
- * Each #GisObject is also a #GObject, but not every GObject in grits is a
- * GisObject. The "Object" part of the name is just coincidence.
+ * Each #GritsObject is also a #GObject, but not every GObject in grits is a
+ * GritsObject. The "Object" part of the name is just coincidence.
  */
 
 #include <config.h>
@@ -35,11 +35,8 @@
 #include "grits-object.h"
 
 
-/*************
- * GisObject *
- *************/
 /**
- * gis_object_draw:
+ * grits_object_draw:
  * @object: the object
  * @opengl: the viewer the object is being displayed in
  *
@@ -48,11 +45,11 @@
  * The GL_PROJECTION and GL_MODELVIEW matricies and GL_ALL_ATTRIB_BITS will be
  * restored to the default state after the call to draw.
  */
-void gis_object_draw(GisObject *object, GisOpenGL *opengl)
+void grits_object_draw(GritsObject *object, GritsOpenGL *opengl)
 {
-       GisObjectClass *klass = GIS_OBJECT_GET_CLASS(object);
+       GritsObjectClass *klass = GRITS_OBJECT_GET_CLASS(object);
        if (!klass->draw) {
-               g_warning("GisObject: draw - Unimplemented");
+               g_warning("GritsObject: draw - Unimplemented");
                return;
        }
 
@@ -60,47 +57,93 @@ void gis_object_draw(GisObject *object, GisOpenGL *opengl)
        if (object->hidden)
                return;
 
-       /* Skip out of range objects */
-       if (object->lod > 0) {
+       /* Support GritsTester */
+       if (!GRITS_IS_OPENGL(opengl)) {
+               g_debug("GritsObject: draw - drawing raw object");
+               klass->draw(object, opengl);
+               return;
+       }
+
+       /* Calculae distance for LOD and horizon tests */
+       GritsPoint *center = &object->center;
+       if ((!(object->skip & GRITS_SKIP_LOD) ||
+            !(object->skip & GRITS_SKIP_HORIZON)) &&
+           (center->elev != -EARTH_R)) {
                /* LOD test */
                gdouble eye[3], obj[3];
-               gis_viewer_get_location(GIS_VIEWER(opengl), &eye[0], &eye[1], &eye[2]);
+               grits_viewer_get_location(GRITS_VIEWER(opengl),
+                               &eye[0], &eye[1], &eye[2]);
                gdouble elev = eye[2];
-               lle2xyz(eye[0], eye[1], eye[2], &eye[0], &eye[1], &eye[2]);
-               lle2xyz(object->center.lat, object->center.lon, object->center.elev,
-                       &obj[0], &obj[1], &obj[2]);
+               lle2xyz(eye[0], eye[1], eye[2],
+                               &eye[0], &eye[1], &eye[2]);
+               lle2xyz(center->lat, center->lon, center->elev,
+                               &obj[0], &obj[1], &obj[2]);
                gdouble dist = distd(obj, eye);
-               if (object->lod < dist)
-                       return;
-
-               /* Horizon testing */
-               gdouble c = EARTH_R+elev;
-               gdouble a = EARTH_R;
-               gdouble horizon = sqrt(c*c - a*a);
-               if (dist > horizon)
-                       return;
+
+               /* Level of detail test */
+               if (!(object->skip & GRITS_SKIP_LOD)
+                               && object->lod > 0) {
+                       if (object->lod < dist)
+                               return;
+               }
+
+               /* Horizon test */
+               if (!(object->skip & GRITS_SKIP_HORIZON)) {
+                       gdouble c = EARTH_R+elev;
+                       gdouble a = EARTH_R;
+                       gdouble horizon = sqrt(c*c - a*a);
+                       if (dist > horizon)
+                               return;
+               }
        }
 
        /* Save state, draw, restore state */
        g_mutex_lock(opengl->sphere_lock);
-       glPushAttrib(GL_ALL_ATTRIB_BITS);
-       glMatrixMode(GL_PROJECTION); glPushMatrix();
-       glMatrixMode(GL_MODELVIEW);  glPushMatrix();
+       if (!(object->skip & GRITS_SKIP_STATE)) {
+               glPushAttrib(GL_ALL_ATTRIB_BITS);
+               glMatrixMode(GL_PROJECTION); glPushMatrix();
+               glMatrixMode(GL_MODELVIEW);  glPushMatrix();
+       }
+
+       if (!(object->skip & GRITS_SKIP_CENTER))
+               grits_viewer_center_position(GRITS_VIEWER(opengl),
+                               object->center.lat,
+                               object->center.lon,
+                               object->center.elev);
 
        klass->draw(object, opengl);
 
-       glPopAttrib();
-       glMatrixMode(GL_PROJECTION); glPopMatrix();
-       glMatrixMode(GL_MODELVIEW);  glPopMatrix();
+       if (!(object->skip & GRITS_SKIP_STATE)) {
+               glPopAttrib();
+               glMatrixMode(GL_PROJECTION); glPopMatrix();
+               glMatrixMode(GL_MODELVIEW);  glPopMatrix();
+       }
        g_mutex_unlock(opengl->sphere_lock);
 }
 
+void grits_object_hide(GritsObject *object, gboolean hidden)
+{
+       GritsObjectClass *klass = GRITS_OBJECT_GET_CLASS(object);
+       object->hidden = hidden;
+       if (klass->hide)
+               klass->hide(object, hidden);
+}
+
+void grits_object_queue_draw(GritsObject *object)
+{
+       if (object->viewer)
+               gtk_widget_queue_draw(GTK_WIDGET(object->viewer));
+}
+
 /* GObject stuff */
-G_DEFINE_ABSTRACT_TYPE(GisObject, gis_object, G_TYPE_OBJECT);
-static void gis_object_init(GisObject *object)
+G_DEFINE_ABSTRACT_TYPE(GritsObject, grits_object, G_TYPE_OBJECT);
+static void grits_object_init(GritsObject *object)
 {
+       object->center.lat  =  0;
+       object->center.lon  =  0;
+       object->center.elev = -EARTH_R;
 }
 
-static void gis_object_class_init(GisObjectClass *klass)
+static void grits_object_class_init(GritsObjectClass *klass)
 {
 }