Some preparation work for new platform support.
- Added a "PSP" compile-time define to clean up some compile time checks (replaced !WIN32 && !LINUX && !IOS with PSP) -- Wil, I am aware that this is redundant with the PSPENV variable you introduced recently, I think we can clean that up easily -- This looks like lots of changes, but most of the time I just moved some blocks here and there -- tested on VC 2010, PSP, and a bit of NDK -- I might have broken maemo, iOS, or Linux compilation, can you guys check? - Fixed some warnings reported by NDK - NDK still does not compile because recent boost additions (mutex, etc...) are apparently not supported
This commit is contained in:
@@ -145,11 +145,11 @@ void JSprite::Render()
|
||||
// //mQuad->SetColor(ARGB(alpha,255,255,255));
|
||||
|
||||
|
||||
#if defined (WIN32) || defined (LINUX) || defined (IOS)
|
||||
#if defined (PSP)
|
||||
mFrames[mCurrentFrame]->SetColor(MAKE_COLOR(alpha, mColor));
|
||||
#else
|
||||
mFrames[mCurrentFrame]->SetColor(alpha<<24 | mColor);
|
||||
// mQuad->SetFlip(mFlipped[mCurrentFrame], false);
|
||||
#else
|
||||
mFrames[mCurrentFrame]->SetColor(MAKE_COLOR(alpha, mColor));
|
||||
#endif
|
||||
// mQuad->SetHFlip(mFlipped[mCurrentFrame]);
|
||||
// }
|
||||
@@ -306,10 +306,10 @@ void JSprite::SetHotSpot(float x, float y, int index)
|
||||
|
||||
}
|
||||
|
||||
#if defined (WIN32) || defined (LINUX) || defined (IOS)
|
||||
void JSprite::SetColor(PIXEL_TYPE color) { mColor = (color&0x00ffffff); }
|
||||
#else
|
||||
#if defined (PSP)
|
||||
void JSprite::SetColor(PIXEL_TYPE color) { mColor = (color&~MASK_ALPHA); }
|
||||
#else
|
||||
void JSprite::SetColor(PIXEL_TYPE color) { mColor = (color&0x00ffffff); }
|
||||
#endif
|
||||
|
||||
// void JSprite::SetBlendMode(int blend, int index)
|
||||
|
||||
Reference in New Issue
Block a user