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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC vs.
Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC

…		…
1	package CFClient::MapWidget;	1	package CFPlus::MapWidget;
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
		8	use CFPlus;
8	use CFClient::OpenGL;	9	use CFPlus::OpenGL;
		10	use CFPlus::UI;
		11	use CFPlus::Macro;
9		12
10	our @ISA = CFClient::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
		14
		15	my $magicmap_tex =
		16	new_from_file CFPlus::Texture CFPlus::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
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		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
42	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
43	}	36	}
44		37
45	sub add_command {	38	sub add_command {
46	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
47		40
49		42
50	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
51	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
52	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
53		46
54	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
55	}	48	}
56		49
57	sub clr_commands {	50	sub clr_commands {
58	my ($self) = @_;	51	my ($self) = @_;
59		52
60	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
61	}
62		54
		55	$::COMPLETER->hide
		56	if $::COMPLETER;
		57	}
		58
		59	sub server_login {
		60	my ($server) = @_;
		61
		62	::stop_game ();
		63	local $::PROFILE->{host} = $server;
		64	::start_game ();
		65	}
		66
		67	sub editor_invoke {
		68	my $editsup = $::CONN && $::CONN->{editor_support}
		69	or return;
		70
		71	CFPlus::background {
		72	print "preparing editor startup...\n";
		73
		74	my $server = $editsup->{gameserver} \|\| "default";
		75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		76
		77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		79
		80	print "map directory is $mapdir\n";
		81	print "lib directory is $libdir\n";
		82
		83	my $ua = CFPlus::lwp_useragent;
		84
		85	for my $file (qw(archetypes crossfire.0)) {
		86	my $url = "$editsup->{lib_root}$file";
		87	print "mirroring $url...\n";
		88	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
		89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		90	}
		91
		92	if (1) { # upload a map
		93	my $mapname = $::CONN->{map_info}[0];
		94
		95	my $mappath = "$mapdir/$mapname";
		96
		97	-e $mappath and die "$mappath already exists\n";
		98
		99	print "getting map revision for $mapname...\n";
		100
		101	# try to get the most recent head revision, what a hack,
		102	# this should have been returned while downloading sigh
		103	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		104
		105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		106	my $rev = $1;
		107
		108	print "downloading revision $rev...\n";
		109
		110	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		111
		112	my $meta = {
		113	%$editsup,
		114	path => $mapname,
		115	revision => $rev,
		116	cf_login => $::PROFILE->{user},
		117	};
		118
		119	require File::Basename;
		120	require File::Path;
		121
		122	File::Path::mkpath (File::Basename::dirname ($mappath));
		123	open my $fh, ">:raw:perlio", "$mappath.meta"
		124	or die "$mappath.meta: $!\n";
		125	print $fh CFPlus::encode_json $meta;
		126	close $fh;
		127	open my $fh, ">:raw:perlio:utf8", $mappath
		128	or die "$mappath: $!\n";
		129	print $fh $map;
		130	close $fh;
		131
		132	print "saved as $mappath\n";
		133
		134	print "invoking editor...\n";
		135	exec "/root/s2/gce $mappath";#d#
		136
		137	# now upload it
		138	# require HTTP::Request::Common;
		139	#
		140	# my $res = $ua->post (
		141	# $ENV{CFPLUS_UPLOAD},
		142	# Content_Type => 'multipart/form-data',
		143	# Content => [
		144	# path => $mapname,
		145	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		146	# map => $map,
		147	# revision => $rev,
		148	# cf_login => $ENV{CFPLUS_LOGIN},
		149	# cf_password => $ENV{CFPLUS_PASSWORD},
		150	# comment => "",
		151	# ]
		152	# );
		153	#
		154	# if ($res->is_error) {
		155	# # fatal condition
		156	# warn $res->status_line;
		157	# } else {
		158	# # script replies are marked as {{..}}
		159	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		160	# warn map "$_\n", @msgs;
		161	# }
		162	} else {
		163	die "viewvc parse error, unable to detect revision\n";
		164	}
		165	}
		166	}
		167	}
		168
