6a26a8ef4b
When requesting, for instance, a 75x85 map, the mapper will now create a 75x85 map, instead of an 80x96 (or even 96x108) map as it did before. This new behavior is the default when using one of the options --centergeometry or --cornergeometry. In addition, both of these options will no longer shrink the map, to remove rows or columns of empty blocks at the edges. Previously, this behavior was enabled with --forcegeometry. An option --geometrymode has been added as well, to tune the interpretation of the geometry. It supports 4 flags: - pixel: the requested geometry is interpreted with pixel granularity. The map is not enlarged to include entire map blocks. - block: the requested geometry is interpreted with block granularity. The map is enlarged with at most 15 nodes at each of the four edges, so that it includes entire map blocks only. - fixed: a map of the requested geometry is created (after adjustmens for 'block' mode). Empty rows or columns at the edges are not removed. - shrink: Empty rows and columns at the map edges are removed to generate the smallest picture possible. Lastly, a new geometry syntax has been added, which is more compatible with known syntax (i.e. X-Windows), and which allows the offset to be optional. If the offset is omitted, the picture defaults to be centered around 0,0. `<width>x<height>[+|-<xoffset>+|-<yoffset>]` For compatibility, the behavior of the option --geometry was not changed. If (and only if) used before --geometrymode, it enables block granularity and shrink. The old option --forcegeometry is no longer documented, but still recognised for compatibility.
111 lines
2.8 KiB
C++
111 lines
2.8 KiB
C++
/*
|
|
* =====================================================================
|
|
* Version: 1.0
|
|
* Created: 25.08.2012 10:55:29
|
|
* Author: Miroslav Bendík
|
|
* Company: LinuxOS.sk
|
|
* =====================================================================
|
|
*/
|
|
|
|
#ifndef PIXELATTRIBUTES_H_ADZ35GYF
|
|
#define PIXELATTRIBUTES_H_ADZ35GYF
|
|
|
|
#include <limits>
|
|
#include <cmath>
|
|
#include <stdint.h>
|
|
#include <stdexcept>
|
|
#include <cassert>
|
|
#include "config.h"
|
|
#include "Color.h"
|
|
|
|
struct PixelAttribute {
|
|
PixelAttribute(): h(NAN), t(0), a(0), r(0), g(0), b(0) {};
|
|
PixelAttribute(const Color &color, double height);
|
|
PixelAttribute(const ColorEntry &entry, double height);
|
|
double h;
|
|
double t;
|
|
double a;
|
|
double r;
|
|
double g;
|
|
double b;
|
|
uint8_t red(void) const { return int(r*255+0.5); }
|
|
uint8_t green(void) const { return int(g*255+0.5); }
|
|
uint8_t blue(void) const { return int(b*255+0.5); }
|
|
uint8_t alpha(void) const { return int(a*255+0.5); }
|
|
uint8_t thicken(void) const { return int(t*255+0.5); }
|
|
unsigned height(void) const { return unsigned(h+0.5); }
|
|
Color color(void) const { return Color(red(), green(), blue(), alpha()); }
|
|
|
|
inline bool is_valid() const { return !isnan(h); }
|
|
PixelAttribute &operator=(const PixelAttribute &p);
|
|
void mixUnder(const PixelAttribute &p);
|
|
};
|
|
|
|
class PixelAttributes
|
|
{
|
|
public:
|
|
PixelAttributes();
|
|
virtual ~PixelAttributes();
|
|
void setParameters(int width, int lines);
|
|
void scroll(int keepY);
|
|
PixelAttribute &attribute(int y, int x);
|
|
void renderShading(bool drawAlpha);
|
|
void setLastY(int y) { m_lastY = y; }
|
|
int getLastY(void) { return m_lastY; }
|
|
|
|
private:
|
|
int yCoord2Line(int y) { return y - m_firstY + m_firstLine; }
|
|
void freeAttributes();
|
|
|
|
private:
|
|
int m_previousLine;
|
|
int m_firstLine;
|
|
int m_lastLine;
|
|
int m_emptyLine;
|
|
int m_lineCount;
|
|
PixelAttribute **m_pixelAttributes;
|
|
int m_width;
|
|
int m_firstY;
|
|
int m_lastY;
|
|
int m_firstUnshadedY;
|
|
};
|
|
|
|
|
|
inline PixelAttribute &PixelAttributes::attribute(int y, int x)
|
|
{
|
|
#ifdef DEBUG
|
|
assert(yCoord2Line(y) >= m_firstLine && yCoord2Line(y) <= m_lastLine);
|
|
#else
|
|
static PixelAttribute p;
|
|
if (!(yCoord2Line(y) >= m_firstLine && yCoord2Line(y) <= m_lastLine))
|
|
return p;
|
|
#endif
|
|
return m_pixelAttributes[yCoord2Line(y)][x + 1];
|
|
}
|
|
|
|
inline PixelAttribute::PixelAttribute(const Color &color, double height) :
|
|
h(height), t(0), a(color.a/255.0),
|
|
r(color.r/255.0), g(color.g/255.0), b(color.b/255.0)
|
|
{
|
|
}
|
|
|
|
inline PixelAttribute::PixelAttribute(const ColorEntry &entry, double height) :
|
|
h(height), t(entry.t/255.0), a(entry.a/255.0),
|
|
r(entry.r/255.0), g(entry.g/255.0), b(entry.b/255.0)
|
|
{
|
|
}
|
|
|
|
inline PixelAttribute &PixelAttribute::operator=(const PixelAttribute &p)
|
|
{
|
|
h = p.h;
|
|
t = p.t;
|
|
a = p.a;
|
|
r = p.r;
|
|
g = p.g;
|
|
b = p.b;
|
|
return *this;
|
|
}
|
|
|
|
#endif /* end of include guard: PIXELATTRIBUTES_H_ADZ35GYF */
|
|
|