diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp index 10533e6f..16e08d1d 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp @@ -39,14 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline/plPlates.h" #include "plPipeline/plDebugText.h" +#include "plGImage/plMipmap.h" #include "hsWindows.h" #include "plPipeline.h" -// base size of the cursor -#define CURSOR_SIZE_X 0.0675f -#define CURSOR_SIZE_Y 0.09f - // The resolution that uses the base size of the cursor. // All other resolutions will scale the cursor size to keep the same physical size. #define BASE_WIDTH 1024 @@ -322,7 +319,7 @@ void plMouseDevice::IUpdateCursorSize() if(fCursor) { // set the size of the cursor based on resolution. - fCursor->SetSize( CURSOR_SIZE_X * BASE_WIDTH / fWidth, CURSOR_SIZE_Y * BASE_HEIGHT / fHeight ); + fCursor->SetSize( 2*fCursor->GetMipmap()->GetWidth()/fWidth, 2*fCursor->GetMipmap()->GetHeight()/fHeight ); } } diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp index c840e6c4..19c5cc55 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp @@ -11673,7 +11673,11 @@ void plDXPlateManager::IDrawToDevice( plPipeline *pipe ) fD3DDevice->SetFVF(dxPipe->fSettings.fCurrFVFFormat = PLD3D_PLATEFVF); fD3DDevice->SetStreamSource( 0, fVertBuffer, 0, sizeof( plPlateVertex ) ); plProfile_Inc(VertexChange); - fD3DDevice->SetTransform( D3DTS_VIEW, &d3dIdentityMatrix ); + // To get plates properly pixel-aligned, we need to compensate for D3D9's weird half-pixel + // offset (see http://drilian.com/2008/11/25/understanding-half-pixel-and-half-texel-offsets/ + // or http://msdn.microsoft.com/en-us/library/bb219690(VS.85).aspx). + D3DXMatrixTranslation(&mat, -0.5f/scrnWidthDiv2, -0.5f/scrnHeightDiv2, 0.0f); + fD3DDevice->SetTransform( D3DTS_VIEW, &mat ); oldCullMode = dxPipe->fCurrCullMode; for( plate = fPlates; plate != nil; plate = plate->GetNext() ) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h index 66c9c5a0..3e0e64e8 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h @@ -110,6 +110,7 @@ class plPlate hsMatrix44 &GetTransform( void ) { return fXformMatrix; } const char *GetTitle( void ) { return fTitle; } UInt32 GetFlags( void ) { return fFlags; } + const plMipmap *GetMipmap( void ) { return fMipmap; } void SetVisible( hsBool vis ) { if( vis ) fFlags |= kFlagVisible; else fFlags &= ~kFlagVisible; } hsBool IsVisible( void );