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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.11 by elmex, Fri Apr 7 16:08:01 2006 UTC vs. Revision 1.91 by root, Wed Apr 12 23:15:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.11 by elmex, Fri Apr 7 16:08:01 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 2006 UTC