Minor improvements for NX
- Recolor crosshair. - Recolor texture in map menu page. - Minimap size increased by 30%. - Recolor waypoint marker.
This commit is contained in:
@@ -6523,7 +6523,7 @@ CMenuManager::PrintMap(void)
|
||||
|
||||
CSprite2d::DrawRect(CRect(MENU_X(14.0f), SCREEN_STRETCH_FROM_BOTTOM(95.0f),
|
||||
SCREEN_STRETCH_FROM_RIGHT(11.0f), SCREEN_STRETCH_FROM_BOTTOM(59.0f)),
|
||||
CRGBA(235, 170, 50, 255));
|
||||
CRGBA(156, 117, 60, 180));
|
||||
|
||||
CFont::SetScale(MENU_X(0.4f), MENU_Y(0.7f));
|
||||
CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
|
||||
|
||||
+18
-26
@@ -1107,34 +1107,26 @@ CRadar::LoadTextures()
|
||||
WaypointSprite.SetTexture("radar_waypoint");
|
||||
if(!WaypointSprite.m_pTexture) {
|
||||
// create the texture if it's missing in TXD
|
||||
#define WAYPOINT_R (255)
|
||||
#define WAYPOINT_G (72)
|
||||
#define WAYPOINT_B (77)
|
||||
#define WAYPOINT_R (2)
|
||||
#define WAYPOINT_G (150)
|
||||
#define WAYPOINT_B (224)
|
||||
|
||||
RwRaster *raster = RwRasterCreate(16, 16, 0, rwRASTERTYPETEXTURE | rwRASTERFORMAT8888);
|
||||
RwRaster *raster = RwRasterCreate(8, 8, 0, rwRASTERTYPETEXTURE | rwRASTERFORMAT8888);
|
||||
RwUInt32 *pixels = (RwUInt32 *)RwRasterLock(raster, 0, rwRASTERLOCKWRITE);
|
||||
|
||||
RwUInt32 *pixels = (RwUInt32 *)RwRasterLock(raster, 0, rwRASTERLOCKWRITE);
|
||||
for(int x = 0; x < 16; x++)
|
||||
for(int y = 0; y < 16; y++)
|
||||
{
|
||||
int x2 = x < 8 ? x : 7 - (x & 7);
|
||||
int y2 = y < 8 ? y : 7 - (y & 7);
|
||||
if ((y2 >= 4 && x2 >= 4) // square in the center is transparent
|
||||
|| (x2 < 2 && y2 == 0) // two pixels on each side of first/last line are transparent
|
||||
|| (x2 < 1 && y2 == 1)) // one pixel on each side of second to first/last line is transparent
|
||||
pixels[x + y * 16] = 0;
|
||||
else if((x2 == 2 && y2 >= 2)|| (y2 == 2 && x2 >= 2) )// colored square inside
|
||||
for (int x = 0; x < 8; x++) {
|
||||
for (int y = 0; y < 8; y++) {
|
||||
#ifdef RW_GL3
|
||||
pixels[x + y * 16] = WAYPOINT_R | (WAYPOINT_G << 8) | (WAYPOINT_B << 16) | (255 << 24);
|
||||
pixels[x + y * 8] = WAYPOINT_R | (WAYPOINT_G << 8) | (WAYPOINT_B << 16) | (255 << 24);
|
||||
#else
|
||||
pixels[x + y * 16] = WAYPOINT_B | (WAYPOINT_G << 8) | (WAYPOINT_R << 16) | (255 << 24);
|
||||
pixels[x + y * 8] = WAYPOINT_B | (WAYPOINT_G << 8) | (WAYPOINT_R << 16) | (255 << 24);
|
||||
#endif
|
||||
else
|
||||
pixels[x + y * 16] = 0xFF000000; // black
|
||||
}
|
||||
RwRasterUnlock(raster);
|
||||
WaypointSprite.m_pTexture = RwTextureCreate(raster);
|
||||
RwTextureSetFilterMode(WaypointSprite.m_pTexture, rwFILTERLINEAR);
|
||||
}
|
||||
}
|
||||
|
||||
RwRasterUnlock(raster);
|
||||
WaypointSprite.m_pTexture = RwTextureCreate(raster);
|
||||
RwTextureSetFilterMode(WaypointSprite.m_pTexture, rwFILTERLINEAR);
|
||||
#undef WAYPOINT_R
|
||||
#undef WAYPOINT_G
|
||||
#undef WAYPOINT_B
|
||||
@@ -1419,11 +1411,11 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i
|
||||
#endif
|
||||
{
|
||||
#ifdef FIX_BUGS
|
||||
out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + SCREEN_SCALE_X(RADAR_LEFT);
|
||||
out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH * 1.3f) + SCREEN_SCALE_X(RADAR_LEFT);
|
||||
#else
|
||||
out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;
|
||||
out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH * 1.3f) + RADAR_LEFT;
|
||||
#endif
|
||||
out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
|
||||
out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(RADAR_HEIGHT * 1.3f) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "common.h"
|
||||
5#include "common.h"
|
||||
|
||||
#include "RwHelper.h"
|
||||
#include "PlayerPed.h"
|
||||
@@ -1205,7 +1205,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
|
||||
}
|
||||
#endif
|
||||
if (bCanPointGunAtTarget) {
|
||||
CWeaponEffects::MarkTarget(markPos, 64, 0, 0, 255, 0.8f);
|
||||
CWeaponEffects::MarkTarget(markPos, 64, 100, 0, 255, 0.8f);
|
||||
} else {
|
||||
CWeaponEffects::MarkTarget(markPos, 64, 32, 0, 255, 0.8f);
|
||||
}
|
||||
|
||||
@@ -1061,7 +1061,7 @@ void CHud::Draw()
|
||||
*/
|
||||
if (m_ItemToFlash == ITEM_RADAR && FRAMECOUNTER & 8 || m_ItemToFlash != ITEM_RADAR) {
|
||||
CRadar::DrawMap();
|
||||
CRect rect(0.0f, 0.0f, SCREEN_SCALE_X(RADAR_WIDTH), SCREEN_SCALE_Y(RADAR_HEIGHT));
|
||||
CRect rect(0.0f, 0.0f, SCREEN_SCALE_X(RADAR_WIDTH * 1.3f), SCREEN_SCALE_Y(RADAR_HEIGHT * 1.3f));
|
||||
rect.Translate(SCREEN_SCALE_X_FIX(RADAR_LEFT), SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT));
|
||||
|
||||
#ifdef PS2_HUD
|
||||
|
||||
Reference in New Issue
Block a user