[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.57 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC

…		…
1	package CFClient::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
		8	use DC;
8	use CFClient::OpenGL;	9	use DC::OpenGL;
		10	use DC::UI;
		11	use DC::Macro;
9		12
10	our @ISA = CFClient::UI::Base::;	13	our @ISA = DC::UI::Base::;
		14
		15	my $magicmap_tex =
		16	new_from_file DC::Texture DC::find_rcfile "magicmap.png",
		17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11		18
12	sub new {	19	sub new {
13	my $class = shift;	20	my $class = shift;
14		21
15	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
16	z => -1,	23	z => -1,
17	can_focus => 1,	24	can_focus => 1,
18	list => glGenList,	25	tilesize => 32,
19
20	smooth_matrix => [
21	0.05, 0.13, 0.05,
22	0.13, 0.30, 0.13,
23	0.05, 0.13, 0.05,
24	],
25
26	@_	26	@_
27	);	27	);
28		28
29	$self->{completer} = new CFClient::MapWidget::Command::
30	command => $self->{command},
31	can_focus => 1,
32	tooltip => "<b>The Command Completer</b>\n\n"
33	. "This is your central interface to send text commands to the server. "
34	. "To enter a verbatim command to send to the server, just type the command, "
35	. "followed by a space, and press return. "
36	. "Typing the initial letters of words (or just any letters) displays guesses "
37	. "for commands you might want to use.\n"
38	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40	;
41
42	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
43	}	36	}
44		37
45	sub add_command {	38	sub add_command {
46	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
47		40
49		42
50	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
51	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
52	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
53		46
54	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
55	}	48	}
56		49
57	sub clr_commands {	50	sub clr_commands {
58	my ($self) = @_;	51	my ($self) = @_;
59		52
60	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
61	}
62		54
		55	$::COMPLETER->hide
		56	if $::COMPLETER;
		57	}
		58
		59	sub server_login {
		60	my ($server) = @_;
		61
		62	::stop_game ();
		63	local $::PROFILE->{host} = $server;
		64	::start_game ();
		65	}
		66
		67	sub editor_invoke {
		68	my $editsup = $::CONN && $::CONN->{editor_support}
		69	or return;
		70
		71	DC::background {
		72	print "preparing editor startup...\n";
		73
		74	my $server = $editsup->{gameserver} \|\| "default";
		75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		76
		77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		79
		80	print "map directory is $mapdir\n";
		81	print "lib directory is $libdir\n";
		82
		83	my $ua = DC::lwp_useragent;
		84
		85	for my $file (qw(archetypes crossfire.0)) {
		86	my $url = "$editsup->{lib_root}$file";
		87	print "mirroring $url...\n";
		88	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		90	}
		91
		92	if (1) { # upload a map
		93	my $mapname = $::CONN->{map_info}[0];
		94
		95	my $mappath = "$mapdir/$mapname";
		96
		97	-e $mappath and die "$mappath already exists\n";
		98
		99	print "getting map revision for $mapname...\n";
		100
		101	# try to get the most recent head revision, what a hack,
		102	# this should have been returned while downloading sigh
		103	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		104
		105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		106	my $rev = $1;
		107
		108	print "downloading revision $rev...\n";
		109
		110	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		111
		112	my $meta = {
		113	%$editsup,
		114	path => $mapname,
		115	revision => $rev,
		116	cf_login => $::PROFILE->{user},
		117	};
		118
		119	require File::Basename;
		120	require File::Path;
		121
		122	File::Path::mkpath (File::Basename::dirname ($mappath));
		123	open my $fh, ">:raw:perlio", "$mappath.meta"
		124	or die "$mappath.meta: $!\n";
		125	print $fh DC::encode_json $meta;
		126	close $fh;
		127	open my $fh, ">:raw:perlio:utf8", $mappath
		128	or die "$mappath: $!\n";
		129	print $fh $map;
		130	close $fh;
		131
		132	print "saved as $mappath\n";
		133
		134	print "invoking editor...\n";
		135	exec "/root/s2/gce $mappath";#d#
		136
		137	# now upload it
		138	# require HTTP::Request::Common;
		139	#
		140	# my $res = $ua->post (
		141	# $ENV{CFPLUS_UPLOAD},
		142	# Content_Type => 'multipart/form-data',
		143	# Content => [
		144	# path => $mapname,
		145	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		146	# map => $map,
		147	# revision => $rev,
		148	# cf_login => $ENV{CFPLUS_LOGIN},
		149	# cf_password => $ENV{CFPLUS_PASSWORD},
		150	# comment => "",
		151	# ]
		152	# );
		153	#
		154	# if ($res->is_error) {
		155	# # fatal condition
		156	# warn $res->status_line;
		157	# } else {
		158	# # script replies are marked as {{..}}
		159	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		160	# warn map "$_\n", @msgs;
		161	# }
		162	} else {
		163	die "viewvc parse error, unable to detect revision\n";
		164	}
		165	}
		166	}
		167	}
		168
63	sub button_down {	169	sub invoke_button_down {
64	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
65		171
66	$self->focus_in;
67
68	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
69	my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});	173	$self->grab_focus;
70	my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});	174	return unless $::CONN;
		175
		176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
		177	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
		178
		179	$x -= DC::floor $::MAP->w * 0.5;
		180	$y -= DC::floor $::MAP->h * 0.5;
		181
		182	if ($::CONN) {
		183	$::CONN->lookat ($x, $y)
		184	}
		185
		186	} elsif ($ev->{button} == 2) {
		187	$self->grab_focus;
		188	return unless $::CONN;
71		189
72	$x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73	$y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74
75	$x -= int 0.5 * $::MAP->w;
76	$y -= int 0.5 * $::MAP->h;
77
78	$x += 1;
79	$y += 1;
80
81	$::CONN->lookat ($x, $y)
82	if $::CONN;
83
84	} elsif ($ev->{button} == 2) {
85	my ($ox, $oy) = ($ev->{x}, $ev->{y});	190	my ($ox, $oy) = ($ev->{x}, $ev->{y});
86	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	191	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87		192
88	$self->{motion} = sub {	193	$self->{motion} = sub {
89	my ($ev, $x, $y) = @_;	194	my ($ev, $x, $y) = @_;
…		…
93	$::CFG->{map_shift_x} = $bw + $x - $ox;	198	$::CFG->{map_shift_x} = $bw + $x - $ox;
94	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
95		200
96	$self->update;	201	$self->update;
97	};	202	};
		203	} elsif ($ev->{button} == 3) {
		204	my @items = (
		205	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		211	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		212	[
		213	$::PICKUP_ENABLE->{state}
		214	? "Disable automatic pickup"
		215	: "Enable automatic pickup",
		216	sub { $::PICKUP_ENABLE->toggle }
		217	],
		218	);
		219
		220	if ($::CONN && $::CONN->{editor_support}) {
		221	# push @items, [
		222	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		223	# \&editor_invoke,
		224	# ];
		225
		226	for my $type (qw(test name)) {
		227	$::CONN->{editor_support}{type} ne $type
		228	or next;
		229	my $server = $::CONN->{editor_support}{"${type}server"}
		230	or next;
		231
		232	push @items, [
		233	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		234	sub { server_login $server },
		235	];
		236	}
		237	}
		238
		239	push @items,
		240	["Quit",
		241	sub {
		242	if ($::CONN) {
		243	&::open_quit_dialog;
		244	} else {
		245	exit;
		246	}
		247	}
		248	],
		249	;
		250
		251	(new DC::UI::Menu
		252	items => \@items,
		253	)->popup ($ev);
98	}	254	}
99		255
100	1	256	1
101	}	257	}
102		258
103	sub button_up {	259	sub invoke_button_up {
104	my ($self, $ev, $x, $y) = @_;	260	my ($self, $ev, $x, $y) = @_;
105		261
106	delete $self->{motion};	262	delete $self->{motion};
107		263
108	1	264	1
109	}	265	}
110		266
111	sub mouse_motion {	267	sub invoke_mouse_motion {
112	my ($self, $ev, $x, $y) = @_;	268	my ($self, $ev, $x, $y) = @_;
113		269
114	if ($self->{motion}) {	270	if ($self->{motion}) {
115	$self->{motion}->($ev, $x, $y);	271	$self->{motion}->($ev, $x, $y);
116	} else {	272	} else {
…		…
119		275
120	1	276	1
121	}	277	}
122		278
123	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
124	(	282	(
125	1 + 32 * int $::WIDTH / 32,	283	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
126	1 + 32 * int $::HEIGHT / 32,	284	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
127	)	285	)
128	}	286	}
129		287
130	sub update {	288	sub update {
131	my ($self) = @_;	289	my ($self) = @_;
…		…
133	$self->{need_update} = 1;	291	$self->{need_update} = 1;
134	$self->SUPER::update;	292	$self->SUPER::update;
135	}	293	}
136		294
137	my %DIR = (	295	my %DIR = (
		296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
138	CFClient::SDLK_KP8, [1, "north"],	297	( "," . DC::SDLK_KP8 ), [1, "north"],
139	CFClient::SDLK_KP9, [2, "northeast"],	298	( "," . DC::SDLK_KP9 ), [2, "northeast"],
140	CFClient::SDLK_KP6, [3, "east"],	299	( "," . DC::SDLK_KP6 ), [3, "east"],
141	CFClient::SDLK_KP3, [4, "southeast"],	300	( "," . DC::SDLK_KP3 ), [4, "southeast"],
142	CFClient::SDLK_KP2, [5, "south"],	301	( "," . DC::SDLK_KP2 ), [5, "south"],
143	CFClient::SDLK_KP1, [6, "southwest"],	302	( "," . DC::SDLK_KP1 ), [6, "southwest"],
144	CFClient::SDLK_KP4, [7, "west"],	303	( "," . DC::SDLK_KP4 ), [7, "west"],
145	CFClient::SDLK_KP7, [8, "northwest"],	304	( "," . DC::SDLK_KP7 ), [8, "northwest"],
146		305
147	CFClient::SDLK_UP, [1, "north"],	306	( "," . DC::SDLK_UP ), [1, "north"],
		307	("1," . DC::SDLK_UP ), [2, "northeast"],
148	CFClient::SDLK_RIGHT, [3, "east"],	308	( "," . DC::SDLK_RIGHT), [3, "east"],
		309	("1," . DC::SDLK_RIGHT), [4, "southeast"],
149	CFClient::SDLK_DOWN, [5, "south"],	310	( "," . DC::SDLK_DOWN ), [5, "south"],
		311	("1," . DC::SDLK_DOWN ), [6, "southwest"],
150	CFClient::SDLK_LEFT, [7, "west"],	312	( "," . DC::SDLK_LEFT ), [7, "west"],
		313	("1," . DC::SDLK_LEFT ), [8, "northwest"],
151	);	314	);
152		315
153	sub key_down {	316	sub invoke_key_down {
154	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
155
156	return 0 unless $::CONN;
157		318
158	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
159	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
160	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
161		322
162	if ($sym == CFClient::SDLK_KP5) {	323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
163	$::CONN->user_send ("stay fire");	324
164	} elsif ($uni == ord ",") {	325	# ignore repeated keypresses
165	$::CONN->user_send ("take");	326	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
166	} elsif ($uni == ord " ") {	327	$self->{last_mod} = $mod;
167	$::CONN->user_send ("apply");	328	$self->{last_sym} = $sym;
168	} elsif ($uni == ord ".") {	329
169	$::CONN->user_send ($self->{completer}{last_command})	330	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
170	if exists $self->{completer}{last_command};
171	} elsif ($uni == ord "\t") {
172	$::INV_WINDOW->toggle_visibility;
173	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
174	$::CONN->user_send ("rotateshoottype +");
175	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
176	$::CONN->user_send ("rotateshoottype -");
177	} elsif ($uni == ord '"') {
178	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
179	$self->{completer}->show;
180	} elsif ($uni == ord "'") {
181	$self->{completer}->set_prefix ("");
182	$self->{completer}->show;
183	} elsif (exists $DIR{$sym}) {
184	if ($mod & CFClient::KMOD_SHIFT) {	331	if ($mod & DC::KMOD_SHIFT) {
185	$self->{shft}++;	332	$self->{shft}++;
		333	if ($dir->[0] != $self->{fire_dir}) {
186	$::CONN->user_send ("fire $DIR{$sym}[0]");	334	$::CONN->user_send ("fire $dir->[0]");
		335	}
		336	$self->{fire_dir} = $dir->[0];
187	} elsif ($mod & CFClient::KMOD_CTRL) {	337	} elsif ($mod & DC::KMOD_CTRL) {
188	$self->{ctrl}++;	338	$self->{ctrl}++;
189	$::CONN->user_send ("run $DIR{$sym}[0]");	339	$::CONN->user_send ("run $dir->[0]");
190	} else {	340	} else {
191	$::CONN->user_send ("$DIR{$sym}[1]");	341	$::CONN->user_send ("$dir->[1]");
192	}	342	}
193	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	343
194	$::BIND_EDITOR->set_binding (undef, undef, [],
195	sub {
196	my ($mod, $sym, $cmds) = @_;
197	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
198	});
199	$::BIND_EDITOR->start;
200	$::BIND_EDITOR->show;
201	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202	$::BIND_EDITOR->stop;
203	$::BIND_EDITOR->ask_for_bind_and_commit;
204	$::BIND_EDITOR->hide;
205	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
206	$::CONN->user_send ($_) for @$bind_cmd;
207	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
208	$self->{completer}->key_down ($ev);
209	$self->{completer}->show;
210	} else {
211	return 0;	344	return 1;
212	}
213
214	1	345	}
215	}
216		346
		347	0
		348	}
		349
217	sub key_up {	350	sub invoke_key_up {
218	my ($self, $ev) = @_;	351	my ($self, $ev) = @_;
219		352
220	my $res = 0;	353	my $res = 0;
221	my $mod = $ev->{mod};	354	my $mod = $ev->{mod};
222	my $sym = $ev->{sym};	355	my $sym = $ev->{sym};
223		356
		357	delete $self->{last_mod};
		358	delete $self->{last_sym};
		359
		360	if ($::CFG->{shift_fire_stop}) {
224	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	361	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
225	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
		363	delete $self->{fire_dir};
226	$res = 1;	364	$res = 1;
		365	}
		366	} else {
		367	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
		368	$::CONN->user_send ("fire_stop");
		369	delete $self->{fire_dir};
		370	$res = 1;
		371	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		372	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
		373	$::CONN->user_send ("fire_stop");
		374	delete $self->{fire_dir};
		375	$res = 1;
		376	}
227	}	377	}
228		378
229	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	379	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
230	$::CONN->user_send ("run_stop");	380	$::CONN->user_send ("run_stop");
231	$res = 1;	381	$res = 1;
232	}	382	}
233		383
234	$res	384	$res
235	}	385	}
236		386
237	sub draw {	387	sub invoke_visibility_change {
238	my ($self) = @_;	388	my ($self) = @_;
239		389
240	my $focused = $CFClient::UI::FOCUS == $self	390	$self->refresh_hook;
241	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
242		391
243	return	392	0
244	unless $focused \|\| !$::FAST;	393	}
245		394
		395	sub set_magicmap {
		396	my ($self, $w, $h, $x, $y, $data) = @_;
		397
		398	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		399	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		400
		401	$self->{magicmap} = [$x, $y, $w, $h, $data];
		402
		403	$self->update;
		404	}
		405
		406	sub refresh_hook {
		407	my ($self) = @_;
		408
		409	if ($::MAP && $::CONN) {
246	if (delete $self->{need_update}) {	410	if (delete $self->{need_update}) {
247	glNewList $self->{list};	411	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
248		412
249	if ($::MAP) {	413	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
250	my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	414	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
251	my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
252		415
253	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};	416	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
254	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};	417	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
255	my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
256	my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
257		418
258	glPushMatrix;	419	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
259	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	420	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
260		421
261	glTranslate $sx0, $sy0;	422	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
262		423	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
263	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
264		424
265	if ($::CFG->{fow_enable}) {	425	if ($::CFG->{fow_enable}) {
266	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	426	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
267	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
268	glConvolutionFilter2D (
269	GL_CONVOLUTION_2D,
270	GL_ALPHA,
271	3, 3,
272	GL_ALPHA, GL_FLOAT,
273	(pack "f*", @{ $self->{smooth_matrix} }),
274	);
275	glEnable GL_CONVOLUTION_2D;
276	}
277		427
278	$self->{fow_texture_name} \|\|= glGenTexture;
279	# try to re-use the texture name: TODO improve texture class instead
280
281	$self->{fow_texture} = new CFClient::Texture	428	$self->{fow_texture} = new DC::Texture
282	w => $w,	429	w => $w,
283	h => $h,	430	h => $h,
284	data => $data,	431	data => $data,
285	name => $self->{fow_texture_name},
286	internalformat => GL_ALPHA,	432	internalformat => GL_ALPHA,
287	format => GL_ALPHA;	433	format => GL_ALPHA;
		434	} else {
		435	delete $self->{fow_texture};
		436	}
288		437
289	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	438	glNewList ($self->{list} \|\|= glGenList);
290		439
		440	glPushMatrix;
		441	glTranslate $sx0, $sy0;
		442	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		443
		444	$::MAP->draw ($dx, $dy, $sw, $sh,
		445	$self->{tilesize},
		446	$::CONN->{player}{tag}, 0, 0);
		447
		448	glScale $self->{tilesize}, $self->{tilesize};
		449
		450	if (my $tex = $self->{fow_texture}) {
		451	glPushMatrix;
		452	glScale 1/3, 1/3;
291	glEnable GL_TEXTURE_2D;	453	glEnable GL_TEXTURE_2D;
292	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	454	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
293		455
294	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	456	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
295	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);	457	$self->{fow_texture}->draw_quad_alpha (0, 0);
296		458
297	glDisable GL_TEXTURE_2D;	459	glDisable GL_TEXTURE_2D;
		460	glPopMatrix;
298	}	461	}
299		462
		463	if ($self->{magicmap}) {
		464	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		465
		466	$x += $::MAP->ox + $self->{dx};
		467	$y += $::MAP->oy + $self->{dy};
		468
		469	glTranslate - $x - 1, - $y - 1;
		470	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		471	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		472	}
		473
300	glPopMatrix;	474	glPopMatrix;
301	}
302
303	glEndList;	475	glEndList;
		476	}
		477	} else {
		478	glDeleteList delete $self->{list}
		479	if $self->{list};
304	}	480	}
		481	}
305		482
306	glPushMatrix;	483	sub draw {
		484	my ($self) = @_;
		485
		486	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		487
		488	return unless $self->{list};
		489
		490	my $focused = $DC::UI::FOCUS == $self
		491	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		492
		493	return
		494	unless $focused \|\| !$::FAST;
		495
307	glCallList $self->{list};	496	glCallList $self->{list};
308	glPopMatrix;
309		497
310	# TNT2 emulates logops in software (or worse :)	498	# TNT2 emulates logops in software (or worse :)
311	if ($focused) {	499	unless ($focused) {
312	(delete $self->{out_of_focus})->destroy	500	glColor_premultiply 0, 0, 1, 0.25;
313	if $self->{out_of_focus};
314	} else {
315	glColor 0.4, 0.2, 0.2, 0.6;
316	glEnable GL_BLEND;	501	glEnable GL_BLEND;
317	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	502	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
318	glBegin GL_QUADS;	503	glBegin GL_QUADS;
319	glVertex 0, 0;	504	glVertex 0, 0;
320	glVertex 0, $::HEIGHT;	505	glVertex 0, $::HEIGHT;
321	glVertex $::WIDTH, $::HEIGHT;	506	glVertex $::WIDTH, $::HEIGHT;
322	glVertex $::WIDTH, 0;	507	glVertex $::WIDTH, 0;
323	glEnd;	508	glEnd;
324	glDisable GL_BLEND;	509	glDisable GL_BLEND;
325
326	# $self->{out_of_focus} \|\|= do {
327	# my $label = new CFClient::UI::Label
328	# x => 0,
329	# y => 0,
330	# z => 1,
331	# ellipsise => 0,
332	# text => "map out of focus (click map to play)";
333	#
334	# $label->show;
335	# $label->update;
336	#
337	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
338	# $label->move_abs (
339	# ($::WIDTH - $label->{w}) * 0.5,
340	# ($::HEIGHT - $label->{h}) * 0.5,
341	# );
342	# });
343	#
344	# $label
345	# };
346	}	510	}
347	}	511	}
348		512
349	sub DESTROY {	513	sub DESTROY {
350	my $self = shift;	514	my $self = shift;
…		…
352	glDeleteList $self->{list};	516	glDeleteList $self->{list};
353		517
354	$self->SUPER::DESTROY;	518	$self->SUPER::DESTROY;
355	}	519	}
356		520
357	package CFClient::MapWidget::MapMap;	521	package DC::MapWidget::MapMap;
358		522
		523	use strict;
		524	use utf8;
		525
359	our @ISA = CFClient::UI::Base::;	526	our @ISA = DC::UI::Base::;
360		527
361	use Time::HiRes qw(time);	528	use Time::HiRes qw(time);
362	use CFClient::OpenGL;	529	use DC::OpenGL;
363		530
364	sub size_request {	531	sub size_request {
365	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	532	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
366	}	533	}
367		534
		535	sub refresh_hook {
		536	my ($self) = @_;
		537
		538	if ($::MAP && $self->{texture_atime} < time) {
		539	my ($w, $h) = @$self{qw(w h)};
		540
		541	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		542	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		543
		544	my $ox = 0.5 * ($w - $sw);
		545	my $oy = 0.5 * ($h - $sh);
		546
		547	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		548	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		549
		550	#TODO: map scale is completely borked
		551
		552	my $x0 = int $ox - $sx + 0.5;
		553	my $y0 = int $oy - $sy + 0.5;
		554
		555	$self->{sw} = $sw;
		556	$self->{sh} = $sh;
		557
		558	$self->{x0} = $x0;
		559	$self->{y0} = $y0;
		560
		561	$self->{texture_atime} = time + 1/3;
		562
		563	$self->{texture} =
		564	new DC::Texture
		565	w => $w,
		566	h => $h,
		567	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		568	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		569	}
		570	}
		571
		572	sub invoke_visibility_change {
		573	my ($self) = @_;
		574
		575	$self->refresh_hook;
		576
		577	0
		578	}
		579
368	sub size_allocate {	580	sub invoke_size_allocate {
369	my ($self, $w, $h) = @_;	581	my ($self, $w, $h) = @_;
370		582
371	$self->SUPER::size_allocate ($w, $h);
372	$self->update;	583	$self->update;
		584
		585	1
373	}	586	}
374		587
375	sub update {	588	sub update {
376	my ($self) = @_;	589	my ($self) = @_;
377		590
…		…
380	}	593	}
381		594
382	sub _draw {	595	sub _draw {
383	my ($self) = @_;	596	my ($self) = @_;
384		597
385	$::MAP or return;	598	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
386		599
387	my ($w, $h) = @$self{qw(w h)};	600	$self->{texture} or return;
388
389	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
390	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
391
392	my $sx = int $::CFG->{map_shift_x} / 32;
393	my $sy = int $::CFG->{map_shift_y} / 32;
394
395	my $ox = 0.5 * ($w - $sw);
396	my $oy = 0.5 * ($h - $sh);
397		601
398	glEnable GL_BLEND;	602	glEnable GL_BLEND;
399	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	603	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
400	glEnable GL_TEXTURE_2D;	604	glEnable GL_TEXTURE_2D;
401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	605	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
402		606
403	if ($self->{texture_atime} < time) {
404	$self->{texture_atime} = time + 1/3;
405
406	$self->{texture} =
407	new CFClient::Texture
408	w => $w,
409	h => $h,
410	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
411	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
412	}
413
414	$self->{texture}->draw_quad (0, 0);	607	$self->{texture}->draw_quad (0, 0);
415		608
416	glDisable GL_TEXTURE_2D;	609	glDisable GL_TEXTURE_2D;
417		610
418	glTranslate 0.375, 0.375;	611	glTranslate 0.375, 0.375;
419
420	#TODO: map scale is completely borked
421
422	my $x0 = int $ox - $sx + 0.5;
423	my $y0 = int $oy - $sy + 0.5;
424		612
425	glColor 1, 1, 0, 1;	613	glColor 1, 1, 0, 1;
426	glBegin GL_LINE_LOOP;	614	glBegin GL_LINE_LOOP;
427	glVertex $x0 , $y0 ;	615	glVertex $self->{x0} , $self->{y0} ;
428	glVertex $x0 , $y0 + $sh;	616	glVertex $self->{x0} , $self->{y0} + $self->{sh};
429	glVertex $x0 + $sw, $y0 + $sh;	617	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
430	glVertex $x0 + $sw, $y0 ;	618	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
431	glEnd;	619	glEnd;
432		620
433	glDisable GL_BLEND;	621	glDisable GL_BLEND;
434	}	622	}
435		623
436	package CFClient::MapWidget::Command;	624	package DC::MapWidget::Command;
437		625
438	use strict;	626	use strict;
439		627
440	use CFClient::OpenGL;	628	use DC::OpenGL;
441		629
442	our @ISA = CFClient::UI::Frame::;	630	our @ISA = DC::UI::Frame::;
443		631
444	sub new {	632	sub new {
445	my $class = shift;	633	my $class = shift;
446		634
447	my $self = $class->SUPER::new (	635	my $self = $class->SUPER::new (
448	bg => [0, 0, 0, 0.8],	636	bg => [0, 0, 0, 0.8],
449	@_,	637	@_,
450	);	638	);
451		639
452	$self->add ($self->{vbox} = new CFClient::UI::VBox);	640	$self->add ($self->{vbox} = new DC::UI::VBox);
453		641
454	$self->{label} = [	642	$self->{label} = [
455	map	643	map
456	CFClient::UI::Label->new (	644	DC::UI::Label->new (
		645	align => 0,
457	can_hover => 1,	646	can_hover => 1,
458	can_events => 1,	647	can_events => 1,
459	tooltip_width => 0.33,	648	tooltip_width => 0.33,
460	fontsize => $_,	649	fontsize => $_,
461	), (0.8) x 16	650	), (0.8) x 16
462	];	651	];
463		652
464	$self->{entry} = new CFClient::UI::Entry	653	$self->{entry} = new DC::UI::Entry
465	on_changed => sub {	654	on_changed => sub {
466	$self->update_labels;	655	$self->update_labels;
		656	0
467	},	657	},
468	on_button_down => sub {	658	on_button_down => sub {
469	my ($entry, $ev, $x, $y) = @_;	659	my ($entry, $ev, $x, $y) = @_;
470		660
471	if ($ev->{button} == 3) {	661	if ($ev->{button} == 3) {
472	(new CFClient::UI::Menu	662	(new DC::UI::Menu
473	items => [	663	items => [
474	["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]	664	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		665	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
475	],	666	],
476	)->popup ($ev);	667	)->popup ($ev);
477	return 1;	668	return 1;
478	}	669	}
479	0	670	0
…		…
486	if ($ev->{sym} == 13) {	677	if ($ev->{sym} == 13) {
487	if (exists $self->{select}) {	678	if (exists $self->{select}) {
488	$self->{last_command} = $self->{select};	679	$self->{last_command} = $self->{select};
489	$::CONN->user_send ($self->{select});	680	$::CONN->user_send ($self->{select});
490		681
491	unshift @{$self->{history}}, $self->{select};	682	unshift @{$self->{history}}, $self->{entry}->get_text;
492	$self->{hist_ptr} = 0;	683	$self->{hist_ptr} = 0;
493		684
494	$self->hide;	685	$self->hide;
495	}	686	}
496	} elsif ($ev->{sym} == 27) {	687	} elsif ($ev->{sym} == 27) {
497	$self->{hist_ptr} = 0;	688	$self->{hist_ptr} = 0;
498	$self->hide;	689	$self->hide;
499	return;
500	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	690	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
501	if ($self->{hist_ptr} > 1) {	691	if ($self->{hist_ptr} > 1) {
502	$self->{hist_ptr}--;	692	$self->{hist_ptr}--;
503	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	693	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
504	} elsif ($self->{hist_ptr} > 0) {	694	} elsif ($self->{hist_ptr} > 0) {
505	$self->{hist_ptr}--;	695	$self->{hist_ptr}--;
…		…
507	} else {	697	} else {
508	++$self->{select_offset}	698	++$self->{select_offset}
509	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	699	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
510	}	700	}
511	$self->update_labels;	701	$self->update_labels;
512	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	702	} elsif ($ev->{sym} == DC::SDLK_UP) {
513	if ($self->{select_offset}) {	703	if ($self->{select_offset}) {
514	--$self->{select_offset}	704	--$self->{select_offset}
515	} else {	705	} else {
516	unless ($self->{hist_ptr}) {	706	unless ($self->{hist_ptr}) {
517	$self->{hist_saveback} = $self->{entry}->get_text;	707	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
544		734
545	$self->{entry}->set_text ($prefix);	735	$self->{entry}->set_text ($prefix);
546	$self->show;	736	$self->show;
547	}	737	}
548		738
549	sub size_allocate {	739	sub invoke_size_allocate {
550	my ($self, $w, $h) = @_;	740	my ($self, $w, $h) = @_;
551		741
552	$self->SUPER::size_allocate ($w, $h);
553	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	742	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		743
		744	$self->SUPER::invoke_size_allocate ($w, $h)
554	}	745	}
555		746
556	sub show {	747	sub show {
557	my ($self) = @_;	748	my ($self) = @_;
558		749
559	$self->SUPER::show;	750	$self->SUPER::show;
560	$self->{entry}->focus_in;	751	$self->{entry}->grab_focus;
561	}	752	}
562		753
563	sub hide {	754	sub hide {
564	my ($self) = @_;	755	my ($self) = @_;
		756
		757	$self->{hist_ptr} = 0;
565		758
566	$self->SUPER::hide;	759	$self->SUPER::hide;
567	$self->{entry}->set_text ("");	760	$self->{entry}->set_text ("");
568	}	761	}
569		762
570	sub key_down {	763	sub inject_key_down {
571	my ($self, $ev) = @_;	764	my ($self, $ev) = @_;
572		765
		766	$self->{entry}->grab_focus;
573	$self->{entry}->key_down ($ev)	767	$self->{entry}->emit (key_down => $ev);
574	}	768	}
575		769
576	sub update_labels {	770	sub update_labels {
577	my ($self) = @_;	771	my ($self) = @_;
578		772
…		…
665	$label->set_text ("");	859	$label->set_text ("");
666	$label->set_tooltip ("");	860	$label->set_tooltip ("");
667	}	861	}
668		862
669	$self->update;	863	$self->update;
670	###
671	}	864	}
672		865
673	sub _draw {	866	sub _draw {
674	my ($self) = @_;	867	my ($self) = @_;
675		868
676	# hack	869	# hack
677	local $CFClient::UI::FOCUS = $self->{entry};	870	local $DC::UI::FOCUS = $self->{entry};
678		871
679	$self->SUPER::_draw;	872	$self->SUPER::_draw;
680	}	873	}
681		874
682	1	875	1
		876

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.57 by elmex, Tue Jun 13 11:01:04 2006 UTC vs. Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.57 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC