xdk360_fonts.cpp - use C comments

This commit is contained in:
twinaphex 2017-10-03 04:46:36 +02:00
parent 0695d93cee
commit 86f5cc6571
1 changed files with 22 additions and 22 deletions

View File

@ -58,18 +58,18 @@ enum
class PackedResource class PackedResource
{ {
protected: protected:
BYTE* m_pSysMemData; // Alloc'ed memory for resource headers etc. BYTE* m_pSysMemData; /* Allocated memory for resource headers etc. */
DWORD m_dwSysMemDataSize; DWORD m_dwSysMemDataSize;
BYTE* m_pVidMemData; // Alloc'ed memory for resource data, etc. BYTE* m_pVidMemData; /* Allocated memory for resource data, etc. */
DWORD m_dwVidMemDataSize; DWORD m_dwVidMemDataSize;
XBRESOURCE* m_pResourceTags; // Tags to associate names with the resources XBRESOURCE* m_pResourceTags; /* Tags to associate names with the resources */
DWORD m_dwNumResourceTags; // Number of resource tags DWORD m_dwNumResourceTags; /* Number of resource tags */
BOOL m_bInitialized; // Resource is fully initialized BOOL m_bInitialized; /* Resource is fully initialized */
public: public:
// Loads the resources out of the specified bundle /* Loads the resources out of the specified bundle */
#if defined(_XBOX1) #if defined(_XBOX1)
HRESULT Create( const char *strFilename, DWORD dwNumResourceTags = 0L, HRESULT Create( const char *strFilename, DWORD dwNumResourceTags = 0L,
XBRESOURCE* pResourceTags = NULL ); XBRESOURCE* pResourceTags = NULL );
@ -82,19 +82,19 @@ class PackedResource
BOOL Initialized() const; BOOL Initialized() const;
#ifdef _XBOX360 #ifdef _XBOX360
// Retrieves the resource tags /* Retrieves the resource tags */
void GetResourceTags( DWORD* pdwNumResourceTags, XBRESOURCE** ppResourceTags ); void GetResourceTags( DWORD* pdwNumResourceTags, XBRESOURCE** ppResourceTags );
#endif #endif
// Helper function to make sure a resource is registered /* Helper function to make sure a resource is registered */
LPDIRECT3DRESOURCE RegisterResource( LPDIRECT3DRESOURCE pResource ) const LPDIRECT3DRESOURCE RegisterResource( LPDIRECT3DRESOURCE pResource ) const
{ {
#ifdef _XBOX1 #ifdef _XBOX1
// Register the resource, if it has not yet been registered. We mark /* Register the resource, if it has not yet been registered. We mark
// a resource as registered by upping it's reference count. * a resource as registered by upping it's reference count. */
if( pResource && ( pResource->Common & D3DCOMMON_REFCOUNT_MASK ) == 1 ) if( pResource && ( pResource->Common & D3DCOMMON_REFCOUNT_MASK ) == 1 )
{ {
// Special case CPU-copy push buffers (which live in system memory) /* Special case CPU-copy push buffers (which live in system memory) */
if( ( pResource->Common & D3DCOMMON_TYPE_PUSHBUFFER ) && if( ( pResource->Common & D3DCOMMON_TYPE_PUSHBUFFER ) &&
( pResource->Common & D3DPUSHBUFFER_RUN_USING_CPU_COPY ) ) ( pResource->Common & D3DPUSHBUFFER_RUN_USING_CPU_COPY ) )
pResource->Data += (DWORD)m_pSysMemData; pResource->Data += (DWORD)m_pSysMemData;
@ -107,7 +107,7 @@ class PackedResource
return pResource; return pResource;
} }
// Functions to retrieve resources by their offset /* Functions to retrieve resources by their offset */
void *GetData( DWORD dwOffset ) const void *GetData( DWORD dwOffset ) const
{ return &m_pSysMemData[dwOffset]; } { return &m_pSysMemData[dwOffset]; }
@ -120,7 +120,7 @@ class PackedResource
LPDIRECT3DVERTEXBUFFER GetVertexBuffer( DWORD dwOffset ) const LPDIRECT3DVERTEXBUFFER GetVertexBuffer( DWORD dwOffset ) const
{ return (LPDIRECT3DVERTEXBUFFER)GetResource( dwOffset ); } { return (LPDIRECT3DVERTEXBUFFER)GetResource( dwOffset ); }
// Functions to retrieve resources by their name /* Functions to retrieve resources by their name */
void *GetData( const char* strName ) const; void *GetData( const char* strName ) const;
LPDIRECT3DRESOURCE GetResource( const char* strName ) const LPDIRECT3DRESOURCE GetResource( const char* strName ) const
@ -132,7 +132,7 @@ class PackedResource
LPDIRECT3DVERTEXBUFFER GetVertexBuffer( const char* strName ) const LPDIRECT3DVERTEXBUFFER GetVertexBuffer( const char* strName ) const
{ return (LPDIRECT3DVERTEXBUFFER)GetResource( strName ); } { return (LPDIRECT3DVERTEXBUFFER)GetResource( strName ); }
// Constructor/destructor /* Constructor/destructor */
PackedResource(); PackedResource();
~PackedResource(); ~PackedResource();
}; };
@ -270,7 +270,7 @@ HRESULT PackedResource::Create(const char *strFilename)
return E_FAIL; return E_FAIL;
} }
// Compute memory requirements /* Compute memory requirements */
#if defined(_XBOX1) #if defined(_XBOX1)
m_dwSysMemDataSize = xprh.dwHeaderSize - sizeof(XPR_HEADER); m_dwSysMemDataSize = xprh.dwHeaderSize - sizeof(XPR_HEADER);
m_dwVidMemDataSize = xprh.dwTotalSize - xprh.dwHeaderSize; m_dwVidMemDataSize = xprh.dwTotalSize - xprh.dwHeaderSize;
@ -279,7 +279,7 @@ HRESULT PackedResource::Create(const char *strFilename)
m_dwVidMemDataSize = xprh.dwDataSize; m_dwVidMemDataSize = xprh.dwDataSize;
#endif #endif
// Allocate memory /* Allocate memory */
m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize); m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize);
if (m_pSysMemData == NULL) if (m_pSysMemData == NULL)
{ {
@ -304,7 +304,7 @@ HRESULT PackedResource::Create(const char *strFilename)
return E_FAIL; return E_FAIL;
} }
// Read in the data from the file /* Read in the data from the file */
if( !ReadFile( hFile, m_pSysMemData, m_dwSysMemDataSize, &dwNumBytesRead, NULL) || if( !ReadFile( hFile, m_pSysMemData, m_dwSysMemDataSize, &dwNumBytesRead, NULL) ||
!ReadFile( hFile, m_pVidMemData, m_dwVidMemDataSize, &dwNumBytesRead, NULL)) !ReadFile( hFile, m_pVidMemData, m_dwVidMemDataSize, &dwNumBytesRead, NULL))
{ {
@ -312,7 +312,7 @@ HRESULT PackedResource::Create(const char *strFilename)
return E_FAIL; return E_FAIL;
} }
// Done with the file /* Done with the file */
CloseHandle( hFile); CloseHandle( hFile);
#ifdef _XBOX1 #ifdef _XBOX1
@ -774,10 +774,10 @@ static void xdk360_draw_text(xdk360_video_font_t *font,
pVertex[12] = m_fCursorX; pVertex[12] = m_fCursorX;
pVertex[13] = m_fCursorY + fHeight; pVertex[13] = m_fCursorY + fHeight;
#ifdef MSB_FIRST #ifdef MSB_FIRST
((volatile uint32_t *)pVertex)[2] = (tu1 << 16) | tv1; // Merged using big endian rules ((volatile uint32_t *)pVertex)[2] = (tu1 << 16) | tv1; /* Merged using big endian rules */
((volatile uint32_t *)pVertex)[6] = (tu2 << 16) | tv1; // Merged using big endian rules ((volatile uint32_t *)pVertex)[6] = (tu2 << 16) | tv1; /* Merged using big endian rules */
((volatile uint32_t*)pVertex)[10] = (tu2 << 16) | tv2; // Merged using big endian rules ((volatile uint32_t*)pVertex)[10] = (tu2 << 16) | tv2; /* Merged using big endian rules */
((volatile uint32_t*)pVertex)[14] = (tu1 << 16) | tv2; // Merged using big endian rules ((volatile uint32_t*)pVertex)[14] = (tu1 << 16) | tv2; /* Merged using big endian rules */
#endif #endif
pVertex[15] = 0; pVertex[15] = 0;
pVertex += 16; pVertex += 16;