grits_viewer_get_location(GRITS_VIEWER(opengl), &lat, &lon, &elev);
glViewport(0, 0, width, height);
- gluPerspective(rad2deg(ang)*2, width/height, near, far);
+ gluPerspective(rad2deg(ang), width/height, near, far);
/* Setup camera and lighting */
glMatrixMode(GL_MODELVIEW);
*
* Used by GritsOpenGL to set up the drawing window
*/
-#define FOV_DIST 2000.0
+#define FOV_DIST 2078.46
/**
* MPPX:
*
* Returns: the resolution in meters per pixel
*/
-#define MPPX(dist) (4*dist/FOV_DIST)
+#define MPPX(dist) (dist/FOV_DIST)
void lle2xyz(gdouble lat, gdouble lon, gdouble elev,
gdouble *x, gdouble *y, gdouble *z);
gdouble lat, lon, elev, scale, rx, ry, rz;
grits_viewer_get_location(GRITS_VIEWER(viewer), &lat, &lon, &elev);
grits_viewer_get_rotation(GRITS_VIEWER(viewer), &rx, &ry, &rz);
- scale = (elev/EARTH_R/15) * (sin(deg2rad(ABS(rx)))*4+1);
+ scale = (elev/EARTH_R/40) * (sin(deg2rad(ABS(rx)))*4+1);
switch (viewer->drag_mode) {
case GRITS_DRAG_PAN: grits_viewer_pan(viewer, -y*scale, x*scale, 0); break;
case GRITS_DRAG_ZOOM: grits_viewer_zoom(viewer, pow(2, -y/500)); break;
- case GRITS_DRAG_TILT: grits_viewer_rotate(viewer, y/10, 0, x/10); break;
+ case GRITS_DRAG_TILT: grits_viewer_rotate(viewer, y/30, 0, x/20); break;
}
viewer->drag_x = event->x;
viewer->drag_y = event->y;
viewer->time = time(NULL);
viewer->location[0] = 40;
viewer->location[1] = -100;
- viewer->location[2] = 1.5*EARTH_R;
+ viewer->location[2] = 4*EARTH_R;
viewer->rotation[0] = 0;
viewer->rotation[1] = 0;
viewer->rotation[2] = 0;
GRITS_OBJECT(test->marker)->center.lat = 38.841847;
GRITS_OBJECT(test->marker)->center.lon = -90.491982;
GRITS_OBJECT(test->marker)->center.elev = 0.0;
- GRITS_OBJECT(test->marker)->lod = EARTH_R;
+ GRITS_OBJECT(test->marker)->lod = EARTH_R*3;
grits_viewer_add(test->viewer, GRITS_OBJECT(test->marker), GRITS_LEVEL_OVERLAY, FALSE);
/* These do not work on marker yet */
//g_signal_connect(test->marker, "enter", G_CALLBACK(on_marker_enter), NULL);