funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-06-07 11:26:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Windows compile errors.

Browse Source
This commit is contained in:
Pieter Hulshoff
2019-12-03 19:32:16 +01:00
parent d6e7de7596
commit a293717351
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RetroFE/Source/Graphics/Component/Image.cpp
View File

@@ -64,8 +64,8 @@ void Image::allocateGraphicsMemory()
{ {
SDL_SetTextureBlendMode(texture_, SDL_BLENDMODE_BLEND); SDL_SetTextureBlendMode(texture_, SDL_BLENDMODE_BLEND);
SDL_QueryTexture(texture_, NULL, NULL, &width, &height); SDL_QueryTexture(texture_, NULL, NULL, &width, &height);
baseViewInfo.ImageWidth = width; baseViewInfo.ImageWidth = (float)width;
baseViewInfo.ImageHeight = height; baseViewInfo.ImageHeight = (float)height;
} }
SDL_UnlockMutex(SDL::getMutex()); SDL_UnlockMutex(SDL::getMutex());

40
RetroFE/Source/SDL.cpp
View File

@@ -374,10 +374,10 @@ bool SDL::renderCopy( SDL_Texture *texture, float alpha, SDL_Rect *src, SDL_Rect
dstRectCopy.w = dstRect.w; dstRectCopy.w = dstRect.w;
dstRectCopy.h = dstRect.h; dstRectCopy.h = dstRect.h;
dstRect.x *= scaleX; dstRect.x = (int)(dstRect.x*scaleX);
dstRect.y *= scaleY; dstRect.y = (int)(dstRect.y*scaleY);
dstRect.w *= scaleX; dstRect.w = (int)(dstRect.w*scaleX);
dstRect.h *= scaleY; dstRect.h = (int)(dstRect.h*scaleY);
SDL_SetTextureAlphaMod( texture, static_cast<char>( alpha * 255 ) ); SDL_SetTextureAlphaMod( texture, static_cast<char>( alpha * 255 ) );
SDL_RenderCopyEx( getRenderer( ), texture, &srcRect, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_NONE ); SDL_RenderCopyEx( getRenderer( ), texture, &srcRect, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_NONE );
@@ -391,10 +391,10 @@ bool SDL::renderCopy( SDL_Texture *texture, float alpha, SDL_Rect *src, SDL_Rect
{ {
dstRect.h = static_cast<unsigned int>( static_cast<float>(dstRect.h ) * viewInfo.ReflectionScale); dstRect.h = static_cast<unsigned int>( static_cast<float>(dstRect.h ) * viewInfo.ReflectionScale);
dstRect.y = dstRect.y - dstRect.h - viewInfo.ReflectionDistance; dstRect.y = dstRect.y - dstRect.h - viewInfo.ReflectionDistance;
dstRect.x *= scaleX; dstRect.x = (int)(dstRect.x*scaleX);
dstRect.y *= scaleY; dstRect.y = (int)(dstRect.y*scaleY);
dstRect.w *= scaleX; dstRect.w = (int)(dstRect.w*scaleX);
dstRect.h *= scaleY; dstRect.h = (int)(dstRect.h*scaleY);
SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) ); SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) );
SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_VERTICAL ); SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_VERTICAL );
} }
@@ -403,10 +403,10 @@ bool SDL::renderCopy( SDL_Texture *texture, float alpha, SDL_Rect *src, SDL_Rect
{ {
dstRect.y = dstRect.y + dstRect.h + viewInfo.ReflectionDistance; dstRect.y = dstRect.y + dstRect.h + viewInfo.ReflectionDistance;
dstRect.h = static_cast<unsigned int>( static_cast<float>(dstRect.h ) * viewInfo.ReflectionScale); dstRect.h = static_cast<unsigned int>( static_cast<float>(dstRect.h ) * viewInfo.ReflectionScale);
dstRect.x *= scaleX; dstRect.x = (int)(dstRect.x*scaleX);
dstRect.y *= scaleY; dstRect.y = (int)(dstRect.y*scaleY);
dstRect.w *= scaleX; dstRect.w = (int)(dstRect.w*scaleX);
dstRect.h *= scaleY; dstRect.h = (int)(dstRect.h*scaleY);
SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) ); SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) );
SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_VERTICAL ); SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_VERTICAL );
} }
@@ -415,10 +415,10 @@ bool SDL::renderCopy( SDL_Texture *texture, float alpha, SDL_Rect *src, SDL_Rect
{ {
dstRect.w = static_cast<unsigned int>( static_cast<float>(dstRect.w ) * viewInfo.ReflectionScale); dstRect.w = static_cast<unsigned int>( static_cast<float>(dstRect.w ) * viewInfo.ReflectionScale);
dstRect.x = dstRect.x - dstRect.w - viewInfo.ReflectionDistance; dstRect.x = dstRect.x - dstRect.w - viewInfo.ReflectionDistance;
dstRect.x *= scaleX; dstRect.x = (int)(dstRect.x*scaleX);
dstRect.y *= scaleY; dstRect.y = (int)(dstRect.y*scaleY);
dstRect.w *= scaleX; dstRect.w = (int)(dstRect.w*scaleX);
dstRect.h *= scaleY; dstRect.h = (int)(dstRect.h*scaleY);
SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) ); SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) );
SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_HORIZONTAL ); SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_HORIZONTAL );
} }
@@ -427,10 +427,10 @@ bool SDL::renderCopy( SDL_Texture *texture, float alpha, SDL_Rect *src, SDL_Rect
{ {
dstRect.x = dstRect.x + dstRect.w + viewInfo.ReflectionDistance; dstRect.x = dstRect.x + dstRect.w + viewInfo.ReflectionDistance;
dstRect.w = static_cast<unsigned int>( static_cast<float>(dstRect.w ) * viewInfo.ReflectionScale); dstRect.w = static_cast<unsigned int>( static_cast<float>(dstRect.w ) * viewInfo.ReflectionScale);
dstRect.x *= scaleX; dstRect.x = (int)(dstRect.x*scaleX);
dstRect.y *= scaleY; dstRect.y = (int)(dstRect.y*scaleY);
dstRect.w *= scaleX; dstRect.w = (int)(dstRect.w*scaleX);
dstRect.h *= scaleY; dstRect.h = (int)(dstRect.h*scaleY);
SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) ); SDL_SetTextureAlphaMod( texture, static_cast<char>( viewInfo.ReflectionAlpha * alpha * 255 ) );
SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_HORIZONTAL ); SDL_RenderCopyEx( getRenderer( ), texture, src, &dstRect, viewInfo.Angle, NULL, SDL_FLIP_HORIZONTAL );
} }