kg: src/Engine.cc@e6cfc44266af (annotated)

185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	1
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	2	#include "Engine.hh"
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	3	#include "SinglePlayer.hh"
380 d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	4	#include "Network/Reactor.hh"
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	5	#include "Config.hh"
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	6
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	7	#include <iostream>
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	8
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: 218 diff changeset	9	Engine::Engine (const std::string resource_xml_path) :
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	10	terrain(NULL), game_state(NULL), graphics_config(NULL), graphics(NULL), net_server(NULL), net_client_connect(NULL),
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: 218 diff changeset	11	is_running(true), resources(resource_xml_path)
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 218 diff changeset	12	{
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 218 diff changeset	13
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	14	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	15
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	16	GameState& Engine::setupGame (Terrain *terrain) {
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	17	// ensure this isn't called in inappropriate ways
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	18	assert(!net_server);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	19
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	20	// remember the terrain
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	21	this->terrain = terrain;
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	22
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	23	// create the GameState
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	24	game_state = new GameState(*terrain);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	25
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	26	// start graphics?
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	27	if (graphics_config)
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	28	startGraphics();
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	29
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	30	return *game_state;
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	31	}
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	32
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	33	GameState& Engine::setupGame (void) {
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	34	// proxy off to setupGame(Terrain *)
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	35	return setupGame(new Terrain(TERRAIN_WIDTH, TERRAIN_HEIGHT, TERRAIN_RANDOM_SEED));
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	36	}
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	37
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	38	void Engine::setupGraphics (const GraphicsConfiguration &config) {
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	39	// store config
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	40	graphics_config = &config;
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	41
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	42	// start already?
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	43	if (game_state)
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	44	startGraphics();
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	45	}
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	46
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	47	void Engine::startGraphics (void) {
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	48	// check state
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	49	assert(game_state && graphics_config);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	50
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	51	// create the graphics
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	52	graphics = new Graphics(this, game_state, *graphics_config);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	53	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	54
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	55	void Engine::setupNetworkServer (const std::string &listen_port) {
381 9b35bc329d23 separate sockaddr stuff out of NetworkAddress... now called NetworkEndpoint terom parents: 380 diff changeset	56	NetworkEndpoint listen_addr(listen_port);
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	57
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	58	// setup default game
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	59	setupGame();
381 9b35bc329d23 separate sockaddr stuff out of NetworkAddress... now called NetworkEndpoint terom parents: 380 diff changeset	60
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	61	// create the server
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	62	net_server = new NetworkServer(*game_state, listen_addr);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	63	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	64
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	65	void Engine::setupNetworkClient (const std::string &connect_host, const std::string &connect_port) {
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	66	// connect_to
381 9b35bc329d23 separate sockaddr stuff out of NetworkAddress... now called NetworkEndpoint terom parents: 380 diff changeset	67	NetworkEndpoint connect_addr(connect_host, connect_port);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	68
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	69	// begin connecting, the client will callback us with setupGame once it's connected
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	70	net_client_connect = new NetworkClientConnect(*this, connect_addr);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	71	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	72
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	73	void Engine::setupSinglePlayer (void) {
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	74	// setup default game
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	75	setupGame();
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	76
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	77	// create player directly
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	78	LocalPlayer* lp = new SinglePlayer(*game_state);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	79
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	80	// add to gamestate
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 389 diff changeset	81	game_state->setLocalPlayer(lp);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	82	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	83
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	84	void Engine::stop (void) {
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	85	is_running = false;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	86	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	87
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	88	void Engine::run (void) {
380 d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	89	// our NetworkReactor
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	90	NetworkReactor *reactor = NetworkReactor::current;
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	91
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	92	// timeout info
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	93	timeval timeout;
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	94
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	95	while (is_running) {
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	96	// this does.... magical things
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	97	CL_System::keep_alive();
380 d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	98
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	99	// setup our timeout to ENGINE_TIMEOUT_MS
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	100	timeout.tv_sec = 0;
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	101	timeout.tv_usec = ENGINE_TIMEOUT_MS * 1000;
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	102
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	103	/*
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	104	* Thursday came and went, I re-wrote clan-event.
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	105	*
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	106	* We use the NetworkReactor for sleeping, as it handles it effeciently even if we're not using network.
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	107	*/
d193dd1d8a7e new NetworkReactor, fix everything to actually work terom parents: 378 diff changeset	108	reactor->poll(&timeout);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	109	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	110	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	111
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: 218 diff changeset	112	CL_ResourceManager* Engine::getResourceManager (void) {
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics, implment even better input handling, and draw weapon names terom* parents: 218 diff changeset	113	return &resources;
218 86d22fe82b30 add static Engine::graphicsEnabled function and disable player graphics loading when false terom parents: 186 diff changeset	114	}
86d22fe82b30 add static Engine::graphicsEnabled function and disable player graphics loading when false terom parents: 186 diff changeset	115
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	116	Logger Engine::log (enum LogLevel level, const char *type) {
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	117	return Logger(level <= WARN ? std::cerr : std::cout, level, type);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	118	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	119

author	Tero Marttila <terom@fixme.fi>
	Tue, 20 Jan 2009 23:30:18 +0200
changeset 408	e6cfc44266af
parent 389	e74c1820fbd2
child 409	1a03ff151abc
permissions	-rw-r--r--