[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs.
Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use Glib;	6	use Time::HiRes 'time';
6	use Gtk2 -init;	7	use Event;
7		8
8	use SDL;	9	use SDL;
9	use SDL::App;	10	use SDL::App;
10	use SDL::Event;	11	use SDL::Event;
11	use SDL::Surface;	12	use SDL::Surface;
12	use SDL::OpenGL;	13	use SDL::OpenGL;
13	use SDL::OpenGL::Constants;
14		14
15	use Crossfire;	15	use Crossfire;
16	use Crossfire::Client;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
		18	use CFClient;
19	use Client::Util;	19	use CFClient::UI;
20		20
21	our $VERSION = '0.1';	21	our $VERSION = '0.1';
		22
		23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused
		25
		26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
22		30
23	our $CFG;	31	our $CFG;
24	our $CONN;	32	our $CONN;
		33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
25		34
		35	our @SDL_MODES;
		36	our $WIDTH;
		37	our $HEIGHT;
		38	our $FULLSCREEN;
		39
		40	our $MAPWIDGET;
		41	our $FONTSIZE;
		42
26	our $SDL_TIMER;	43	our $SDL_ACTIVE;
27	our $SDL_APP;	44	our $SDL_EV;
28	our $SDL_EV = new SDL::Event;
29	our %SDL_CB;	45	our %SDL_CB;
30		46
		47	our $ALT_ENTER_MESSAGE;
		48	our $STATUS_LINE;
		49	our $DEBUG_STATUS;
		50
		51	sub status {
		52	$STATUS_LINE->set_text ($_[0]);
		53	my ($w, $h) = $STATUS_LINE->size_request;
		54	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		55	}
		56
		57	sub debug {
		58	$DEBUG_STATUS->set_text ($_[0]);
		59	my ($w, $h) = $DEBUG_STATUS->size_request;
		60	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		61	}
		62
		63	sub start_game {
		64	status "logging in...";
		65
		66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		67
		68	$CONN = new conn
		69	host => $CFG->{host},
		70	port => $CFG->{port},
		71	user => $CFG->{user},
		72	pass => $CFG->{password},
		73	mapw => $mapsize,
		74	maph => $mapsize,
		75	;
		76
		77	status "login successful";
		78
		79	CFClient::lowdelay fileno $CONN->{fh};
		80	}
		81
		82	sub stop_game {
		83	undef $CONN;
		84	}
		85
		86	sub config_dialog {
		87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		88	child => (my $vbox = new CFClient::UI::VBox);
		89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		90	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		91
		92	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		93	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		94
		95	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		96	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		97
		98	$mode_slider->connect (changed => sub {
		99	my ($self, $value) = @_;
		100
		101	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		102	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		103	});
		104	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		105
		106	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		108	my ($self, $value) = @_;
		109	$CFG->{fullscreen} = $value;
		110	});
		111
		112	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		113	destroy_screen ();
		114	init_screen ();
		115	});
		116
		117	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");
		118	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		119	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		120	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		121
		122	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		123	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		124
		125	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		126	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		127
		128	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		129	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		130
		131	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		132	$table->add (1, 6, new CFClient::UI::Slider
		133	req_w => 100,
		134	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		135	connect_changed => sub {
		136	my ($self, $value) = @_;
		137
		138	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		139	},
		140	);
		141
		142	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		143	start_game;
		144	});
		145
		146	$vbox->add (my $hbox = new CFClient::UI::HBox);
		147
		148	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		149	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		150	status "Configuration Saved";
		151	});
		152	$CFClient::UI::TOPLEVEL->add ($dialog);
		153	}
		154
31	sub init_screen {	155	sub init_screen {
32	# nuke all gl context data	156	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		157	$FULLSCREEN = $CFG->{fullscreen};
		158
		159	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		160	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		161	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		162	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		163
		164	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		165	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		166	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		167	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		168
		169	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		170	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		171	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		172
		173	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		174	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		175	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		176	or die "SDL::SetVideoMode failed!\n";
		177
		178	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		179
		180	$SDL_EV = new SDL::Event;
		181	$SDL_EV->set_unicode (1);
		182
		183	$SDL_ACTIVE = 1;
		184
		185	$LAST_REFRESH = time - 0.01;
		186
		187	CFClient::gl_init;
		188
		189	$FONTSIZE = int $HEIGHT / 40;
		190
		191	#############################################################################
		192
		193	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		194	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
33		195
34	$SDL_APP = new SDL::App	196	$STATUS_LINE = new CFClient::UI::Label
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	197	padding => 0,
36	-title => "Crossfire+ Client",	198	y => $HEIGHT * 49 / 50 - $FONTSIZE;
37	-width => $CFG->{width},	199	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
38	-height => $CFG->{height},
39	-opengl => 1,
40	-red_size => 8,
41	-green_size => 8,
42	-blue_size => 8,
43	-double_buffer => 1,
44	-fullscreen => $CFG->{fullscreen},
45	-resizeable => 0;
46		200
47	glEnable GL_TEXTURE_2D;	201	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
48	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	202	padding => 0,
49	glShadeModel GL_FLAT;	203	y => $HEIGHT * 49 / 50,
50	glDisable GL_DEPTH_TEST;	204	height => $HEIGHT / 50,
51	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	205	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
52	glEnable GL_BLEND;	206	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		207
		208	$MAPWIDGET = new CFClient::UI::MapWidget;
		209	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		210	$MAPWIDGET->focus_in;
		211
		212	config_dialog;
		213	}
		214
		215	sub destroy_screen {
		216	$CFClient::UI::TOPLEVEL->{children} = [];
		217	undef $SDL_ACTIVE;
		218	undef $SDL_EV;
		219	SDL::Quit;
		220	}
		221
		222	my %animate_object;
		223	my $animate_timer;
		224
		225	my $want_refresh;
		226	my $can_refresh;
		227
		228	my $fps = 9;
		229
		230	sub force_refresh {
		231	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		232	debug sprintf "%3.2f", $fps;
		233
		234	$want_refresh = 0;
		235	$can_refresh = 0;
		236
		237	glViewport 0, 0, $WIDTH, $HEIGHT;
53		238
54	glMatrixMode GL_PROJECTION;	239	glMatrixMode GL_PROJECTION;
55	glLoadIdentity;	240	glLoadIdentity;
56	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	241	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		242	glMatrixMode GL_MODELVIEW;
		243	glLoadIdentity;
57		244
58	# re-bind all textures	245	glClear GL_COLOR_BUFFER_BIT;
59	}
60		246
61	sub start_game {	247	$CFClient::UI::TOPLEVEL->draw;
62	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	248
63	while ($SDL_EV->poll) {	249	SDL::GLSwapBuffers;
		250
		251	$LAST_REFRESH = $NOW;
		252	}
		253
		254	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		255	$NOW = time;
		256
64	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	257	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
65	}	258	while $SDL_EV->poll;
66		259
67	1	260	if (%animate_object) {
		261	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		262	$want_refresh++;
68	};	263	}
69		264
70	init_screen;	265	if ($want_refresh) {
71		266	force_refresh;
72	$CONN = new conn	267	} else {
73	host => $CFG->{host},	268	$can_refresh = 1;
74	port => $CFG->{port};	269	}
75	}	270	});
76
77	sub stop_game {
78	remove Glib::Source $SDL_TIMER;
79
80	undef $SDL_APP;
81	SDL::Quit;
82	}
83		271
84	sub refresh {	272	sub refresh {
85	glClearColor 0, 0, 0, 0;	273	$want_refresh++;
86	glClear GL_COLOR_BUFFER_BIT;	274	}
87		275
88	my $map = $CONN->{map};	276	sub animation_start {
		277	my ($widget) = @_;
		278	$animate_object{$widget} = $widget;
		279	}
89		280
90	for my $x (0 .. $CONN->{mapw} - 1) {	281	sub animation_stop {
91	for my $y (0 .. $CONN->{maph} - 1) {	282	my ($widget) = @_;
		283	delete $animate_object{$widget};
		284	}
92		285
93	my $cell = $map->[$x][$y]	286	@conn::ISA = Crossfire::Protocol::;
94	or next;
95		287
96	my $darkness = $cell->[3] * (1 / 255);	288	sub conn::map_update {
97	glColor $darkness, $darkness, $darkness;	289	my ($self, $dirty) = @_;
98		290
99	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	291	$MAPWIDGET->update;
100	my $tex = $CONN->{face}[$num]{texture} \|\| 0;	292	}
101
102	glBindTexture GL_TEXTURE_2D, $tex;
103		293
104	glBegin GL_QUADS;	294	sub conn::map_scroll {
105	glTexCoord 0, 0; glVertex $x, $y;	295	my ($self, $dx, $dy) = @_;
106	glTexCoord 0, 1; glVertex $x, $y + 1;
107	glTexCoord 1, 1; glVertex $x + 1, $y + 1;
108	glTexCoord 1, 0; glVertex $x + 1, $y;
109	glEnd;
110	}
111	}
112	}
113		296
114	SDL::GLSwapBuffers;	297	# refresh;
		298	}
		299
		300	sub conn::map_clear {
		301	my ($self) = @_;
		302
		303	# refresh;
		304	}
		305
		306	sub conn::face_find {
		307	my ($self, $face) = @_;
		308
		309	$FACECACHE->{"$face->{chksum},$face->{name}"}
		310	}
		311
		312	sub conn::face_update {
		313	my ($self, $face) = @_;
		314
		315	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		316
		317	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		318	}
		319
		320	sub conn::query {
		321	my ($self, $flags, $prompt) = @_;
		322
		323	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
115	}	324	}
116		325
117	%SDL_CB = (	326	%SDL_CB = (
118	SDL_QUIT() => sub {	327	SDL_QUIT() => sub {
119	warn "sdl quit\n";#d#	328	Event::unloop -1;
120	exit;
121	},	329	},
122	SDL_VIDEORESIZE() => sub {	330	SDL_VIDEORESIZE() => sub {
123	},	331	},
124	SDL_VIDEOEXPOSE() => sub {	332	SDL_VIDEOEXPOSE() => sub {
125	refresh;	333	refresh;
126	},	334	},
127	SDL_KEYDOWN() => sub {	335	SDL_KEYDOWN() => sub {
		336	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		337	# alt-enter
		338	$FULLSCREEN = !$FULLSCREEN;
		339	destroy_screen;
		340	init_screen;
		341	} else {
		342	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
		343	}
128	},	344	},
129	SDL_KEYUP() => sub {	345	SDL_KEYUP() => sub {
		346	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
130	},	347	},
131	SDL_MOUSEMOTION() => sub {	348	SDL_MOUSEMOTION() => sub {
132	warn "sdl motion\n";#d#	349	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
133	},	350	},
134	SDL_MOUSEBUTTONDOWN() => sub {	351	SDL_MOUSEBUTTONDOWN() => sub {
		352	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
135	},	353	},
136	SDL_MOUSEBUTTONUP() => sub {	354	SDL_MOUSEBUTTONUP() => sub {
		355	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
137	},	356	},
138	SDL_ACTIVEEVENT() => sub {	357	SDL_ACTIVEEVENT() => sub {
139	warn "active\n";#d#	358	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
140	},	359	},
141	);	360	);
142		361
143	@conn::ISA = Crossfire::Protocol::;
144
145	sub conn::map_update {
146	my ($self, $dirty) = @_;
147
148	refresh;
149	}
150
151	sub conn::map_scroll {
152	my ($self, $dx, $dy) = @_;
153
154	refresh;
155	}
156
157	sub conn::map_clear {
158	my ($self) = @_;
159
160	refresh;
161	}
162
163	sub conn::face_update {
164	my ($self, $num, $face) = @_;
165
166	my $pb = new Gtk2::Gdk::PixbufLoader;
167	$pb->write ($face->{image});
168	$pb->close;
169
170	$pb = $pb->get_pixbuf;
171	$pb = $pb->add_alpha (0, 0, 0, 0);
172
173	glGetError();
174	my ($tex) = @{glGenTextures 1};
175
176	$face->{texture} = $tex;
177
178	glBindTexture GL_TEXTURE_2D, $tex;
179	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
180
181	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
182	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
183	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
184	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
185
186	glTexImage2D GL_TEXTURE_2D, 0,
187	GL_RGBA8,
188	$pb->get_width, $pb->get_height,
189	0,
190	GL_RGBA,
191	GL_UNSIGNED_BYTE,
192	$pb->get_pixels;
193	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
194	}
195
196	#############################################################################	362	#############################################################################
197		363
198	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	364	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
199		365
200	$CFG \|\|= {	366	$CFG \|\|= {
201	width => 640,	367	width => 640,
202	height => 480,	368	height => 480,
203	fullscreen => 0,	369	fullscreen => 0,
		370	sdl_mode => 0,
		371	mapsize => 100,
204	host => "crossfire.schmorp.de",	372	host => "crossfire.schmorp.de",
205	port => 13327,	373	port => 13327,
206	};	374	};
207		375
208	Client::Util::run_config_dialog	376	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
209	login => sub { print "Login $_[0] with $_[1]\n" },	377	and die "SDL::Init failed!\n";
210	logout => sub { print "Logout" };
211		378
212	main Gtk2;	379	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		380	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
213		381
		382	init_screen;
		383
		384	{
		385	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		386
		387	CFClient::add_font $_ for @fonts;
		388	CFClient::set_font $fonts[0];
		389	}
		390
		391	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		392
		393	Event::loop;
		394
		395	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		396

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs. Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.14 by elmex, Fri Apr 7 16:36:44 2006 UTC vs.
Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC