actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "i" for ints; don't distinguish between signed and unsigned. (If we're

Browse Source 
marking unsigned ints, that seems to imply marking long ints, doubles vs.
floats, etc; Hungarian serves little enough purpose without being that fine-
grained.)
This commit is contained in:
Glenn Maynard
2006-07-24 06:11:37 +00:00
parent 9eaabe4a74
commit 2ddb0c2912
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.h
+2 -2
View File
@@ -178,11 +178,11 @@ public:
bool bGenerateMipMaps
) = 0;
virtual void UpdateTexture(
unsigned uTexHandle,
unsigned iTexHandle,
RageSurface* img,
int xoffset, int yoffset, int width, int height
) = 0;
virtual void DeleteTexture( unsigned uTexHandle ) = 0;
virtual void DeleteTexture( unsigned iTexHandle ) = 0;
virtual void ClearAllTextures() = 0;
virtual int GetNumTextureUnits() = 0;
virtual void SetTexture( TextureUnit tu, unsigned iTexture ) = 0;
stepmania/src/RageDisplay_D3D.cpp
+6 -6
View File
@@ -1342,16 +1342,16 @@ void RageDisplay_D3D::SetCullMode( CullMode mode )
}
}
void RageDisplay_D3D::DeleteTexture( unsigned uTexHandle )
void RageDisplay_D3D::DeleteTexture( unsigned iTexHandle )
{
IDirect3DTexture8* pTex = (IDirect3DTexture8*) uTexHandle;
IDirect3DTexture8* pTex = (IDirect3DTexture8*) iTexHandle;
pTex->Release();
// Delete palette (if any)
if( g_TexResourceToPaletteIndex.find(uTexHandle) != g_TexResourceToPaletteIndex.end() )
g_TexResourceToPaletteIndex.erase( g_TexResourceToPaletteIndex.find(uTexHandle) );
if( g_TexResourceToTexturePalette.find(uTexHandle) != g_TexResourceToTexturePalette.end() )
g_TexResourceToTexturePalette.erase( g_TexResourceToTexturePalette.find(uTexHandle) );
if( g_TexResourceToPaletteIndex.find(iTexHandle) != g_TexResourceToPaletteIndex.end() )
g_TexResourceToPaletteIndex.erase( g_TexResourceToPaletteIndex.find(iTexHandle) );
if( g_TexResourceToTexturePalette.find(iTexHandle) != g_TexResourceToTexturePalette.end() )
g_TexResourceToTexturePalette.erase( g_TexResourceToTexturePalette.find(iTexHandle) );
}
stepmania/src/RageDisplay_D3D.h
+2 -2
View File
@@ -28,11 +28,11 @@ public:
RageSurface* img,
bool bGenerateMipMaps );
void UpdateTexture(
unsigned uTexHandle,
unsigned iTexHandle,
RageSurface* img,
int xoffset, int yoffset, int width, int height
);
void DeleteTexture( unsigned uTexHandle );
void DeleteTexture( unsigned iTexHandle );
void ClearAllTextures();
int GetNumTextureUnits();
void SetTexture( TextureUnit tu, unsigned iTexture );
stepmania/src/RageDisplay_Null.h
+2 -2
View File
@@ -25,11 +25,11 @@ public:
RageSurface* img,
bool bGenerateMipMaps ) { return 1; }
void UpdateTexture(
unsigned uTexHandle,
unsigned iTexHandle,
RageSurface* img,
int xoffset, int yoffset, int width, int height
) { }
void DeleteTexture( unsigned uTexHandle ) { }
void DeleteTexture( unsigned iTexHandle ) { }
void ClearAllTextures() { }
int GetNumTextureUnits() { return 1; }
void SetTexture( TextureUnit tu, unsigned iTexture ) { }
stepmania/src/RageDisplay_OGL.cpp
+7 -7
View File
@@ -1715,11 +1715,11 @@ unsigned RageDisplay_OGL::CreateTexture(
}
// allocate OpenGL texture resource
unsigned int uTexHandle;
glGenTextures( 1, reinterpret_cast<GLuint*>(&uTexHandle) );
ASSERT( uTexHandle );
unsigned int iTexHandle;
glGenTextures( 1, reinterpret_cast<GLuint*>(&iTexHandle) );
ASSERT( iTexHandle );
glBindTexture( GL_TEXTURE_2D, uTexHandle );
glBindTexture( GL_TEXTURE_2D, iTexHandle );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
GLint iMinFilter;
if( bGenerateMipMaps )
@@ -1823,15 +1823,15 @@ unsigned RageDisplay_OGL::CreateTexture(
if( bFreeImg )
delete pImg;
return uTexHandle;
return iTexHandle;
}
void RageDisplay_OGL::UpdateTexture(
unsigned uTexHandle,
unsigned iTexHandle,
RageSurface* pImg,
int iXOffset, int iYOffset, int iWidth, int iHeight )
{
glBindTexture( GL_TEXTURE_2D, uTexHandle );
glBindTexture( GL_TEXTURE_2D, iTexHandle );
bool bFreeImg;
PixelFormat SurfacePixFmt = GetImgPixelFormat( pImg, bFreeImg, iWidth, iHeight, false );
stepmania/src/RageDisplay_OGL.h
+2 -2
View File
@@ -35,11 +35,11 @@ public:
RageSurface* img,
bool bGenerateMipMaps );
void UpdateTexture(
unsigned uTexHandle,
unsigned iTexHandle,
RageSurface* img,
int xoffset, int yoffset, int width, int height
);
void DeleteTexture( unsigned uTexHandle );
void DeleteTexture( unsigned iTexHandle );
void ClearAllTextures();
int GetNumTextureUnits();
void SetTexture( TextureUnit tu, unsigned iTexture );