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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.138 by root, Sun Jul 20 04:17:02 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_file DC::Texture DC::find_rcfile "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 => "<b>The Command Completer</b>\n\n"
38	. "This is your central interface to send text commands to the server. "
39	. "To enter a verbatim command to send to the server, just type the command, "
40	. "followed by a space, and press return. "
41	. "Typing the initial letters of words (or just any letters) displays guesses "
42	. "for commands you might want to use.\n"
43	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45	;
46		28
47	$self	29	$self
48	}	30	}
49		31
50	sub add_command {	32	sub add_command {
54		36
55	$tooltip =~ s/^\s+//;	37	$tooltip =~ s/^\s+//;
56	$tooltip = "<big>$data</big>\n\n$tooltip";	38	$tooltip = "<big>$data</big>\n\n$tooltip";
57	$tooltip =~ s/\s+$//;	39	$tooltip =~ s/\s+$//;
58		40
59	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
60	}	42	}
61		43
62	sub clr_commands {	44	sub clr_commands {
63	my ($self) = @_;	45	my ($self) = @_;
64		46
65	%{$self->{completer}{command}} = ();	47	%{$::COMPLETER->{command}} = ();
66		48
67	$self->{completer}->hide	49	$::COMPLETER->hide
68	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	}
69	}	161	}
70		162
71	sub invoke_button_down {	163	sub invoke_button_down {
72	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
73		165
74	if ($ev->{button} == 1) {	166	if ($ev->{button} == 1) {
75	$self->grab_focus;	167	$self->grab_focus;
76	return unless $::CONN;	168	return unless $::CONN;
77		169
78	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};
79	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};
80		172
81	$x -= int 0.5 * $self->{sw};	173	$x -= DC::floor $::MAP->w * 0.5;
82	$y -= int 0.5 * $self->{sh};	174	$y -= DC::floor $::MAP->h * 0.5;
83		175
		176	if ($::CONN) {
84	$::CONN->lookat ($x, $y)	177	$::CONN->lookat ($x, $y)
85	if $::CONN;	178	}
86		179
87	} elsif ($ev->{button} == 2) {	180	} elsif ($ev->{button} == 2) {
88	$self->grab_focus;	181	$self->grab_focus;
89	return unless $::CONN;	182	return unless $::CONN;
90		183
…		…
100	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
101		194
102	$self->update;	195	$self->update;
103	};	196	};
104	} elsif ($ev->{button} == 3) {	197	} elsif ($ev->{button} == 3) {
105	(new CFPlus::UI::Menu	198	my @items = (
106	items => [
107	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	199	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
112	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
113	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
114	[	206	[
115	$::PICKUP_ENABLE->{state}	207	$::PICKUP_ENABLE->{state}
116	? "Disable automatic pickup"	208	? "Disable automatic pickup"
117	: "Enable automatic pickup",	209	: "Enable automatic pickup",
118	sub { $::PICKUP_ENABLE->toggle }	210	sub { $::PICKUP_ENABLE->toggle }
119	],	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,
120	["Quit",	234	["Quit",
121	sub {	235	sub {
122	if ($::CONN) {	236	if ($::CONN) {
123	&::open_quit_dialog;	237	&::open_quit_dialog;
124	} else {	238	} else {
125	exit;	239	exit;
126	}
127	}	240	}
128	],	241	}
129	],	242	],
		243	;
		244
		245	(new DC::UI::Menu
		246	items => \@items,
130	)->popup ($ev);	247	)->popup ($ev);
131	}	248	}
132		249
133	1	250	1
134	}	251	}
…		…
152		269
153	1	270	1
154	}	271	}
155		272
156	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
157	(	276	(
158	32 * CFPlus::ceil $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
159	32 * CFPlus::ceil $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
160	)	279	)
161	}	280	}
162		281
163	sub update {	282	sub update {
164	my ($self) = @_;	283	my ($self) = @_;
…		…
166	$self->{need_update} = 1;	285	$self->{need_update} = 1;
167	$self->SUPER::update;	286	$self->SUPER::update;
168	}	287	}
169		288
170	my %DIR = (	289	my %DIR = (
		290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
171	CFPlus::SDLK_KP8, [1, "north"],	291	( "," . DC::SDLK_KP8 ), [1, "north"],
172	CFPlus::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
173	CFPlus::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
174	CFPlus::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
175	CFPlus::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
176	CFPlus::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
177	CFPlus::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
178	CFPlus::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
179		299
180	CFPlus::SDLK_UP, [1, "north"],	300	( "," . DC::SDLK_UP ), [1, "north"],
		301	("1," . DC::SDLK_UP ), [2, "northeast"],
181	CFPlus::SDLK_RIGHT, [3, "east"],	302	( "," . DC::SDLK_RIGHT), [3, "east"],
		303	("1," . DC::SDLK_RIGHT), [4, "southeast"],
182	CFPlus::SDLK_DOWN, [5, "south"],	304	( "," . DC::SDLK_DOWN ), [5, "south"],
		305	("1," . DC::SDLK_DOWN ), [6, "southwest"],
183	CFPlus::SDLK_LEFT, [7, "west"],	306	( "," . DC::SDLK_LEFT ), [7, "west"],
		307	("1," . DC::SDLK_LEFT ), [8, "northwest"],
184	);	308	);
185		309
186	sub invoke_key_down {	310	sub invoke_key_down {
187	my ($self, $ev) = @_;	311	my ($self, $ev) = @_;
188		312
189	my $mod = $ev->{mod};	313	my $mod = $ev->{mod};
190	my $sym = $ev->{sym};	314	my $sym = $ev->{sym};
191	my $uni = $ev->{unicode};	315	my $uni = $ev->{unicode};
192		316
193	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	317	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
194		318
195	if ($uni == ord "\t") {	319	# ignore repeated keypresses
196	$::PL_WINDOW->toggle_visibility;	320	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
197	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	321	$self->{last_mod} = $mod;
198	$::HELP_WINDOW->toggle_visibility;	322	$self->{last_sym} = $sym;
199	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200	::toggle_player_page ($::STATS_PAGE);
201	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
202	::toggle_player_page ($::SKILL_PAGE);
203	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
204	::toggle_player_page ($::SPELL_PAGE);
205	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206	::toggle_player_page ($::INVENTORY_PAGE);
207	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208	$::SETUP_DIALOG->toggle_visibility;
209	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210	$::BIND_EDITOR->set_binding (undef, undef, [],
211	sub {
212	my ($mod, $sym, $cmds) = @_;
213	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214	});
215	$::BIND_EDITOR->start;
216	$::BIND_EDITOR->show;
217	} elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218	$::BIND_EDITOR->stop;
219	$::BIND_EDITOR->ask_for_bind_and_commit;
220	$::BIND_EDITOR->hide;
221	} elsif (!$::CONN) {
222	return 0; # bindings further down need a valid connection
223		323
224	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	324	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
225	$::CONN->user_send ("stay fire");
226	} elsif ($uni == ord ",") {
227	$::CONN->user_send ("take");
228	} elsif ($uni == ord " ") {
229	$::CONN->user_send ("apply");
230	} elsif ($uni == ord ".") {
231	$::CONN->user_send ($self->{completer}{last_command})
232	if exists $self->{completer}{last_command};
233	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
234	$::CONN->user_send ($_) for @$bind_cmd;
235	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
236	$::CONN->user_send ("rotateshoottype +");
237	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
238	$::CONN->user_send ("rotateshoottype -");
239	} elsif ($uni == ord '"') {
240	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
241	$self->{completer}->show;
242	} elsif ($uni == ord "'") {
243	$self->{completer}->set_prefix ("");
244	$self->{completer}->show;
245	} elsif (exists $DIR{$sym}) {
246	if ($mod & CFPlus::KMOD_SHIFT) {	325	if ($mod & DC::KMOD_SHIFT) {
247	$self->{shft}++;	326	$self->{shft}++;
248	if ($DIR{$sym}[0] != $self->{fire_dir}) {	327	if ($dir->[0] != $self->{fire_dir}) {
249	$::CONN->user_send ("fire $DIR{$sym}[0]");	328	$::CONN->user_send ("fire $dir->[0]");
250	}	329	}
251	$self->{fire_dir} = $DIR{$sym}[0];	330	$self->{fire_dir} = $dir->[0];
252	} elsif ($mod & CFPlus::KMOD_CTRL) {	331	} elsif ($mod & DC::KMOD_CTRL) {
253	$self->{ctrl}++;	332	$self->{ctrl}++;
254	$::CONN->user_send ("run $DIR{$sym}[0]");	333	$::CONN->user_send ("run $dir->[0]");
255	} else {	334	} else {
256	$::CONN->user_send ("$DIR{$sym}[1]");	335	$::CONN->user_send ("$dir->[1]");
257	}	336	}
258	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	337
259	$self->{completer}->inject_key_down ($ev);
260	$self->{completer}->show;
261	} else {
262	return 0;	338	return 1;
263	}
264
265	1	339	}
		340
		341	0
266	}	342	}
267		343
268	sub invoke_key_up {	344	sub invoke_key_up {
269	my ($self, $ev) = @_;	345	my ($self, $ev) = @_;
270		346
271	my $res = 0;	347	my $res = 0;
272	my $mod = $ev->{mod};	348	my $mod = $ev->{mod};
273	my $sym = $ev->{sym};	349	my $sym = $ev->{sym};
274		350
		351	delete $self->{last_mod};
		352	delete $self->{last_sym};
		353
275	if ($::CFG->{shift_fire_stop}) {	354	if ($::CFG->{shift_fire_stop}) {
276	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	355	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
277	$::CONN->user_send ("fire_stop");	356	$::CONN->user_send ("fire_stop");
278	delete $self->{fire_dir};	357	delete $self->{fire_dir};
279	$res = 1;	358	$res = 1;
280	}	359	}
281	} else {	360	} else {
282	if (exists $DIR{$sym} && delete $self->{shft}) {	361	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
283	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
284	delete $self->{fire_dir};	363	delete $self->{fire_dir};
285	$res = 1;	364	$res = 1;
286	} 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?
287	$::CONN->user_send ("fire_stop");	367	$::CONN->user_send ("fire_stop");
288	delete $self->{fire_dir};	368	delete $self->{fire_dir};
289	$res = 1;	369	$res = 1;
290	}	370	}
291	}	371	}
292		372
293	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
294	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
295	$res = 1;	375	$res = 1;
296	}	376	}
297		377
298	$res	378	$res
299	}	379	}
300		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
301	sub set_magicmap {	406	sub set_magicmap {
302	my ($self, $w, $h, $x, $y, $data) = @_;	407	my ($self, $w, $h, $x, $y, $data) = @_;
303		408
304	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	409	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	410	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306		411
307	$self->{magicmap} = [$x, $y, $w, $h, $data];	412	$self->{magicmap} = [$x, $y, $w, $h, $data];
308		413
309	$self->update;	414	$self->update;
310	}	415	}
311		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	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		464	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		465
		466	# width/height of map, in tiles
		467	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
		468	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
		469
		470	# the map displacement, in tiles
		471	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		472	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
		473
		474	# the upper left "visible" corner, in pixels
		475	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		476	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		477
		478	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		479	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		480
		481	if ($::CFG->{fow_enable}) {
		482	$sdx_t = $sdy_t = 0;#d#
		483	my ($w, $h, $data) = $::MAP->fow_texture (
		484	$dx + (min 0, $sdx_t),
		485	$dy + (min 0, $sdy_t),
		486	$sw + abs $sdx_t,
		487	$sh + abs $sdy_t
		488	);
		489
		490	$self->{fow_texture} = new DC::Texture
		491	w => $w,
		492	h => $h,
		493	data => $data,
		494	internalformat => GL_ALPHA,
		495	format => GL_ALPHA;
		496	} else {
		497	delete $self->{fow_texture};
		498	}
		499
		500	glNewList ($self->{list} \|\|= glGenList);
		501
		502	glPushMatrix;
		503	glTranslate $sx0, $sy0;
		504	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		505	glTranslate $self->{sdx}, $self->{sdy};
		506
		507	$::MAP->draw ($dx, $dy, $sw, $sh,
		508	$self->{tilesize},
		509	$::CONN->{player}{tag},
		510	-$self->{sdx}, -$self->{sdy});
		511
		512	#glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
		513	glScale $self->{tilesize}, $self->{tilesize};
		514
		515	if (my $tex = $self->{fow_texture}) {
		516	glPushMatrix;
		517	glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
		518	glScale 1/3, 1/3;
		519	glEnable GL_TEXTURE_2D;
		520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		521
		522	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		523	$self->{fow_texture}->draw_quad_alpha (0, 0);
		524
		525	glDisable GL_TEXTURE_2D;
		526	glPopMatrix;
		527	}
		528
		529	if ($self->{magicmap}) {
		530	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		531
		532	$x += $::MAP->ox + $self->{dx};
		533	$y += $::MAP->oy + $self->{dy};
		534
		535	glTranslate - $x - 1, - $y - 1;
		536	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		537	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		538	}
		539
		540	glPopMatrix;
		541	glEndList;
		542	}
		543	} else {
		544	glDeleteList delete $self->{list}
		545	if $self->{list};
		546	}
		547	}
		548
