kg: src/Graphics/Graphics.hh@f337a86d144e (annotated)

424 f337a86d144e fix GRAPHICS_ENABLED configuration... probably broken again if the <ClanLib/Display> includes aren't there Tero Marttila <terom@fixme.fi> parents: 423 diff changeset	1
f337a86d144e fix GRAPHICS_ENABLED configuration... probably broken again if the <ClanLib/Display> includes aren't there Tero Marttila <terom@fixme.fi> parents: 423 diff changeset	2	#ifndef GRAPHICS_GRAPHICS_HH
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	3	#define GRAPHICS_GRAPHICS_HH
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	4
412 721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	5	namespace graphics
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	6	{
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	7
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	8	class Graphics;
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	9
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	10	}
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	11
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	12	#include "../Engine.hh"
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	13	#include "Display.hh"
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	14	#include "FontManager.hh"
414 cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	15	#include "Input.hh"
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	16	#include "GameView.hh"
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	17
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	18	namespace graphics
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	19	{
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	20
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	21	/**
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	22	* Core class that ties everything else together
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	23	*/
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	24	class Graphics {
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	25	public:
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	26	/**
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	27	* Our reference to the engine
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	28	*/
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	29	Engine &engine;
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	30
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	31	/**
412 721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	32	* Our primary display
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	33	*/
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	34	Display display;
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	35
721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	36	/**
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	37	* For loading fonts
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	38	*/
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	39	FontManager fonts;
414 cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	40
cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	41	/**
cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	42	* Input handling
cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	43	*
cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	44	* XXX: move Input class into this?
cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	45	*/
cede5463b845 port Input to new Graphics, still a bit hacky, but everything seems to work now Tero Marttila <terom@fixme.fi> parents: 413 diff changeset	46	Input input;
412 721c60072091 new graphics code compiles... no, it doesn't work yet Tero Marttila <terom@fixme.fi> parents: 411 diff changeset	47
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	48	/**
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	49	* Initialize the graphics subsystem
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	50	*/
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	51	Graphics (Engine &engine, CL_ResourceManager &resources, const DisplayConfig &display_config);
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	52
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	53	/**
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	54	* Display a new GameView
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	55	*/
419 9cd4e54693b6 fix Engine <-> NetworkClient interaction Tero Marttila <terom@fixme.fi> parents: 414 diff changeset	56	GameView* displayGameView (GameState &state, LocalPlayer *player) {
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	57	// allocate a new GameView
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	58	GameView *view = new GameView(state, player);
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	59
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	60	// assign it to the display
413 7dddc163489a drawing the GameView works Tero Marttila <terom@fixme.fi> parents: 412 diff changeset	61	display.setView(view);
419 9cd4e54693b6 fix Engine <-> NetworkClient interaction Tero Marttila <terom@fixme.fi> parents: 414 diff changeset	62
9cd4e54693b6 fix Engine <-> NetworkClient interaction Tero Marttila <terom@fixme.fi> parents: 414 diff changeset	63	// return it
9cd4e54693b6 fix Engine <-> NetworkClient interaction Tero Marttila <terom@fixme.fi> parents: 414 diff changeset	64	return view;
411 106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	65	}
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	66
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	67	};
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	68
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	69	/**
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	70	* The global Graphics instance
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	71	*/
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	72	extern Graphics *graphics;
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	73
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	74	}
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	75
106aaf6eadfe there's a grain of truth in the new graphics code now... Tero Marttila <terom@fixme.fi> parents: diff changeset	76	#endif

author	Tero Marttila <terom@fixme.fi>
	Thu, 22 Jan 2009 04:09:53 +0200
changeset 424	f337a86d144e
parent 423	947ab54de4b7
permissions	-rw-r--r--