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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 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_file DC::Texture DC::find_rcfile "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	;
26
27	$self	29	$self
28	}	30	}
29		31
30	sub add_command {	32	sub add_command {
31	my ($self, $command, $tooltip, $widget, $cb) = @_;	33	my ($self, $command, $tooltip, $widget, $cb) = @_;
32		34
33	(my $data = $command) =~ s/\\//g;	35	(my $data = $command) =~ s/\\//g;
34		36
35	$tooltip =~ s/^\s+//;	37	$tooltip =~ s/^\s+//;
36
37	$tooltip = "<big>$data</big>\n\n$tooltip";	38	$tooltip = "<big>$data</big>\n\n$tooltip";
38
39	$tooltip =~ s/\s+$//;	39	$tooltip =~ s/\s+$//;
40		40
41	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42	}	42	}
43		43
44	sub clr_commands {	44	sub clr_commands {
45	my ($self) = @_;	45	my ($self) = @_;
46		46
47	%{$self->{completer}{command}} = ();	47	%{$::COMPLETER->{command}} = ();
48	}
49		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
50	sub button_down {	163	sub invoke_button_down {
51	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
52		165
53	$self->focus_in;
54
55	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
56	my ($ox, $oy) = ($ev->{x}, $ev->{y});	184	my ($ox, $oy) = ($ev->{x}, $ev->{y});
57	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	185	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58		186
59	$self->{motion} = sub {	187	$self->{motion} = sub {
60	my ($ev, $x, $y) = @_;	188	my ($ev, $x, $y) = @_;
64	$::CFG->{map_shift_x} = $bw + $x - $ox;	192	$::CFG->{map_shift_x} = $bw + $x - $ox;
65	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
66		194
67	$self->update;	195	$self->update;
68	};	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
69	}	250	1
70	}	251	}
71		252
72	sub button_up {	253	sub invoke_button_up {
73	my ($self, $ev, $x, $y) = @_;	254	my ($self, $ev, $x, $y) = @_;
74		255
75	delete $self->{motion};	256	delete $self->{motion};
76	}
77		257
		258	1
		259	}
		260
78	sub mouse_motion {	261	sub invoke_mouse_motion {
79	my ($self, $ev, $x, $y) = @_;	262	my ($self, $ev, $x, $y) = @_;
80		263
		264	if ($self->{motion}) {
81	$self->{motion}->($ev, $x, $y) if $self->{motion};	265	$self->{motion}->($ev, $x, $y);
		266	} else {
		267	return 0;
		268	}
		269
		270	1
82	}	271	}
83		272
84	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
85	(	276	(
86	1 + 32 * int $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
87	1 + 32 * int $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
88	)	279	)
89	}	280	}
90		281
91	sub update {	282	sub update {
92	my ($self) = @_;	283	my ($self) = @_;
…		…
94	$self->{need_update} = 1;	285	$self->{need_update} = 1;
95	$self->SUPER::update;	286	$self->SUPER::update;
96	}	287	}
97		288
98	my %DIR = (	289	my %DIR = (
		290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
99	CFClient::SDLK_KP8, [1, "north"],	291	( "," . DC::SDLK_KP8 ), [1, "north"],
100	CFClient::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
101	CFClient::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
102	CFClient::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
103	CFClient::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
104	CFClient::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
105	CFClient::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
106	CFClient::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
107		299
108	CFClient::SDLK_UP, [1, "north"],	300	( "," . DC::SDLK_UP ), [1, "north"],
		301	("1," . DC::SDLK_UP ), [2, "northeast"],
109	CFClient::SDLK_RIGHT, [3, "east"],	302	( "," . DC::SDLK_RIGHT), [3, "east"],
		303	("1," . DC::SDLK_RIGHT), [4, "southeast"],
110	CFClient::SDLK_DOWN, [5, "south"],	304	( "," . DC::SDLK_DOWN ), [5, "south"],
		305	("1," . DC::SDLK_DOWN ), [6, "southwest"],
111	CFClient::SDLK_LEFT, [7, "west"],	306	( "," . DC::SDLK_LEFT ), [7, "west"],
		307	("1," . DC::SDLK_LEFT ), [8, "northwest"],
112	);	308	);
113		309
114	sub key_down {	310	sub invoke_key_down {
115	my ($self, $ev) = @_;	311	my ($self, $ev) = @_;
116
117	return unless $::CONN;
118		312
119	my $mod = $ev->{mod};	313	my $mod = $ev->{mod};
120	my $sym = $ev->{sym};	314	my $sym = $ev->{sym};
121	my $uni = $ev->{unicode};	315	my $uni = $ev->{unicode};
122		316
123	if ($sym == CFClient::SDLK_KP5) {	317	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
124	$::CONN->user_send ("stay fire");	318
125	} elsif ($uni == ord ",") {	319	# ignore repeated keypresses
126	$::CONN->user_send ("take");	320	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
127	} elsif ($uni == ord " ") {	321	$self->{last_mod} = $mod;
128	$::CONN->user_send ("apply");	322	$self->{last_sym} = $sym;
129	} elsif ($uni == ord "\t") {	323
130	# TODO: toggle inventory	324	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
131	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
132	$::CONN->user_send ("rotateshoottype +");
133	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
134	$::CONN->user_send ("rotateshoottype -");
135	} elsif ($uni == ord '"') {
136	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
137	$self->{completer}->show;
138	} elsif ($uni == ord "'") {
139	$self->{completer}->set_prefix ("");
140	$self->{completer}->show;
141	} elsif (exists $DIR{$sym}) {
142	if ($mod & CFClient::KMOD_SHIFT) {	325	if ($mod & DC::KMOD_SHIFT) {
143	$self->{shft}++;	326	$self->{shft}++;
		327	if ($dir->[0] != $self->{fire_dir}) {
144	$::CONN->user_send ("fire $DIR{$sym}[0]");	328	$::CONN->user_send ("fire $dir->[0]");
		329	}
		330	$self->{fire_dir} = $dir->[0];
145	} elsif ($mod & CFClient::KMOD_CTRL) {	331	} elsif ($mod & DC::KMOD_CTRL) {
146	$self->{ctrl}++;	332	$self->{ctrl}++;
147	$::CONN->user_send ("run $DIR{$sym}[0]");	333	$::CONN->user_send ("run $dir->[0]");
148	} else {	334	} else {
149	$::CONN->user_send ("$DIR{$sym}[1]");	335	$::CONN->user_send ("$dir->[1]");
150	}	336	}
151	} elsif ($ev->{unicode}) {	337
152	$self->{completer}->key_down ($ev);	338	return 1;
153	$self->{completer}->show;	339	}
		340
154	}	341	0
155	}	342	}
156		343
157	sub key_up {	344	sub invoke_key_up {
158	my ($self, $ev) = @_;	345	my ($self, $ev) = @_;
159		346
		347	my $res = 0;
160	my $mod = $ev->{mod};	348	my $mod = $ev->{mod};
161	my $sym = $ev->{sym};	349	my $sym = $ev->{sym};
162		350
		351	delete $self->{last_mod};
		352	delete $self->{last_sym};
		353
		354	if ($::CFG->{shift_fire_stop}) {
163	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	355	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
164	$::CONN->user_send ("fire_stop");	356	$::CONN->user_send ("fire_stop");
		357	delete $self->{fire_dir};
		358	$res = 1;
		359	}
		360	} else {
		361	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
		362	$::CONN->user_send ("fire_stop");
		363	delete $self->{fire_dir};
		364	$res = 1;
		365	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		366	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
		367	$::CONN->user_send ("fire_stop");
		368	delete $self->{fire_dir};
		369	$res = 1;
		370	}
165	}	371	}
		372
166	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
167	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
		375	$res = 1;
		376	}
		377
		378	$res
		379	}
		380
		381	sub invoke_visibility_change {
		382	my ($self) = @_;
		383
		384	$self->refresh_hook;
		385
168	}	386	0
169	}	387	}
170		388
171	sub draw {	389	sub set_tilesize {
		390	my ($self, $tilesize) = @_;
		391
		392	$self->{tilesize} = $tilesize;
		393	}
		394
		395	sub scroll {
172	my ($self) = @_;	396	my ($self, $dx, $dy) = @_;
173		397
174	my $focused = $CFClient::UI::FOCUS == $self	398	$::MAP->scroll ($dx, $dy);
175	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
176		399
177	return	400	$self->movement_update;
178	unless $focused \|\| !$::FAST;
179		401
		402	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		403	$self->{sdy} += $dy * $self->{tilesize};
		404	}
		405
		406	sub set_magicmap {
		407	my ($self, $w, $h, $x, $y, $data) = @_;
		408
		409	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		410	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		411
		412	$self->{magicmap} = [$x, $y, $w, $h, $data];
		413
		414	$self->update;
		415	}
		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) {
180	if (delete $self->{need_update}) {	458	if (delete $self->{need_update}) {
181	glNewList $self->{list};	459	$self->movement_update;
182		460
183	if ($::MAP) {	461	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
184	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
185	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
186		462
187	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	463	# width/height of map, in tiles
188	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	464	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
		465	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
189		466
190	glPushMatrix;	467	# the map displacement, in tiles
191	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	468	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
		469	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
192		470
193	glTranslate $sx0 - 32, $sy0 - 32, 0;	471	# the upper left "visible" corner, in pixels
		472	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		473	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
194		474
195	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	475	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		476	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
196		477
197	if ($::CFG->{fow_enable}) {	478	if ($::CFG->{fow_enable}) {
198	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	479	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
199	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
200	glConvolutionFilter2D (
201	GL_CONVOLUTION_2D,
202	GL_ALPHA,
203	3, 3,
204	GL_ALPHA, GL_FLOAT,
205	pack "f*",
206	0.05, 0.13, 0.05,
207	0.13, 0.30, 0.13,
208	0.05, 0.13, 0.05,
209	);
210	glEnable GL_CONVOLUTION_2D;
211	}
212		480
213	$self->{fow_texture_name} \|\|= glGenTexture;
214	# try to re-use the texture name: TODO improve texture class instead
215
216	$self->{fow_texture} = new CFClient::Texture	481	$self->{fow_texture} = new DC::Texture
217	w => $w,	482	w => $w,
218	h => $h,	483	h => $h,
219	data => $data,	484	data => $data,
220	name => $self->{fow_texture_name},
221	internalformat => GL_ALPHA,	485	internalformat => GL_ALPHA,
222	format => GL_ALPHA;	486	format => GL_ALPHA;
		487	} else {
		488	delete $self->{fow_texture};
		489	}
223		490
224	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	491	glNewList ($self->{list} \|\|= glGenList);
225		492
		493	glPushMatrix;
		494	glTranslate $sx0, $sy0;
		495	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		496	glTranslate $self->{sdx}, $self->{sdy};
		497
		498	warn "mapdraw -$self->{sdx}\n";#d#
		499	$::MAP->draw ($dx, $dy, $sw, $sh,
		500	$self->{tilesize},
		501	$::CONN->{player}{tag},
		502	-$self->{sdx}, -$self->{sdy});
		503
		504	glTranslate -$self->{sdx}, -$self->{sdy};
		505	glScale $self->{tilesize}, $self->{tilesize};
		506
		507	if (my $tex = $self->{fow_texture}) {
		508	glPushMatrix;
		509	glScale 1/3, 1/3;
226	glEnable GL_TEXTURE_2D;	510	glEnable GL_TEXTURE_2D;
227	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228		512
229	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	513	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);	514	$self->{fow_texture}->draw_quad_alpha (0, 0);
231		515
232	glDisable GL_TEXTURE_2D;	516	glDisable GL_TEXTURE_2D;
		517	glPopMatrix;
233	}	518	}
234		519
		520	if ($self->{magicmap}) {
		521	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		522
		523	$x += $::MAP->ox + $self->{dx};
		524	$y += $::MAP->oy + $self->{dy};
		525
		526	glTranslate - $x - 1, - $y - 1;
		527	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		528	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		529	}
		530
235	glPopMatrix;	531	glPopMatrix;
236	}
237
238	glEndList;	532	glEndList;
		533	}
		534	} else {
		535	glDeleteList delete $self->{list}
		536	if $self->{list};
239	}	537	}
		538	}
240		539
241	glPushMatrix;	540	sub draw {
		541	my ($self) = @_;
		542
		543	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		544
		545	return unless $self->{list};
		546
		547	my $focused = $DC::UI::FOCUS == $self
		548	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		549
		550	return
		551	unless $focused \|\| !$::FAST;
		552
242	glCallList $self->{list};	553	glCallList $self->{list};
243	glPopMatrix;
244		554
245	# TNT2 emulates logops in software (or worse :)	555	# TNT2 emulates logops in software (or worse :)
246	if ($focused) {	556	unless ($focused) {
247	(delete $self->{out_of_focus})->destroy	557	glColor_premultiply 0, 0, 1, 0.25;
248	if $self->{out_of_focus};
249	} else {
250	glColor 0.4, 0.2, 0.2, 0.6;
251	glEnable GL_BLEND;	558	glEnable GL_BLEND;
252	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
253	glBegin GL_QUADS;	560	glBegin GL_QUADS;
254	glVertex 0, 0;	561	glVertex 0, 0;
255	glVertex 0, $::HEIGHT;	562	glVertex 0, $::HEIGHT;
256	glVertex $::WIDTH, $::HEIGHT;	563	glVertex $::WIDTH, $::HEIGHT;
257	glVertex $::WIDTH, 0;	564	glVertex $::WIDTH, 0;
258	glEnd;	565	glEnd;
259	glDisable GL_BLEND;	566	glDisable GL_BLEND;
260
261	$self->{out_of_focus} \|\|= do {
262	my $label = new CFClient::UI::Label
263	x => 0,
264	y => 0,
265	z => 1,
266	ellipsise => 0,
267	text => "map out of focus (click map to play)";
268
269	$label->show;
270	$label->update;
271
272	$CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273	$label->move (
274	($::WIDTH - $label->{w}) * 0.5,
275	($::HEIGHT - $label->{h}) * 0.5,
276	);
277	});
278
279	$label
280	};
281	}	567	}
282	}	568	}
283		569
284	sub DESTROY {	570	sub DESTROY {
285	my $self = shift;	571	my $self = shift;
…		…
287	glDeleteList $self->{list};	573	glDeleteList $self->{list};
288		574
289	$self->SUPER::DESTROY;	575	$self->SUPER::DESTROY;
290	}	576	}
291		577
292	package CFClient::MapWidget::MapMap;	578	package DC::MapWidget::MapMap;
293		579
		580	use strict;
		581	use utf8;
		582
294	our @ISA = CFClient::UI::Base::;	583	our @ISA = DC::UI::Base::;
295		584
296	use Time::HiRes qw(time);	585	use Time::HiRes qw(time);
297	use CFClient::OpenGL;	586	use DC::OpenGL;
298		587
299	sub size_request {	588	sub size_request {
300	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	589	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
301	}	590	}
302		591
		592	sub refresh_hook {
		593	my ($self) = @_;
		594
		595	if ($::MAP && $self->{texture_atime} < time) {
		596	my ($w, $h) = @$self{qw(w h)};
		597
		598	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		599	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		600
		601	my $ox = 0.5 * ($w - $sw);
		602	my $oy = 0.5 * ($h - $sh);
		603
		604	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		605	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		606
		607	#TODO: map scale is completely borked
		608
		609	my $x0 = int $ox - $sx + 0.5;
		610	my $y0 = int $oy - $sy + 0.5;
		611
		612	$self->{sw} = $sw;
		613	$self->{sh} = $sh;
		614
		615	$self->{x0} = $x0;
		616	$self->{y0} = $y0;
		617
		618	$self->{texture_atime} = time + 1/3;
		619
		620	$self->{texture} =
		621	new DC::Texture
		622	w => $w,
		623	h => $h,
		624	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		625	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		626	}
		627	}
		628
		629	sub invoke_visibility_change {
		630	my ($self) = @_;
		631
		632	$self->refresh_hook;
		633
		634	0
		635	}
		636
303	sub size_allocate {	637	sub invoke_size_allocate {
304	my ($self, $w, $h) = @_;	638	my ($self, $w, $h) = @_;
305		639
306	$self->SUPER::size_allocate ($w, $h);
307	$self->update;	640	$self->update;
		641
		642	1
308	}	643	}
309		644
310	sub update {	645	sub update {
311	my ($self) = @_;	646	my ($self) = @_;
312		647
…		…
315	}	650	}
316		651
317	sub _draw {	652	sub _draw {
318	my ($self) = @_;	653	my ($self) = @_;
319		654
320	$::MAP or return;	655	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
321		656
322	my ($w, $h) = @$self{qw(w h)};	657	$self->{texture} or return;
323
324	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
325	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
326
327	my $sx = int $::CFG->{map_shift_x} / 32;
328	my $sy = int $::CFG->{map_shift_y} / 32;
329
330	my $ox = 0.5 * ($w - $sw);
331	my $oy = 0.5 * ($h - $sh);
332		658
333	glEnable GL_BLEND;	659	glEnable GL_BLEND;
334	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335	glEnable GL_TEXTURE_2D;	661	glEnable GL_TEXTURE_2D;
336	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337		663
338	if ($self->{texture_atime} < time) {
339	$self->{texture_atime} = time + 1/3;
340
341	$self->{texture} =
342	new CFClient::Texture
343	w => $w,
344	h => $h,
345	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
346	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
347	}
348
349	$self->{texture}->draw_quad (0, 0);	664	$self->{texture}->draw_quad (0, 0);
350		665
351	glDisable GL_TEXTURE_2D;	666	glDisable GL_TEXTURE_2D;
352		667
353	glTranslate 0.375, 0.375;	668	glTranslate 0.375, 0.375;
354
355	#TODO: map scale is completely borked
356
357	my $x0 = int $ox - $sx + 0.5;
358	my $y0 = int $oy - $sy + 0.5;
359		669
360	glColor 1, 1, 0, 1;	670	glColor 1, 1, 0, 1;
361	glBegin GL_LINE_LOOP;	671	glBegin GL_LINE_LOOP;
362	glVertex $x0 , $y0 ;	672	glVertex $self->{x0} , $self->{y0} ;
363	glVertex $x0 , $y0 + $sh;	673	glVertex $self->{x0} , $self->{y0} + $self->{sh};
364	glVertex $x0 + $sw, $y0 + $sh;	674	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
365	glVertex $x0 + $sw, $y0 ;	675	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
366	glEnd;	676	glEnd;
367		677
368	glDisable GL_BLEND;	678	glDisable GL_BLEND;
369	}	679	}
370		680
371	package CFClient::MapWidget::Command;	681	package DC::MapWidget::Command;
372		682
373	use strict;	683	use strict;
374		684
375	use CFClient::OpenGL;	685	use DC::OpenGL;
376		686
377	our @ISA = CFClient::UI::Frame::;	687	our @ISA = DC::UI::Frame::;
378		688
379	sub new {	689	sub new {
380	my $class = shift;	690	my $class = shift;
381		691
382	my $self = $class->SUPER::new (	692	my $self = $class->SUPER::new (
383	bg => [0, 0, 0, 0.8],	693	bg => [0, 0, 0, 0.8],
384	@_,	694	@_,
385	);	695	);
386		696
387	$self->add ($self->{vbox} = new CFClient::UI::VBox);	697	$self->add ($self->{vbox} = new DC::UI::VBox);
388		698
389	$self->{label} = [	699	$self->{label} = [
390	map	700	map
391	CFClient::UI::Label->new (	701	DC::UI::Label->new (
		702	align => 0,
392	can_hover => 1,	703	can_hover => 1,
393	can_events => 1,	704	can_events => 1,
394	tooltip_width => 0.33,	705	tooltip_width => 0.33,
395	fontsize => $_,	706	fontsize => $_,
396	), (0.8) x 16	707	), (0.8) x 16
397	];	708	];
398		709
399	$self->{entry} = new CFClient::UI::Entry	710	$self->{entry} = new DC::UI::Entry
400	connect_changed => sub {	711	on_changed => sub {
401	$self->update_labels;	712	$self->update_labels;
		713	0
402	},	714	},
		715	on_button_down => sub {
		716	my ($entry, $ev, $x, $y) = @_;
		717
		718	if ($ev->{button} == 3) {
		719	(new DC::UI::Menu
		720	items => [
		721	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		722	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		723	],
		724	)->popup ($ev);
		725	return 1;
		726	}
		727	0
		728	},
403	connect_key_down => sub {	729	on_key_down => sub {
404	my ($entry, $ev) = @_;	730	my ($entry, $ev) = @_;
405		731
406	my $self = $entry->{parent}{parent};	732	my $self = $entry->{parent}{parent};
407		733
408	if ($ev->{sym} == 13) {	734	if ($ev->{sym} == 13) {
409	if (exists $self->{select}) {	735	if (exists $self->{select}) {
		736	$self->{last_command} = $self->{select};
410	$::CONN->user_send ($self->{select});	737	$::CONN->user_send ($self->{select});
		738
		739	unshift @{$self->{history}}, $self->{entry}->get_text;
		740	$self->{hist_ptr} = 0;
		741
411	$self->hide;	742	$self->hide;
412	}	743	}
413	} elsif ($ev->{sym} == 27) {	744	} elsif ($ev->{sym} == 27) {
		745	$self->{hist_ptr} = 0;
414	$self->hide;	746	$self->hide;
415	return;
416	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	747	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		748	if ($self->{hist_ptr} > 1) {
		749	$self->{hist_ptr}--;
		750	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		751	} elsif ($self->{hist_ptr} > 0) {
		752	$self->{hist_ptr}--;
		753	$self->{entry}->set_text ($self->{hist_saveback});
		754	} else {
417	++$self->{select_offset}	755	++$self->{select_offset}
418	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	756	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		757	}
419	$self->update_labels;	758	$self->update_labels;
420	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	759	} elsif ($ev->{sym} == DC::SDLK_UP) {
		760	if ($self->{select_offset}) {
421	--$self->{select_offset}	761	--$self->{select_offset}
		762	} else {
		763	unless ($self->{hist_ptr}) {
		764	$self->{hist_saveback} = $self->{entry}->get_text;
		765	}
		766	if ($self->{hist_ptr} <= $#{$self->{history}}) {
422	if $self->{select_offset};	767	$self->{hist_ptr}++;
		768	}
		769	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		770	if exists $self->{history}->[$self->{hist_ptr} - 1];
		771	}
423	$self->update_labels;	772	$self->update_labels;
424	} else {	773	} else {
425	return 0;	774	return 0;
426	}	775	}
427		776
…		…
442		791
443	$self->{entry}->set_text ($prefix);	792	$self->{entry}->set_text ($prefix);
444	$self->show;	793	$self->show;
445	}	794	}
446		795
447	sub size_allocate {	796	sub invoke_size_allocate {
448	my ($self, $w, $h) = @_;	797	my ($self, $w, $h) = @_;
449		798
450	$self->SUPER::size_allocate ($w, $h);
451	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	799	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		800
		801	$self->SUPER::invoke_size_allocate ($w, $h)
452	}	802	}
453		803
454	sub show {	804	sub show {
455	my ($self) = @_;	805	my ($self) = @_;
456		806
457	$self->SUPER::show;	807	$self->SUPER::show;
458	$self->{entry}->focus_in;	808	$self->{entry}->grab_focus;
459	}	809	}
460		810
461	sub hide {	811	sub hide {
462	my ($self) = @_;	812	my ($self) = @_;
		813
		814	$self->{hist_ptr} = 0;
463		815
464	$self->SUPER::hide;	816	$self->SUPER::hide;
465	$self->{entry}->set_text ("");	817	$self->{entry}->set_text ("");
466	}	818	}
467		819
468	sub key_down {	820	sub inject_key_down {
469	my ($self, $ev) = @_;	821	my ($self, $ev) = @_;
470		822
		823	$self->{entry}->grab_focus;
471	$self->{entry}->key_down ($ev);	824	$self->{entry}->emit (key_down => $ev);
472	}	825	}
473		826
474	sub update_labels {	827	sub update_labels {
475	my ($self) = @_;	828	my ($self) = @_;
476		829
…		…
509		862
510	@match = map $self->{command}{$_->[0]},	863	@match = map $self->{command}{$_->[0]},
511	sort {	864	sort {
512	$a->[1] <=> $b->[1]	865	$a->[1] <=> $b->[1]
513	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	866	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514	or (length $a->[0]) <=> (length $b->[0])	867	or (length $b->[0]) <=> (length $a->[0])
515	} @match;	868	} @match;
516	}	869	}
517		870
518	$self->{last_search} = $cmd;	871	$self->{last_search} = $text;
519	$self->{last_match} = \@match;	872	$self->{last_match} = \@match;
520		873
521	$self->{select_offset} = 0;	874	$self->{select_offset} = 0;
522	}	875	}
523		876
…		…
563	$label->set_text ("");	916	$label->set_text ("");
564	$label->set_tooltip ("");	917	$label->set_tooltip ("");
565	}	918	}
566		919
567	$self->update;	920	$self->update;
568	###
569	}	921	}
570		922
571	sub _draw {	923	sub _draw {
572	my ($self) = @_;	924	my ($self) = @_;
573		925
574	# hack	926	# hack
575	local $CFClient::UI::FOCUS = $self->{entry};	927	local $DC::UI::FOCUS = $self->{entry};
576		928
577	$self->SUPER::_draw;	929	$self->SUPER::_draw;
578	}	930	}
579		931
580	1	932	1
		933

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs. Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC