kg: src/Network/Client.cc@c35307e8645c (annotated)

185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	1
186 0738f2949a2b move src/Network% to src/Network/% terom parents: 185 diff changeset	2	#include "Client.hh"
187 f41f894213ca restructure network code a bit terom parents: 186 diff changeset	3	#include "Protocol.hh"
f41f894213ca restructure network code a bit terom parents: 186 diff changeset	4	#include "Config.hh"
186 0738f2949a2b move src/Network% to src/Network/% terom parents: 185 diff changeset	5	#include "../Engine.hh"
0738f2949a2b move src/Network% to src/Network/% terom parents: 185 diff changeset	6	#include "../Logger.hh"
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	7
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	8	#include <cassert>
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	9
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	10	NetworkClient::NetworkClient (GameState &state, const NetworkAddress &connect_to) :
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	11	state(state), netsession(NETWORK_MAGIC_ID), server(netsession.connect(connect_to)), controller(*this)
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	12	{
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	13	// connect slots
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	14	slots.connect(netsession.sig_chan_message(NETCHAN_TERRAIN_ARRAY), this, &NetworkClient::on_terrain_array);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	15
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	16	// XXX: sig_disconnected
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	17	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	18
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	19	void NetworkClient::on_terrain_array (NetworkPacketInput &pkt, NetworkNode *node) {
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	20	// ignore if not from server
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	21	if (node != server)
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	22	return;
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	23
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	24	Terrain &terrain = state.world;
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	25
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	26	// read map width/height
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	27	uint32_t map_w = pkt.read_uint32();
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	28	uint32_t map_h = pkt.read_uint32();
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	29
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	30	// read map data
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	31	for (int x = 0; x < map_w; x++) {
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	32	for (int y = 0; y < map_h; y++) {
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	33	terrain.terrain[x][y] = (TerrainType) pkt.read_uint8();
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	34	}
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	35	}
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	36
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	37	// update the pixbuf
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	38	terrain.generatePixelBuffer();
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	39	}
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	40
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	41	void NetworkClient::player_quit (NetworkClientRemotePlayer *player) {
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	42	// inform state
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	43	state.removePlayer(player);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	44
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	45	// delete
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	46	// XXX: leak because deleting the slot while it's being called breaks ClanLib
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	47	// delete player;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	48	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	49
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	50	/*
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	51	* NetworkClientController
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	52	*/
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	53	NetworkClientController::NetworkClientController (NetworkClient &client) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	54	NetworkObject_ClientController(client.netsession, NETCHAN_CORE, client.server), client(client)
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	55	{
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	56
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	57	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	58
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	59	void NetworkClientController::handle_create (NetworkObjectID obj_id, NetworkMessageID msg_id, NetworkPacketInput &pkt, NetworkNode *node) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	60	switch (msg_id) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	61	case NETMSG_SERVER_HELLO:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	62	on_server_hello(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	63	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	64
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	65	case NETMSG_PLAYER_INFO:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	66	on_player_info(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	67	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	68
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	69	case NETMSG_PLAYER_JOIN:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	70	on_player_join(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	71	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	72
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	73	case NETMSG_PROJECTILE_CREATE:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	74	on_projectile_create(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	75	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	76
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	77	default:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	78	Engine::log(WARN, "client.handle_create") << "Unknown object create message: obj_id=" << obj_id << ", msg_id=" << msg_id;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	79	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	80	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	81
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	82	void NetworkClientController::on_server_hello (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	83	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	84	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	85
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	86	Engine::log(INFO, "client.on_server_hello") << this << ": pos=" << position;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	87
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	88	// create the LocalPlayer object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	89	new NetworkClientLocalPlayer(client, obj_id, position);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	90	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	91
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	92	void NetworkClientController::on_player_info (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	93	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	94	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	95
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	96	Engine::log(INFO, "client.on_player_info") << this << ": pos=" << position;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	97
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	98	// create the LocalPlayer object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	99	new NetworkClientRemotePlayer(client, obj_id, position);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	100	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	101
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	102	void NetworkClientController::on_player_join (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	103	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	104	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	105
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	106	Engine::log(INFO, "client.on_player_join") << this << ": pos=" << position;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	107
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	108	// create the RemotePlayer object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	109	new NetworkClientRemotePlayer(client, obj_id, position);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	110	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	111
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	112	void NetworkClientController::on_projectile_create (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	113	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	114	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	115	Vector velocity = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	116	float explosionRadius = pkt.read_float32();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	117	float radius = pkt.read_float32();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	118
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	119	Engine::log(INFO, "client.on_projectile_create") << this << ": pos=" << position << ", velocity=" << velocity;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	120
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	121	// create the NetworkClientPorjectile object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	122	new NetworkClientProjectile(client, obj_id, position, velocity, explosionRadius, radius);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	123	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	124
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	125	/*
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	126	* NetworkClientObject
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	127	*/
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	128	NetworkClientObject::NetworkClientObject (NetworkClient &client, NetworkObjectID obj_id) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	129	NetworkObject_Client(client.controller, obj_id), client(client)
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	130	{
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	131
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	132	}
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	133
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	134	/*
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	135	* NetworkClientPlayerBase
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	136	*/
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	137	NetworkClientPlayerBase::NetworkClientPlayerBase (NetworkClient &client, NetworkObjectID obj_id, Vector position) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	138	NetworkClientObject(client, obj_id), Player(client.state, position, true)
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	139	{
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	140	slots.connect(sig_message(NETMSG_PLAYER_POSITION), this, &NetworkClientPlayerBase::on_position );
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	141	slots.connect(sig_message(NETMSG_PLAYER_DIG), this, &NetworkClientPlayerBase::on_dig );
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	142	slots.connect(sig_message(NETMSG_PLAYER_WEAPON_CHANGE), this, &NetworkClientPlayerBase::on_weapon_change );
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	143	slots.connect(sig_message(NETMSG_PLAYER_ROPE_THROW), this, &NetworkClientPlayerBase::on_rope_throw );
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	144	slots.connect(sig_message(NETMSG_PLAYER_ROPE_FIXED), this, &NetworkClientPlayerBase::on_rope_fixed );
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	145	slots.connect(sig_message(NETMSG_PLAYER_ROPE_RELEASED), this, &NetworkClientPlayerBase::on_rope_released );
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	146	slots.connect(sig_message(NETMSG_PLAYER_ROPE_LENGTH), this, &NetworkClientPlayerBase::on_rope_length );
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	147	}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	148
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	149	void NetworkClientPlayerBase::on_position (NetworkPacketInput &pkt) {
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	150	Vector position = pkt.read_vector();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	151	Vector velocity = pkt.read_vector();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	152	int flags = pkt.read_uint8();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	153	float aim = pkt.read_float32();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	154
255 99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code terom parents: 241 diff changeset	155	// Engine::log(INFO, "client_player.on_position") << "obj=" << obj << ", position=" << position << ", velocity=" << velocity << ", aim=" << aim << ", [" << flags << "]";
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	156
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	157	// just update...
264 215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	158	updatePhysics(position, velocity,
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	159	flags & NETWORK_PHYSICS_INAIR,
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	160	flags & NETWORK_PHYSICS_FACE_RIGHT ? FACING_RIGHT : FACING_LEFT,
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	161	aim
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	162	);
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	163	}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	164
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	165	void NetworkClientPlayerBase::on_dig (NetworkPacketInput &pkt) {
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	166	Vector position = pkt.read_vector();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	167	float radius = pkt.read_float32();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	168
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	169	Engine::log(INFO, "client_player.on_dig") << this << ": position=" << position << ", radius=" << radius;
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	170
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	171	// just update...
209 68cc4248a508 sneak in some ugly ugly ugly Multiple Inheritance that hopefully nobody ever notices terom parents: 203 diff changeset	172	handleDig(position, radius);
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	173	}
239 550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	174
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	175	void NetworkClientPlayerBase::on_weapon_change (NetworkPacketInput &pkt) {
239 550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	176	uint8_t weapon_index = pkt.read_uint8();
550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	177
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	178	Engine::log(INFO, "client_player.on_weapon_change") << this << ": weapon_index=" << weapon_index;
239 550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	179
550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	180	handleChangeWeapon(weapon_index);
550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	181	}
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	182
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	183	void NetworkClientPlayerBase::on_rope_throw (NetworkPacketInput &pkt) {
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	184	Vector position = pkt.read_vector();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	185	Vector velocity = pkt.read_vector();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	186	float length = pkt.read_float32();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	187
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	188	Engine::log(INFO, "client_player.on_rope_throw") << this << ": position=" << position << ", velocity=" << velocity << ", length=" << length;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	189
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	190	rope.updateState(ROPE_FLYING, position, velocity, length);
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	191	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	192
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	193	void NetworkClientPlayerBase::on_rope_fixed (NetworkPacketInput &pkt) {
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	194	Vector position = pkt.read_vector();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	195	float length = pkt.read_float32();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	196
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	197	Engine::log(INFO, "client_player.on_rope_fixed") << this << ": position=" << position << ", length=" << length;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	198
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	199	rope.updateState(ROPE_FIXED, position, Vector(0, 0), length);
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	200	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	201
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	202	void NetworkClientPlayerBase::on_rope_released (NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	203	Engine::log(INFO, "client_player.on_rope_released") << this;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	204
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	205	// use rope.getPosition() instead of e.g. Vector(0, 0) because it will collide there...
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	206	rope.updateState(ROPE_FOLDED, rope.getPosition(), Vector(0, 0), 0);
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	207	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	208
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	209	void NetworkClientPlayerBase::on_rope_length (NetworkPacketInput &pkt) {
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	210	float length = pkt.read_float32();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	211
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	212	Engine::log(INFO, "client_player.on_rope_length") << this << ": length=" << length;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	213
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	214	rope.updateLength(length);
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	215	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	216
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	217	/*
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	218	* NetworkClientLocalPlayer
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	219	*/
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	220	NetworkClientLocalPlayer::NetworkClientLocalPlayer (NetworkClient &client, NetworkObjectID obj_id, Vector position) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	221	Player(client.state, position, true), NetworkClientPlayerBase(client, obj_id, position)
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	222	{
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	223	// set ourselves as the local player
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	224	state.setLocalPlayer(this);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	225	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	226
221 fbc5db6fce45 reorganize the weapons code and input handling code terom parents: 209 diff changeset	227	void NetworkClientLocalPlayer::handleInput (PlayerInput input) {
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	228	// always send move, in all cases
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	229	NetworkPacket pkt;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	230	pkt.write_uint16(input);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	231
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	232	send(NETMSG_CLIENT_INPUT, pkt, false);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	233
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	234	// do not handle locally
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	235	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	236
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	237	/*
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	238	* NetworkClientRemotePlayer
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	239	*/
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	240	NetworkClientRemotePlayer::NetworkClientRemotePlayer (NetworkClient &client, NetworkObjectID obj_id, Vector position) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	241	Player(client.state, position, true), NetworkClientPlayerBase(client, obj_id, position) {
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	242
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	243	// receive messages
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	244	slots.connect(sig_message(NETMSG_PLAYER_QUIT), this, &NetworkClientRemotePlayer::on_quit);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	245	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	246
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	247	void NetworkClientRemotePlayer::on_quit (NetworkPacketInput &pkt) {
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	248	// pkt is empty
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	249	(void) pkt;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	250
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	251	Engine::log(INFO, "client_player.on_quit") << this;
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	252
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	253	client.player_quit(this);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	254	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	255
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	256	NetworkClientProjectile::NetworkClientProjectile (NetworkClient &client, NetworkObjectID obj_id, Vector position,
263 8c999cf4c182 weapon projectile radiuses and fix network play (local_player == NULL, Rope releasing upon being hit terom parents: 255 diff changeset	257	Vector velocity, float explosionRadius, float radius) :
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	258	NetworkClientObject(client, obj_id), Projectile(client.state, position, velocity, explosionRadius, radius, 100 /* XXX */)
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	259	{
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	260	// hook up signals
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	261	slots.connect(sig_message(NETMSG_PROJECTILE_DESTROY), this, &NetworkClientProjectile::on_destroy);
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	262	}
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	263
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	264	void NetworkClientProjectile::onDestroy (Vector position, bool removeGround) {
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	265	// ignore :>
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	266	}
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	267
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	268	void NetworkClientProjectile::on_destroy (NetworkPacketInput &pkt) {
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	269	Vector position = pkt.read_vector();
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	270	uint8_t flags = pkt.read_uint8();
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	271
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	272	Engine::log(INFO, "client_projectile.on_destroy") << this << ": position=" << position << ", flags=" << flags;
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	273
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	274	// XXX: leak obj, not yet implemented: obj.destory();
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	275
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	276	// pass on to super
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	277	Projectile::onDestroy(position, flags & NETWORK_PROJECTILE_REMOVE_GROUND);
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	278	}
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	279

author	terom
	Mon, 08 Dec 2008 00:16:43 +0000
changeset 274	c35307e8645c
parent 264	215de3d4de60
child 276	87434abc1ba1
permissions	-rw-r--r--