Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile issues caused by PVR Refactor by Falco #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compile issues caused by PVR Refactor by Falco #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/fnt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class fntFont
virtual void getBBox (const char *s, float pointsize, float italic, float *left, float *right, float *bot, float *top) {}
virtual void putch (sgVec3 curpos, float pointsize, float italic, char c, float red, float green, float blue, float alpha) {}
virtual void puts (sgVec3 curpos, float pointsize, float italic, const char *s, float red, float green, float blue, float alpha) {}
virtual void begin (int filter_mode) {}
virtual void begin (pvr_filter_t filter_mode) {}
virtual void end () {}

virtual bool load (const char *fname) { return false; }
Expand Down Expand Up @@ -123,7 +123,7 @@ class fntTexFont : public fntFont
float v_left [FNTMAX_CHAR];
float v_right[FNTMAX_CHAR];

void bind_texture (int filter_mode)
void bind_texture (pvr_filter_t filter_mode)
{
// PSH OPTIMIZE: it would probably make sense to only compile the header once, and store it as a class variable, instead of recalculating it every time.

Expand Down Expand Up @@ -208,7 +208,7 @@ class fntTexFont : public fntFont

void getBBox (const char *s, float pointsize, float italic, float *left, float *right, float *bot, float *top);

void begin (int filter_mode)
void begin (pvr_filter_t filter_mode)
{
bind_texture (filter_mode);
bound = true;
Expand Down Expand Up @@ -243,7 +243,7 @@ class fntRenderer

float red, green, blue, alpha;

int filter_mode;
pvr_filter_t filter_mode;

public:
fntRenderer () : pointsize (10.0f), italic (0.0f), red (1.0f), green (1.0f), blue (1.0f), alpha (1.0f), filter_mode (PVR_FILTER_NONE)
Expand Down Expand Up @@ -326,11 +326,11 @@ class fntRenderer
*a = alpha;
}

int getFilterMode ()
pvr_filter_t getFilterMode ()
{
return filter_mode;
}
void setFilterMode (int fm)
void setFilterMode (pvr_filter_t fm)
{
filter_mode = fm;
}
Expand Down