Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"reticle_scale" parameter for Scanner Targeting Enhancement

Browse Source 
HUDs intended for large high-resolution screens may wish to reduce this a little from the default. Closes #20
This commit is contained in:
cim 2013-10-07 17:59:14 +01:00
parent 84e7653432
commit a5d8d2b43a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Config/hud.plist
View File

@ -7,6 +7,7 @@
{ // Targeting enhancement { // Targeting enhancement
equipment_required = "EQ_SCANNER_SHOW_MISSILE_TARGET"; equipment_required = "EQ_SCANNER_SHOW_MISSILE_TARGET";
selector = "drawTargetReticle:"; selector = "drawTargetReticle:";
// reticle_scale = 0.015625 /* 1/64 is default */
}, },
{ // Waypoint display { // Waypoint display
equipment_required = "EQ_ADVANCED_COMPASS"; equipment_required = "EQ_ADVANCED_COMPASS";

18
src/Core/HeadUpDisplay.m
View File

@ -83,7 +83,7 @@ static void hudDrawMarkerAt(GLfloat x, GLfloat y, GLfloat z, NSSize siz, GLfloat
static void hudDrawBarAt(GLfloat x, GLfloat y, GLfloat z, NSSize siz, GLfloat amount); static void hudDrawBarAt(GLfloat x, GLfloat y, GLfloat z, NSSize siz, GLfloat amount);
static void hudDrawSurroundAt(GLfloat x, GLfloat y, GLfloat z, NSSize siz); static void hudDrawSurroundAt(GLfloat x, GLfloat y, GLfloat z, NSSize siz);
static void hudDrawStatusIconAt(int x, int y, int z, NSSize siz); static void hudDrawStatusIconAt(int x, int y, int z, NSSize siz);
static void hudDrawReticleOnTarget(Entity* target, PlayerEntity* player1, GLfloat z1, GLfloat alpha, BOOL reticleTargetSensitive, NSMutableDictionary *propertiesReticleTargetSensitive, BOOL colourFromScannerColour, BOOL showText); static void hudDrawReticleOnTarget(Entity* target, PlayerEntity* player1, GLfloat z1, GLfloat alpha, BOOL reticleTargetSensitive, NSMutableDictionary *propertiesReticleTargetSensitive, BOOL colourFromScannerColour, BOOL showText, NSDictionary *info);
static void hudDrawWaypoint(OOWaypointEntity *waypoint, PlayerEntity *player1, GLfloat z1, GLfloat alpha, BOOL selected); static void hudDrawWaypoint(OOWaypointEntity *waypoint, PlayerEntity *player1, GLfloat z1, GLfloat alpha, BOOL selected);
static void drawScannerGrid(GLfloat x, GLfloat y, GLfloat z, NSSize siz, int v_dir, GLfloat thickness, GLfloat zoom); static void drawScannerGrid(GLfloat x, GLfloat y, GLfloat z, NSSize siz, int v_dir, GLfloat thickness, GLfloat zoom);
@ -2281,7 +2281,7 @@ static OOPolygonSprite *IconForMissileRole(NSString *role)
if ([PLAYER primaryTarget] != nil) if ([PLAYER primaryTarget] != nil)
{ {
hudDrawReticleOnTarget([PLAYER primaryTarget], PLAYER, z1, alpha, reticleTargetSensitive, propertiesReticleTargetSensitive, NO, YES); hudDrawReticleOnTarget([PLAYER primaryTarget], PLAYER, z1, alpha, reticleTargetSensitive, propertiesReticleTargetSensitive, NO, YES, info);
[self drawDirectionCue:info]; [self drawDirectionCue:info];
} }
// extra feature if extra equipment installed // extra feature if extra equipment installed
@ -2318,7 +2318,7 @@ static OOPolygonSprite *IconForMissileRole(NSString *role)
{ {
if ([secondary zeroDistance] <= SCANNER_MAX_RANGE2 && [secondary isInSpace]) if ([secondary zeroDistance] <= SCANNER_MAX_RANGE2 && [secondary isInSpace])
{ {
hudDrawReticleOnTarget(secondary, PLAYER, z1, alpha, NO, nil, YES, NO); hudDrawReticleOnTarget(secondary, PLAYER, z1, alpha, NO, nil, YES, NO, info);
} }
} }
} }
@ -2975,11 +2975,13 @@ static void hudDrawStatusIconAt(int x, int y, int z, NSSize siz)
} }
static void hudDrawReticleOnTarget(Entity *target, PlayerEntity *player1, GLfloat z1, GLfloat alpha, BOOL reticleTargetSensitive, NSMutableDictionary *propertiesReticleTargetSensitive, BOOL colourFromScannerColour, BOOL showText) static void hudDrawReticleOnTarget(Entity *target, PlayerEntity *player1, GLfloat z1, GLfloat alpha, BOOL reticleTargetSensitive, NSMutableDictionary *propertiesReticleTargetSensitive, BOOL colourFromScannerColour, BOOL showText, NSDictionary *info)
{ {
ShipEntity *target_ship = nil; ShipEntity *target_ship = nil;
NSString *legal_desc = nil; NSString *legal_desc = nil;
GLfloat scale = [info oo_floatForKey:@"reticle_scale" defaultValue:ONE_SIXTYFOURTH];
if (target == nil || player1 == nil) return; if (target == nil || player1 == nil) return;
if ([target isShip]) if ([target isShip])
@ -3032,8 +3034,8 @@ static void hudDrawReticleOnTarget(Entity *target, PlayerEntity *player1, GLfloa
GLfloat rdist = magnitude(p1); GLfloat rdist = magnitude(p1);
GLfloat rsize = [target collisionRadius]; GLfloat rsize = [target collisionRadius];
if (rsize < rdist * ONE_SIXTYFOURTH) if (rsize < rdist * scale)
rsize = rdist * ONE_SIXTYFOURTH; rsize = rdist * scale;
GLfloat rs0 = rsize; GLfloat rs0 = rsize;
GLfloat rs2 = rsize * 0.50; GLfloat rs2 = rsize * 0.50;
@ -3192,8 +3194,8 @@ static void hudDrawReticleOnTarget(Entity *target, PlayerEntity *player1, GLfloa
// add text for reticle here // add text for reticle here
range *= 0.001f; range *= 0.001f;
if (range < 0.001f) range = 0.0f; // avoids the occasional -0.001 km distance. if (range < 0.001f) range = 0.0f; // avoids the occasional -0.001 km distance.
NSSize textsize = NSMakeSize(rdist * ONE_SIXTYFOURTH, rdist * ONE_SIXTYFOURTH); NSSize textsize = NSMakeSize(rdist * scale, rdist * scale);
float line_height = rdist * ONE_SIXTYFOURTH; float line_height = rdist * scale;
NSString* info = [NSString stringWithFormat:@"%0.3f km", range]; NSString* info = [NSString stringWithFormat:@"%0.3f km", range];
if (legal_desc != nil) info = [NSString stringWithFormat:@"%@ (%@)", info, legal_desc]; if (legal_desc != nil) info = [NSString stringWithFormat:@"%@ (%@)", info, legal_desc];
// no need to set colour here // no need to set colour here