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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.37 by root, Thu May 25 01:26:53 2006 UTC vs.
Revision 1.143 by root, Wed Sep 3 06:07:39 2008 UTC

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