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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.81 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

…		…
1	package CFPlus::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 CFPlus;	8	use DC;
9	use CFPlus::OpenGL;	9	use DC::OpenGL;
10	use CFPlus::UI;	10	use DC::UI;
		11	use DC::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = DC::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 DC::Texture DC::find_rcfile "magicmap.png",
16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17		18
18	sub new {	19	sub new {
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
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39		28
40	$self	29	$self
41	}	30	}
42		31
43	sub add_command {	32	sub add_command {
47		36
48	$tooltip =~ s/^\s+//;	37	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	38	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	39	$tooltip =~ s/\s+$//;
51		40
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	42	}
54		43
55	sub clr_commands {	44	sub clr_commands {
56	my ($self) = @_;	45	my ($self) = @_;
57		46
58	%{$self->{completer}{command}} = ();	47	%{$::COMPLETER->{command}} = ();
59		48
60	$self->{completer}->hide	49	$::COMPLETER->hide
61	if $self->{completer};	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	}
62	}	161	}
63		162
64	sub invoke_button_down {	163	sub invoke_button_down {
65	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
66		165
67	if ($ev->{button} == 1) {	166	if ($ev->{button} == 1) {
68	$self->grab_focus;	167	$self->grab_focus;
69	return unless $::CONN;	168	return unless $::CONN;
70		169
71	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
72	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
73		172
74	$x -= int 0.5 * $self->{sw};	173	$x -= DC::floor $::MAP->w * 0.5;
75	$y -= int 0.5 * $self->{sh};	174	$y -= DC::floor $::MAP->h * 0.5;
76		175
		176	if ($::CONN) {
77	$::CONN->lookat ($x, $y)	177	$::CONN->lookat ($x, $y)
78	if $::CONN;	178	}
79		179
80	} elsif ($ev->{button} == 2) {	180	} elsif ($ev->{button} == 2) {
81	$self->grab_focus;	181	$self->grab_focus;
82	return unless $::CONN;	182	return unless $::CONN;
83		183
…		…
93	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
94		194
95	$self->update;	195	$self->update;
96	};	196	};
97	} elsif ($ev->{button} == 3) {	197	} elsif ($ev->{button} == 3) {
98	(new CFPlus::UI::Menu	198	my @items = (
99	items => [
100	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	199	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
105	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
106	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
107	[	206	[
108	$::PICKUP_ENABLE->{state}	207	$::PICKUP_ENABLE->{state}
109	? "Disable automatic pickup"	208	? "Disable automatic pickup"
110	: "Enable automatic pickup",	209	: "Enable automatic pickup",
111	sub { $::PICKUP_ENABLE->toggle }	210	sub { $::PICKUP_ENABLE->toggle }
112	],	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,
113	["Quit",	234	["Quit",
114	sub {	235	sub {
115	if ($::CONN) {	236	if ($::CONN) {
116	&::open_quit_dialog;	237	&::open_quit_dialog;
117	} else {	238	} else {
118	exit;	239	exit;
119	}
120	}	240	}
121	],	241	}
122	],	242	],
		243	;
		244
		245	(new DC::UI::Menu
		246	items => \@items,
123	)->popup ($ev);	247	)->popup ($ev);
124	}	248	}
125		249
126	1	250	1
127	}	251	}
…		…
145		269
146	1	270	1
147	}	271	}
148		272
149	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
150	(	276	(
151	32 * CFPlus::ceil $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
152	32 * CFPlus::ceil $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
153	)	279	)
154	}	280	}
155		281
156	sub update {	282	sub update {
157	my ($self) = @_;	283	my ($self) = @_;
…		…
159	$self->{need_update} = 1;	285	$self->{need_update} = 1;
160	$self->SUPER::update;	286	$self->SUPER::update;
161	}	287	}
162		288
163	my %DIR = (	289	my %DIR = (
		290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
164	CFPlus::SDLK_KP8, [1, "north"],	291	( "," . DC::SDLK_KP8 ), [1, "north"],
165	CFPlus::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
166	CFPlus::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
167	CFPlus::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
168	CFPlus::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
169	CFPlus::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
170	CFPlus::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
171	CFPlus::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
172		299
173	CFPlus::SDLK_UP, [1, "north"],	300	( "," . DC::SDLK_UP ), [1, "north"],
		301	("1," . DC::SDLK_UP ), [2, "northeast"],
174	CFPlus::SDLK_RIGHT, [3, "east"],	302	( "," . DC::SDLK_RIGHT), [3, "east"],
		303	("1," . DC::SDLK_RIGHT), [4, "southeast"],
175	CFPlus::SDLK_DOWN, [5, "south"],	304	( "," . DC::SDLK_DOWN ), [5, "south"],
		305	("1," . DC::SDLK_DOWN ), [6, "southwest"],
176	CFPlus::SDLK_LEFT, [7, "west"],	306	( "," . DC::SDLK_LEFT ), [7, "west"],
		307	("1," . DC::SDLK_LEFT ), [8, "northwest"],
177	);	308	);
178		309
179	sub invoke_key_down {	310	sub invoke_key_down {
180	my ($self, $ev) = @_;	311	my ($self, $ev) = @_;
181		312
182	my $mod = $ev->{mod};	313	my $mod = $ev->{mod};
183	my $sym = $ev->{sym};	314	my $sym = $ev->{sym};
184	my $uni = $ev->{unicode};	315	my $uni = $ev->{unicode};
185		316
186	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	317	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
187		318
188	if ($uni == ord "\t") {	319	# ignore repeated keypresses
189	$::PL_WINDOW->toggle_visibility;	320	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
190	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	321	$self->{last_mod} = $mod;
191	$::HELP_WINDOW->toggle_visibility;	322	$self->{last_sym} = $sym;
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	} elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
211	$::BIND_EDITOR->stop;
212	$::BIND_EDITOR->ask_for_bind_and_commit;
213	$::BIND_EDITOR->hide;
214	} elsif (!$::CONN) {
215	return 0; # bindings further down need a valid connection
216		323
217	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	324	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
218	$::CONN->user_send ("stay fire");
219	} elsif ($uni == ord ",") {
220	$::CONN->user_send ("take");
221	} elsif ($uni == ord " ") {
222	$::CONN->user_send ("apply");
223	} elsif ($uni == ord ".") {
224	$::CONN->user_send ($self->{completer}{last_command})
225	if exists $self->{completer}{last_command};
226	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
227	$::CONN->user_send ($_) for @$bind_cmd;
228	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
229	$::CONN->user_send ("rotateshoottype +");
230	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
231	$::CONN->user_send ("rotateshoottype -");
232	} elsif ($uni == ord '"') {
233	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
234	$self->{completer}->show;
235	} elsif ($uni == ord "'") {
236	$self->{completer}->set_prefix ("");
237	$self->{completer}->show;
238	} elsif (exists $DIR{$sym}) {
239	if ($mod & CFPlus::KMOD_SHIFT) {	325	if ($mod & DC::KMOD_SHIFT) {
240	$self->{shft}++;	326	$self->{shft}++;
241	if ($DIR{$sym}[0] != $self->{fire_dir}) {	327	if ($dir->[0] != $self->{fire_dir}) {
242	$::CONN->user_send ("fire $DIR{$sym}[0]");	328	$::CONN->user_send ("fire $dir->[0]");
243	}	329	}
244	$self->{fire_dir} = $DIR{$sym}[0];	330	$self->{fire_dir} = $dir->[0];
245	} elsif ($mod & CFPlus::KMOD_CTRL) {	331	} elsif ($mod & DC::KMOD_CTRL) {
246	$self->{ctrl}++;	332	$self->{ctrl}++;
247	$::CONN->user_send ("run $DIR{$sym}[0]");	333	$::CONN->user_send ("run $dir->[0]");
248	} else {	334	} else {
249	$::CONN->user_send ("$DIR{$sym}[1]");	335	$::CONN->user_send ("$dir->[1]");
250	}	336	}
251	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	337
252	$self->{completer}->inject_key_down ($ev);
253	$self->{completer}->show;
254	} else {
255	return 0;	338	return 1;
256	}
257
258	1	339	}
		340
		341	0
259	}	342	}
260		343
261	sub invoke_key_up {	344	sub invoke_key_up {
262	my ($self, $ev) = @_;	345	my ($self, $ev) = @_;
263		346
264	my $res = 0;	347	my $res = 0;
265	my $mod = $ev->{mod};	348	my $mod = $ev->{mod};
266	my $sym = $ev->{sym};	349	my $sym = $ev->{sym};
267		350
		351	delete $self->{last_mod};
		352	delete $self->{last_sym};
		353
268	if ($::CFG->{shift_fire_stop}) {	354	if ($::CFG->{shift_fire_stop}) {
269	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	355	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
270	$::CONN->user_send ("fire_stop");	356	$::CONN->user_send ("fire_stop");
271	delete $self->{fire_dir};	357	delete $self->{fire_dir};
272	$res = 1;	358	$res = 1;
273	}	359	}
274	} else {	360	} else {
275	if (exists $DIR{$sym} && delete $self->{shft}) {	361	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
276	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
277	delete $self->{fire_dir};	363	delete $self->{fire_dir};
278	$res = 1;	364	$res = 1;
279	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	365	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		366	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
280	$::CONN->user_send ("fire_stop");	367	$::CONN->user_send ("fire_stop");
281	delete $self->{fire_dir};	368	delete $self->{fire_dir};
282	$res = 1;	369	$res = 1;
283	}	370	}
284	}	371	}
285		372
286	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
287	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
288	$res = 1;	375	$res = 1;
289	}	376	}
290		377
291	$res	378	$res
292	}	379	}
293		380
		381	sub invoke_visibility_change {
		382	my ($self) = @_;
		383
		384	$self->refresh_hook;
		385
		386	0
		387	}
		388
		389	sub set_tilesize {
		390	my ($self, $tilesize) = @_;
		391
		392	$self->{tilesize} = $tilesize;
		393	}
		394
		395	sub scroll {
		396	my ($self, $dx, $dy) = @_;
		397
		398	$::MAP->scroll ($dx, $dy);
		399
		400	$self->movement_update;
		401
		402	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		403	$self->{sdy} += $dy * $self->{tilesize};
		404	}
		405
294	sub set_magicmap {	406	sub set_magicmap {
295	my ($self, $w, $h, $x, $y, $data) = @_;	407	my ($self, $w, $h, $x, $y, $data) = @_;
296		408
297	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	409	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
298	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	410	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
299		411
300	$self->{magicmap} = [$x, $y, $w, $h, $data];	412	$self->{magicmap} = [$x, $y, $w, $h, $data];
301		413
302	$self->update;	414	$self->update;
303	}	415	}
304		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) {
		458	if (delete $self->{need_update}) {
		459	$self->movement_update;
		460
		461	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		462
		463	# width/height of map, in tiles
		464	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
		465	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
		466
		467	# the map displacement, in tiles
		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};
		470
		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;
		474
		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;
		477
		478	if ($::CFG->{fow_enable}) {
		479	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		480
		481	$self->{fow_texture} = new DC::Texture
		482	w => $w,
		483	h => $h,
		484	data => $data,
		485	internalformat => GL_ALPHA,
		486	format => GL_ALPHA;
		487	} else {
		488	delete $self->{fow_texture};
		489	}
		490
		491	glNewList ($self->{list} \|\|= glGenList);
		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;
		510	glEnable GL_TEXTURE_2D;
		511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		512
		513	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		514	$self->{fow_texture}->draw_quad_alpha (0, 0);
		515
		516	glDisable GL_TEXTURE_2D;
		517	glPopMatrix;
		518	}
		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
		531	glPopMatrix;
		532	glEndList;
		533	}
		534	} else {
		535	glDeleteList delete $self->{list}
		536	if $self->{list};
		537	}
		538	}
		539
305	sub draw {	540	sub draw {
306	my ($self) = @_;	541	my ($self) = @_;
307		542
308	return unless $::MAP;	543	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
309		544
		545	return unless $self->{list};
		546
310	my $focused = $CFPlus::UI::FOCUS == $self	547	my $focused = $DC::UI::FOCUS == $self
311	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	548	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
312		549
313	return	550	return
314	unless $focused \|\| !$::FAST;	551	unless $focused \|\| !$::FAST;
315		552
316	if (delete $self->{need_update}) {
317	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
318
319	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
320	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
321
322	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
323	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
324
325	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
326	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
327
328	if ($::CFG->{fow_enable}) {
329	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
330
331	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
332	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
333	glConvolutionFilter2D (
334	GL_CONVOLUTION_2D,
335	GL_ALPHA,
336	3, 3,
337	GL_ALPHA, GL_FLOAT,
338	(pack "f*", @{ $self->{smooth_matrix} }),
339	);
340	glEnable GL_CONVOLUTION_2D;
341	}
342
343	$self->{fow_texture} = new CFPlus::Texture
344	w => $w,
345	h => $h,
346	data => $data,
347	internalformat => GL_ALPHA,
348	format => GL_ALPHA;
349
350	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
351	} else {
352	delete $self->{fow_texture};
353	}
354
355	glNewList $self->{list};
356
357	glPushMatrix;
358	glTranslate $sx0, $sy0;
359	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
360
361	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
362
363	glScale 32, 32;
364
365	if (my $tex = $self->{fow_texture}) {
366	glEnable GL_TEXTURE_2D;
367	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
368
369	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
370	$self->{fow_texture}->draw_quad_alpha (0, 0);
371
372	glDisable GL_TEXTURE_2D;
373	}
374
375	if ($self->{magicmap}) {
376	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
377
378	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
379	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
380
381	glTranslate - $x - 1, - $y - 1;
382	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
383	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
384	}
385
386	glPopMatrix;
387	glEndList;
388	}
389
390	glCallList $self->{list};	553	glCallList $self->{list};
391		554
392	# TNT2 emulates logops in software (or worse :)	555	# TNT2 emulates logops in software (or worse :)
393	unless ($focused) {	556	unless ($focused) {
394	glColor 0.4, 0.2, 0.2, 0.6;	557	glColor_premultiply 0, 0, 1, 0.25;
395	glEnable GL_BLEND;	558	glEnable GL_BLEND;
396	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
397	glBegin GL_QUADS;	560	glBegin GL_QUADS;
398	glVertex 0, 0;	561	glVertex 0, 0;
399	glVertex 0, $::HEIGHT;	562	glVertex 0, $::HEIGHT;
400	glVertex $::WIDTH, $::HEIGHT;	563	glVertex $::WIDTH, $::HEIGHT;
401	glVertex $::WIDTH, 0;	564	glVertex $::WIDTH, 0;
…		…
410	glDeleteList $self->{list};	573	glDeleteList $self->{list};
411		574
412	$self->SUPER::DESTROY;	575	$self->SUPER::DESTROY;
413	}	576	}
414		577
415	package CFPlus::MapWidget::MapMap;	578	package DC::MapWidget::MapMap;
416		579
		580	use strict;
		581	use utf8;
		582
417	our @ISA = CFPlus::UI::Base::;	583	our @ISA = DC::UI::Base::;
418		584
419	use Time::HiRes qw(time);	585	use Time::HiRes qw(time);
420	use CFPlus::OpenGL;	586	use DC::OpenGL;
421		587
422	sub size_request {	588	sub size_request {
423	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	589	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		590	}
		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
424	}	635	}
425		636
426	sub invoke_size_allocate {	637	sub invoke_size_allocate {
427	my ($self, $w, $h) = @_;	638	my ($self, $w, $h) = @_;
428		639
…		…
439	}	650	}
440		651
441	sub _draw {	652	sub _draw {
442	my ($self) = @_;	653	my ($self) = @_;
443		654
444	$::MAP or return;	655	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
445		656
446	my ($w, $h) = @$self{qw(w h)};	657	$self->{texture} or return;
447
448	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
449	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
450
451	my $sx = int $::CFG->{map_shift_x} / 32;
452	my $sy = int $::CFG->{map_shift_y} / 32;
453
454	my $ox = 0.5 * ($w - $sw);
455	my $oy = 0.5 * ($h - $sh);
456		658
457	glEnable GL_BLEND;	659	glEnable GL_BLEND;
458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
459	glEnable GL_TEXTURE_2D;	661	glEnable GL_TEXTURE_2D;
460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
461		663
462	if ($self->{texture_atime} < time) {
463	$self->{texture_atime} = time + 1/3;
464
465	$self->{texture} =
466	new CFPlus::Texture
467	w => $w,
468	h => $h,
469	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
470	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
471	}
472
473	$self->{texture}->draw_quad (0, 0);	664	$self->{texture}->draw_quad (0, 0);
474		665
475	glDisable GL_TEXTURE_2D;	666	glDisable GL_TEXTURE_2D;
476		667
477	glTranslate 0.375, 0.375;	668	glTranslate 0.375, 0.375;
478
479	#TODO: map scale is completely borked
480
481	my $x0 = int $ox - $sx + 0.5;
482	my $y0 = int $oy - $sy + 0.5;
483		669
484	glColor 1, 1, 0, 1;	670	glColor 1, 1, 0, 1;
485	glBegin GL_LINE_LOOP;	671	glBegin GL_LINE_LOOP;
486	glVertex $x0 , $y0 ;	672	glVertex $self->{x0} , $self->{y0} ;
487	glVertex $x0 , $y0 + $sh;	673	glVertex $self->{x0} , $self->{y0} + $self->{sh};
488	glVertex $x0 + $sw, $y0 + $sh;	674	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
489	glVertex $x0 + $sw, $y0 ;	675	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
490	glEnd;	676	glEnd;
491		677
492	glDisable GL_BLEND;	678	glDisable GL_BLEND;
493	}	679	}
494		680
495	package CFPlus::MapWidget::Command;	681	package DC::MapWidget::Command;
496		682
497	use strict;	683	use strict;
498		684
499	use CFPlus::OpenGL;	685	use DC::OpenGL;
500		686
501	our @ISA = CFPlus::UI::Frame::;	687	our @ISA = DC::UI::Frame::;
502		688
503	sub new {	689	sub new {
504	my $class = shift;	690	my $class = shift;
505		691
506	my $self = $class->SUPER::new (	692	my $self = $class->SUPER::new (
507	bg => [0, 0, 0, 0.8],	693	bg => [0, 0, 0, 0.8],
508	@_,	694	@_,
509	);	695	);
510		696
511	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	697	$self->add ($self->{vbox} = new DC::UI::VBox);
512		698
513	$self->{label} = [	699	$self->{label} = [
514	map	700	map
515	CFPlus::UI::Label->new (	701	DC::UI::Label->new (
		702	align => 0,
516	can_hover => 1,	703	can_hover => 1,
517	can_events => 1,	704	can_events => 1,
518	tooltip_width => 0.33,	705	tooltip_width => 0.33,
519	fontsize => $_,	706	fontsize => $_,
520	), (0.8) x 16	707	), (0.8) x 16
521	];	708	];
522		709
523	$self->{entry} = new CFPlus::UI::Entry	710	$self->{entry} = new DC::UI::Entry
524	on_changed => sub {	711	on_changed => sub {
525	$self->update_labels;	712	$self->update_labels;
526	0	713	0
527	},	714	},
528	on_button_down => sub {	715	on_button_down => sub {
529	my ($entry, $ev, $x, $y) = @_;	716	my ($entry, $ev, $x, $y) = @_;
530		717
531	if ($ev->{button} == 3) {	718	if ($ev->{button} == 3) {
532	(new CFPlus::UI::Menu	719	(new DC::UI::Menu
533	items => [	720	items => [
534	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	721	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
535	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	722	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
536	],	723	],
537	)->popup ($ev);	724	)->popup ($ev);
538	return 1;	725	return 1;
539	}	726	}
540	0	727	0
…		…
555	$self->hide;	742	$self->hide;
556	}	743	}
557	} elsif ($ev->{sym} == 27) {	744	} elsif ($ev->{sym} == 27) {
558	$self->{hist_ptr} = 0;	745	$self->{hist_ptr} = 0;
559	$self->hide;	746	$self->hide;
560	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	747	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
561	if ($self->{hist_ptr} > 1) {	748	if ($self->{hist_ptr} > 1) {
562	$self->{hist_ptr}--;	749	$self->{hist_ptr}--;
563	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	750	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
564	} elsif ($self->{hist_ptr} > 0) {	751	} elsif ($self->{hist_ptr} > 0) {
565	$self->{hist_ptr}--;	752	$self->{hist_ptr}--;
…		…
567	} else {	754	} else {
568	++$self->{select_offset}	755	++$self->{select_offset}
569	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	756	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
570	}	757	}
571	$self->update_labels;	758	$self->update_labels;
572	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	759	} elsif ($ev->{sym} == DC::SDLK_UP) {
573	if ($self->{select_offset}) {	760	if ($self->{select_offset}) {
574	--$self->{select_offset}	761	--$self->{select_offset}
575	} else {	762	} else {
576	unless ($self->{hist_ptr}) {	763	unless ($self->{hist_ptr}) {
577	$self->{hist_saveback} = $self->{entry}->get_text;	764	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
735		922
736	sub _draw {	923	sub _draw {
737	my ($self) = @_;	924	my ($self) = @_;
738		925
739	# hack	926	# hack
740	local $CFPlus::UI::FOCUS = $self->{entry};	927	local $DC::UI::FOCUS = $self->{entry};
741		928
742	$self->SUPER::_draw;	929	$self->SUPER::_draw;
743	}	930	}
744		931
745	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.81 by root, Sun Aug 13 15:14:17 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.81 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC