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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.122 by root, Wed Dec 5 10:49:17 2007 UTC

…		…
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use CFPlus;
9	use CFPlus::OpenGL;	9	use CFPlus::OpenGL;
10	use CFPlus::UI;	10	use CFPlus::UI;
		11	use CFPlus::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
…		…
19	my $class = shift;	20	my $class = shift;
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	tilesize => 32,
25
26	smooth_matrix => [
27	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,
30	],
31
32	@_	26	@_
33	);	27	);
34		28
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39
40	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
41	}	36	}
42		37
43	sub add_command {	38	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		40
…		…
47		42
48	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
51		46
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	48	}
54		49
55	sub clr_commands {	50	sub clr_commands {
56	my ($self) = @_;	51	my ($self) = @_;
57		52
58	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
59		54
60	$self->{completer}->hide	55	$::COMPLETER->hide
61	if $self->{completer};	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 = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
		78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::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	}
62	}	167	}
63		168
64	sub invoke_button_down {	169	sub invoke_button_down {
65	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
66		171
67	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
68	$self->grab_focus;	173	$self->grab_focus;
69	return unless $::CONN;	174	return unless $::CONN;
70		175
71	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	176	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
72	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	177	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
73		178
74	$x -= int 0.5 * $self->{sw};	179	$x -= CFPlus::floor $::MAP->w * 0.5;
75	$y -= int 0.5 * $self->{sh};	180	$y -= CFPlus::floor $::MAP->h * 0.5;
76		181
		182	if ($::CONN) {
77	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
78	if $::CONN;	184	}
79		185
80	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
81	$self->grab_focus;	187	$self->grab_focus;
82	return unless $::CONN;	188	return unless $::CONN;
83		189
…		…
93	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
94		200
95	$self->update;	201	$self->update;
96	};	202	};
97	} elsif ($ev->{button} == 3) {	203	} elsif ($ev->{button} == 3) {
98	(new CFPlus::UI::Menu	204	my @items = (
99	items => [
100	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	205	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
108	$::PICKUP_ENABLE->{state}	213	$::PICKUP_ENABLE->{state}
109	? "Disable automatic pickup"	214	? "Disable automatic pickup"
110	: "Enable automatic pickup",	215	: "Enable automatic pickup",
111	sub { $::PICKUP_ENABLE->toggle }	216	sub { $::PICKUP_ENABLE->toggle }
112	],	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,
113	["Quit",	240	["Quit",
114	sub {	241	sub {
115	if ($::CONN) {	242	if ($::CONN) {
116	&::open_quit_dialog;	243	&::open_quit_dialog;
117	} else {	244	} else {
118	exit;	245	exit;
119	}
120	}	246	}
121	],	247	}
122	],	248	],
		249	;
		250
		251	(new CFPlus::UI::Menu
		252	items => \@items,
123	)->popup ($ev);	253	)->popup ($ev);
124	}	254	}
125		255
126	1	256	1
127	}	257	}
…		…
145		275
146	1	276	1
147	}	277	}
148		278
149	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
150	(	282	(
151	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
152	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
153	)	285	)
154	}	286	}
155		287
156	sub update {	288	sub update {
157	my ($self) = @_;	289	my ($self) = @_;
…		…
159	$self->{need_update} = 1;	291	$self->{need_update} = 1;
160	$self->SUPER::update;	292	$self->SUPER::update;
161	}	293	}
162		294
163	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
164	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
165	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
166	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
167	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
168	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
169	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
170	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
171	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
172		305
173	CFPlus::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
174	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
175	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
176	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
177	);	314	);
178		315
179	sub invoke_key_down {	316	sub invoke_key_down {
180	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
181		318
…		…
183	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
184	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
185		322
186	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
187		324
188	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
189	$::PL_WINDOW->toggle_visibility;
190	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
191	$::HELP_WINDOW->toggle_visibility;
192	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
193	::toggle_player_page ($::STATS_PAGE);
194	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
195	::toggle_player_page ($::SKILL_PAGE);
196	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
197	::toggle_player_page ($::SPELL_PAGE);
198	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
199	::toggle_player_page ($::INVENTORY_PAGE);
200	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
201	$::SETUP_DIALOG->toggle_visibility;
202	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
203	$::BIND_EDITOR->set_binding (undef, undef, [],
204	sub {
205	my ($mod, $sym, $cmds) = @_;
206	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
207	});
208	$::BIND_EDITOR->start;
209	$::BIND_EDITOR->show;
210	#TODO: elmex, what was this supposed to do? it currently crashes the client.
211	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
212	# $::BIND_EDITOR->stop;
213	# $::BIND_EDITOR->ask_for_bind_and_commit;
214	# $::BIND_EDITOR->hide;
215	} elsif (!$::CONN) {
216	return 0; # bindings further down need a valid connection
217
218	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
219	$::CONN->user_send ("stay fire");
220	} elsif ($uni == ord ",") {
221	$::CONN->user_send ("take");
222	} elsif ($uni == ord " ") {
223	$::CONN->user_send ("apply");
224	} elsif ($uni == 13) {
225	$::CONN->user_send ("examine");
226	} elsif ($uni == ord ".") {
227	$::CONN->user_send ($self->{completer}{last_command})
228	if exists $self->{completer}{last_command};
229	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
230	$::CONN->user_send ($_) for @$bind_cmd;
231	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
232	$::CONN->user_send ("rotateshoottype +");
233	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
234	$::CONN->user_send ("rotateshoottype -");
235	} elsif ($uni == ord '"') {
236	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
237	$self->{completer}->show;
238	} elsif ($uni == ord "'") {
239	$self->{completer}->set_prefix ("");
240	$self->{completer}->show;
241	} elsif (exists $DIR{$sym}) {
242	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
243	$self->{shft}++;	327	$self->{shft}++;
244	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
245	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
246	}	330	}
247	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $DIR{$sym}[0];
248	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
249	$self->{ctrl}++;	333	$self->{ctrl}++;
250	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
251	} else {	335	} else {
252	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
253	}	337	}
254	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
255	$self->{completer}->inject_key_down ($ev);
256	$self->{completer}->show;
257	} else {
258	return 0;	339	return 1;
259	}
260
261	1	340	}
		341
		342	0
