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

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

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.39 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.121 by root, Tue Aug 28 16:26:13 2007 UTC