63	sub button_down {	169	sub invoke_button_down {
64	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
65		171
66	$self->focus_in;
67
68	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
69	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	173	$self->grab_focus;
70	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	174	return unless $::CONN;
71		175
72	my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99;	176	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
73	my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;	177	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
74		178
75	$::CONN->send (sprintf "lookat %d %d", $fx, $fy)	179	$x -= CFPlus::floor $::MAP->w * 0.5;
		180	$y -= CFPlus::floor $::MAP->h * 0.5;
		181
76	if $::CONN;	182	if ($::CONN) {
		183	$::CONN->lookat ($x, $y)
		184	}
77		185
78	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
		187	$self->grab_focus;
		188	return unless $::CONN;
		189
79	my ($ox, $oy) = ($ev->{x}, $ev->{y});	190	my ($ox, $oy) = ($ev->{x}, $ev->{y});
80	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	191	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
81		192
82	$self->{motion} = sub {	193	$self->{motion} = sub {
83	my ($ev, $x, $y) = @_;	194	my ($ev, $x, $y) = @_;
…		…
87	$::CFG->{map_shift_x} = $bw + $x - $ox;	198	$::CFG->{map_shift_x} = $bw + $x - $ox;
88	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
89		200
90	$self->update;	201	$self->update;
91	};	202	};
		203	} elsif ($ev->{button} == 3) {
		204	my @items = (
		205	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		211	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		212	[
		213	$::PICKUP_ENABLE->{state}
		214	? "Disable automatic pickup"
		215	: "Enable automatic pickup",
		216	sub { $::PICKUP_ENABLE->toggle }
		217	],
		218	);
		219
		220	if ($::CONN && $::CONN->{editor_support}) {
		221	push @items, [
		222	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
		223	\&editor_invoke,
		224	];
		225
		226	for my $type (qw(test name)) {
		227	$::CONN->{editor_support}{type} ne $type
		228	or next;
		229	my $server = $::CONN->{editor_support}{"${type}server"}
		230	or next;
		231
		232	push @items, [
		233	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
		234	sub { server_login $server },
		235	];
		236	}
		237	}
		238
		239	push @items,
		240	["Quit",
		241	sub {
		242	if ($::CONN) {
		243	&::open_quit_dialog;
		244	} else {
		245	exit;
		246	}
		247	}
		248	],
		249	;
		250
		251	(new CFPlus::UI::Menu
		252	items => \@items,
		253	)->popup ($ev);
92	}	254	}
93		255
94	1	256	1
95	}	257	}
96		258
97	sub button_up {	259	sub invoke_button_up {
98	my ($self, $ev, $x, $y) = @_;	260	my ($self, $ev, $x, $y) = @_;
99		261
100	delete $self->{motion};	262	delete $self->{motion};
101		263
102	1	264	1
103	}	265	}
104		266
105	sub mouse_motion {	267	sub invoke_mouse_motion {
106	my ($self, $ev, $x, $y) = @_;	268	my ($self, $ev, $x, $y) = @_;
107		269
108	if ($self->{motion}) {	270	if ($self->{motion}) {
109	$self->{motion}->($ev, $x, $y);	271	$self->{motion}->($ev, $x, $y);
110	} else {	272	} else {
…		…
113		275
114	1	276	1
115	}	277	}
116		278
117	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
118	(	282	(
119	1 + 32 * int $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
120	1 + 32 * int $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
121	)	285	)
122	}	286	}
123		287
124	sub update {	288	sub update {
125	my ($self) = @_;	289	my ($self) = @_;
…		…
127	$self->{need_update} = 1;	291	$self->{need_update} = 1;
128	$self->SUPER::update;	292	$self->SUPER::update;
129	}	293	}
130		294
131	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
132	CFClient::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
133	CFClient::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
134	CFClient::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
135	CFClient::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
136	CFClient::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
137	CFClient::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
138	CFClient::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
139	CFClient::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
140		305
141	CFClient::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
142	CFClient::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
143	CFClient::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
144	CFClient::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
145	);	314	);
146		315
147	sub key_down {	316	sub invoke_key_down {
148	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
149
150	return 0 unless $::CONN;
151		318
152	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
153	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
154	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
155		322
156	if ($sym == CFClient::SDLK_KP5) {	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
157	$::CONN->user_send ("stay fire");	324
158	} elsif ($uni == ord ",") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
159	$::CONN->user_send ("take");
160	} elsif ($uni == ord " ") {
161	$::CONN->user_send ("apply");
162	} elsif ($uni == ord ".") {
163	$::CONN->user_send ($self->{completer}{last_command})
164	if exists $self->{completer}{last_command};
165	} elsif ($uni == ord "\t") {
166	$::INV_WINDOW->toggle_visibility;
167	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
168	$::CONN->user_send ("rotateshoottype +");
169	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
170	$::CONN->user_send ("rotateshoottype -");
171	} elsif ($uni == ord '"') {
172	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
173	$self->{completer}->show;
174	} elsif ($uni == ord "'") {
175	$self->{completer}->set_prefix ("");
176	$self->{completer}->show;
177	} elsif (exists $DIR{$sym}) {
178	if ($mod & CFClient::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
179	$self->{shft}++;	327	$self->{shft}++;
		328	if ($dir->[0] != $self->{fire_dir}) {
180	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
		330	}
		331	$self->{fire_dir} = $dir->[0];
181	} elsif ($mod & CFClient::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
182	$self->{ctrl}++;	333	$self->{ctrl}++;
183	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
184	} else {	335	} else {
185	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
186	}	337	}
187	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	338
188	$::BIND_EDITOR->set_binding (undef, undef, [],
189	sub {
190	my ($mod, $sym, $cmds) = @_;
191	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
192	});
193	$::BIND_EDITOR->start;
194	$::BIND_EDITOR->show;
195	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
196	$::BIND_EDITOR->stop;
197	$::BIND_EDITOR->ask_for_bind_and_commit;
198	$::BIND_EDITOR->hide;
199	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
200	$::CONN->user_send ($_) for @$bind_cmd;
201	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
202	$self->{completer}->key_down ($ev);
203	$self->{completer}->show;
204	} else {
205	return 0;	339	return 1;
206	}
207
208	1	340	}
209	}
210		341
		342	0
		343	}
		344
211	sub key_up {	345	sub invoke_key_up {
212	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
213		347
214	my $res = 0;	348	my $res = 0;
215	my $mod = $ev->{mod};	349	my $mod = $ev->{mod};
216	my $sym = $ev->{sym};	350	my $sym = $ev->{sym};
217		351
		352	if ($::CFG->{shift_fire_stop}) {
218	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
219	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
		355	delete $self->{fire_dir};
220	$res = 1;	356	$res = 1;
		357	}
		358	} else {
		359	if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
		360	$::CONN->user_send ("fire_stop");
		361	delete $self->{fire_dir};
		362	$res = 1;
		363	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT)
		364	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
		365	$::CONN->user_send ("fire_stop");
		366	delete $self->{fire_dir};
		367	$res = 1;
		368	}
221	}	369	}
222		370
223	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	371	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
224	$::CONN->user_send ("run_stop");	372	$::CONN->user_send ("run_stop");
225	$res = 1;	373	$res = 1;
226	}	374	}
227		375
228	$res	376	$res
229	}	377	}
230		378
231	sub draw {	379	sub invoke_visibility_change {
232	my ($self) = @_;	380	my ($self) = @_;
233		381
234	my $focused = $CFClient::UI::FOCUS == $self	382	$self->refresh_hook;
235	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
236		383
237	return	384	0
238	unless $focused \|\| !$::FAST;	385	}
239		386
		387	sub set_magicmap {
		388	my ($self, $w, $h, $x, $y, $data) = @_;
		389
		390	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		391	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		392
		393	$self->{magicmap} = [$x, $y, $w, $h, $data];
		394
		395	$self->update;
		396	}
		397
		398	sub refresh_hook {
		399	my ($self) = @_;
		400
		401	if ($::MAP && $::CONN) {
240	if (delete $self->{need_update}) {	402	if (delete $self->{need_update}) {
241	glNewList $self->{list};	403	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
242		404
243	if ($::MAP) {	405	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
244	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	406	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
245	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
246		407
247	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	408	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
248	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	409	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
249		410
250	glPushMatrix;	411	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
251	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	412	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
252		413
253	glTranslate $sx0 - 32, $sy0 - 32, 0;	414	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
254		415	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
255	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
256		416
257	if ($::CFG->{fow_enable}) {	417	if ($::CFG->{fow_enable}) {
258	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	418	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
259	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
260	glConvolutionFilter2D (
261	GL_CONVOLUTION_2D,
262	GL_ALPHA,
263	3, 3,
264	GL_ALPHA, GL_FLOAT,
265	(pack "f*", @{ $self->{smooth_matrix} }),
266	);
267	glEnable GL_CONVOLUTION_2D;
268	}
269		419
270	$self->{fow_texture_name} \|\|= glGenTexture;
271	# try to re-use the texture name: TODO improve texture class instead
272
273	$self->{fow_texture} = new CFClient::Texture	420	$self->{fow_texture} = new CFPlus::Texture
274	w => $w,	421	w => $w,
275	h => $h,	422	h => $h,
276	data => $data,	423	data => $data,
277	name => $self->{fow_texture_name},
278	internalformat => GL_ALPHA,	424	internalformat => GL_ALPHA,
279	format => GL_ALPHA;	425	format => GL_ALPHA;
		426	} else {
		427	delete $self->{fow_texture};
		428	}
280		429
281	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	430	glNewList ($self->{list} \|\|= glGenList);
282		431
		432	glPushMatrix;
		433	glTranslate $sx0, $sy0;
		434	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		435
		436	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		437
		438	glScale $self->{tilesize}, $self->{tilesize};
		439
		440	if (my $tex = $self->{fow_texture}) {
		441	glPushMatrix;
		442	glScale 1/3, 1/3;
283	glEnable GL_TEXTURE_2D;	443	glEnable GL_TEXTURE_2D;
284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
285		445
286	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	446	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
287	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);	447	$self->{fow_texture}->draw_quad_alpha (0, 0);
288		448
289	glDisable GL_TEXTURE_2D;	449	glDisable GL_TEXTURE_2D;
		450	glPopMatrix;
290	}	451	}
291		452
		453	if ($self->{magicmap}) {
		454	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		455
		456	$x += $::MAP->ox + $self->{dx};
		457	$y += $::MAP->oy + $self->{dy};
		458
		459	glTranslate - $x - 1, - $y - 1;
		460	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		461	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		462	}
		463
292	glPopMatrix;	464	glPopMatrix;
293	}
294
295	glEndList;	465	glEndList;
		466	}
		467	} else {
		468	glDeleteList delete $self->{list}
		469	if $self->{list};
296	}	470	}
		471	}
297		472
298	glPushMatrix;	473	sub draw {
		474	my ($self) = @_;
		475
		476	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		477
		478	return unless $self->{list};
		479
		480	my $focused = $CFPlus::UI::FOCUS == $self
		481	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
		482
		483	return
		484	unless $focused \|\| !$::FAST;
		485
299	glCallList $self->{list};	486	glCallList $self->{list};
300	glPopMatrix;
301		487
302	# TNT2 emulates logops in software (or worse :)	488	# TNT2 emulates logops in software (or worse :)
303	if ($focused) {	489	unless ($focused) {
304	(delete $self->{out_of_focus})->destroy	490	glColor_premultiply 0, 0, 1, 0.25;
305	if $self->{out_of_focus};
306	} else {
307	glColor 0.4, 0.2, 0.2, 0.6;
308	glEnable GL_BLEND;	491	glEnable GL_BLEND;
309	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
310	glBegin GL_QUADS;	493	glBegin GL_QUADS;
311	glVertex 0, 0;	494	glVertex 0, 0;
312	glVertex 0, $::HEIGHT;	495	glVertex 0, $::HEIGHT;
313	glVertex $::WIDTH, $::HEIGHT;	496	glVertex $::WIDTH, $::HEIGHT;
314	glVertex $::WIDTH, 0;	497	glVertex $::WIDTH, 0;
315	glEnd;	498	glEnd;
316	glDisable GL_BLEND;	499	glDisable GL_BLEND;
317
318	# $self->{out_of_focus} \|\|= do {
319	# my $label = new CFClient::UI::Label
320	# x => 0,
321	# y => 0,
322	# z => 1,
323	# ellipsise => 0,
324	# text => "map out of focus (click map to play)";
325	#
326	# $label->show;
327	# $label->update;
328	#
329	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
330	# $label->move_abs (
331	# ($::WIDTH - $label->{w}) * 0.5,
332	# ($::HEIGHT - $label->{h}) * 0.5,
333	# );
334	# });
335	#
336	# $label
337	# };
338	}	500	}
339	}	501	}
340		502
341	sub DESTROY {	503	sub DESTROY {
342	my $self = shift;	504	my $self = shift;
…		…
344	glDeleteList $self->{list};	506	glDeleteList $self->{list};
345		507
346	$self->SUPER::DESTROY;	508	$self->SUPER::DESTROY;
347	}	509	}
348		510
349	package CFClient::MapWidget::MapMap;	511	package CFPlus::MapWidget::MapMap;
350		512
		513	use strict;
		514	use utf8;
		515
351	our @ISA = CFClient::UI::Base::;	516	our @ISA = CFPlus::UI::Base::;
352		517
353	use Time::HiRes qw(time);	518	use Time::HiRes qw(time);
354	use CFClient::OpenGL;	519	use CFPlus::OpenGL;
355		520
356	sub size_request {	521	sub size_request {
357	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	522	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
358	}	523	}
359		524
		525	sub refresh_hook {
		526	my ($self) = @_;
		527
		528	if ($::MAP && $self->{texture_atime} < time) {
		529	my ($w, $h) = @$self{qw(w h)};
		530
		531	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		532	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		533
		534	my $ox = 0.5 * ($w - $sw);
		535	my $oy = 0.5 * ($h - $sh);
		536
		537	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		538	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		539
		540	#TODO: map scale is completely borked
		541
		542	my $x0 = int $ox - $sx + 0.5;
		543	my $y0 = int $oy - $sy + 0.5;
		544
		545	$self->{sw} = $sw;
		546	$self->{sh} = $sh;
		547
		548	$self->{x0} = $x0;
		549	$self->{y0} = $y0;
		550
		551	$self->{texture_atime} = time + 1/3;
		552
		553	$self->{texture} =
		554	new CFPlus::Texture
		555	w => $w,
		556	h => $h,
		557	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		558	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		559	}
		560	}
		561
		562	sub invoke_visibility_change {
		563	my ($self) = @_;
		564
		565	$self->refresh_hook;
		566
		567	0
		568	}
		569
360	sub size_allocate {	570	sub invoke_size_allocate {
361	my ($self, $w, $h) = @_;	571	my ($self, $w, $h) = @_;
362		572
363	$self->SUPER::size_allocate ($w, $h);
364	$self->update;	573	$self->update;
		574
		575	1
365	}	576	}
366		577
367	sub update {	578	sub update {
368	my ($self) = @_;	579	my ($self) = @_;
369		580
…		…
372	}	583	}
373		584
374	sub _draw {	585	sub _draw {
375	my ($self) = @_;	586	my ($self) = @_;
376		587
377	$::MAP or return;	588	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
378		589
379	my ($w, $h) = @$self{qw(w h)};	590	$self->{texture} or return;
380
381	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
382	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
383
384	my $sx = int $::CFG->{map_shift_x} / 32;
385	my $sy = int $::CFG->{map_shift_y} / 32;
386
387	my $ox = 0.5 * ($w - $sw);
388	my $oy = 0.5 * ($h - $sh);
389		591
390	glEnable GL_BLEND;	592	glEnable GL_BLEND;
391	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	593	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
392	glEnable GL_TEXTURE_2D;	594	glEnable GL_TEXTURE_2D;
393	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
394		596
395	if ($self->{texture_atime} < time) {
396	$self->{texture_atime} = time + 1/3;
397
398	$self->{texture} =
399	new CFClient::Texture
400	w => $w,
401	h => $h,
402	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
403	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
404	}
405
406	$self->{texture}->draw_quad (0, 0);	597	$self->{texture}->draw_quad (0, 0);
407		598
408	glDisable GL_TEXTURE_2D;	599	glDisable GL_TEXTURE_2D;
409		600
410	glTranslate 0.375, 0.375;	601	glTranslate 0.375, 0.375;
411
412	#TODO: map scale is completely borked
413
414	my $x0 = int $ox - $sx + 0.5;
415	my $y0 = int $oy - $sy + 0.5;
416		602
417	glColor 1, 1, 0, 1;	603	glColor 1, 1, 0, 1;
418	glBegin GL_LINE_LOOP;	604	glBegin GL_LINE_LOOP;
419	glVertex $x0 , $y0 ;	605	glVertex $self->{x0} , $self->{y0} ;
420	glVertex $x0 , $y0 + $sh;	606	glVertex $self->{x0} , $self->{y0} + $self->{sh};
421	glVertex $x0 + $sw, $y0 + $sh;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
422	glVertex $x0 + $sw, $y0 ;	608	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
423	glEnd;	609	glEnd;
424		610
425	glDisable GL_BLEND;	611	glDisable GL_BLEND;
426	}	612	}
427		613
428	package CFClient::MapWidget::Command;	614	package CFPlus::MapWidget::Command;
429		615
430	use strict;	616	use strict;
431		617
432	use CFClient::OpenGL;	618	use CFPlus::OpenGL;
433		619
434	our @ISA = CFClient::UI::Frame::;	620	our @ISA = CFPlus::UI::Frame::;
435		621
436	sub new {	622	sub new {
437	my $class = shift;	623	my $class = shift;
438		624
439	my $self = $class->SUPER::new (	625	my $self = $class->SUPER::new (
440	bg => [0, 0, 0, 0.8],	626	bg => [0, 0, 0, 0.8],
441	@_,	627	@_,
442	);	628	);
443		629
444	$self->add ($self->{vbox} = new CFClient::UI::VBox);	630	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
445		631
446	$self->{label} = [	632	$self->{label} = [
447	map	633	map
448	CFClient::UI::Label->new (	634	CFPlus::UI::Label->new (
449	can_hover => 1,	635	can_hover => 1,
450	can_events => 1,	636	can_events => 1,
451	tooltip_width => 0.33,	637	tooltip_width => 0.33,
452	fontsize => $_,	638	fontsize => $_,
453	), (0.8) x 16	639	), (0.8) x 16
454	];	640	];
455		641
456	$self->{entry} = new CFClient::UI::Entry	642	$self->{entry} = new CFPlus::UI::Entry
457	on_changed => sub {	643	on_changed => sub {
458	$self->update_labels;	644	$self->update_labels;
		645	0
		646	},
		647	on_button_down => sub {
		648	my ($entry, $ev, $x, $y) = @_;
		649
		650	if ($ev->{button} == 3) {
		651	(new CFPlus::UI::Menu
		652	items => [
		653	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
		654	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		655	],
		656	)->popup ($ev);
		657	return 1;
		658	}
		659	0
459	},	660	},
460	on_key_down => sub {	661	on_key_down => sub {
461	my ($entry, $ev) = @_;	662	my ($entry, $ev) = @_;
462		663
463	my $self = $entry->{parent}{parent};	664	my $self = $entry->{parent}{parent};
…		…
465	if ($ev->{sym} == 13) {	666	if ($ev->{sym} == 13) {
466	if (exists $self->{select}) {	667	if (exists $self->{select}) {
467	$self->{last_command} = $self->{select};	668	$self->{last_command} = $self->{select};
468	$::CONN->user_send ($self->{select});	669	$::CONN->user_send ($self->{select});
469		670
470	unshift @{$self->{history}}, $self->{select};	671	unshift @{$self->{history}}, $self->{entry}->get_text;
471	$self->{hist_ptr} = 0;	672	$self->{hist_ptr} = 0;
472		673
473	$self->hide;	674	$self->hide;
474	}	675	}
475	} elsif ($ev->{sym} == 27) {	676	} elsif ($ev->{sym} == 27) {
476	$self->{hist_ptr} = 0;	677	$self->{hist_ptr} = 0;
477	$self->hide;	678	$self->hide;
478	return;
479	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	679	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
480	if ($self->{hist_ptr} > 1) {	680	if ($self->{hist_ptr} > 1) {
481	$self->{hist_ptr}--;	681	$self->{hist_ptr}--;
482	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	682	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483	} elsif ($self->{hist_ptr} > 0) {	683	} elsif ($self->{hist_ptr} > 0) {
484	$self->{hist_ptr}--;	684	$self->{hist_ptr}--;
…		…
486	} else {	686	} else {
487	++$self->{select_offset}	687	++$self->{select_offset}
488	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	688	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
489	}	689	}
490	$self->update_labels;	690	$self->update_labels;
491	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	691	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
492	if ($self->{select_offset}) {	692	if ($self->{select_offset}) {
493	--$self->{select_offset}	693	--$self->{select_offset}
494	} else {	694	} else {
495	unless ($self->{hist_ptr}) {	695	unless ($self->{hist_ptr}) {
496	$self->{hist_saveback} = $self->{entry}->get_text;	696	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
523		723
524	$self->{entry}->set_text ($prefix);	724	$self->{entry}->set_text ($prefix);
525	$self->show;	725	$self->show;
526	}	726	}
527		727
528	sub size_allocate {	728	sub invoke_size_allocate {
529	my ($self, $w, $h) = @_;	729	my ($self, $w, $h) = @_;
530		730
531	$self->SUPER::size_allocate ($w, $h);
532	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	731	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		732
		733	$self->SUPER::invoke_size_allocate ($w, $h)
533	}	734	}
534		735
535	sub show {	736	sub show {
536	my ($self) = @_;	737	my ($self) = @_;
537		738
538	$self->SUPER::show;	739	$self->SUPER::show;
539	$self->{entry}->focus_in;	740	$self->{entry}->grab_focus;
540	}	741	}
541		742
542	sub hide {	743	sub hide {
543	my ($self) = @_;	744	my ($self) = @_;
		745
		746	$self->{hist_ptr} = 0;
544		747
545	$self->SUPER::hide;	748	$self->SUPER::hide;
546	$self->{entry}->set_text ("");	749	$self->{entry}->set_text ("");
547	}	750	}
548		751
549	sub key_down {	752	sub inject_key_down {
550	my ($self, $ev) = @_;	753	my ($self, $ev) = @_;
551		754
		755	$self->{entry}->grab_focus;
552	$self->{entry}->key_down ($ev)	756	$self->{entry}->emit (key_down => $ev);
553	}	757	}
554		758
555	sub update_labels {	759	sub update_labels {
556	my ($self) = @_;	760	my ($self) = @_;
557		761
…		…
644	$label->set_text ("");	848	$label->set_text ("");
645	$label->set_tooltip ("");	849	$label->set_tooltip ("");
646	}	850	}
647		851
648	$self->update;	852	$self->update;
649	###
650	}	853	}
651		854
652	sub _draw {	855	sub _draw {
653	my ($self) = @_;	856	my ($self) = @_;
654		857
655	# hack	858	# hack
656	local $CFClient::UI::FOCUS = $self->{entry};	859	local $CFPlus::UI::FOCUS = $self->{entry};
657		860
658	$self->SUPER::_draw;	861	$self->SUPER::_draw;
659	}	862	}
660		863
661	1	864	1
		865

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC vs. Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC vs.
Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC