Incorporate my changes to xglobe, make a temporary 0.5p1 release,

until Thorsten finds time to make a real 0.6 release.
This includes:
- much improved cloud cover code,
- slightly faster rendering,
- fixed stars position,
- label placement to avoid collisions,
- auto-calibration of ambient light for night maps.
This commit is contained in:
espie 2000-06-19 12:59:15 +00:00
parent ee8435233c
commit 0eda5adc71
5 changed files with 11 additions and 57 deletions

View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2000/06/09 17:06:55 espie Exp $
# $OpenBSD: Makefile,v 1.7 2000/06/19 12:59:15 espie Exp $
CATEGORIES=x11
HOMEPAGE=http://wwwrzstud.rz.uni-karlsruhe.de/%7Euddn/xglobe/
MASTER_SITES=${HOMEPAGE}
DISTNAME=xglobe-0.5
#MASTER_SITES=${HOMEPAGE}
# Temporary release
MASTER_SITES=ftp://quatramaran.ens.fr/pub/espie/
DISTNAME=xglobe-0.5p1
NEED_VERSION=1.295
MAINTAINER=espie@cvs.openbsd.org

View File

@ -1,6 +1,6 @@
MD5 (xglobe-0.5-no-map.tar.gz) = b4eb36efbe9f8f0b6a6918379a8185dc
MD5 (xglobe-0.5.tar.gz) = 87caf7803f1d71a0b024188e3a2c759c
RMD160 (xglobe-0.5-no-map.tar.gz) = d1e0a82a881946d344639df47395100f013f428f
RMD160 (xglobe-0.5.tar.gz) = 0aa1f0c6fefa2a87d09a0c75fdc897a07889ee5c
SHA1 (xglobe-0.5-no-map.tar.gz) = c73e30e271a84fe78ce0f024fe4fd32e19da75f4
SHA1 (xglobe-0.5.tar.gz) = ba436e1105462577dd9fb1cbedcec93dd58e4e3a
MD5 (xglobe-0.5p1-no-map.tar.gz) = 4a423043d3949ddd35bc14a53fee91a9
MD5 (xglobe-0.5p1.tar.gz) = 049e266c9e32cbd30ad75cd0512209c4
RMD160 (xglobe-0.5p1-no-map.tar.gz) = 0a2397fc0103e4cb79f5d2175cb09e91f6d355a8
RMD160 (xglobe-0.5p1.tar.gz) = 1262cee9fa514a3a52b2957e67d5921babb7f332
SHA1 (xglobe-0.5p1-no-map.tar.gz) = 64dde39cd36eda21271d332d009de5b447013ed4
SHA1 (xglobe-0.5p1.tar.gz) = 5f92c1278995c11249c0d7d70acc0eb7ce91ed07

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2000/05/19 13:49:35 espie Exp $
--- Makefile.orig Fri May 19 13:03:55 2000
+++ Makefile Fri May 19 13:04:12 2000
@@ -112,4 +112,4 @@ markerlist.o: markerlist.cpp markerlist.
earthapp.cpp: earthapp.moc;
earthapp.moc: earthapp.h
- $(MOC) -o $@ $<
+ $(MOC) -o $@ $>

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-earthapp_cpp,v 1.1 2000/05/19 19:12:11 espie Exp $
--- earthapp.cpp.orig Fri May 19 21:07:11 2000
+++ earthapp.cpp Fri May 19 21:07:42 2000
@@ -371,7 +371,7 @@ void EarthApplication::readPosition(int
if(strncmp(argv()[i], "random", 6) == 0)
{
p_type = RANDOM;
- srand((int)time(NULL) + (int)getpid());
+ srandom((int)time(NULL) + (int)getpid());
return;
}
else if(strncmp(argv()[i], "fixed", 5) == 0)
@@ -937,8 +937,8 @@ void EarthApplication::readOutFileName(i
void EarthApplication::randomPosition()
{
- view_lat = ((rand()%30001)/30000.)*180. - 90.;
- view_long = ((rand()%30001)/30000.)*360. - 180.;
+ view_lat = ((random()%30001)/30000.)*180. - 90.;
+ view_long = ((random()%30001)/30000.)*360. - 180.;
}
/* ------------------------------------------------------------------------*/

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-renderer_cpp,v 1.1 2000/05/19 19:12:11 espie Exp $
--- renderer.cpp.orig Fri May 19 21:07:11 2000
+++ renderer.cpp Fri May 19 21:07:24 2000
@@ -1562,9 +1562,9 @@ void Renderer::drawStars()
for(int i=0; i<numstars; i++)
{
- x = rand() % renderedImage->width();
- y = rand() % renderedImage->height();
- brightness = 150+ (rand() % 106);
+ x = random() % renderedImage->width();
+ y = random() % renderedImage->height();
+ brightness = 150+ (random() % 106);
p = (unsigned int *)renderedImage->scanLine(y);
p += x;
*p = qRgb(brightness, brightness, brightness);