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

make chart transitions smoother and restore background image to chart

Browse Source
This commit is contained in:
Kevin Anthoney 2014-07-20 09:57:18 +01:00
parent 91fdf82b43
commit d6e300aa9c
3 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Entities/PlayerEntity.h
View File

@ -421,9 +421,13 @@ typedef enum
NSPoint cursor_coordinates; NSPoint cursor_coordinates;
NSPoint chart_centre_coordinates; NSPoint chart_centre_coordinates;
// where we want the chart centre to be - used for smooth transitions
NSPoint target_chart_centre;
// Chart zoom is 1.0 when fully zoomed in and increases as we zoom out. The reason I've done it that way round // Chart zoom is 1.0 when fully zoomed in and increases as we zoom out. The reason I've done it that way round
// is because we might want to implement bigger galaxies one day, and thus may need to zoom out indefinitely. // is because we might want to implement bigger galaxies one day, and thus may need to zoom out indefinitely.
OOScalar chart_zoom; OOScalar chart_zoom;
OOScalar target_chart_zoom;
OOScalar saved_chart_zoom;
OOChartMode chart_mode; OOChartMode chart_mode;
OOTimeDelta witchspaceCountdown; OOTimeDelta witchspaceCountdown;

9
src/Core/Entities/PlayerEntity.m
View File

@ -567,7 +567,6 @@ static GLfloat sBaseMass = 0.0;
- (OOScalar) chart_zoom - (OOScalar) chart_zoom
{ {
if (chart_mode == CHART_MODE_LONG_RANGE) return CHART_MAX_ZOOM;
return chart_zoom; return chart_zoom;
} }
@ -591,6 +590,7 @@ static GLfloat sBaseMass = 0.0;
system_seed = s_seed; system_seed = s_seed;
galaxy_coordinates = NSMakePoint(s_seed.d, s_seed.b); galaxy_coordinates = NSMakePoint(s_seed.d, s_seed.b);
chart_centre_coordinates = galaxy_coordinates; chart_centre_coordinates = galaxy_coordinates;
target_chart_centre = chart_centre_coordinates;
} }
@ -950,8 +950,11 @@ static GLfloat sBaseMass = 0.0;
galaxy_coordinates.x = [coord_vals oo_unsignedCharAtIndex:0]; galaxy_coordinates.x = [coord_vals oo_unsignedCharAtIndex:0];
galaxy_coordinates.y = [coord_vals oo_unsignedCharAtIndex:1]; galaxy_coordinates.y = [coord_vals oo_unsignedCharAtIndex:1];
chart_centre_coordinates = galaxy_coordinates; chart_centre_coordinates = galaxy_coordinates;
target_chart_centre = chart_centre_coordinates;
cursor_coordinates = galaxy_coordinates; cursor_coordinates = galaxy_coordinates;
chart_zoom = 1.0; chart_zoom = 1.0;
target_chart_zoom = 1.0;
saved_chart_zoom = 1.0;
chart_mode = CHART_MODE_SHORT_RANGE; chart_mode = CHART_MODE_SHORT_RANGE;
NSString *keyStringValue = [dict oo_stringForKey:@"target_coordinates"]; NSString *keyStringValue = [dict oo_stringForKey:@"target_coordinates"];
@ -1724,8 +1727,11 @@ static GLfloat sBaseMass = 0.0;
market_rnd = 0; market_rnd = 0;
ship_kills = 0; ship_kills = 0;
chart_centre_coordinates = galaxy_coordinates; chart_centre_coordinates = galaxy_coordinates;
target_chart_centre = chart_centre_coordinates;
cursor_coordinates = galaxy_coordinates; cursor_coordinates = galaxy_coordinates;
chart_zoom = 1.0; chart_zoom = 1.0;
target_chart_zoom = 1.0;
saved_chart_zoom = 1.0;
chart_mode = CHART_MODE_SHORT_RANGE; chart_mode = CHART_MODE_SHORT_RANGE;
@ -6404,6 +6410,7 @@ static GLfloat sBaseMass = 0.0;
[[UNIVERSE station] update: 2.34375 * market_rnd]; // from 0..10 minutes [[UNIVERSE station] update: 2.34375 * market_rnd]; // from 0..10 minutes
chart_centre_coordinates = galaxy_coordinates; chart_centre_coordinates = galaxy_coordinates;
target_chart_centre = chart_centre_coordinates;
OOProfilerEndMarker(@"witchspace"); OOProfilerEndMarker(@"witchspace");
} }

43
src/Core/Entities/PlayerEntityControls.m
View File

@ -1580,7 +1580,7 @@ static NSTimeInterval time_last_frame;
{ {
MyOpenGLView *gameView = [UNIVERSE gameView]; MyOpenGLView *gameView = [UNIVERSE gameView];
BOOL moving = NO; BOOL moving = NO;
double cursor_speed = ([gameView isCtrlDown] ? 20.0 : 10.0)* [self chart_zoom]; double cursor_speed = ([gameView isCtrlDown] ? 20.0 : 10.0)* chart_zoom;
GameController *controller = [UNIVERSE gameController]; GameController *controller = [UNIVERSE gameController];
GuiDisplayGen *gui = [UNIVERSE gui]; GuiDisplayGen *gui = [UNIVERSE gui];
GUI_ROW_INIT(gui); GUI_ROW_INIT(gui);
@ -1697,9 +1697,9 @@ static NSTimeInterval time_last_frame;
if (gui_screen == GUI_SCREEN_SHORT_RANGE_CHART) if (gui_screen == GUI_SCREEN_SHORT_RANGE_CHART)
{ {
double vadjust = 80; double vadjust = 80;
double hscale = MAIN_GUI_PIXEL_WIDTH / (64.0 * [self chart_zoom]); double hscale = MAIN_GUI_PIXEL_WIDTH / (64.0 * chart_zoom);
double vscale = MAIN_GUI_PIXEL_HEIGHT / (128.0 * [self chart_zoom]); double vscale = MAIN_GUI_PIXEL_HEIGHT / (128.0 * chart_zoom);
NSPoint centre = [self chart_centre_for_zoom: [self chart_zoom]]; NSPoint centre = [self chart_centre_for_zoom: chart_zoom];
cursor_coordinates.x = OOClamp_0_max_f(centre.x + (maus.x * MAIN_GUI_PIXEL_WIDTH) / hscale, 256.0); cursor_coordinates.x = OOClamp_0_max_f(centre.x + (maus.x * MAIN_GUI_PIXEL_WIDTH) / hscale, 256.0);
cursor_coordinates.y = OOClamp_0_max_f(centre.y + (maus.y * MAIN_GUI_PIXEL_HEIGHT + vadjust) / vscale, 256.0); cursor_coordinates.y = OOClamp_0_max_f(centre.y + (maus.y * MAIN_GUI_PIXEL_HEIGHT + vadjust) / vscale, 256.0);
} }
@ -1733,16 +1733,16 @@ static NSTimeInterval time_last_frame;
} }
if ([gameView isDown:gvPageDownKey]) if ([gameView isDown:gvPageDownKey])
{ {
chart_zoom *=1.02; target_chart_zoom *=1.02;
if (chart_zoom > CHART_MAX_ZOOM) chart_zoom = CHART_MAX_ZOOM; if (target_chart_zoom > CHART_MAX_ZOOM) target_chart_zoom = CHART_MAX_ZOOM;
moving = YES; moving = YES;
} }
if ([gameView isDown:gvPageUpKey]) if ([gameView isDown:gvPageUpKey])
{ {
chart_zoom /= 1.02; target_chart_zoom /= 1.02;
if (chart_zoom < 1) chart_zoom = 1; if (target_chart_zoom < 1.0) target_chart_zoom = 1.0;
moving = YES; moving = YES;
chart_centre_coordinates = cursor_coordinates; target_chart_centre = cursor_coordinates;
} }
BOOL nextSystem = [gameView isShiftDown] && gui_screen == GUI_SCREEN_LONG_RANGE_CHART; BOOL nextSystem = [gameView isShiftDown] && gui_screen == GUI_SCREEN_LONG_RANGE_CHART;
@ -1826,23 +1826,25 @@ static NSTimeInterval time_last_frame;
cursor_coordinates.x = target_system_seed.d; cursor_coordinates.x = target_system_seed.d;
cursor_coordinates.y = target_system_seed.b; cursor_coordinates.y = target_system_seed.b;
} }
if (cursor_coordinates.x - chart_centre_coordinates.x <= -CHART_SCROLL_AT_X*chart_zoom) if (cursor_coordinates.x - target_chart_centre.x <= -CHART_SCROLL_AT_X*chart_zoom)
{ {
chart_centre_coordinates.x = cursor_coordinates.x + CHART_SCROLL_AT_X*chart_zoom; target_chart_centre.x = cursor_coordinates.x + CHART_SCROLL_AT_X*chart_zoom;
} }
else if (cursor_coordinates.x - chart_centre_coordinates.x >= CHART_SCROLL_AT_X*chart_zoom) else if (cursor_coordinates.x - target_chart_centre.x >= CHART_SCROLL_AT_X*chart_zoom)
{ {
chart_centre_coordinates.x = cursor_coordinates.x - CHART_SCROLL_AT_X*chart_zoom; target_chart_centre.x = cursor_coordinates.x - CHART_SCROLL_AT_X*chart_zoom;
} }
if (cursor_coordinates.y - chart_centre_coordinates.y <= -CHART_SCROLL_AT_Y*chart_zoom) if (cursor_coordinates.y - target_chart_centre.y <= -CHART_SCROLL_AT_Y*chart_zoom)
{ {
chart_centre_coordinates.y = cursor_coordinates.y + CHART_SCROLL_AT_Y*chart_zoom; target_chart_centre.y = cursor_coordinates.y + CHART_SCROLL_AT_Y*chart_zoom;
} }
else if (cursor_coordinates.y - chart_centre_coordinates.y >= CHART_SCROLL_AT_Y*chart_zoom) else if (cursor_coordinates.y - target_chart_centre.y >= CHART_SCROLL_AT_Y*chart_zoom)
{ {
chart_centre_coordinates.y = cursor_coordinates.y - CHART_SCROLL_AT_Y*chart_zoom; target_chart_centre.y = cursor_coordinates.y - CHART_SCROLL_AT_Y*chart_zoom;
} }
if ((cursor_moving)&&(gui_screen == GUI_SCREEN_LONG_RANGE_CHART)) [self setGuiToLongRangeChartScreen]; // update graphics chart_centre_coordinates.x = (3.0*chart_centre_coordinates.x + target_chart_centre.x)/4.0;
chart_centre_coordinates.y = (3.0*chart_centre_coordinates.y + target_chart_centre.y)/4.0;
chart_zoom = (3.0*chart_zoom + target_chart_zoom)/4.0;
if ((cursor_moving)&&(gui_screen == GUI_SCREEN_SHORT_RANGE_CHART)) [self setGuiToShortRangeChartScreen]; // update graphics if ((cursor_moving)&&(gui_screen == GUI_SCREEN_SHORT_RANGE_CHART)) [self setGuiToShortRangeChartScreen]; // update graphics
cursor_moving = moving; cursor_moving = moving;
} }
@ -3267,14 +3269,17 @@ static NSTimeInterval time_last_frame;
{ {
if (chart_mode == CHART_MODE_LONG_RANGE) if (chart_mode == CHART_MODE_LONG_RANGE)
{ {
target_chart_zoom = saved_chart_zoom;
chart_mode = CHART_MODE_SHORT_RANGE; chart_mode = CHART_MODE_SHORT_RANGE;
} }
else else
{ {
saved_chart_zoom = target_chart_zoom;
target_chart_zoom = CHART_MAX_ZOOM;
chart_mode = CHART_MODE_LONG_RANGE; chart_mode = CHART_MODE_LONG_RANGE;
} }
} }
[gui clearAndKeepBackground: NO]; [gui clearAndKeepBackground: YES];
[self setGuiToShortRangeChartScreen]; [self setGuiToShortRangeChartScreen];
} }
} }