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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.88 by root, Wed Apr 12 21:01:47 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
		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 (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		113	destroy_screen ();
		114	init_screen ();
		115	});
33		116
34	$app = new SDL::App	117	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	118	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
36	-title => "Crossfire+ Client",	119	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
37	-width => $WIDTH,	120	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
38	-height => $HEIGHT,	121
39	-opengl => 1,	122	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
40	-red_size => 8,	123	$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		124
46	glEnable GL_TEXTURE_2D;	125	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
47	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	126	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
48	glShadeModel GL_FLAT;	127
49	glDisable GL_DEPTH_TEST;	128	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
50	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	129	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
51	glEnable GL_BLEND;	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
		155	sub init_screen {
		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);
		195
		196	$STATUS_LINE = new CFClient::UI::Label
		197	padding => 0,
		198	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		199	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		200
		201	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		202	padding => 0,
		203	y => $HEIGHT * 49 / 50,
		204	height => $HEIGHT / 50,
		205	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		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;
52		238
53	glMatrixMode GL_PROJECTION;	239	glMatrixMode GL_PROJECTION;
54	glLoadIdentity;	240	glLoadIdentity;
55	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;	241	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		242	glMatrixMode GL_MODELVIEW;
		243	glLoadIdentity;
56		244
57	# re-bind all textures	245	glClear GL_COLOR_BUFFER_BIT;
		246
		247	$CFClient::UI::TOPLEVEL->draw;
		248
		249	SDL::GLSwapBuffers;
		250
		251	$LAST_REFRESH = $NOW;
58	}	252	}
		253
		254	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		255	$NOW = time;
		256
		257	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		258	while $SDL_EV->poll;
		259
		260	if (%animate_object) {
		261	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		262	$want_refresh++;
		263	}
		264
		265	if ($want_refresh) {
		266	force_refresh;
		267	} else {
		268	$can_refresh = 1;
		269	}
		270	});
59		271
60	sub refresh {	272	sub refresh {
61	glClearColor 0, 0, 0, 0;	273	$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	}	274	}
93		275
94	my $ev = new SDL::Event;	276	sub animation_start {
95	my %ev_cb;	277	my ($widget) = @_;
96		278	$animate_object{$widget} = $widget;
97	sub event(&$) {
98	$ev_cb{$_[0]->()} = $_[1];
99	}	279	}
100		280
101	sub does(&) { shift }	281	sub animation_stop {
102		282	my ($widget) = @_;
103	event {SDL_QUIT} does {	283	delete $animate_object{$widget};
104	exit;	284	}
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		285
141	@conn::ISA = Crossfire::Protocol::;	286	@conn::ISA = Crossfire::Protocol::;
		287
		288	sub conn::send {
		289	my ($self, $command) = @_;
		290
		291	$self->Crossfire::Protocol::send ($command);
		292	status $command;
		293	}
142		294
143	sub conn::map_update {	295	sub conn::map_update {
144	my ($self, $dirty) = @_;	296	my ($self, $dirty) = @_;
145		297
146	refresh;	298	$MAPWIDGET->update;
147	}	299	}
148		300
149	sub conn::map_scroll {	301	sub conn::map_scroll {
150	my ($self, $dx, $dy) = @_;	302	my ($self, $dx, $dy) = @_;
151		303
152	refresh;	304	# refresh;
153	}	305	}
154		306
155	sub conn::map_clear {	307	sub conn::map_clear {
156	my ($self) = @_;	308	my ($self) = @_;
157		309
158	refresh;	310	# refresh;
		311	}
		312
		313	sub conn::face_find {
		314	my ($self, $face) = @_;
		315
		316	$FACECACHE->{"$face->{chksum},$face->{name}"}
159	}	317	}
160		318
161	sub conn::face_update {	319	sub conn::face_update {
162	my ($self, $num, $face) = @_;	320	my ($self, $face) = @_;
163		321
164	warn "up face $self,$num,$face\n";#d#	322	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
165	use Gtk2;
166		323
167	my $pb = new Gtk2::Gdk::PixbufLoader;	324	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
168	$pb->write ($face->{image});	325	}
169	$pb->close;
170		326
171	$pb = $pb->get_pixbuf;	327	sub conn::query {
172	$pb = $pb->add_alpha (0, 0, 0, 0);	328	my ($self, $flags, $prompt) = @_;
173		329
174	glGetError();	330	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
175	my ($tex) = @{glGenTextures 1};	331	}
176		332
177	$face->{texture} = $tex;	333	%SDL_CB = (
		334	SDL_QUIT() => sub {
		335	Event::unloop -1;
178		336	},
179	glBindTexture GL_TEXTURE_2D, $tex;	337	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		338	},
187	glTexImage2D GL_TEXTURE_2D, 0,	339	SDL_VIDEOEXPOSE() => sub {
188	GL_RGBA8,	340	refresh;
189	$pb->get_width, $pb->get_height,	341	},
190	0,	342	SDL_KEYDOWN() => sub {
191	GL_RGBA,	343	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
192	GL_UNSIGNED_BYTE,	344	# alt-enter
193	$pb->get_pixels;	345	$FULLSCREEN = !$FULLSCREEN;
194	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	346	destroy_screen;
195	}	347	init_screen;
		348	} else {
		349	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
		350	}
		351	},
		352	SDL_KEYUP() => sub {
		353	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
		354	},
		355	SDL_MOUSEMOTION() => sub {
		356	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
		357	},
		358	SDL_MOUSEBUTTONDOWN() => sub {
		359	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
		360	},
		361	SDL_MOUSEBUTTONUP() => sub {
		362	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
		363	},
		364	SDL_ACTIVEEVENT() => sub {
		365	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
		366	},
		367	);
196		368
197	#############################################################################	369	#############################################################################
198		370
199	use Event;
200
201	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	371	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
202		372
203		373	$CFG \|\|= {
204	if ($ARGV[0] eq 'config') {	374	width => 640,
205	Client::Util::run_config_dialog;	375	height => 480,
206	}	376	fullscreen => 0,
207		377	sdl_mode => 0,
208	glinit;	378	mapsize => 100,
209
210	$conn = new conn
211	host => "cf.schmorp.de",	379	host => "crossfire.schmorp.de",
212	port => 13327;	380	port => 13327,
213
214	Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
215	while ($ev->poll) {
216	($ev_cb{$ev->type} \|\| sub { warn "unhandled event ", $ev->type })->();
217	}
218	});	381	};
		382
		383	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		384	and die "SDL::Init failed!\n";
		385
		386	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		387	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		388
		389	init_screen;
		390
		391	{
		392	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		393
		394	CFClient::add_font $_ for @fonts;
		395	CFClient::set_font $fonts[0];
		396	}
		397
		398	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
219		399
220	Event::loop;	400	Event::loop;
221		401
		402	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		403

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs. Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC