Commit 329054c2 authored by Mark Frohnmayer's avatar Mark Frohnmayer
Browse files

tested with new threaded socket

parent 03c455ed

cocao_test_tnl2/tnl2_test_cocoa.xcodeproj/project.pbxproj

+0 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
		1D3822521153D0BE009D94C5 /* packet_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_stream.h; path = ../../torque_sockets/torque_sockets/packet_stream.h; sourceTree = SOURCE_ROOT; };

		1D3822531153D0BE009D94C5 /* pending_connection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pending_connection.h; path = ../../torque_sockets/torque_sockets/pending_connection.h; sourceTree = SOURCE_ROOT; };

		1D3822541153D0BE009D94C5 /* random_generator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = random_generator.h; path = ../../torque_sockets/torque_sockets/random_generator.h; sourceTree = SOURCE_ROOT; };

		1D3822551153D0BE009D94C5 /* scratch_pad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scratch_pad.h; path = ../../torque_sockets/torque_sockets/scratch_pad.h; sourceTree = SOURCE_ROOT; };

		1D3822561153D0BE009D94C5 /* sockets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sockets.h; path = ../../torque_sockets/torque_sockets/sockets.h; sourceTree = SOURCE_ROOT; };

		1D3822571153D0BE009D94C5 /* symmetric_cipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = symmetric_cipher.h; path = ../../torque_sockets/torque_sockets/symmetric_cipher.h; sourceTree = SOURCE_ROOT; };

		1D3822581153D0BE009D94C5 /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = time.h; path = ../../torque_sockets/torque_sockets/time.h; sourceTree = SOURCE_ROOT; };
@@ -223,7 +222,6 @@ 
				1D3822521153D0BE009D94C5 /* packet_stream.h */,

				1D3822531153D0BE009D94C5 /* pending_connection.h */,

				1D3822541153D0BE009D94C5 /* random_generator.h */,

				1D3822551153D0BE009D94C5 /* scratch_pad.h */,

				1D3822561153D0BE009D94C5 /* sockets.h */,

				1D3822571153D0BE009D94C5 /* symmetric_cipher.h */,

				1D3822581153D0BE009D94C5 /* time.h */,

test_tnl2/test_game.cpp

+4 −3
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ void click_game(int game_index, float x, float y) 


void tick_games()

{

	core::_log_index = 0;

	core::_log_prefix = "Game0";

	if(game[0])

		game[0]->tick();

	core::_log_index = 1;

	core::_log_prefix = "Game1";

	if(game[1])

		game[1]->tick();

}
@@ -96,7 +96,8 @@ extern "C" 
	}

	void tick_game(void *the_game, unsigned index)

	{

		core::_log_index = index;

		const char *prefixes[] = { "Game 1", "Game 2", "Game 3", };

		core::_log_prefix = index < 3 ? prefixes[index] : "";

		((tnl_test::test_game *) the_game)->tick();

	}

	void render_game_scene(void *the_game, unsigned width, unsigned height)

tnl2/event_connection.h

+0 −20
Original line number Diff line number Diff line
@@ -23,26 +23,6 @@ class event_connection : public net_connection 
public:

	typedef net_connection parent;

protected:

	class functor_creator

	{

	public:

		virtual functor *create() = 0;

		virtual ~functor_creator() {}

	};

	

	template<typename signature> class functor_creator_decl : public functor_creator

	{

		signature f;

	public:

		functor_creator_decl(signature sig)

		{

			f = sig;

		}

		functor *create()

		{

			return new functor_decl<signature>(f);

		}

	};

	struct rpc_record

	{

		uint32 method_hash;