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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.6 by root, Thu Apr 6 21:15:11 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 Crossfire::Client;	6	use Time::HiRes 'time';
6	use Crossfire::Protocol;	7	use Event;
7
8	package Crossfire::Client; # uh, yeah
9
10	use strict;
11		8
12	use SDL;	9	use SDL;
13	use SDL::App;	10	use SDL::App;
14	use SDL::Event;	11	use SDL::Event;
15	use SDL::Surface;	12	use SDL::Surface;
16	use SDL::OpenGL;	13	use SDL::OpenGL;
17	use SDL::OpenGL::Constants;
18		14
19	my $conn;	15	use Crossfire;
20	my $app;	16	use Crossfire::Protocol;
21		17
22	my $WIDTH = 640;	18	use CFClient;
23	my $HEIGHT = 480;	19	use CFClient::UI;
24		20
25	sub glinit {	21	our $VERSION = '0.1';
26	# 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	});
27		116
28	$app = new SDL::App	117	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");
29	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	118	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
30	-title => "Crossfire+ Client",	119	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
31	-width => $WIDTH,	120	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
32	-height => $HEIGHT,	121
33	-opengl => 1,	122	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
34	-red_size => 8,	123	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
35	-green_size => 8,
36	-blue_size => 8,
37	-double_buffer => 1,
38	-resizeable => 0;
39		124
40	glEnable GL_TEXTURE_2D;	125	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
41	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL;	126	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
42	glShadeModel GL_FLAT;	127
43	glDisable GL_DEPTH_TEST;	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
		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;
		238
44	glMatrixMode GL_PROJECTION;	239	glMatrixMode GL_PROJECTION;
45
46	glLoadIdentity;	240	glLoadIdentity;
47	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;	241	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		242	glMatrixMode GL_MODELVIEW;
		243	glLoadIdentity;
48		244
49	# 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;
50	}	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	});
51		271
52	sub refresh {	272	sub refresh {
53	glClearColor 0.5, 0.5, 0.7, 0;	273	$want_refresh++;
54	glClear GL_COLOR_BUFFER_BIT;
55
56	my $map = $conn->{map};
57
58	for my $x (0 .. $conn->{mapw} - 1) {
59	for my $y (0 .. $conn->{maph} - 1) {
60
61	my $cell = $map->[$x][$y]
62	or next;
63
64	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
65	my $tex = $conn->{face}[$num]{texture} \|\| 0;
66
67	glBindTexture GL_TEXTURE_2D, $tex;
68
69	glColor 1,0.2,0.7;
70	glBegin GL_QUADS;
71	glTexCoord 0, 0; glVertex $x, $y;
72	glTexCoord 0, 1; glVertex $x, $y + 0.9;
73	glTexCoord 1, 1; glVertex $x + 0.9, $y + 0.9;
74	glTexCoord 1, 0; glVertex $x + 0.9, $y;
75	glEnd;
76	}
77	}
78	}
79
80	SDL::GLSwapBuffers;
81	}	274	}
82		275
83	my $ev = new SDL::Event;	276	sub animation_start {
84	my %ev_cb;	277	my ($widget) = @_;
85		278	$animate_object{$widget} = $widget;
86	sub event(&$) {
87	$ev_cb{$_[0]->()} = $_[1];
88	}	279	}
89		280
90	sub does(&) { shift }	281	sub animation_stop {
91		282	my ($widget) = @_;
92	event {SDL_QUIT} does {	283	delete $animate_object{$widget};
93	exit;	284	}
94	};
95
96	event {SDL_VIDEORESIZE} does {
97	print "resize\n";
98	};
99
100	event {SDL_VIDEOEXPOSE} does {
101	refresh;
102	};
103
104	event {SDL_KEYDOWN} does {
105	print "keypress\n";
106	};
107
108	event {SDL_KEYUP} does {
109	print "keyup\n";#d#
110	};
111
112	event {SDL_MOUSEMOTION} does {
113	print "motion\n";
114	};
115
116	event {SDL_MOUSEBUTTONDOWN} does {
117	print "button\n";
118	};
119
120	event {SDL_MOUSEBUTTONUP} does {
121	print "buttup\n";
122	};
123
124	event {SDL_ACTIVEEVENT} does {
125	print "active\n";
126	};
127
128	package Crossfire::Client;
129		285
130	@conn::ISA = Crossfire::Protocol::;	286	@conn::ISA = Crossfire::Protocol::;
131		287
132	sub conn::map_update {	288	sub conn::map_update {
133	my ($self, $dirty) = @_;	289	my ($self, $dirty) = @_;
134		290
135	refresh;	291	$MAPWIDGET->update;
136	}	292	}
137		293
138	sub conn::map_scroll {	294	sub conn::map_scroll {
139	my ($self, $dx, $dy) = @_;	295	my ($self, $dx, $dy) = @_;
140		296
141	refresh;	297	# refresh;
142	}	298	}
143		299
144	sub conn::map_clear {	300	sub conn::map_clear {
145	my ($self) = @_;	301	my ($self) = @_;
146		302
147	refresh;	303	# refresh;
		304	}
		305
		306	sub conn::face_find {
		307	my ($self, $face) = @_;
		308
		309	$FACECACHE->{"$face->{chksum},$face->{name}"}
148	}	310	}
149		311
150	sub conn::face_update {	312	sub conn::face_update {
151	my ($self, $num, $face) = @_;	313	my ($self, $face) = @_;
152		314
153	warn "up face $self,$num,$face\n";#d#	315	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
154	#TODO
155	open my $fh, ">:raw", "/tmp/x~";
156	syswrite $fh, $face->{image};
157	close $fh;
158		316
159	my $surface = new SDL::Surface -name => "/tmp/x~";	317	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		318	}
160		319
161	unlink "/tmp/x~";	320	sub conn::query {
		321	my ($self, $flags, $prompt) = @_;
162		322
163	my ($tex) = @{glGenTextures 1};	323	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
164	glGetError();	324	}
165		325
166	$face->{texture} = $tex;	326	%SDL_CB = (
		327	SDL_QUIT() => sub {
		328	Event::unloop -1;
167		329	},
168	glBindTexture GL_TEXTURE_2D, $tex;	330	SDL_VIDEORESIZE() => sub {
169	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
170
171	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
172	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
173	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
174	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
175		331	},
176	$surface->rgba;	332	SDL_VIDEOEXPOSE() => sub {
177		333	refresh;
178	glTexImage2D GL_TEXTURE_2D, 0,	334	},
179	4, # components	335	SDL_KEYDOWN() => sub {
180	$surface->width, $surface->height,	336	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
181	0,	337	# alt-enter
182	GL_RGBA,	338	$FULLSCREEN = !$FULLSCREEN;
183	GL_UNSIGNED_BYTE,	339	destroy_screen;
184	$surface->pixels;	340	init_screen;
185	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	341	} else {
186	}	342	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
		343	}
		344	},
		345	SDL_KEYUP() => sub {
		346	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
		347	},
		348	SDL_MOUSEMOTION() => sub {
		349	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
		350	},
		351	SDL_MOUSEBUTTONDOWN() => sub {
		352	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
		353	},
		354	SDL_MOUSEBUTTONUP() => sub {
		355	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
		356	},
		357	SDL_ACTIVEEVENT() => sub {
		358	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
		359	},
		360	);
187		361
188	#############################################################################	362	#############################################################################
189		363
190	use Event;	364	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
191		365
192	glinit;	366	$CFG \|\|= {
193		367	width => 640,
194	$conn = new conn	368	height => 480,
		369	fullscreen => 0,
		370	sdl_mode => 0,
		371	mapsize => 100,
195	host => "cf.schmorp.de",	372	host => "crossfire.schmorp.de",
196	port => 13327;	373	port => 13327,
197
198	Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
199	while ($ev->poll) {
200	($ev_cb{$ev->type} \|\| sub { warn "unhandled event ", $ev->type })->();
201	}
202	});	374	};
		375
		376	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		377	and die "SDL::Init failed!\n";
		378
		379	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		380	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		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" } \|\| {};
203		392
204	Event::loop;	393	Event::loop;
205		394
		395	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
206		396

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.6 by root, Thu Apr 6 21:15:11 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.6 by root, Thu Apr 6 21:15:11 2006 UTC vs.
Revision 1.87 by root, Wed Apr 12 20:06:37 2006 UTC