kg: src/Graphics.cc@10743f190aab (annotated)

25 af75a1894a32 simple proto almost works terom parents: diff changeset	1
af75a1894a32 simple proto almost works terom parents: diff changeset	2	#include "Graphics.hh"
86 ed31ece6f340 Segfault <3 (mik? oli odotettavaa) saiam parents: 60 diff changeset	3	#include "GameState.hh"
108 1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti. saiam parents: 96 diff changeset	4	#include <cmath>
25 af75a1894a32 simple proto almost works terom parents: diff changeset	5
af75a1894a32 simple proto almost works terom parents: diff changeset	6	Graphics::Graphics (Engine &engine, GameState &state) :
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	7	CL_DisplayWindow(GRAPHICS_WINDOW_TITLE, GRAPHICS_RESOLUTION_WIDTH, GRAPHICS_RESOLUTION_HEIGHT),
25 af75a1894a32 simple proto almost works terom parents: diff changeset	8	engine(engine),
af75a1894a32 simple proto almost works terom parents: diff changeset	9	state(state),
282 e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 275 diff changeset	10	resolution(GRAPHICS_RESOLUTION_WIDTH, GRAPHICS_RESOLUTION_HEIGHT),
25 af75a1894a32 simple proto almost works terom parents: diff changeset	11	update_timer(GRAPHICS_UPDATE_INTERVAL_MS),
235 0a0c729365ee code cleanup terom parents: 233 diff changeset	12	input(get_ic()->get_keyboard()),
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	13	simple_font("Font2", engine.getResourceManager())
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	14	{
86 ed31ece6f340 Segfault <3 (mik? oli odotettavaa) saiam parents: 60 diff changeset	15
25 af75a1894a32 simple proto almost works terom parents: diff changeset	16	// connect timer signal
205 905028e58ed1 implement a new tick-timer that doesn't suck terom parents: 199 diff changeset	17	slots.connect(update_timer.sig_tick(), this, &Graphics::on_update);
25 af75a1894a32 simple proto almost works terom parents: diff changeset	18
af75a1894a32 simple proto almost works terom parents: diff changeset	19	// enable
205 905028e58ed1 implement a new tick-timer that doesn't suck terom parents: 199 diff changeset	20	update_timer.start();
25 af75a1894a32 simple proto almost works terom parents: diff changeset	21	}
af75a1894a32 simple proto almost works terom parents: diff changeset	22
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	23	void Graphics::check_input (void) {
25 af75a1894a32 simple proto almost works terom parents: diff changeset	24	LocalPlayer *player;
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	25	PlayerInput input_mask;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	26	TimeMS input_dt;
25 af75a1894a32 simple proto almost works terom parents: diff changeset	27
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	28	// update gui flags
235 0a0c729365ee code cleanup terom parents: 233 diff changeset	29	this->flags = input.readGuiInput();
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	30
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	31	// quit?
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	32	if (flags & GUI_INPUT_QUIT) {
108 1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti. saiam parents: 96 diff changeset	33	engine.stop();
25 af75a1894a32 simple proto almost works terom parents: diff changeset	34
108 1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti. saiam parents: 96 diff changeset	35	return;
25 af75a1894a32 simple proto almost works terom parents: diff changeset	36	}
af75a1894a32 simple proto almost works terom parents: diff changeset	37
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	38	// stop here if we don't have a local player
25 af75a1894a32 simple proto almost works terom parents: diff changeset	39	if ((player = state.getLocalPlayer()) == NULL)
af75a1894a32 simple proto almost works terom parents: diff changeset	40	return;
af75a1894a32 simple proto almost works terom parents: diff changeset	41
221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: 212 diff changeset	42	// dump debug info on stderr
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	43	if (flags & GUI_INPUT_DEBUG_PLAYER)
221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: 212 diff changeset	44	player->printDebugInfo();
180 bfe1077edab3 Ammuksia f:lla ekku parents: 162 diff changeset	45
230 78cf0cd69af4 better input handling terom parents: 222 diff changeset	46	// build input_mask
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	47	input.readPlayerInput(input_mask, input_dt);
221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: 212 diff changeset	48
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	49	// apply input if there was any
221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: 212 diff changeset	50	if (input_mask)
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	51	player->handleInput(input_mask, input_dt);
25 af75a1894a32 simple proto almost works terom parents: diff changeset	52	}
af75a1894a32 simple proto almost works terom parents: diff changeset	53
266 ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	54	static PixelDimension value_between (PixelDimension low, PixelDimension value, PixelDimension high) {
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	55	if (value < low)
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	56	return low;
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	57
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	58	else if (value > high)
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	59	return high;
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	60
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	61	else
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	62	return value;
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	63	}
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	64
25 af75a1894a32 simple proto almost works terom parents: diff changeset	65	void Graphics::do_redraw (void) {
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	66	CL_GraphicContext *gc = get_gc();
266 ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	67	LocalPlayer *player;
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	68
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	69	// calculate camera
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	70	PixelCoordinate camera(0, 0);
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	71
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	72	// ...to track our local player
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	73	if ((player = state.getLocalPlayer()) != NULL) {
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	74	PixelCoordinate target = player->getCoordinate() - resolution / 2;
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	75	PixelCoordinate max = state.world.getDimensions() - resolution;
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	76
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	77	// keep the terrain in view
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	78	camera = PixelCoordinate(
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	79	value_between(0, target.x, max.x),
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	80	value_between(0, target.y, max.y)
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	81	);
ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	82	}
25 af75a1894a32 simple proto almost works terom parents: diff changeset	83
312 10743f190aab info box nireco parents: 311 diff changeset	84	// Black background
248 e40ef56dc62c scrolling looks like it works nireco parents: 235 diff changeset	85	gc->clear(CL_Color::black);
25 af75a1894a32 simple proto almost works terom parents: diff changeset	86
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	87	// Draw the game
266 ad72d0a0cc02 increase the map size and control the camera to always have the screen full of terrain terom parents: 248 diff changeset	88	state.draw(this, camera, flags & GUI_INPUT_DISPLAY_WEAPON);
180 bfe1077edab3 Ammuksia f:lla ekku parents: 162 diff changeset	89
312 10743f190aab info box nireco parents: 311 diff changeset	90	// Draw box for player information
10743f190aab info box nireco parents: 311 diff changeset	91	if (player != NULL) {
10743f190aab info box nireco parents: 311 diff changeset	92	player->draw_player_info(this);
10743f190aab info box nireco parents: 311 diff changeset	93	}
10743f190aab info box nireco parents: 311 diff changeset	94
184 561892e2a30e try and sync graphics flip terom parents: 182 diff changeset	95	// Flip window buffer, sync
233 ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 230 diff changeset	96	flip(1);
25 af75a1894a32 simple proto almost works terom parents: diff changeset	97	}
af75a1894a32 simple proto almost works terom parents: diff changeset	98
205 905028e58ed1 implement a new tick-timer that doesn't suck terom parents: 199 diff changeset	99	void Graphics::on_update (TimeMS tick_length) {
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	100	(void) tick_length;
440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	101
25 af75a1894a32 simple proto almost works terom parents: diff changeset	102	// check keyboard input
311 440763821484 make Input have its own timer, and add key-repeat handling, and fix some warnings terom parents: 282 diff changeset	103	check_input();
25 af75a1894a32 simple proto almost works terom parents: diff changeset	104
af75a1894a32 simple proto almost works terom parents: diff changeset	105	// redraw display
af75a1894a32 simple proto almost works terom parents: diff changeset	106	do_redraw();
af75a1894a32 simple proto almost works terom parents: diff changeset	107	}

author	nireco
	Mon, 08 Dec 2008 21:20:55 +0000
changeset 312	10743f190aab
parent 311	440763821484
child 315	fe9da2d5355e
permissions	-rw-r--r--