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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs. Revision 1.143 by root, Wed Sep 3 06:07:39 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.143 by root, Wed Sep 3 06:07:39 2008 UTC