playground/base/marble
SVN commit 638441 by rahn:
Starting debian support based on the work from Steffen Joeris
A debian (directory)
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/data-files
A debian/manpages
A debian/marble-data.dirs
A debian/marble.1
A debian/marble.dirs
A debian/patches (directory)
A debian/rules
M +6 -50 src/texloader.cpp
M +2 -2 src/texloader.h
M +4 -2 src/vectorcomposer.cpp
M +2 -0 src/vectorcomposer.h
--- trunk/playground/base/marble/src/texloader.cpp #638440:638441
@@ -148,13 +148,15 @@
int lng = (int)(maxhalfalpha + radlng * rad2pixw);
int lat = (int)(maxquatbeta + radlat * rad2pixh);
- if ( lng >= maxfullalpha ) lng = maxfullalpha-1; // necessary to prevent crash if radalpha = -pi
- if ( lat >= maxhalfbeta ) lat = maxhalfbeta-1; // necessary to prevent crash
+ // necessary to prevent crash if TextureMapper::radalpha = -pi
+ if ( lng >= maxfullalpha ) lng = maxfullalpha-1;
+ // necessary to prevent crash
+ if ( lat >= maxhalfbeta ) lat = maxhalfbeta-1;
// if ( lng >= maxfullalpha ) lng = (int)(radlng * rad2pixw); // necessary to prevent crash if radalpha = -pi
// if ( lat >= maxhalfbeta ) lat = (int)(radlat * rad2pixh - maxquatbeta); // necessary to prevent crash
-// Calculate the position on the respective Tile
+// Calculate the position on the respective Tile
bool newtile = false;
@@ -187,53 +189,7 @@
else
pixelvalue = tile->jumpTable32[posy][posx];
}
-/*
-// Interpolate skipped points
-void TextureLoader::getPixelValueApprox(const float& lng, const float& lat, QRgb* line, const int& x){
- avglat = lat-m_prevlat;
- avglat *= m_ninv;
- avglng = lng + m_prevlng;
- if (fabs(avglng) > M_PI){
-
- avglng = TWOPI - fabs(avglng);
- avglng *= m_ninv;
-
- if (-m_prevlng > lng){
- float curAvgLng = -m_prevlng;
- for (int j=1-m_n; j < 0; j++){
- m_prevlat += avglat;
- curAvgLng += avglng;
- if (curAvgLng >= M_PI) curAvgLng -= TWOPI;
- getPixelValue( -curAvgLng, m_prevlat, line[x+j]);
- }
- }
-
- if (-m_prevlng < lng){
- float curAvgLng = lng + m_n*avglng;
- for (int j=1-m_n; j < 0; j++){
- m_prevlat += avglat;
- curAvgLng -= avglng;
- float evallng = curAvgLng;
- if (curAvgLng >= M_PI) evallng -= TWOPI;
- getPixelValue( -evallng, m_prevlat, line[x+j]);
- }
- }
- }
-
- else {
-
- avglng *= m_ninv;
- for (int j=1-m_n; j < 0; j++) {
- m_prevlat += avglat;
- m_prevlng -= avglng;
- getPixelValue( m_prevlng, m_prevlat, line[x + j]);
- }
- }
-
-}
-*/
-
// Interpolate skipped points
void TextureLoader::getPixelValueApprox(const float& lng, const float& lat, QRgb* line, const int& x){
avglat = lat-m_prevlat;
@@ -333,6 +289,6 @@
maxhalfalpha = (float)(21600.0f / (float)(texpixw));
maxquatalpha = (int)(10800.0f / (float)(texpixw));
maxquatbeta = (float)(10800.0f / (float)(texpixh));
- maxhalfbeta = 2.0f * maxquatbeta;
+ maxhalfbeta = (int) ( 2.0f * maxquatbeta);
}
}
--- trunk/playground/base/marble/src/texloader.h #638440:638441
@@ -63,8 +63,8 @@
float avglng, avglat;
int texpixw, texpixh;
float rad2pixw, rad2pixh;
- int maxfullalpha, maxquatalpha;
- float maxhalfalpha, maxhalfbeta, maxquatbeta;
+ int maxfullalpha, maxquatalpha, maxhalfbeta;
+ float maxhalfalpha, maxquatbeta;
int tilx, tily;
int tilxw, tilyh;
--- trunk/playground/base/marble/src/vectorcomposer.cpp #638440:638441
@@ -92,7 +92,8 @@
vectormap -> setzPointLimit(-1.0);
vectormap -> createFromPntMap(pborder,radius,rotAxis);
- QPen borderpen(QColor(242,187,136));
+// QPen borderpen(QColor(242,187,136));
+ QPen borderpen(QColor(242,155,104));
borderpen.setStyle(Qt::DashLine);
vectormap -> setPen(borderpen);
@@ -105,7 +106,8 @@
vectormap -> setzPointLimit(-1.0);
vectormap -> createFromPntMap(pusa,radius,rotAxis);
- QPen statepen(QColor(242,187,136));
+// QPen statepen(QColor(242,187,136));
+ QPen statepen(QColor(242,155,104));
statepen.setStyle(Qt::DotLine);
vectormap -> setPen(statepen);
vectormap -> setBrush(Qt::NoBrush);
--- trunk/playground/base/marble/src/vectorcomposer.h #638440:638441
@@ -47,6 +47,8 @@
VectorMap* vectormap;
QPen m_areapen, m_riverpen, m_borderpen;
QBrush m_areabrush, m_lakebrush;
+
+ QVector<qreal> m_dashes;
};
#endif // VECTORMAP_H
Reply to: