[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.24 by root, Fri Apr 7 20:34:44 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2
3	use strict;	2	use strict;
4		3
5	use Glib;	4	use Glib;
6	use Gtk2 -init;	5	use Gtk2 -init;
7		6
14		13
15	use Crossfire;	14	use Crossfire;
16	use Crossfire::Client;	15	use Crossfire::Client;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use Client::Util;	18	use Crossfire::Client::Util;
		19	use Crossfire::Client::Widget;
		20
		21	our $FACECACHE;
20		22
21	our $VERSION = '0.1';	23	our $VERSION = '0.1';
22		24
23	our $CFG;	25	our $CFG;
24	our $CONN;	26	our $CONN;
		27
		28	our $GUIFONT;
25		29
26	our $SDL_TIMER;	30	our $SDL_TIMER;
27	our $SDL_APP;	31	our $SDL_APP;
28	our $SDL_EV = new SDL::Event;	32	our $SDL_EV = new SDL::Event;
29	our %SDL_CB;	33	our %SDL_CB;
30		34
		35	our @GL_INIT; # hooks called on every gl init
		36
31	sub init_screen {	37	sub init_screen {
32	# nuke all gl context data
33
34	$SDL_APP = new SDL::App	38	$SDL_APP = new SDL::App
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	39	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
36	-title => "Crossfire+ Client",	40	-title => "Crossfire+ Client",
37	-width => $CFG->{width},	41	-width => $CFG->{width},
38	-height => $CFG->{height},	42	-height => $CFG->{height},
…		…
42	-blue_size => 8,	46	-blue_size => 8,
43	-double_buffer => 1,	47	-double_buffer => 1,
44	-fullscreen => $CFG->{fullscreen},	48	-fullscreen => $CFG->{fullscreen},
45	-resizeable => 0;	49	-resizeable => 0;
46		50
		51	glClearColor 0, 0, 0, 0;
		52
47	glEnable GL_TEXTURE_2D;	53	glEnable GL_TEXTURE_2D;
48	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	54	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
49	glShadeModel GL_FLAT;	55	glShadeModel GL_FLAT;
50	glDisable GL_DEPTH_TEST;	56	glDisable GL_DEPTH_TEST;
51	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	57	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
52	glEnable GL_BLEND;	58	glEnable GL_BLEND;
53		59
54	glMatrixMode GL_PROJECTION;	60	glMatrixMode GL_PROJECTION;
55	glLoadIdentity;	61	glLoadIdentity;
56	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	62	glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;
57		63
58	# re-bind all textures	64	glMatrixMode GL_MODELVIEW;
		65
		66	$_->() for @GL_INIT;
59	}	67	}
		68
		69	my $label;#d#
60		70
61	sub start_game {	71	sub start_game {
62	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	72	$SDL_TIMER = add Glib::Timeout 1000/20, sub {
63	while ($SDL_EV->poll) {	73	while ($SDL_EV->poll) {
64	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	74	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();
…		…
67	1	77	1
68	};	78	};
69		79
70	init_screen;	80	init_screen;
71		81
		82	# $label = new Crossfire::Client::Widget::Label "Testü[]";
		83	# $label->activate;
		84
72	$CONN = new conn	85	$CONN = new conn
73	host => $CFG->{host},	86	host => $CFG->{host},
74	port => $CFG->{port};	87	port => $CFG->{port};
75	}	88	}
76		89
…		…
80	undef $SDL_APP;	93	undef $SDL_APP;
81	SDL::Quit;	94	SDL::Quit;
82	}	95	}
83		96
84	sub refresh {	97	sub refresh {
85	glClearColor 0, 0, 0, 0;
86	glClear GL_COLOR_BUFFER_BIT;	98	glClear GL_COLOR_BUFFER_BIT;
87		99
88	my $map = $CONN->{map};	100	$_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;
89
90	for my $x (0 .. $CONN->{mapw} - 1) {
91	for my $y (0 .. $CONN->{maph} - 1) {
92
93	my $cell = $map->[$x][$y]
94	or next;
95
96	my $darkness = $cell->[3] * (1 / 255);
97	glColor $darkness, $darkness, $darkness;
98
99	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
100	my $tex = $CONN->{face}[$num]{texture} \|\| 0;
101
102	glBindTexture GL_TEXTURE_2D, $tex;
103
104	glBegin GL_QUADS;
105	glTexCoord 0, 0; glVertex $x, $y;
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		101
114	SDL::GLSwapBuffers;	102	SDL::GLSwapBuffers;
115	}	103	}
116		104
117	%SDL_CB = (	105	%SDL_CB = (
118	SDL_QUIT() => sub {	106	SDL_QUIT() => sub {
119	warn "sdl quit\n";#d#	107	main_quit Gtk2;
120	exit;
121	},	108	},
122	SDL_VIDEORESIZE() => sub {	109	SDL_VIDEORESIZE() => sub {
123	},	110	},
124	SDL_VIDEOEXPOSE() => sub {	111	SDL_VIDEOEXPOSE() => sub {
125	refresh;	112	refresh;
126	},	113	},
127	SDL_KEYDOWN() => sub {	114	SDL_KEYDOWN() => sub {
		115	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		116	# alt-enter
		117	$CFG->{fullscreen} = !$CFG->{fullscreen};
		118	init_screen;
		119	} else {
		120	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
		121	}
128	},	122	},
129	SDL_KEYUP() => sub {	123	SDL_KEYUP() => sub {
		124	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
130	},	125	},
131	SDL_MOUSEMOTION() => sub {	126	SDL_MOUSEMOTION() => sub {
132	warn "sdl motion\n";#d#	127	warn "sdl motion\n";#d#
133	},	128	},
134	SDL_MOUSEBUTTONDOWN() => sub {	129	SDL_MOUSEBUTTONDOWN() => sub {
		130	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
135	},	131	},
136	SDL_MOUSEBUTTONUP() => sub {	132	SDL_MOUSEBUTTONUP() => sub {
		133	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
137	},	134	},
138	SDL_ACTIVEEVENT() => sub {	135	SDL_ACTIVEEVENT() => sub {
139	warn "active\n";#d#	136	warn "active\n";#d#
140	},	137	},
141	);	138	);
…		…
158	my ($self) = @_;	155	my ($self) = @_;
159		156
160	refresh;	157	refresh;
161	}	158	}
162		159
		160	sub conn::face_find {
		161	my ($self, $face) = @_;
		162
		163	$FACECACHE->{"$face->{chksum},$face->{name}"}
		164	}
		165
163	sub conn::face_update {	166	sub conn::face_update {
164	my ($self, $num, $face) = @_;	167	my ($self, $face) = @_;
165		168
166	my $pb = new Gtk2::Gdk::PixbufLoader;	169	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
167	$pb->write ($face->{image});
168	$pb->close;
169		170
170	$pb = $pb->get_pixbuf;	171	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
171	$pb = $pb->add_alpha (0, 0, 0, 0);	172	}
172		173
173	glGetError();	174	sub gtk_add_cfg_field {
174	my ($tex) = @{glGenTextures 1};	175	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		176	my $i = $cfg->{_i}++;
		177	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		178	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		179	if ($key eq 'password') {
		180	$ent->set_invisible_char ("*");
		181	$ent->set (visibility => 0)
		182	}
		183	$ent->set_text ($value);
		184	$ent->signal_connect (changed => sub {
		185	my ($ent) = @_;
		186	$cfg->{$key} = $ent->get_text;
		187	});
		188	}
175		189
176	$face->{texture} = $tex;	190	sub run_config_dialog {
		191	my (%events) = @_;
		192
		193	my $w = Gtk2::Window->new;
		194
		195	my @cfg = (
		196	[qw/Host host/],
		197	[qw/Port port/],
		198	[qw/Username user/],
		199	[qw/Password password/],
177		200	);
178	glBindTexture GL_TEXTURE_2D, $tex;	201
179	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;	202	my $cfg = {};
		203
		204	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		205	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		206
		207	$w->add (my $vb = Gtk2::VBox->new);
		208	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		209	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		210	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		211	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		212	my $i = 0;
		213	my $act = 0;
		214	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		215	if ($_ eq $selmode) { $act = $i }
		216	$cb->append_text ($_);
		217	$i++;
		218	}
		219	$cb->set_active ($act);
		220	$cb->signal_connect (changed => sub {
		221	my ($cb) = @_;
		222	my $txt = $cb->get_active_text;
		223	if ($txt =~ m/(\d+)x(\d+)/) {
		224	$::CFG->{width} = $1;
		225	$::CFG->{height} = $2;
180		226	}
181	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	227	});
182	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;	228
183	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	229	$cfg->{_i} = 1;
184	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	230	for (@cfg) {
185		231	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
186	glTexImage2D GL_TEXTURE_2D, 0,	232	}
187	GL_RGBA8,	233
188	$pb->get_width, $pb->get_height,	234	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		235	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		236	$cb->signal_connect (clicked => sub {
		237	for (keys %$cfg) {
		238	$::CFG->{$_} = $cfg->{$_}
		239	if $_ ne '_i';
189	0,	240	}
		241	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		242	});
		243	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		244	$cb->signal_connect (clicked => sub {
		245	for (keys %$cfg) {
		246	$::CFG->{$_} = $cfg->{$_}
		247	if $_ ne '_i';
190	GL_RGBA,	248	}
191	GL_UNSIGNED_BYTE,	249	my $cb = $events{login} \|\| sub {};
192	$pb->get_pixels;	250	$cb->($::CFG->{user}, $::CFG->{password});
193	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	251	});
		252	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		253	$cb->signal_connect (clicked => sub {
		254	my $cb = $events{login} \|\| sub {};
		255	$cb->();
		256	});
		257	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		258	$cb->signal_connect (clicked => sub { $w->destroy });
		259
		260	$w->show_all;
		261
		262	$w->signal_connect (destroy => sub { Gtk2->main_quit });
194	}	263	}
		264
195		265
196	#############################################################################	266	#############################################################################
197		267
		268	SDL::Init SDL_INIT_EVERYTHING;
		269
		270	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
		271
		272	$mapwidget->activate;
		273	$mapwidget->focus_in;
		274
198	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	275	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
199		276
200	$CFG \|\|= {	277	$CFG \|\|= {
201	width => 640,	278	width => 640,
202	height => 480,	279	height => 480,
203	fullscreen => 0,	280	fullscreen => 0,
204	host => "crossfire.schmorp.de",	281	host => "crossfire.schmorp.de",
205	port => 13327,	282	port => 13327,
206	};	283	};
207		284
208	Client::Util::run_config_dialog	285	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
209	login => sub { print "Login $_[0] with $_[1]\n" },	286
210	logout => sub { print "Logout" };	287	SDL::TTFInit;
		288
		289	$GUIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", 12
		290	or die "TTFOpenFont: $!";
		291
		292	run_config_dialog
		293	login => sub { start_game },
		294	logout => sub { stop_game };
211		295
212	main Gtk2;	296	main Gtk2;
213		297
		298	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

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.24 by root, Fri Apr 7 20:34:44 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.24 by root, Fri Apr 7 20:34:44 2006 UTC