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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.149 by root, Tue Jan 13 00:01:48 2009 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs. Revision 1.149 by root, Tue Jan 13 00:01:48 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.149 by root, Tue Jan 13 00:01:48 2009 UTC