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

Fixed new planets not rotating. Made cloak indicator on status light default to YES.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2819 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2009-11-30 21:03:16 +00:00
parent 323c25b8ca
commit f5b4de349a
4 changed files with 289 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/hud-small.plist
View File

@ -218,5 +218,5 @@
overall_alpha = 0.75;
reticle_target_sensitive = no;
cloak_indicator_on_status_light = no;
cloak_indicator_on_status_light = yes;
}

564
Resources/Config/hud.plist
View File

@ -1,30 +1,30 @@
{
crosshair_scale = 32.0;
crosshair_width = 1.5;
crosshair_color = "greenColor";
dials = //these are drawn, in order, after the legends
(
{ // Targeting enhancement
equipment_required = "EQ_SCANNER_SHOW_MISSILE_TARGET";
selector = "drawTargetReticle:";
},
{ // scanner
alpha = 0.75;
selector = "drawScanner:";
x = 0;
y = 60;
y_origin = -1;
height = 72.0;
width = 288.0;
rgb_color = (1.0, 0.0, 0.0);
},
{ // scanner zoom indicator
alpha = 1.0;
selector = "drawScannerZoomIndicator:";
x = 108;
y = 24;
y_origin = -1;
},
{
crosshair_scale = 32.0;
crosshair_width = 1.5;
crosshair_color = "greenColor";
dials = //these are drawn, in order, after the legends
(
{ // Targeting enhancement
equipment_required = "EQ_SCANNER_SHOW_MISSILE_TARGET";
selector = "drawTargetReticle:";
},
{ // scanner
alpha = 0.75;
selector = "drawScanner:";
x = 0;
y = 60;
y_origin = -1;
height = 72.0;
width = 288.0;
rgb_color = (1.0, 0.0, 0.0);
},
{ // scanner zoom indicator
alpha = 1.0;
selector = "drawScannerZoomIndicator:";
x = 108;
y = 24;
y_origin = -1;
},
//{ // stick sensitivity indicator
// alpha = 1.0;
// selector = "drawStickSensitivityIndicator:";
@ -33,258 +33,258 @@
// height = 12;
// width = 12;
//},
{ // compass
alpha = 1.0;
selector = "drawCompass:";
x = 132;
y = 24;
y_origin = -1;
},
{ // station aegis
alpha = 1.0;
selector = "drawAegis:";
x = -132;
y = 24;
y_origin = -1;
},
{ // fuel scoop status
alpha = 0.75;
selector = "drawScoopStatus:";
x = -132;
y = 88;
y_origin = -1;
},
{ // speed bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawSpeedBar:";
width = 80;
x = 200;
y = 95;
y_origin = -1;
},
{ // roll bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawRollBar:";
width = 80;
x = 200;
y = 80;
y_origin = -1;
},
{ // pitch bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawPitchBar:";
width = 80;
x = 200;
y = 70;
y_origin = -1;
},
//{ // yaw bar, can draw a surround 2 units out from the dial size specified
// // this is disabled by default, uncomment as required to enable
// draw_surround = yes;
// height = 8;
// selector = "drawYawBar:";
// width = 80;
// x = 200;
// y = -130;
//},
{ // energy gauge, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 48;
selector = "drawEnergyGauge:";
width = 80;
x = 200;
y = 35;
y_origin = -1;
labelled = yes;
},
{ // forward shield bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawForwardShieldBar:";
width = 80;
x = -200;
y = 94;
y_origin = -1;
},
{ // aft shield bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawAftShieldBar:";
width = 80;
x = -200;
y = 78;
y_origin = -1;
},
{ // just draws a surround 2 units around the selected size, you could also use drawGreenSurround:
height = 40;
selector = "drawYellowSurround:";
width = 80;
x = -200;
y = 46;
y_origin = -1;
},
{ // fuel bar
height = 8;
selector = "drawFuelBar:";
width = 80;
x = -200;
y = 61;
y_origin = -1;
},
{ // cabin temperature bar
height = 8;
selector = "drawCabinTempBar:";
width = 80;
x = -200;
y = 51;
y_origin = -1;
},
{ // weapon temperature bar
height = 8;
selector = "drawWeaponTempBar:";
width = 80;
x = -200;
y = 41;
y_origin = -1;
},
{ // altitude bar
height = 8;
selector = "drawAltitudeBar:";
width = 80;
x = -200;
y = 31;
y_origin = -1;
},
{ // missile display, x and y give the location, the x-spacing is given by spacing, the size defines the icon size
height = 12;
selector = "drawMissileDisplay:";
spacing = 16;
width = 12;
x = -228;
y = 16;
y_origin = -1;
},
{ // status indicator light, x and y give the location, the size defines the icon size
height = 8;
selector = "drawStatusLight:";
width = 8;
x = -108;
y = 24;
y_origin = -1;
},
{ // ship's clock, x and y give the location, the size defines the character size
height = 12;
selector = "drawClock:";
width = 12;
x = -48;
y = 6;
y_origin = -1;
},
{ // fps counter, x and y give the location, the size defines the character size
height = 18;
selector = "drawFPSInfoCounter:";
width = 18;
x = -300;
y = -20;
y_origin = 1;
}
);
legends = // these are drawn, in order, before the dials, add any other images you want here
(
{ // LHS
text = "FWD";
x = -264;
y = 82;
y_origin = -1;
height = 20;
width = 10;
},
{ text = "AFT";
x = -262;
y = 66;
y_origin = -1;
height = 20;
width = 10;
},
{
text = "FUEL";
x = -264;
y = 52;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "CT";
x = -255;
y = 42;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "LT";
x = -254;
y = 32;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "ALT";
x = -260;
y = 22;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "MISS";
x = -266;
y = 4;
y_origin = -1;
height = 16;
width = 10;
},
{ // RHS
text = "SPD";
x = 241;
y = 82;
y_origin = -1;
height = 20;
width = 10;
},
{
text = "ROLL";
x = 241;
y = 72;
y_origin = -1;
height = 12;
width = 9;
},
//{ // yaw bar legend, disabled by default
// // uncomment as required to enable
// text = "YAW";
// x = 241;
// y = -138;
// height = 12;
// width = 9;
//},
{
text = "PITCH";
x = 241;
y = 62;
y_origin = -1;
height = 12;
width = 9;
}
);
overall_alpha = 0.75;
reticle_target_sensitive = no;
cloak_indicator_on_status_light = no;
}
{ // compass
alpha = 1.0;
selector = "drawCompass:";
x = 132;
y = 24;
y_origin = -1;
},
{ // station aegis
alpha = 1.0;
selector = "drawAegis:";
x = -132;
y = 24;
y_origin = -1;
},
{ // fuel scoop status
alpha = 0.75;
selector = "drawScoopStatus:";
x = -132;
y = 88;
y_origin = -1;
},
{ // speed bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawSpeedBar:";
width = 80;
x = 200;
y = 95;
y_origin = -1;
},
{ // roll bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawRollBar:";
width = 80;
x = 200;
y = 80;
y_origin = -1;
},
{ // pitch bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawPitchBar:";
width = 80;
x = 200;
y = 70;
y_origin = -1;
},
//{ // yaw bar, can draw a surround 2 units out from the dial size specified
// // this is disabled by default, uncomment as required to enable
// draw_surround = yes;
// height = 8;
// selector = "drawYawBar:";
// width = 80;
// x = 200;
// y = -130;
//},
{ // energy gauge, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 48;
selector = "drawEnergyGauge:";
width = 80;
x = 200;
y = 35;
y_origin = -1;
labelled = yes;
},
{ // forward shield bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawForwardShieldBar:";
width = 80;
x = -200;
y = 94;
y_origin = -1;
},
{ // aft shield bar, can draw a surround 2 units out from the dial size specified
draw_surround = yes;
height = 8;
selector = "drawAftShieldBar:";
width = 80;
x = -200;
y = 78;
y_origin = -1;
},
{ // just draws a surround 2 units around the selected size, you could also use drawGreenSurround:
height = 40;
selector = "drawYellowSurround:";
width = 80;
x = -200;
y = 46;
y_origin = -1;
},
{ // fuel bar
height = 8;
selector = "drawFuelBar:";
width = 80;
x = -200;
y = 61;
y_origin = -1;
},
{ // cabin temperature bar
height = 8;
selector = "drawCabinTempBar:";
width = 80;
x = -200;
y = 51;
y_origin = -1;
},
{ // weapon temperature bar
height = 8;
selector = "drawWeaponTempBar:";
width = 80;
x = -200;
y = 41;
y_origin = -1;
},
{ // altitude bar
height = 8;
selector = "drawAltitudeBar:";
width = 80;
x = -200;
y = 31;
y_origin = -1;
},
{ // missile display, x and y give the location, the x-spacing is given by spacing, the size defines the icon size
height = 12;
selector = "drawMissileDisplay:";
spacing = 16;
width = 12;
x = -228;
y = 16;
y_origin = -1;
},
{ // status indicator light, x and y give the location, the size defines the icon size
height = 8;
selector = "drawStatusLight:";
width = 8;
x = -108;
y = 24;
y_origin = -1;
},
{ // ship's clock, x and y give the location, the size defines the character size
height = 12;
selector = "drawClock:";
width = 12;
x = -48;
y = 6;
y_origin = -1;
},
{ // fps counter, x and y give the location, the size defines the character size
height = 18;
selector = "drawFPSInfoCounter:";
width = 18;
x = -300;
y = -20;
y_origin = 1;
}
);
legends = // these are drawn, in order, before the dials, add any other images you want here
(
{ // LHS
text = "FWD";
x = -264;
y = 82;
y_origin = -1;
height = 20;
width = 10;
},
{ text = "AFT";
x = -262;
y = 66;
y_origin = -1;
height = 20;
width = 10;
},
{
text = "FUEL";
x = -264;
y = 52;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "CT";
x = -255;
y = 42;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "LT";
x = -254;
y = 32;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "ALT";
x = -260;
y = 22;
y_origin = -1;
height = 14;
width = 9;
},
{
text = "MISS";
x = -266;
y = 4;
y_origin = -1;
height = 16;
width = 10;
},
{ // RHS
text = "SPD";
x = 241;
y = 82;
y_origin = -1;
height = 20;
width = 10;
},
{
text = "ROLL";
x = 241;
y = 72;
y_origin = -1;
height = 12;
width = 9;
},
//{ // yaw bar legend, disabled by default
// // uncomment as required to enable
// text = "YAW";
// x = 241;
// y = -138;
// height = 12;
// width = 9;
//},
{
text = "PITCH";
x = 241;
y = 62;
y_origin = -1;
height = 12;
width = 9;
}
);
overall_alpha = 0.75;
reticle_target_sensitive = no;
cloak_indicator_on_status_light = yes;
}

13
src/Core/Entities/OOPlanetEntity.m
View File

@ -282,14 +282,11 @@ static OOColor *ColorWithHSBColor(Vector c)
// FIXME: update atmosphere
}
else
{
// Miniature
quaternion_rotate_about_axis(&orientation, _rotationAxis, _rotationalVelocity * delta_t);
[self orientationChanged];
// FIXME: update atmosphere
}
quaternion_rotate_about_axis(&orientation, _rotationAxis, _rotationalVelocity * delta_t);
[self orientationChanged];
// FIXME: update atmosphere
}

2
src/Core/HeadUpDisplay.m
View File

@ -202,7 +202,7 @@ OOINLINE void GLColorWithOverallAlpha(const GLfloat *color, GLfloat alpha)
reticleTargetSensitive = [hudinfo oo_boolForKey:@"reticle_target_sensitive" defaultValue:NO];
cloakIndicatorOnStatusLight = [hudinfo oo_boolForKey:@"cloak_indicator_on_status_light" defaultValue:NO];
cloakIndicatorOnStatusLight = [hudinfo oo_boolForKey:@"cloak_indicator_on_status_light" defaultValue:YES];
last_transmitter = NO_TARGET;