262	}	343	}
263		344
264	sub invoke_key_up {	345	sub invoke_key_up {
265	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
266		347
…		…
292	}	373	}
293		374
294	$res	375	$res
295	}	376	}
296		377
		378	sub invoke_visibility_change {
		379	my ($self) = @_;
		380
		381	$self->refresh_hook;
		382
		383	0
		384	}
		385
297	sub set_magicmap {	386	sub set_magicmap {
298	my ($self, $w, $h, $x, $y, $data) = @_;	387	my ($self, $w, $h, $x, $y, $data) = @_;
299		388
300	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	389	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
301	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	390	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
302		391
303	$self->{magicmap} = [$x, $y, $w, $h, $data];	392	$self->{magicmap} = [$x, $y, $w, $h, $data];
304		393
305	$self->update;	394	$self->update;
306	}	395	}
307		396
		397	sub refresh_hook {
		398	my ($self) = @_;
		399
		400	if ($::MAP && $::CONN) {
		401	if (delete $self->{need_update}) {
		402	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		403
		404	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		405	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		406
		407	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		408	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		409
		410	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		411	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		412
		413	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		414	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		415
		416	if ($::CFG->{fow_enable}) {
		417	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		418
		419	$self->{fow_texture} = new CFPlus::Texture
		420	w => $w,
		421	h => $h,
		422	data => $data,
		423	internalformat => GL_ALPHA,
		424	format => GL_ALPHA;
		425	} else {
		426	delete $self->{fow_texture};
		427	}
		428
		429	glNewList ($self->{list} \|\|= glGenList);
		430
		431	glPushMatrix;
		432	glTranslate $sx0, $sy0;
		433	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		434
		435	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		436
		437	glScale $self->{tilesize}, $self->{tilesize};
		438
		439	if (my $tex = $self->{fow_texture}) {
		440	glPushMatrix;
		441	glScale 1/3, 1/3;
		442	glEnable GL_TEXTURE_2D;
		443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		444
		445	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		446	$self->{fow_texture}->draw_quad_alpha (0, 0);
		447
		448	glDisable GL_TEXTURE_2D;
		449	glPopMatrix;
		450	}
		451
		452	if ($self->{magicmap}) {
		453	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		454
		455	$x += $::MAP->ox + $self->{dx};
		456	$y += $::MAP->oy + $self->{dy};
		457
		458	glTranslate - $x - 1, - $y - 1;
		459	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		460	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		461	}
		462
		463	glPopMatrix;
		464	glEndList;
		465	}
		466	} else {
		467	glDeleteList delete $self->{list}
		468	if $self->{list};
		469	}
		470	}
		471
308	sub draw {	472	sub draw {
309	my ($self) = @_;	473	my ($self) = @_;
310		474
311	return unless $::MAP;	475	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		476
		477	return unless $self->{list};
312		478
313	my $focused = $CFPlus::UI::FOCUS == $self	479	my $focused = $CFPlus::UI::FOCUS == $self
314	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	480	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
315		481
316	return	482	return
317	unless $focused \|\| !$::FAST;	483	unless $focused \|\| !$::FAST;
318		484
319	if (delete $self->{need_update}) {
320	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
321
322	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
323	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
324
325	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
326	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
327
328	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
329	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
330
331	if ($::CFG->{fow_enable}) {
332	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
333
334	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
335	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
336	glConvolutionFilter2D (
337	GL_CONVOLUTION_2D,
338	GL_ALPHA,
339	3, 3,
340	GL_ALPHA, GL_FLOAT,
341	(pack "f*", @{ $self->{smooth_matrix} }),
342	);
343	glEnable GL_CONVOLUTION_2D;
344	}
345
346	$self->{fow_texture} = new CFPlus::Texture
347	w => $w,
348	h => $h,
349	data => $data,
350	internalformat => GL_ALPHA,
351	format => GL_ALPHA;
352
353	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
354	} else {
355	delete $self->{fow_texture};
356	}
357
358	glNewList $self->{list};
359
360	glPushMatrix;
361	glTranslate $sx0, $sy0;
362	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
363
364	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
365
366	glScale 32, 32;
367
368	if (my $tex = $self->{fow_texture}) {
369	glEnable GL_TEXTURE_2D;
370	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371
372	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
373	$self->{fow_texture}->draw_quad_alpha (0, 0);
374
375	glDisable GL_TEXTURE_2D;
376	}
377
378	if ($self->{magicmap}) {
379	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
380
381	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
382	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
383
384	glTranslate - $x - 1, - $y - 1;
385	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
386	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
387	}
388
389	glPopMatrix;
390	glEndList;
391	}
392
393	glCallList $self->{list};	485	glCallList $self->{list};
394		486
395	# TNT2 emulates logops in software (or worse :)	487	# TNT2 emulates logops in software (or worse :)
396	unless ($focused) {	488	unless ($focused) {
397	glColor 0.4, 0.2, 0.2, 0.6;	489	glColor_premultiply 0, 0, 1, 0.25;
398	glEnable GL_BLEND;	490	glEnable GL_BLEND;
399	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
400	glBegin GL_QUADS;	492	glBegin GL_QUADS;
401	glVertex 0, 0;	493	glVertex 0, 0;
402	glVertex 0, $::HEIGHT;	494	glVertex 0, $::HEIGHT;
403	glVertex $::WIDTH, $::HEIGHT;	495	glVertex $::WIDTH, $::HEIGHT;
404	glVertex $::WIDTH, 0;	496	glVertex $::WIDTH, 0;
…		…
415	$self->SUPER::DESTROY;	507	$self->SUPER::DESTROY;
416	}	508	}
417		509
418	package CFPlus::MapWidget::MapMap;	510	package CFPlus::MapWidget::MapMap;
419		511
		512	use strict;
		513	use utf8;
		514
420	our @ISA = CFPlus::UI::Base::;	515	our @ISA = CFPlus::UI::Base::;
421		516
422	use Time::HiRes qw(time);	517	use Time::HiRes qw(time);
423	use CFPlus::OpenGL;	518	use CFPlus::OpenGL;
424		519
425	sub size_request {	520	sub size_request {
426	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	521	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
427	}	522	}
428		523
429	sub invoke_size_allocate {	524	sub refresh_hook {
430	my ($self, $w, $h) = @_;	525	my ($self) = @_;
431		526
432	$self->update;	527	if ($::MAP && $self->{texture_atime} < time) {
433
434	1
435	}
436
437	sub update {
438	my ($self) = @_;
439
440	delete $self->{texture_atime};
441	$self->SUPER::update;
442	}
443
444	sub _draw {
445	my ($self) = @_;
446
447	$::MAP or return;
448
449	my ($w, $h) = @$self{qw(w h)};	528	my ($w, $h) = @$self{qw(w h)};
450		529
451	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	530	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
452	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	531	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
453		532
454	my $sx = int $::CFG->{map_shift_x} / 32;
455	my $sy = int $::CFG->{map_shift_y} / 32;
456
457	my $ox = 0.5 * ($w - $sw);	533	my $ox = 0.5 * ($w - $sw);
458	my $oy = 0.5 * ($h - $sh);	534	my $oy = 0.5 * ($h - $sh);
459		535
460	glEnable GL_BLEND;	536	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
461	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	537	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
462	glEnable GL_TEXTURE_2D;
463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
464		538
465	if ($self->{texture_atime} < time) {	539	#TODO: map scale is completely borked
		540
		541	my $x0 = int $ox - $sx + 0.5;
		542	my $y0 = int $oy - $sy + 0.5;
		543
		544	$self->{sw} = $sw;
		545	$self->{sh} = $sh;
		546
		547	$self->{x0} = $x0;
		548	$self->{y0} = $y0;
		549
466	$self->{texture_atime} = time + 1/3;	550	$self->{texture_atime} = time + 1/3;
467		551
468	$self->{texture} =	552	$self->{texture} =
469	new CFPlus::Texture	553	new CFPlus::Texture
470	w => $w,	554	w => $w,
471	h => $h,	555	h => $h,
472	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	556	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
473	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	557	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
474	}	558	}
		559	}
		560
		561	sub invoke_visibility_change {
		562	my ($self) = @_;
		563
		564	$self->refresh_hook;
		565
		566	0
		567	}
		568
		569	sub invoke_size_allocate {
		570	my ($self, $w, $h) = @_;
		571
		572	$self->update;
		573
		574	1
		575	}
		576
		577	sub update {
		578	my ($self) = @_;
		579
		580	delete $self->{texture_atime};
		581	$self->SUPER::update;
		582	}
		583
		584	sub _draw {
		585	my ($self) = @_;
		586
		587	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		588
		589	$self->{texture} or return;
		590
		591	glEnable GL_BLEND;
		592	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		593	glEnable GL_TEXTURE_2D;
		594	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
475		595
476	$self->{texture}->draw_quad (0, 0);	596	$self->{texture}->draw_quad (0, 0);
477		597
478	glDisable GL_TEXTURE_2D;	598	glDisable GL_TEXTURE_2D;
479		599
480	glTranslate 0.375, 0.375;	600	glTranslate 0.375, 0.375;
481
482	#TODO: map scale is completely borked
483
484	my $x0 = int $ox - $sx + 0.5;
485	my $y0 = int $oy - $sy + 0.5;
486		601
487	glColor 1, 1, 0, 1;	602	glColor 1, 1, 0, 1;
488	glBegin GL_LINE_LOOP;	603	glBegin GL_LINE_LOOP;
489	glVertex $x0 , $y0 ;	604	glVertex $self->{x0} , $self->{y0} ;
490	glVertex $x0 , $y0 + $sh;	605	glVertex $self->{x0} , $self->{y0} + $self->{sh};
491	glVertex $x0 + $sw, $y0 + $sh;	606	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
492	glVertex $x0 + $sw, $y0 ;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
493	glEnd;	608	glEnd;
494		609
495	glDisable GL_BLEND;	610	glDisable GL_BLEND;
496	}	611	}
497		612
…		…
533		648
534	if ($ev->{button} == 3) {	649	if ($ev->{button} == 3) {
535	(new CFPlus::UI::Menu	650	(new CFPlus::UI::Menu
536	items => [	651	items => [
537	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	652	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
538	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	653	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
539	],	654	],
540	)->popup ($ev);	655	)->popup ($ev);
541	return 1;	656	return 1;
542	}	657	}
543	0	658	0
…		…
744		859
745	$self->SUPER::_draw;	860	$self->SUPER::_draw;
746	}	861	}
747		862
748	1	863	1
		864

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs. Revision 1.122 by root, Wed Dec 5 10:49:17 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.122 by root, Wed Dec 5 10:49:17 2007 UTC