No OneTemporary
Actions

Authored By

Unknown

Size

53 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/util/console.cpp b/util/console.cpp
	index f700196a..1579c22f 100644
	--- a/util/console.cpp
	+++ b/util/console.cpp
	@@ -1,311 +1,310 @@
	#include "console.h"
	#include "graphics/bitmap.h"
	#include "font.h"
	#include "funcs.h"
	#include "file-system.h"
	#include "exceptions/exception.h"
	#include "input/input-manager.h"
	#include "input/input-map.h"
	#include "debug.h"
	#include <string>
	#include <sstream>
	#include <string.h>

	using namespace std;

	namespace Console{

	ConsoleEnd Console::endl;

	static void doProcess(void * self){
	Console * console = (Console*) self;
	console->activate();
	}

	static void doToggle(void * self){
	Console * console = (Console*) self;
	console->toggle();
	}

	static void doPreviousHistory(void * self){
	Console * console = (Console*) self;
	console->previousHistory();
	}

	static void doNextHistory(void * self){
	Console * console = (Console*) self;
	console->nextHistory();
	}

	static void doTabComplete(void * self){
	Console * console = (Console*) self;
	console->tabComplete();
	}

	static void doPageUp(void * self){
	Console * console = (Console*) self;
	console->pageUp();
	}

	static void doPageDown(void * self){
	Console * console = (Console*) self;
	console->pageDown();
	}

	Console::Console(const int maxHeight, const Filesystem::RelativePath & font):
	state(Closed),
	maxHeight(maxHeight),
	height(0),
	font(font),
	textHeight(15),
	textWidth(15),
	offset(0),
	historyIndex(0),
	pagePosition(-1){
	textInput.addBlockingHandle(Keyboard::Key_TILDE, doToggle, this);
	textInput.addBlockingHandle(Keyboard::Key_ENTER, doProcess, this);
	textInput.addBlockingHandle(Keyboard::Key_UP, doPreviousHistory, this);
	textInput.addBlockingHandle(Keyboard::Key_DOWN, doNextHistory, this);
	textInput.addBlockingHandle(Keyboard::Key_TAB, doTabComplete, this);
	textInput.addBlockingHandle(Keyboard::Key_PGUP, doPageUp, this);
	textInput.addBlockingHandle(Keyboard::Key_PGDN, doPageDown, this);
	}

	Console::~Console(){
	textInput.disable();
	}

	/* attempt to complete the current text to a command */
	void Console::tabComplete(){
	string text = textInput.getText();
	for (map<string, Util::ReferenceCount<Command> >::iterator it = commands.begin(); it != commands.end(); it++){
	string what = it->first;
	if (what.find(text) == 0){
	Global::debug(0) << "Auto complete '" << what << "'" << std::endl;
	textInput.setText(what);
	return;
	}
	}
	}

	void Console::addCommand(const std::string & name, const Util::ReferenceCount<Command> & command){
	if (command == NULL){
	return;
	}

	if (commands[name] != 0){
	Global::debug(0) << "Warning: duplicate console command for '" << name << "'" << std::endl;
	}
	commands[name] = command;
	}

	void Console::addAlias(const std::string & alias, const std::string & name){
	addCommand(alias, commands[name]);
	}

	void Console::previousHistory(){
	if (historyIndex < history.size()){
	textInput.setText(history[historyIndex]);
	historyIndex += 1;
	}
	}

	void Console::nextHistory(){
	if (historyIndex > 0){
	historyIndex -= 1;
	textInput.setText(history[historyIndex]);
	} else {
	textInput.setText(string());
	}
	}

	static const int PAGE_MOVEMENT = 3;
	void Console::pageUp(){
	if (pagePosition == -1){
	pagePosition = lines.size();
	}
	pagePosition -= PAGE_MOVEMENT;
	if (pagePosition < PAGE_MOVEMENT){
	pagePosition = PAGE_MOVEMENT;
	}
	}

	void Console::pageDown(){
	if (pagePosition != -1){
	pagePosition += PAGE_MOVEMENT;
	}
	if (pagePosition >= lines.size()){
	pagePosition = -1;
	}
	}

	void Console::act(){
	double speed = 10.0;
	switch (state){
	case Closed : {
	break;
	}
	case Open : {
	break;
	}
	case Closing : {
	int distance = height;
	height -= (int)((double)distance / speed + 1.0);
	if (height <= 0){
	height = 0;
	state = Closed;
	}
	break;
	}
	case Opening : {
	int distance = maxHeight - height;
	height += (int)((double)distance / speed + 1.0);
	if (height >= maxHeight){
	height = maxHeight;
	state = Open;
	}
	break;
	}
	}
	}

	/*
	static bool isChar(char c){
	const char * letters = "abcdefghijklmnopqrstuvwxyz ,.";
	return strchr(letters, c) != NULL;
	}
	*/

	void Console::activate(){
	if (textInput.getText() != ""){
	process(textInput.getText());
	}
	textInput.clearInput();
	}

	bool Console::isActive() const {
	return state == Open \|\| state == Opening;
	}

	/* console input */
	bool Console::doInput() {
	if (state == Closed \|\| state == Closing){
	return false;
	}

	textInput.doInput();

	return true;
	}

	void Console::draw(const Graphics::Bitmap & work){
	int x = 3;
	/* if we can show something */
	if (height > 0){
	Graphics::Bitmap::transBlender(0, 0, 0, 160);
	work.translucent().rectangleFill(0, 0, work.getWidth(), height, Graphics::makeColor(200,0,0));
	work.translucent().horizontalLine(0, height, work.getWidth(), Graphics::makeColor(200, 200, 200));
	const Font & font = Font::getFont(getFont(), textWidth, textHeight);
	int start = height - font.getHeight() * 2;
	+ Graphics::Color white = Graphics::makeColor(255, 255, 255);

	int position = 0;
	if (pagePosition != -1){
	position = lines.size() - pagePosition;
	}
	for (std::vector<std::string>::reverse_iterator i = lines.rbegin() + position; i != lines.rend() && start > 0; ++i){
	std::string str = *i;
	- font.printf(x, start, Graphics::makeColor(255,255,255), work, str, 0);
	+ font.printf(x, start, white, work, str, 0);
	start -= font.getHeight();
	}
	if (position != 0){
	- work.circleFill(x, height - font.getHeight() - 2, 1, Graphics::makeColor(255, 255, 255));
	- work.circleFill(x + 5, height - font.getHeight() - 2, 1, Graphics::makeColor(255, 255, 255));
	- work.circleFill(x + 10, height - font.getHeight() - 2, 1, Graphics::makeColor(255, 255, 255));
	- work.circleFill(x + 15, height - font.getHeight() - 2, 1, Graphics::makeColor(255, 255, 255));
	- work.circleFill(x + 20, height - font.getHeight() - 2, 1, Graphics::makeColor(255, 255, 255));
	+ for (int x0 = 0; x0 < 5; x0++){
	+ work.circleFill(x + x0 * 5, height - font.getHeight() - 2, 1, white);
	+ }
	}
	- font.printf(x, height - font.getHeight(), Graphics::makeColor(255,255,255), work, "> " + textInput.getText() + "\|", 0);
	+ font.printf(x, height - font.getHeight(), white, work, "> " + textInput.getText() + "\|", 0);
	}
	}

	void Console::toggle(){
	switch (state){
	case Open:
	case Opening: {
	state = Closing;
	textInput.disable();
	break;
	}
	case Closed:
	case Closing: {
	state = Opening;
	textInput.enable();
	break;
	}
	}
	}

	static vector<string> split(string str, char splitter){
	vector<string> strings;
	size_t next = str.find(splitter);
	while (next != string::npos){
	strings.push_back(str.substr(0, next));
	str = str.substr(next+1);
	next = str.find(splitter);
	}
	if (str != ""){
	strings.push_back(str);
	}

	return strings;
	}

	/* do something with a command */
	void Console::process(const string & command){
	/* reset history index */
	historyIndex = 0;
	/* don't duplicate history */
	if (history.size() == 0 \|\| (history.size() > 0 && !(command == history[1]))){
	history.push_front(command);
	}
	string start = command;
	if (command.find(' ') != string::npos){
	start = command.substr(0, command.find(' '));
	}

	const map<string, Util::ReferenceCount<Command> > & commandSet = commands;
	if (commandSet.find(start) != commandSet.end()){
	map<string, Util::ReferenceCount<Command> >::const_iterator found = commandSet.find(start);
	addLine(found->second->act(command));
	} else {
	addLine("Unknown command '" + start + "'");
	}
	}

	void Console::addLine(const std::string & line){
	vector<string> each = split(line, '\n');
	for (vector<string>::iterator it = each.begin(); it != each.end(); it++){
	lines.push_back(*it);
	}
	}

	Console & Console::operator<<(const ConsoleEnd & e){
	return *this;
	}

	void Console::clear(){
	lines.clear();
	}

	vector<Util::ReferenceCount<Command> > Console::getCommands() const {
	vector<Util::ReferenceCount<Command> > out;
	for (map<std::string, Util::ReferenceCount<Command> >::const_iterator it = commands.begin(); it != commands.end(); it++){
	Util::ReferenceCount<Command> command = it->second;
	if (command != NULL){
	out.push_back(command);
	}
	}
	return out;
	}

	}
	diff --git a/util/graphics/bitmap.cpp b/util/graphics/bitmap.cpp
	index 74dbdd71..d3ec91e6 100644
	--- a/util/graphics/bitmap.cpp
	+++ b/util/graphics/bitmap.cpp
	@@ -1,576 +1,593 @@
	#include "../funcs.h"
	#include "bitmap.h"
	#include "../file-system.h"
	#include <string>
	#include <stdio.h>
	#include <math.h>

	namespace Graphics{

	static Bitmap * Screen = NULL;
	/* bitmaps that should always be resized to the dimensions of the screen */
	static std::vector<Bitmap*> needResize;

	Util::Parameter<Bitmap*> screenParameter;
	+Util::Parameter<Util::ReferenceCount<ShaderManager> > shaderManager;
	+
	+ShaderManager::ShaderManager(){
	+}
	+
	+ShaderManager::~ShaderManager(){
	+}
	+
	+Util::ReferenceCount<Shader> ShaderManager::getShader(const std::string & name, Util::ReferenceCount<Shader> (*create)()){
	+ std::map<std::string, Util::ReferenceCount<Shader> >::iterator it = shaders.find(name);
	+ if (it == shaders.end()){
	+ shaders[name] = create();
	+ it = shaders.find(name);
	+ }
	+
	+ return it->second;
	+}

	/* implementation independant definitions can go here */

	Bitmap * Bitmap::temporary_bitmap = NULL;
	Bitmap * Bitmap::temporary_bitmap2 = NULL;

	/*
	int SCALE_X = 0;
	int SCALE_Y = 0;
	*/

	/*
	const int Bitmap::MODE_TRANS = 0;
	const int Bitmap::MODE_SOLID = 1;
	*/

	const int SPRITE_NO_FLIP = 0;
	const int SPRITE_V_FLIP = 1;
	const int SPRITE_H_FLIP = 2;

	const int SPRITE_NORMAL = 1;
	const int SPRITE_LIT = 2;
	const int SPRITE_TRANS = 3;

	static inline int max(int a, int b){
	return a > b ? a : b;
	}

	INTERNAL_COLOR Color::defaultColor(){
	return makeColor(0, 0, 0).color;
	}

	void initializeExtraStuff();

	Bitmap::Bitmap(Storage::File & file):
	mustResize(false),
	error(false),
	bit8MaskColor(makeColor(0, 0, 0)){
	int length = file.getSize();
	if (length == -1){
	throw BitmapException(__FILE__, __LINE__, std::string("Could not read from file"));
	}
	char * data = new char[length];
	try{
	file.readLine(data, length);
	loadFromMemory(data, length);
	delete[] data;
	} catch (const BitmapException & fail){
	delete[] data;
	throw;
	} catch (...){
	delete[] data;
	throw;
	}
	}

	QualityFilter qualityFilterName(const std::string & type){
	if (type == "xbr"){
	return XbrFilter;
	}
	if (type == "hqx"){
	return HqxFilter;
	}
	return NoFilter;
	}

	Bitmap::~Bitmap(){
	if (mustResize){
	for (std::vector<Bitmap*>::iterator it = needResize.begin(); it != needResize.end(); it++){
	Bitmap * who = *it;
	if (who == this){
	needResize.erase(it);
	break;
	}
	}
	}
	}

	static Bitmap makeTemporaryBitmap(Bitmap *& temporary, int w, int h){
	if (temporary == NULL){
	temporary = new Bitmap(w, h);
	} else if (temporary->getWidth() < w \|\| temporary->getHeight() < h){
	int mw = max(temporary->getWidth(), w);
	int mh = max(temporary->getHeight(), h);
	// printf("Create temporary bitmap %d %d\n", mw, mh);
	delete temporary;
	temporary = new Bitmap(mw, mh);
	}
	if (temporary == NULL){
	printf("bug temporary bitmap is null\n");
	}
	return Bitmap(*temporary, 0, 0, w, h);
	}

	Bitmap Bitmap::temporaryBitmap(int w, int h){
	return makeTemporaryBitmap(temporary_bitmap, w, h);
	}

	Bitmap Bitmap::temporaryBitmap2(int w, int h){
	return makeTemporaryBitmap(temporary_bitmap2, w, h);
	}

	void Bitmap::cleanupTemporaryBitmaps(){
	if (temporary_bitmap != NULL){
	delete temporary_bitmap;
	temporary_bitmap = NULL;
	}

	if (temporary_bitmap2 != NULL){
	delete temporary_bitmap2;
	temporary_bitmap2 = NULL;
	}
	}

	Bitmap & Bitmap::operator=(const Bitmap & copy){
	path = copy.getPath();
	this->width = copy.getWidth();
	this->height = copy.getHeight();
	setData(copy.getData());
	return *this;
	}

	double Bitmap::getScale(){
	/* the game is pretty much hard coded to run at 320 scaled upto 640
	* and then scaled to whatever the user wants, but as long as
	* 320 and 640 remain this number will be 2.
	* maybe calculate this at some point
	*/
	return 2;
	/*
	if (Scaler != NULL && Buffer != NULL){
	double x1 = Scaler->getWidth();
	double x2 = Buffer->getWidth();
	return x2 / x1;
	}
	return 1;
	*/
	}

	/* taken from the color addon from allegro 4.9 */
	static void al_color_cmyk_to_rgb(float cyan, float magenta, float yellow, float key, float red, float green, float *blue){
	float max = 1 - key;
	red = max - cyan max;
	green = max - magenta max;
	blue = max - yellow max;
	}

	void Bitmap::cymkToRGB(int c, int y, int m, int k, int * r, int * g, int * b){
	float fc = (float)c / 255.0;
	float fy = (float)y / 255.0;
	float fm = (float)m / 255.0;
	float fk = (float)k / 255.0;

	float fr, fg, fb;
	al_color_cmyk_to_rgb(fc, fm, fy, fk, &fr, &fg, &fb);
	r = (int)(fr 255.0);
	g = (int)(fg 255.0);
	b = (int)(fb 255.0);
	}

	void Bitmap::updateOnResize(){
	if (!mustResize){
	mustResize = true;
	needResize.push_back(this);
	}
	}

	void Bitmap::updateSize(const int width, const int height){
	if (getWidth() == width && getHeight() == height){
	return;
	}

	Bitmap created(width, height);
	*this = created;
	}

	/* resize the internal bitmap. not guaranteed to destroy the internal bitmap */
	void Bitmap::resize(const int width, const int height){

	/* if internal bitmap is already the proper size, do nothing */
	if (getWidth() == width && getHeight() == height){
	return;
	}

	Bitmap created(width, height);
	Stretch(created);
	*this = created;
	}


	/* decrement bitmap reference counter and free memory if counter hits 0 */
	#if 0
	void Bitmap::releaseInternalBitmap(){
	const int MAGIC_DEBUG = 0xa5a5a5;
	if (own != NULL){
	if (*own == MAGIC_DEBUG){
	printf("[bitmap] Trying to delete an already deleted reference counter %p\n", own);
	}

	(*own) -= 1;
	if ( *own == 0 ){
	*own = MAGIC_DEBUG;
	delete own;
	destroyPrivateData();
	own = NULL;
	}
	}
	}
	#endif

	void Bitmap::BlitToScreen() const {
	// this->Blit( *Bitmap::Screen );
	this->BlitToScreen(0, 0);
	}

	void Bitmap::load( const std::string & str ){
	// releaseInternalBitmap();
	internalLoadFile( str.c_str() );
	}

	Bitmap Bitmap::scaleBy(const double widthRatio, const double heightRatio) const {
	return scaleTo(getWidth() * widthRatio, getHeight() * heightRatio);
	}

	void Bitmap::border( int min, int max, Color color ) const {
	int w = getWidth();
	int h = getHeight();
	for (int i = min; i < max; i++){
	rectangle(i, i, w - 1 - i, h - 1 - i, color);
	}
	}

	void Bitmap::drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const {
	drawHFlip(x, y, startWidth, startHeight, width, height, NULL, where);
	}

	void Bitmap::drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const {
	Bitmap sub(*this, getWidth() - width, getHeight() - height, getWidth() - startWidth, getHeight() - startHeight);
	sub.drawHFlip(x + startWidth, y + startHeight, filter, where);
	}

	void Bitmap::drawRotateCenter(const int x, const int y, const int angle, const Bitmap & where){
	drawRotate(x - getWidth() / 2, y - getHeight() / 2, angle, where);
	}

	void Bitmap::drawCenter(const int x, const int y, const Bitmap & where) const {
	draw(x - getWidth() / 2, y - getHeight() / 2, where);
	}

	void Bitmap::drawStretched(const Bitmap & who) const {
	drawStretched(0, 0, who.getWidth(), who.getHeight(), who);
	}

	void Bitmap::draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const {
	draw(x, y, startWidth, startHeight, width, height, NULL, where);
	/*
	Bitmap sub(*this, startWidth, startHeight, width, height);
	sub.draw(x + startWidth, y + startHeight, where);
	*/
	}

	void Bitmap::draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const {
	Bitmap sub(*this, startWidth, startHeight, width, height);
	sub.draw(x + startWidth, y + startHeight, filter, where);
	}

	void Bitmap::horizontalLine( const int x1, const int y, const int x2, const Graphics::Color color ) const{
	this->hLine(x1, y, x2, color);
	}

	void Bitmap::equilateralTriangle(int x, int y, int angle, int size, Color color) const {
	double radians = Util::radians(angle);
	int x1 = x + size / 2 * cos(radians + 2 * Util::pi / 3);
	int y1 = y + size / 2 * sin(radians + 2 * Util::pi / 3);
	int x2 = x + size / 2 * cos(radians - 2 * Util::pi / 3);
	int y2 = y + size / 2 * sin(radians - 2 * Util::pi / 3);
	int x3 = x + size / 2 * cos(radians);
	int y3 = y + size / 2 * sin(radians);
	triangle(x1, y1, x2, y2, x3, y3, color);
	}

	Bitmap Bitmap::greyScale(){
	Bitmap grey(getWidth(), getHeight());

	for (int x = 0; x < getWidth(); x++){
	for (int y = 0; y < getHeight(); y++){
	Color pixel = getPixel(x, y);
	int val = (int)((0.299getRed(pixel) + 0.587getGreen(pixel) + 0.114*getBlue(pixel) + 0.5) + 16);
	if (val > 255){
	val = 255;
	}
	grey.putPixel(x, y, makeColor(val, val, val));
	}
	}

	return grey;
	}

	bool Bitmap::inRange(int x, int y) const {
	int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
	getClipRect(x1, y1, x2, y2);
	return (x >= x1 && x <= x2 &&
	y >= y1 && y <= y2);
	}

	void Bitmap::drawMask( const int _x, const int _y, const Bitmap & where ){
	Color mask = MaskColor();
	for (int x = 0; x < getWidth(); x++){
	for (int y = 0; y < getHeight(); y++){
	if (getPixel(x,y) == mask){
	where.putPixel(x+_x, y+_y, mask);
	}
	}
	}
	}

	void Bitmap::set8BitMaskColor(const Color & color){
	bit8MaskColor = color;
	}

	Color Bitmap::get8BitMaskColor(){
	return bit8MaskColor;
	}

	void Bitmap::setFakeGraphicsMode(int width, int height){
	initializeExtraStuff();
	Screen = new Bitmap(width, height);
	}

	void Bitmap::Blit( const std::string & xpath ) const {
	Bitmap duh(xpath);
	duh.Blit(*this);
	}

	void Bitmap::Blit(const Bitmap & where) const {
	this->Blit(0, 0, where);
	}

	void Bitmap::Blit(const int x, const int y, const Bitmap & where) const {
	Blit(0, 0, x, y, where);
	}

	void Bitmap::Blit(const int mx, const int my, const int wx, const int wy, const Bitmap & where) const {
	Blit(mx, my, getWidth(), getHeight(), wx, wy, where);
	}

	void Bitmap::BlitFromScreen(const int x, const int y) const {
	Screen->Blit(x, y, getWidth(), getHeight(), 0, 0, *this);
	}

	//! min (borrowed from allegro)
	static inline int Min(int x, int y){ return (((x) < (y)) ? (x) : (y)); }

	//! max (borrowed from allegro)
	static inline int Max(int x, int y){ return (((x) > (y)) ? (x) : (y)); }

	//! mid (borrowed from allegro)
	static inline int Mid(int x,int y,int z){ return (Max((x), Min((y), (z)))); }

	void Bitmap::roundRect(int radius, int x1, int y1, int x2, int y2, Color color) const {
	const int width = x2 - x1;
	const int height = y2 - y1;
	radius = Mid(0, radius, Min((x1+width - x1)/2, (y1+height - y1)/2));
	line(x1+radius, y1, x1+width-radius, y1, color);
	line(x1+radius, y1+height, x1+width-radius,y1+height, color);
	line(x1, y1+radius,x1, y1+height-radius, color);
	line(x1+width, y1+radius,x1+width, y1+height-radius, color);

	double quarterTurn = Util::pi / 2;
	double quadrant1 = 0;
	/* signs are flipped because the coordinate system is reflected over the y-axis */
	double quadrant2 = -Util::pi / 2;
	double quadrant3 = Util::pi;
	double quadrant4 = -3 * Util::pi / 2;

	/* upper right. draw from 90 to 0 */
	arc(x1+radius + (width - radius *2), y1 + radius, quadrant1, quadrant1 + quarterTurn, radius, color);
	/* upper left. draw from 180 to 270 */
	arc(x1 + radius, y1 + radius, quadrant2, quadrant2 + quarterTurn, radius, color);
	/* lower left. draw from 180 to 270 */
	arc(x1 + radius, y1 + height - radius, quadrant3, quadrant3 + quarterTurn, radius, color);
	/* lower right. draw from 0 to 270 */
	arc(x1+width-radius, y1+height-radius, quadrant4, quadrant4 + quarterTurn, radius, color);
	}

	void Bitmap::roundRectFill(int radius, int x1, int y1, int x2, int y2, Graphics::Color color) const {
	const int width = x2 - x1;
	const int height = y2 - y1;
	radius = Mid(0, radius, Min((x1+width - x1)/2, (y1+height - y1)/2));

	double quarterTurn = Util::pi / 2;
	double quadrant1 = 0;
	/* signs are flipped because the coordinate system is reflected over the y-axis */
	double quadrant2 = -Util::pi / 2;
	double quadrant3 = Util::pi;
	double quadrant4 = -3 * Util::pi / 2;

	/* upper right. draw from 90 to 0 */
	arcFilled(x1+radius + (width - radius *2), y1 + radius, quadrant1, quadrant1 + quarterTurn, radius, color);
	/* upper left. draw from 180 to 270 */
	arcFilled(x1 + radius, y1 + radius, quadrant2, quadrant2 + quarterTurn, radius, color);
	/* lower left. draw from 180 to 270 */
	arcFilled(x1 + radius, y1 + height - radius, quadrant3, quadrant3 + quarterTurn, radius, color);
	/* lower right. draw from 0 to 270 */
	arcFilled(x1+width-radius, y1+height-radius, quadrant4, quadrant4 + quarterTurn, radius, color);

	rectangleFill(x1+radius + 1, y1, x2-radius - 1, y1+radius - 1, color);
	rectangleFill(x1, y1+radius, x2, y2-radius, color);
	rectangleFill(x1+radius + 1, y2-radius + 1, x2-radius - 1, y2, color);
	}

	int Bitmap::getScreenWidth(){
	if (Screen != 0){
	return Screen->getWidth();
	}
	return 0;
	}

	int Bitmap::getScreenHeight(){
	if (Screen != 0){
	return Screen->getHeight();
	}
	return 0;
	}

	void Bitmap::clear() const {
	fill(makeColor(0, 0, 0));
	}

	void Bitmap::copy(const Bitmap & him){
	resize(him.getWidth(), him.getHeight());
	him.Blit(*this);
	}

	void Bitmap::Stretch( const Bitmap & where ) const {
	if (getWidth() == where.getWidth() && getHeight() == where.getHeight()){
	Blit(where);
	} else {
	Stretch(where, 0, 0, getWidth(), getHeight(), 0, 0, where.getWidth(), where.getHeight());
	}
	}

	void Bitmap::StretchHqx(const Bitmap & where) const {
	if (getWidth() == where.getWidth() && getHeight() == where.getHeight()){
	Blit(where);
	} else {
	StretchHqx(where, 0, 0, getWidth(), getHeight(), 0, 0, where.getWidth(), where.getHeight());
	}
	}

	void Bitmap::StretchXbr(const Bitmap & where) const {
	if (getWidth() == where.getWidth() && getHeight() == where.getHeight()){
	Blit(where);
	} else {
	StretchXbr(where, 0, 0, getWidth(), getHeight(), 0, 0, where.getWidth(), where.getHeight());
	}
	}

	Color darken(Color color, double factor ){
	int r = (int)((double)getRed(color) / factor);
	int g = (int)((double)getGreen(color) / factor);
	int b = (int)((double)getBlue(color) / factor);

	return makeColor(r, g, b);
	}

	LitBitmap::LitBitmap(const Bitmap & b):
	Bitmap(b){
	int x1, y1, x2, y2;
	b.getClipRect(x1, y1, x2, y2);
	setClipRect(x1, y1, x2, y2);
	}

	LitBitmap::LitBitmap():
	Bitmap(){
	}

	LitBitmap::~LitBitmap(){
	}

	LitBitmap Bitmap::lit() const {
	return LitBitmap(*this);
	}

	TranslucentBitmap Bitmap::translucent() const {
	return TranslucentBitmap(*this);
	}

	TranslucentBitmap Bitmap::translucent(int red, int green, int blue, int alpha) const {
	transBlender(red, green, blue, alpha);
	return TranslucentBitmap(*this);
	}

	TranslucentBitmap::TranslucentBitmap(const Bitmap & b):
	Bitmap(b){
	int x1, y1, x2, y2;
	b.getClipRect(x1, y1, x2, y2);
	setClipRect(x1, y1, x2, y2);
	}

	TranslucentBitmap::TranslucentBitmap():
	Bitmap(){
	}

	TranslucentBitmap::~TranslucentBitmap(){
	}

	void TranslucentBitmap::fill(Color color) const {
	Bitmap::applyTrans(color);
	}

	int StretchedBitmap::getWidth() const {
	return width;
	}

	int StretchedBitmap::getHeight() const {
	return height;
	}

	double StretchedBitmap::getScaleWidth() const {
	return (double) where.getWidth() / (double) getWidth();
	}

	double StretchedBitmap::getScaleHeight() const {
	return (double) where.getHeight() / (double) getHeight();
	}

	void blend_palette(Color * pal, int mp, Color startColor, Color endColor){
	/*
	ASSERT(pal);
	ASSERT(mp != 0);
	*/

	int sc_r = Graphics::getRed(startColor);
	int sc_g = Graphics::getGreen(startColor);
	int sc_b = Graphics::getBlue(startColor);

	int ec_r = Graphics::getRed(endColor);
	int ec_g = Graphics::getGreen(endColor);
	int ec_b = Graphics::getBlue(endColor);

	for ( int q = 0; q < mp; q++ ) {
	float j = (float)( q + 1 ) / (float)( mp );
	int f_r = (int)( 0.5 + (float)( sc_r ) + (float)( ec_r-sc_r ) * j );
	int f_g = (int)( 0.5 + (float)( sc_g ) + (float)( ec_g-sc_g ) * j );
	int f_b = (int)( 0.5 + (float)( sc_b ) + (float)( ec_b-sc_b ) * j );
	pal[q] = Graphics::makeColor( f_r, f_g, f_b );
	}
	}

	}

	#ifdef USE_ALLEGRO
	#include "allegro/bitmap.cpp"
	#endif
	#ifdef USE_SDL
	#include "sdl/bitmap.cpp"
	#endif
	#ifdef USE_ALLEGRO5
	#include "allegro5/bitmap.cpp"
	#endif

	diff --git a/util/graphics/bitmap.h b/util/graphics/bitmap.h
	index b0761636..6f10ac75 100644
	--- a/util/graphics/bitmap.h
	+++ b/util/graphics/bitmap.h
	@@ -1,694 +1,707 @@
	#ifndef _paintown_bitmap_h_
	#define _paintown_bitmap_h_

	#include "../exceptions/exception.h"
	#include "../pointer.h"
	#include "../parameter.h"
	#include <string>
	#include <vector>
	+#include <map>
	#include <iostream>

	#ifdef USE_ALLEGRO
	#include "allegro/bitmap.h"
	#endif
	#ifdef USE_SDL
	#include "sdl/bitmap.h"
	#endif
	#ifdef USE_ALLEGRO5
	#include "allegro5/bitmap.h"
	struct ALLEGRO_SHADER;
	#endif

	#include "color.h"

	#if !defined(USE_ALLEGRO) && !defined(USE_SDL) && !defined(USE_ALLEGRO5)
	#error No backend specified. Define one of USE_ALLEGRO, USE_SDL, or USE_ALLEGRO5
	#endif

	namespace Storage{
	class File;
	}

	namespace Graphics{

	class Bitmap;

	class Color{
	public:
	explicit Color(const INTERNAL_COLOR & color):
	color(color){
	}

	static INTERNAL_COLOR defaultColor();

	Color():
	color(defaultColor()){
	}

	Color & operator=(const Color & him){
	this->color = him.color;
	return *this;
	}

	bool operator==(const Color & him) const {
	return color == him.color;
	}

	bool operator!=(const Color & him) const {
	return !(*this == him);
	}

	bool operator<(const Color & him) const {
	return this->color < him.color;
	}

	INTERNAL_COLOR color;
	};

	enum ImageFormat{
	FormatPNG,
	FormatBMP,
	FormatJPG,
	FormatPCX,
	FormatTGA,
	FormatTIF,
	FormatXPM,
	FormatGIF,
	FormatUnknown
	};

	ImageFormat identifyImage(const unsigned char * data, int length);

	class TranslucentBitmap;
	class LitBitmap;
	class Bitmap;

	extern Util::Parameter<Bitmap*> screenParameter;

	extern const int SPRITE_NORMAL;
	extern const int SPRITE_LIT;
	extern const int SPRITE_TRANS;

	extern const int SPRITE_NO_FLIP;
	extern const int SPRITE_V_FLIP;
	extern const int SPRITE_H_FLIP;

	/*
	extern int SCALE_X;
	extern int SCALE_Y;
	*/

	class BitmapException: public Exception::Base {
	public:
	BitmapException(const std::string & file, int line, const std::string & reason):
	Base(file, line),
	reason(reason){
	}

	BitmapException(const BitmapException & copy):
	Base(copy),
	reason(copy.reason){
	}

	virtual void throwSelf() const {
	throw *this;
	}

	virtual ~BitmapException() throw () {
	}

	protected:
	virtual const std::string getReason() const {
	return reason;
	}

	std::string reason;
	};

	/* create a color from components */
	Color makeColor(int r, int g, int b);
	Color darken(Color color, double factor);
	void hsvToRGB( float h, float s, float v, int * r, int * g, int * b );

	int setGfxModeText();
	int setGfxModeFullscreen( int x, int y );
	int setGfxModeWindowed( int x, int y );
	int setGraphicsMode(int mode, int width, int height);

	/* get color components */
	int getRed(Color x);
	int getBlue(Color x);
	int getGreen(Color x);
	int getAlpha(Color x);

	Color MaskColor();

	enum QualityFilter{
	NoFilter,
	HqxFilter,
	XbrFilter
	};

	QualityFilter qualityFilterName(const std::string & type);

	class Shader{
	public:
	Shader();
	virtual ~Shader();

	#ifdef USE_ALLEGRO5
	Shader(ALLEGRO_SHADER * shader);
	ALLEGRO_SHADER * getShader();
	ALLEGRO_SHADER * shader;
	#endif
	};

	+class ShaderManager{
	+public:
	+ ShaderManager();
	+ Util::ReferenceCount<Shader> getShader(const std::string & name, Util::ReferenceCount<Shader> (*create)());
	+ virtual ~ShaderManager();
	+
	+protected:
	+ std::map<std::string, Util::ReferenceCount<Shader> > shaders;
	+};
	+
	+extern Util::Parameter<Util::ReferenceCount<ShaderManager> > shaderManager;
	+
	#ifdef USE_ALLEGRO5
	ALLEGRO_SHADER * create_shader(const std::string & vertex, const std::string & pixel);
	void setShaderSampler(ALLEGRO_SHADER * shader, const std::string & name, const Bitmap & texture, int unit);
	void setShaderBool(ALLEGRO_SHADER * shader, const std::string & name, bool value);
	void setShaderInt(ALLEGRO_SHADER * shader, const std::string & name, int value);
	void setShaderFloat(ALLEGRO_SHADER * shader, const std::string & name, float value);
	void setShaderVec4(ALLEGRO_SHADER * shader, const std::string & name, float v1, float v2, float v3, float v4);

	std::string defaultVertexShader();
	std::string defaultPixelShader();
	#endif

	class Bitmap{
	private:

	/* these constructors don't really matter, get rid of them at some point */
	Bitmap( const Bitmap & copy, int sx, int sy, double accuracy );
	Bitmap( const char * load_file, int sx, int sy, double accuracy );
	public:

	/* equivalent to a GPU shader */
	class Filter{
	public:
	virtual Color filter(Color pixel) const = 0;
	virtual Util::ReferenceCount<Shader> getShader() = 0;
	virtual ~Filter(){
	}
	};

	/* default constructor makes 10x10 bitmap */
	Bitmap();
	Bitmap( int x, int y );
	Bitmap( const char * load_file );
	Bitmap(const char * data, int length);
	Bitmap( const std::string & load_file );
	Bitmap( const char * load_file, int sx, int sy );

	/* Load a bitmap from an abstract file */
	Bitmap(Storage::File & file);

	/* 4/24/2010: remove this at some point */
	#ifdef USE_ALLEGRO
	explicit Bitmap( BITMAP * who, bool deep_copy = false );
	#endif
	#ifdef USE_SDL
	explicit Bitmap(SDL_Surface * who, bool deep_copy = false );
	#endif
	#ifdef USE_ALLEGRO5
	explicit Bitmap(ALLEGRO_BITMAP * who, bool deep_copy = false );
	#endif
	Bitmap( const Bitmap & copy, bool deep_copy = false );
	Bitmap( const Bitmap & copy, int sx, int sy );
	Bitmap( const Bitmap & copy, int x, int y, int width, int height );
	virtual ~Bitmap();

	virtual TranslucentBitmap translucent() const;
	/* will call transBlender() with the supplied values for you */
	virtual TranslucentBitmap translucent(int red, int green, int blue, int alpha) const;
	virtual LitBitmap lit() const;

	virtual void save( const std::string & str ) const;

	virtual Bitmap & operator=( const Bitmap & );

	virtual void load( const std::string & str );

	virtual int getWidth() const;
	virtual int getHeight() const;

	/*
	inline const int getWidth() const{
	return getBitmap()->w;
	}

	inline const int getHeight() const{
	return getBitmap()->h;
	}
	*/

	/*
	inline const int getWidth() const{
	return my_bitmap->w;
	}

	inline const int getHeight() const{
	return my_bitmap->h;
	}
	*/

	void detach();

	/* replace all pixels that have value `original' with `replaced' */
	void replaceColor(const Color & original, const Color & replaced);
	void set8BitMaskColor(const Color & color);
	Color get8BitMaskColor();

	/* Blend between source pixel and destination pixel.
	* Source and dest should be 0-255.
	* source = 64, dest = 128
	* pixel = source_pixel * source / 255 + dest_pixel * dest / 255
	*/
	static void alphaBlender(int source, int dest);
	static void transBlender( int r, int g, int b, int a );
	static void multiplyBlender( int r, int g, int b, int a );
	static void dissolveBlender( int r, int g, int b, int a );
	static void addBlender( int r, int g, int b, int a );
	static void burnBlender( int r, int g, int b, int a );
	static void colorBlender( int r, int g, int b, int a );
	static void differenceBlender( int r, int g, int b, int a );
	static void dodgeBlender( int r, int g, int b, int a );
	static void hueBlender( int r, int g, int b, int a );
	static void luminanceBlender( int r, int g, int b, int a );
	static void invertBlender( int r, int g, int b, int a );
	static void screenBlender( int r, int g, int b, int a );
	/* for testing */
	static void setFakeGraphicsMode(int width, int height);

	/* clean up any remaining state */
	static void shutdown();

	// static void drawingMode( int type );

	virtual Color blendColor(const Color & input) const;
	/* sets the blend state. try not to use these function unless
	* absolutely necessary.
	*/
	virtual void startDrawing() const;
	virtual void endDrawing() const;

	void acquire();
	void release();

	void updateOnResize();

	/* Resizes the bitmap and stretches the old pixels to the new bitmap */
	void resize(const int width, const int height);

	/* Just resizes the bitmap without copying pixels */
	void updateSize(const int width, const int height);

	/* Makes this bitmap the same as the parameter.
	* Width/height is copied and then a Blit is called.
	*/
	void copy(const Bitmap & him);

	void debugSelf() const;

	/* convert to a grey scale version */
	virtual Bitmap greyScale();

	virtual void triangle( int x1, int y1, int x2, int y2, int x3, int y3, Color color ) const;

	/* draws an equilateral triangle centered at (x,y) pointing at `angle'
	* where each side has `size' pixels using the color.
	*/
	virtual void equilateralTriangle(int x, int y, int angle, int size, Color color) const;
	virtual void ellipse( int x, int y, int rx, int ry, Color color ) const;
	virtual void ellipseFill( int x, int y, int rx, int ry, Color color ) const;

	virtual void light(int x, int y, int width, int height, int start_y, int focus_alpha, int edge_alpha, Color focus_color, Color edge_color) const;
	virtual void applyTrans(const Color color) const;

	virtual void border( int min, int max, Color color ) const;
	virtual void rectangle( int x1, int y1, int x2, int y2, Color color ) const;
	virtual void rectangleFill( int x1, int y1, int x2, int y2, Color color ) const;
	virtual void circleFill( int x, int y, int radius, Color color ) const;
	virtual void circle( int x, int y, int radius, Color color ) const;
	virtual void circle(int x, int y, int radius, int thickness, Color color) const;
	virtual void line( const int x1, const int y1, const int x2, const int y2, const Color color ) const;

	virtual void floodfill( const int x, const int y, const Color color ) const;
	virtual void horizontalLine( const int x1, const int y, const int x2, const Color color ) const;
	virtual void hLine( const int x1, const int y, const int x2, const Color color ) const;
	virtual void vLine( const int y1, const int x, const int y2, const Color color ) const;
	virtual void polygon( const int * verts, const int nverts, const Color color ) const;
	virtual void arc(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const;
	virtual void arcFilled(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const;

	/* x/y is in the center of the bitmap */
	virtual void drawCenter(const int x, const int y, const Bitmap & where) const;

	virtual void draw(const int x, const int y, const Bitmap & where) const;
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where) const;
	virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	virtual void drawCharacter( const int x, const int y, const Color color, const int background, const Bitmap & where ) const;

	/* flip horizontally */
	virtual void drawHFlip(const int x, const int y, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, Filter * filter, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	/* flip vertically */
	virtual void drawVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;

	/* flip horizontal and vertical */
	virtual void drawHVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTrans( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTrans( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransHFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransHFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransVFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransHVFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	virtual void drawMask( const int x, const int y, const Bitmap & where );
	virtual void drawStretched( const int x, const int y, const int new_width, const int new_height, const Bitmap & who ) const;
	virtual void drawStretched(const Bitmap & who) const;

	/* middle of the bitmap is at x, y */
	virtual void drawRotateCenter(const int x, const int y, const int angle, const Bitmap & where);
	/* upper left hand corner is at x, y*/
	virtual void drawRotate(const int x, const int y, const int angle, const Bitmap & where);
	virtual void drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const Bitmap & where );
	virtual void drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const double scale, const Bitmap & where );

	/* Stretch using the hqx algorithm */
	virtual void StretchHqx(const Bitmap & where) const;
	virtual void StretchHqx(const Bitmap & where, const int sourceX, const int sourceY, const int sourceWidth, const int sourceHeight, const int destX, const int destY, const int destWidth, const int destHeight) const;

	/* Xbr is defined here:
	* http://board.byuu.org/viewtopic.php?f=10&t=2248
	*/
	virtual void StretchXbr(const Bitmap & where) const;
	virtual void StretchXbr(const Bitmap & where, const int sourceX, const int sourceY, const int sourceWidth, const int sourceHeight, const int destX, const int destY, const int destWidth, const int destHeight) const;

	/* Just copies pixels (fast) */
	virtual void Stretch(const Bitmap & where) const;
	virtual void Stretch(const Bitmap & where, const int sourceX, const int sourceY, const int sourceWidth, const int sourceHeight, const int destX, const int destY, const int destWidth, const int destHeight ) const;
	virtual void StretchBy2( const Bitmap & where );
	virtual void StretchBy4( const Bitmap & where );

	virtual void Blit( const std::string & xpath ) const;
	virtual void Blit( const Bitmap & where ) const;
	virtual void Blit( const int x, const int y, const Bitmap & where ) const;
	virtual void Blit( const int mx, const int my, const int wx, const int wy, const Bitmap & where ) const;
	virtual void Blit( const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where ) const;
	virtual void BlitMasked( const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where ) const;
	virtual void BlitToScreen() const;
	virtual void BlitAreaToScreen(const int upper_left_x, const int upper_left_y) const;
	virtual void BlitToScreen(const int upper_left_x, const int upper_left_y) const;
	virtual void BlitFromScreen(const int x, const int y) const;

	void roundRect(int radius, int x1, int y1, int x2, int y2, Color color) const;
	void roundRectFill(int radius, int x1, int y1, int x2, int y2, Graphics::Color color) const;

	virtual void drawShadow(Bitmap & where, int x, int y, int intensity, Color color, double scale, bool facingRight) const;

	/* returned a scaled version of this bitmap of the given dimensions */
	virtual Bitmap scaleTo(const int width, const int height) const;

	/* scale the image by the given ratios, i.e: a ratio of 1 means do nothing.
	* less than 1 will make it smaller and larger than 1 will make it larger.
	*/
	virtual Bitmap scaleBy(const double widthRatio, const double heightRatio) const;

	/* try to call Global::getScreenWidth/Height() instead of these directly */
	static int getScreenWidth();
	static int getScreenHeight();

	virtual void fill(Color color) const;

	virtual void clear() const;

	inline void clearToMask() const{
	this->fill(MaskColor());
	}

	bool getError();

	inline const Util::ReferenceCount<BitmapData> & getData() const {
	return data;
	}

	inline Util::ReferenceCount<BitmapData> getData(){
	return data;
	}

	void setData(Util::ReferenceCount<BitmapData> data){
	this->data = data;
	}

	virtual void readLine( std::vector<Color> & vec, int y );
	Color getPixel( const int x, const int y ) const;

	/* lock video bitmap to memory */
	void lock() const;
	void lock(int x, int y, int width, int height) const;
	void unlock() const;

	/* true if the point is within the bounds of the bitmap */
	bool inRange(int x, int y) const;

	/* uses _putpixel16 underneath which ignores translucent behavior */
	void putPixel( int x, int y, Color col ) const;
	/* respects the current trans mode */
	virtual void putPixelNormal(int x, int y, Color col) const;

	/*
	inline int getPixel( int x, int y ) const{
	if ( x >= 0 && x < my_bitmap->w && y >= 0 && y <= my_bitmap->h )
	return _getpixel16( my_bitmap, x, y );
	return -1;
	}

	inline void putPixel( int x, int y, int col ) const{
	if ( x >= 0 && x < my_bitmap->w && y >= 0 && y <= my_bitmap->h )
	_putpixel16( my_bitmap, x, y, col );
	}
	*/

	void setClipRect( int x1, int y1, int x2, int y2 ) const;
	void getClipRect( int & x1, int & y1, int & x2, int & y2 ) const;

	inline const std::string & getPath() const{
	return path;
	}

	/* produce a temporary bitmap that is not guaranteed to be preserved
	* after your function returns. do not hold references to this bitmap
	* and if you make a temporary bitmap, do not call functions that
	* might also make temporary bitmaps.
	*/
	static Bitmap temporaryBitmap(int w, int h);
	static Bitmap temporaryBitmap2(int w, int h);

	/* call this method to delete all temporary bitmaps.
	* don't call this unless you know what you are doing
	*/
	static void cleanupTemporaryBitmaps();

	static double getScale();


	/*
	* Convert color values between the HSV and RGB color spaces. The RGB values
	* range from 0 to 255, hue is from 0 to 360, and saturation and value are
	* from 0 to 1.
	*/
	static void rgbToHSV(int r, int g, int b, float * h, float * s, float * v);

	/* convert cymk to rgb. values should be in the range 0-255 */
	static void cymkToRGB(int c, int y, int m, int k, int * r, int * g, int * b);

	/* Add two RGB16 colors together
	* r = c1.r + c2.r
	* g = c1.g + c2.g
	* b = c1.b + c2.b
	*/
	static Color addColor( Color color1, Color color2 );

	/*
	inline static int makeColor( int r, int g, int b ){
	return makecol16( r, g, b );
	}
	*/

	// static const int MaskColor = MASK_COLOR_16;
	/*
	static const int MODE_TRANS;
	static const int MODE_SOLID;
	*/

	#ifdef USE_ALLEGRO5
	void convertToVideo();
	#endif
	protected:
	#ifdef USE_ALLEGRO5
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where, int flags) const;
	#endif
	/* release a reference count, and possibly destroy data */
	// void releaseInternalBitmap();

	/* really destroy private data */
	// void destroyPrivateData();

	/*
	inline void setBitmap( BITMAP * bitmap ){
	if ( bitmap == NULL ){
	std::cout << "FATAL Setting null bitmap" << std::endl;
	}
	_my_bitmap = bitmap;
	}
	*/

	void loadFromMemory(const char * data, int length);

	void internalLoadFile( const char * load_file );

	/* implementation specific data */
	Util::ReferenceCount<BitmapData> data;
	// int * own;
	bool mustResize;
	// bool own;
	bool error;
	std::string path;
	static Bitmap * temporary_bitmap;
	static Bitmap * temporary_bitmap2;
	Color bit8MaskColor;

	/* only used by allegro5 for now */
	int width, height;
	};

	/* 8-bit bitmap that supports a palette */
	class PaletteBitmap: public Bitmap {
	public:
	PaletteBitmap();
	virtual ~PaletteBitmap();
	using Bitmap::operator=;

	protected:
	Color palette[256];
	};

	Bitmap memoryPCX(unsigned char * const data, const int length, const bool mask = true);

	/* creates a bitmap that can be used as a buffer for the screen.
	* on opengl/allegro5 systems this will return the current backbuffer
	*/
	Bitmap * getScreenBuffer();

	void blend_palette(Color * pal, int mp, Color sc, Color ec);
	// bool sameColors(Color color1, Color color2);

	class LitBitmap: public Bitmap {
	public:
	LitBitmap( const Bitmap & b );
	LitBitmap();
	virtual ~LitBitmap();

	using Bitmap::draw;
	virtual void draw(const int x, const int y, const Bitmap & where) const;
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where ) const;
	using Bitmap::drawHFlip;
	virtual void drawHFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawHFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	using Bitmap::drawVFlip;
	virtual void drawVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	using Bitmap::drawHVFlip;
	virtual void drawHVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	using Bitmap::operator=;
	};

	class StretchedBitmap: public Bitmap {
	public:
	StretchedBitmap(int width, int height, const Bitmap & where, QualityFilter filter = NoFilter);
	void finish();
	void start();
	virtual int getWidth() const;
	virtual int getHeight() const;
	using Bitmap::operator=;

	virtual double getScaleWidth() const;
	virtual double getScaleHeight() const;

	protected:
	double width;
	double height;
	double scale_x, scale_y;
	const Bitmap & where;
	const QualityFilter filter;
	Bitmap scaleToFilter;
	};

	class TranslatedBitmap: public Bitmap {
	public:
	TranslatedBitmap(int x, int y, const Bitmap & where);
	using Bitmap::operator=;
	using Bitmap::BlitToScreen;
	virtual void BlitToScreen() const;
	virtual ~TranslatedBitmap();
	public:
	int x, y;
	};

	class TranslucentBitmap: public Bitmap {
	public:
	TranslucentBitmap(const Bitmap & b);
	TranslucentBitmap();
	virtual ~TranslucentBitmap();

	using Bitmap::operator=;
	virtual Color blendColor(const Color & color) const;
	virtual void startDrawing() const;
	virtual void endDrawing() const;

	virtual void putPixelNormal(int x, int y, Color col) const;
	virtual void rectangleFill(int x1, int y1, int x2, int y2, Color color) const;
	virtual void rectangle(int x1, int y1, int x2, int y2, Color color) const;
	virtual void fill(Color color) const;
	virtual void line( const int x1, const int y1, const int x2, const int y2, const Color color ) const;
	virtual void hLine( const int x1, const int y, const int x2, const Color color ) const;
	virtual void arc(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color) const;
	virtual void arcFilled(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const;
	virtual void circleFill( int x, int y, int radius, Color color ) const;
	virtual void ellipse( int x, int y, int rx, int ry, Color color ) const;
	virtual void ellipseFill( int x, int y, int rx, int ry, Color color ) const;

	using Bitmap::draw;
	virtual void draw(const int x, const int y, const Bitmap & where) const;
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where) const;

	// virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	// virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;

	using Bitmap::drawHFlip;
	virtual void drawHFlip(const int x, const int y, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, Filter * filter, const Bitmap & where) const;
	// virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	// virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	virtual void drawVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	virtual void drawHVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;

	protected:
	#ifdef USE_ALLEGRO5
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where, int flags) const;
	#endif
	};

	}

	#endif

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 16, 12:58 AM (2 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 71629
Default Alt Text: (53 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions