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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.77 by root, Sun Jul 23 02:44:05 2006 UTC vs. Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.77 by root, Sun Jul 23 02:44:05 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC