kg: src/proto2/NetworkClient.cc@785d220fc6b7 (annotated)

21 32c6cc55256a change proto2 network code to use CL_NetSession terom parents: diff changeset	1
32c6cc55256a change proto2 network code to use CL_NetSession terom parents: diff changeset	2	#include "NetworkClient.hh"
23 8d802b573cf0 fixed more network code, there's actually a high probability of it working now terom parents: 22 diff changeset	3	#include "Engine.hh"
8d802b573cf0 fixed more network code, there's actually a high probability of it working now terom parents: 22 diff changeset	4	#include "Logger.hh"
21 32c6cc55256a change proto2 network code to use CL_NetSession terom parents: diff changeset	5
25 af75a1894a32 simple proto almost works terom parents: 24 diff changeset	6	#include <cassert>
af75a1894a32 simple proto almost works terom parents: 24 diff changeset	7
36 785d220fc6b7 ... terom parents: 35 diff changeset	8	NetworkClient::NetworkClient (GameState &state, const NetworkAddress &connect_to) :
785d220fc6b7 ... terom parents: 35 diff changeset	9	NetworkCore(state), netsession(NETWORK_MAGIC_ID), server(netsession.connect(connect_to)), netobjs(netsession, NETCHAN_CORE, server) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	10
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	11	// connect slots
36 785d220fc6b7 ... terom parents: 35 diff changeset	12	slots.connect(netobjs.sig_create(), this, &NetworkClient::on_create);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	13
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	14	// XXX: sig_disconnected
21 32c6cc55256a change proto2 network code to use CL_NetSession terom parents: diff changeset	15	}
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	16
36 785d220fc6b7 ... terom parents: 35 diff changeset	17	void NetworkClient::on_create (NetworkObject_Client *obj, NetworkMessageID msg_id, NetworkPacket &pkt) {
785d220fc6b7 ... terom parents: 35 diff changeset	18	switch (msg_id) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	19	case NETMSG_SERVER_HELLO:
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	20	on_server_hello(obj, pkt);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	21
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	22	break;
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	23
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	24	case NETMSG_PLAYER_INFO:
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	25	on_player_info(obj, pkt);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	26
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	27	break;
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	28
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	29	case NETMSG_PLAYER_JOIN:
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	30	on_player_join(obj, pkt);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	31
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	32	break;
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	33
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	34	default:
36 785d220fc6b7 ... terom parents: 35 diff changeset	35	Engine::log(WARN, "client.on_create_object") << "unknown msg_id=" << msg_id << " for obj=" << obj;
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	36	}
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	37	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	38
36 785d220fc6b7 ... terom parents: 35 diff changeset	39	void NetworkClient::on_server_hello (NetworkObject_Client *obj, NetworkPacket &pkt) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	40	// read the packet
36 785d220fc6b7 ... terom parents: 35 diff changeset	41	Vector position = pkt.read_vector();
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	42
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	43	Engine::log(INFO, "client.on_server_hello") << "obj=" << obj << ", pos=" << position;
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	44
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	45	// create the LocalPlayer object
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	46	NetworkClientLocalPlayer player = new NetworkClientLocalPlayer(this, obj, position);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	47
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	48	// inform state
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	49	state.newLocalPlayer(player);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	50	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	51
36 785d220fc6b7 ... terom parents: 35 diff changeset	52	void NetworkClient::on_player_info (NetworkObject_Client *obj, NetworkPacket &pkt) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	53	// read the packet
36 785d220fc6b7 ... terom parents: 35 diff changeset	54	Vector position = pkt.read_vector();
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	55
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	56	Engine::log(INFO, "client.on_player_info") << "obj=" << obj << ", pos=" << position;
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	57
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	58	// create the LocalPlayer object
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	59	NetworkClientRemotePlayer player = new NetworkClientRemotePlayer(this, obj, position);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	60
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	61	// inform state
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	62	state.newRemotePlayer(player);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	63
b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	64	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	65
36 785d220fc6b7 ... terom parents: 35 diff changeset	66	void NetworkClient::on_player_join (NetworkObject_Client *obj, NetworkPacket &pkt) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	67	// read the packet
36 785d220fc6b7 ... terom parents: 35 diff changeset	68	Vector position = pkt.read_vector();
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	69
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	70	Engine::log(INFO, "client.on_player_join") << "obj=" << obj << ", pos=" << position;
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	71
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	72	// create the RemotePlayer object
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	73	NetworkClientRemotePlayer player = new NetworkClientRemotePlayer(this, obj, position);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	74
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	75	// inform state
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	76	state.newRemotePlayer(player);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	77	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	78
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	79	void NetworkClient::player_quit (NetworkClientRemotePlayer *player) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	80	// inform state
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	81	state.removePlayer(player);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	82
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	83	// delete
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	84	// XXX: leak because deleting the slot while it's being called breaks ClanLib
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	85	// delete player;
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	86	}
b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	87
36 785d220fc6b7 ... terom parents: 35 diff changeset	88	NetworkClientLocalPlayer::NetworkClientLocalPlayer (NetworkClient &client, NetworkObject_Client *obj, Vector position) :
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	89	LocalPlayer(client.state, position, true), client(client), obj(obj) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	90
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	91	// receive messages
36 785d220fc6b7 ... terom parents: 35 diff changeset	92	slots.connect(obj->sig_message(NETMSG_PLAYER_POSITION), this, &NetworkClientLocalPlayer::on_position);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	93	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	94
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	95	void NetworkClientLocalPlayer::applyForce (Vector force, uint16_t dt) {
25 af75a1894a32 simple proto almost works terom parents: 24 diff changeset	96	// always send move, in all cases
36 785d220fc6b7 ... terom parents: 35 diff changeset	97	NetworkPacket pkt;
785d220fc6b7 ... terom parents: 35 diff changeset	98	pkt.write_vector(force);
785d220fc6b7 ... terom parents: 35 diff changeset	99	pkt.write_uint16(dt);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	100
36 785d220fc6b7 ... terom parents: 35 diff changeset	101	obj->send(NETMSG_CLIENT_MOVE, pkt, false);
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	102
e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	103	// do not handle locally
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	104	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	105
36 785d220fc6b7 ... terom parents: 35 diff changeset	106	void NetworkClientLocalPlayer::on_position (NetworkPacket &pkt) {
785d220fc6b7 ... terom parents: 35 diff changeset	107	Vector position = pkt.read_vector();
785d220fc6b7 ... terom parents: 35 diff changeset	108	Vector velocity = pkt.read_vector();
23 8d802b573cf0 fixed more network code, there's actually a high probability of it working now terom parents: 22 diff changeset	109
36 785d220fc6b7 ... terom parents: 35 diff changeset	110	Engine::log(INFO, "client_player.on_position") /* << "obj=" << obj */ << ", position=" << position << ", velocity=" << velocity;
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	111
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	112	// just update...
e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	113	updatePhysics(position, velocity);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	114	}
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	115
36 785d220fc6b7 ... terom parents: 35 diff changeset	116	NetworkClientRemotePlayer::NetworkClientRemotePlayer (NetworkClient &client, NetworkObject_Client *obj, Vector position) :
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	117	RemotePlayer(client.state, position, true), client(client), obj(obj) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	118
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	119	// receive messages
36 785d220fc6b7 ... terom parents: 35 diff changeset	120	slots.connect(obj->sig_message(NETMSG_PLAYER_POSITION), this, &NetworkClientRemotePlayer::on_position);
785d220fc6b7 ... terom parents: 35 diff changeset	121	slots.connect(obj->sig_message(NETMSG_PLAYER_QUIT), this, &NetworkClientRemotePlayer::on_quit);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	122	}
b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	123
36 785d220fc6b7 ... terom parents: 35 diff changeset	124	void NetworkClientRemotePlayer::on_position (NetworkPacket &pkt) {
785d220fc6b7 ... terom parents: 35 diff changeset	125	Vector position = pkt.read_vector();
785d220fc6b7 ... terom parents: 35 diff changeset	126	Vector velocity = pkt.read_vector();
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	127
36 785d220fc6b7 ... terom parents: 35 diff changeset	128	Engine::log(INFO, "client_player.on_position") /* << "obj=" << obj */ << ", position=" << position << ", velocity=" << velocity;
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	129
35 e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	130	// just update...
e21cfda0edde Merge from at r31:36 terom parents: 28 diff changeset	131	updatePhysics(position, velocity);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	132	}
b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	133
36 785d220fc6b7 ... terom parents: 35 diff changeset	134	void NetworkClientRemotePlayer::on_quit (NetworkPacket &pkt) {
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	135	// pkt is empty
b81cb670e6b2 the great :retab terom parents: 23 diff changeset	136	(void) pkt;
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	137
36 785d220fc6b7 ... terom parents: 35 diff changeset	138	Engine::log(INFO, "client_player.on_quit") /* << "obj=" << obj */;
23 8d802b573cf0 fixed more network code, there's actually a high probability of it working now terom parents: 22 diff changeset	139
24 b81cb670e6b2 the great :retab terom parents: 23 diff changeset	140	client.player_quit(this);
22 b70d30e1b0fe all the network code is now there, although it doesn't quite work terom parents: 21 diff changeset	141	}
36 785d220fc6b7 ... terom parents: 35 diff changeset	142

author	terom
	Thu, 20 Nov 2008 19:25:56 +0000
branch	no-netsession
changeset 36	785d220fc6b7
parent 35	e21cfda0edde
permissions	-rw-r--r--