312	sub draw {	549	sub draw {
313	my ($self) = @_;	550	my ($self) = @_;
314		551
315	return unless $::MAP;	552	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
316		553
		554	return unless $self->{list};
		555
317	my $focused = $CFPlus::UI::FOCUS == $self	556	my $focused = $DC::UI::FOCUS == $self
318	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	557	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
319		558
320	return	559	return
321	unless $focused \|\| !$::FAST;	560	unless $focused \|\| !$::FAST;
322		561
323	if (delete $self->{need_update}) {
324	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325
326	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328
329	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331
332	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
333	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
334
335	if ($::CFG->{fow_enable}) {
336	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
337
338	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340	glConvolutionFilter2D (
341	GL_CONVOLUTION_2D,
342	GL_ALPHA,
343	3, 3,
344	GL_ALPHA, GL_FLOAT,
345	(pack "f*", @{ $self->{smooth_matrix} }),
346	);
347	glEnable GL_CONVOLUTION_2D;
348	}
349
350	$self->{fow_texture} = new CFPlus::Texture
351	w => $w,
352	h => $h,
353	data => $data,
354	internalformat => GL_ALPHA,
355	format => GL_ALPHA;
356
357	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
358	} else {
359	delete $self->{fow_texture};
360	}
361
362	glNewList $self->{list};
363
364	glPushMatrix;
365	glTranslate $sx0, $sy0;
366	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367
368	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
369
370	glScale 32, 32;
371
372	if (my $tex = $self->{fow_texture}) {
373	glEnable GL_TEXTURE_2D;
374	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375
376	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
377	$self->{fow_texture}->draw_quad_alpha (0, 0);
378
379	glDisable GL_TEXTURE_2D;
380	}
381
382	if ($self->{magicmap}) {
383	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384
385	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
386	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
387
388	glTranslate - $x - 1, - $y - 1;
389	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391	}
392
393	glPopMatrix;
394	glEndList;
395	}
396
397	glCallList $self->{list};	562	glCallList $self->{list};
398		563
399	# TNT2 emulates logops in software (or worse :)	564	# TNT2 emulates logops in software (or worse :)
400	unless ($focused) {	565	unless ($focused) {
401	glColor 0.4, 0.2, 0.2, 0.6;	566	glColor_premultiply 0, 0, 1, 0.25;
402	glEnable GL_BLEND;	567	glEnable GL_BLEND;
403	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	568	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
404	glBegin GL_QUADS;	569	glBegin GL_QUADS;
405	glVertex 0, 0;	570	glVertex 0, 0;
406	glVertex 0, $::HEIGHT;	571	glVertex 0, $::HEIGHT;
407	glVertex $::WIDTH, $::HEIGHT;	572	glVertex $::WIDTH, $::HEIGHT;
408	glVertex $::WIDTH, 0;	573	glVertex $::WIDTH, 0;
…		…
417	glDeleteList $self->{list};	582	glDeleteList $self->{list};
418		583
419	$self->SUPER::DESTROY;	584	$self->SUPER::DESTROY;
420	}	585	}
421		586
422	package CFPlus::MapWidget::MapMap;	587	package DC::MapWidget::MapMap;
423		588
		589	use strict;
		590	use utf8;
		591
424	our @ISA = CFPlus::UI::Base::;	592	our @ISA = DC::UI::Base::;
425		593
426	use Time::HiRes qw(time);	594	use Time::HiRes qw(time);
427	use CFPlus::OpenGL;	595	use DC::OpenGL;
428		596
429	sub size_request {	597	sub size_request {
430	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	598	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		599	}
		600
		601	sub refresh_hook {
		602	my ($self) = @_;
		603
		604	if ($::MAP && $self->{texture_atime} < time) {
		605	my ($w, $h) = @$self{qw(w h)};
		606
		607	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		608	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		609
		610	my $ox = 0.5 * ($w - $sw);
		611	my $oy = 0.5 * ($h - $sh);
		612
		613	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		614	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		615
		616	#TODO: map scale is completely borked
		617
		618	my $x0 = int $ox - $sx + 0.5;
		619	my $y0 = int $oy - $sy + 0.5;
		620
		621	$self->{sw} = $sw;
		622	$self->{sh} = $sh;
		623
		624	$self->{x0} = $x0;
		625	$self->{y0} = $y0;
		626
		627	$self->{texture_atime} = time + 1/3;
		628
		629	$self->{texture} =
		630	new DC::Texture
		631	w => $w,
		632	h => $h,
		633	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		634	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		635	}
		636	}
		637
		638	sub invoke_visibility_change {
		639	my ($self) = @_;
		640
		641	$self->refresh_hook;
		642
		643	0
431	}	644	}
432		645
433	sub invoke_size_allocate {	646	sub invoke_size_allocate {
434	my ($self, $w, $h) = @_;	647	my ($self, $w, $h) = @_;
435		648
…		…
446	}	659	}
447		660
448	sub _draw {	661	sub _draw {
449	my ($self) = @_;	662	my ($self) = @_;
450		663
451	$::MAP or return;	664	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
452		665
453	my ($w, $h) = @$self{qw(w h)};	666	$self->{texture} or return;
454
455	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
456	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
457
458	my $sx = int $::CFG->{map_shift_x} / 32;
459	my $sy = int $::CFG->{map_shift_y} / 32;
460
461	my $ox = 0.5 * ($w - $sw);
462	my $oy = 0.5 * ($h - $sh);
463		667
464	glEnable GL_BLEND;	668	glEnable GL_BLEND;
465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
466	glEnable GL_TEXTURE_2D;	670	glEnable GL_TEXTURE_2D;
467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468		672
469	if ($self->{texture_atime} < time) {
470	$self->{texture_atime} = time + 1/3;
471
472	$self->{texture} =
473	new CFPlus::Texture
474	w => $w,
475	h => $h,
476	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
477	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
478	}
479
480	$self->{texture}->draw_quad (0, 0);	673	$self->{texture}->draw_quad (0, 0);
481		674
482	glDisable GL_TEXTURE_2D;	675	glDisable GL_TEXTURE_2D;
483		676
484	glTranslate 0.375, 0.375;	677	glTranslate 0.375, 0.375;
485
486	#TODO: map scale is completely borked
487
488	my $x0 = int $ox - $sx + 0.5;
489	my $y0 = int $oy - $sy + 0.5;
490		678
491	glColor 1, 1, 0, 1;	679	glColor 1, 1, 0, 1;
492	glBegin GL_LINE_LOOP;	680	glBegin GL_LINE_LOOP;
493	glVertex $x0 , $y0 ;	681	glVertex $self->{x0} , $self->{y0} ;
494	glVertex $x0 , $y0 + $sh;	682	glVertex $self->{x0} , $self->{y0} + $self->{sh};
495	glVertex $x0 + $sw, $y0 + $sh;	683	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
496	glVertex $x0 + $sw, $y0 ;	684	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
497	glEnd;	685	glEnd;
498		686
499	glDisable GL_BLEND;	687	glDisable GL_BLEND;
500	}	688	}
501		689
502	package CFPlus::MapWidget::Command;	690	package DC::MapWidget::Command;
503		691
504	use strict;	692	use strict;
505		693
506	use CFPlus::OpenGL;	694	use DC::OpenGL;
507		695
508	our @ISA = CFPlus::UI::Frame::;	696	our @ISA = DC::UI::Frame::;
509		697
510	sub new {	698	sub new {
511	my $class = shift;	699	my $class = shift;
512		700
513	my $self = $class->SUPER::new (	701	my $self = $class->SUPER::new (
514	bg => [0, 0, 0, 0.8],	702	bg => [0, 0, 0, 0.8],
515	@_,	703	@_,
516	);	704	);
517		705
518	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	706	$self->add ($self->{vbox} = new DC::UI::VBox);
519		707
520	$self->{label} = [	708	$self->{label} = [
521	map	709	map
522	CFPlus::UI::Label->new (	710	DC::UI::Label->new (
		711	align => 0,
523	can_hover => 1,	712	can_hover => 1,
524	can_events => 1,	713	can_events => 1,
525	tooltip_width => 0.33,	714	tooltip_width => 0.33,
526	fontsize => $_,	715	fontsize => $_,
527	), (0.8) x 16	716	), (0.8) x 16
528	];	717	];
529		718
530	$self->{entry} = new CFPlus::UI::Entry	719	$self->{entry} = new DC::UI::Entry
531	on_changed => sub {	720	on_changed => sub {
532	$self->update_labels;	721	$self->update_labels;
533	0	722	0
534	},	723	},
535	on_button_down => sub {	724	on_button_down => sub {
536	my ($entry, $ev, $x, $y) = @_;	725	my ($entry, $ev, $x, $y) = @_;
537		726
538	if ($ev->{button} == 3) {	727	if ($ev->{button} == 3) {
539	(new CFPlus::UI::Menu	728	(new DC::UI::Menu
540	items => [	729	items => [
541	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	730	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
542	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	731	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
543	],	732	],
544	)->popup ($ev);	733	)->popup ($ev);
545	return 1;	734	return 1;
546	}	735	}
547	0	736	0
…		…
562	$self->hide;	751	$self->hide;
563	}	752	}
564	} elsif ($ev->{sym} == 27) {	753	} elsif ($ev->{sym} == 27) {
565	$self->{hist_ptr} = 0;	754	$self->{hist_ptr} = 0;
566	$self->hide;	755	$self->hide;
567	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	756	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
568	if ($self->{hist_ptr} > 1) {	757	if ($self->{hist_ptr} > 1) {
569	$self->{hist_ptr}--;	758	$self->{hist_ptr}--;
570	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	759	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571	} elsif ($self->{hist_ptr} > 0) {	760	} elsif ($self->{hist_ptr} > 0) {
572	$self->{hist_ptr}--;	761	$self->{hist_ptr}--;
…		…
574	} else {	763	} else {
575	++$self->{select_offset}	764	++$self->{select_offset}
576	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	765	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
577	}	766	}
578	$self->update_labels;	767	$self->update_labels;
579	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	768	} elsif ($ev->{sym} == DC::SDLK_UP) {
580	if ($self->{select_offset}) {	769	if ($self->{select_offset}) {
581	--$self->{select_offset}	770	--$self->{select_offset}
582	} else {	771	} else {
583	unless ($self->{hist_ptr}) {	772	unless ($self->{hist_ptr}) {
584	$self->{hist_saveback} = $self->{entry}->get_text;	773	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
742		931
743	sub _draw {	932	sub _draw {
744	my ($self) = @_;	933	my ($self) = @_;
745		934
746	# hack	935	# hack
747	local $CFPlus::UI::FOCUS = $self->{entry};	936	local $DC::UI::FOCUS = $self->{entry};
748		937
749	$self->SUPER::_draw;	938	$self->SUPER::_draw;
750	}	939	}
751		940
752	1	941	1
		942

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC