ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved scale information to Filter Base

This commit is contained in:
Arthur Moore 2015-06-17 14:53:01 -04:00
parent a8499431e2
commit 577fc7a99c
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/filters/filter_base.hpp
View File

@ -12,17 +12,23 @@ class filter_base
private:
//Need to give the filter a width,height at initialization
filter_base();
///The filter's width
///The filter's input width
unsigned int width;
///The filter's height
///The filter's input height
unsigned int height;
///The filter's scale
unsigned int scale;
protected:
void setScale(unsigned int _scale) {scale=_scale;};
public:
filter_base(unsigned int _width,unsigned int _height): width(_width),height(_height) {}
filter_base(unsigned int _width,unsigned int _height): width(_width),height(_height),scale(1) {}
virtual ~filter_base() {}
unsigned int getWidth() {return width;}
unsigned int getHeight() {return height;}
unsigned int getOutWidth() {return width*scale;}
unsigned int getOutHeight() {return height*scale;}
virtual std::string getName() {return "Dummy Filter";}
virtual unsigned int getScale() {return 1;}
virtual unsigned int getScale() {return scale;}
virtual bool exists() {return false;}
/**
* Run the filter.

14
src/filters/filters.hpp
View File

@ -27,8 +27,6 @@ private:
std::string name;
///The internal filter used
FilterFunc myFilter;
///The internal scale
unsigned int myScale;
//Don't need to calculate these every time (based off width)
///The number of pixels per horizontal row
unsigned int horiz_bytes;
@ -37,13 +35,13 @@ private:
public:
raw_filter(std::string _name,FilterFunc _myFilter,unsigned int _scale,unsigned int _width,unsigned int _height):
filter_base(_width,_height),
name(_name), myFilter(_myFilter), myScale(_scale),
name(_name), myFilter(_myFilter),
horiz_bytes(_width * 4), horiz_bytes_out(_width * 4 * _scale)
{
this->setScale(_scale);
// std::cerr << name << std::endl;
}
std::string getName() {return name;}
unsigned int getScale() {return myScale;}
bool exists() {return true;}
///Run the filter pointed to by the internal FilterFunc
void run(u32 *srcPtr, u32 *dstPtr)
@ -64,15 +62,13 @@ class xbr : public filter_base
private:
//Must enter width and height at filter initialization
xbr();
unsigned int myscale;
public:
xbr(unsigned int _width,unsigned int _height,unsigned int _myscale): filter_base(_width,_height), myscale(_myscale) {}
std::string getName() {return "XBR "+std::to_string(myscale)+"x";}
unsigned int getScale() {return myscale;}
xbr(unsigned int _width,unsigned int _height,unsigned int scale = 5): filter_base(_width,_height) {this->setScale(scale);}
std::string getName() {return "XBR "+std::to_string(this->getScale())+"x";}
bool exists() {return true;}
void run(u32 *srcPtr,u32 *dstPtr)
{
xbrz::scale(myscale, //valid range:
xbrz::scale(this->getScale(),
srcPtr, dstPtr, getWidth(), getHeight(),
xbrz::ColorFormat::ARGB);
}