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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.96 by root, Sat Dec 9 21:44:43 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.96 by root, Sat Dec 9 21:44:43 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.96 by root, Sat Dec 9 21:44:43 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC