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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.4 by root, Wed Apr 19 23:37:49 2006 UTC vs.
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC

…		…
1	package CFClient::MapWidget;	1	package CFClient::MapWidget;
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use List::Util qw(min max);	6	use List::Util qw(min max);
6		7
7	use CFClient::OpenGL;	8	use CFClient::OpenGL;
8		9
9	our @ISA = CFClient::UI::Base::;	10	our @ISA = CFClient::UI::Base::;
10		11
11	sub new {	12	sub new {
12	my $class = shift;	13	my $class = shift;
13		14
14	$class->SUPER::new (	15	my $self = $class->SUPER::new (
15	z => -1,	16	z => -1,
16	can_focus => 1,	17	can_focus => 1,
17	list => glGenList,	18	list => glGenList,
18	@_	19	@_
19	)	20	);
		21
		22	$self
20	}	23	}
21		24
22	sub DESTROY {	25	sub DESTROY {
23	my $self = shift;	26	my $self = shift;
24		27
25	glDeleteList $self->{list};	28	glDeleteList $self->{list};
26		29
27	$self->SUPER::DESTROY;	30	$self->SUPER::DESTROY;
28	}	31	}
29		32
30	sub key_down {
31	print "MAPKEYDOWN\n";
32	}
33
34	sub key_up {
35	}
36
37	sub button_down {	33	sub button_down {
38	my ($self, $ev, $x, $y) = @_;	34	my ($self, $ev, $x, $y) = @_;
39		35
40	$self->focus_in;	36	$self->focus_in;
41		37
42	if ($ev->button == 2) {	38	if ($ev->{button} == 2) {
43	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	39	my ($ox, $oy) = ($ev->{x}, $ev->{y});
44	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
45		41
46	$self->{motion} = sub {	42	$self->{motion} = sub {
47	my ($ev, $x, $y) = @_;	43	my ($ev, $x, $y) = @_;
48		44
49	($x, $y) = ($ev->motion_x, $ev->motion_y);	45	($x, $y) = ($ev->{x}, $ev->{y});
50		46
51	$::CFG->{map_shift_x} = $bw + $x - $ox;	47	$::CFG->{map_shift_x} = $bw + $x - $ox;
52	$::CFG->{map_shift_y} = $bh + $y - $oy;	48	$::CFG->{map_shift_y} = $bh + $y - $oy;
53		49
54	$self->update;	50	$self->update;
83	}	79	}
84		80
85	sub draw {	81	sub draw {
86	my ($self) = @_;	82	my ($self) = @_;
87		83
		84	return
		85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;
		86
88	if (delete $self->{need_update}) {	87	if (delete $self->{need_update}) {
89	glNewList $self->{list};	88	glNewList $self->{list};
90		89
91	if ($::MAP) {	90	if ($::MAP) {
92	my $sw = int $::WIDTH / 32;	91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
93	my $sh = int $::HEIGHT / 32;	92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
94		93
95	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
96	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		96
		97	glPushMatrix;
		98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
97		99
98	glTranslate $sx0 - 32, $sy0 - 32, 0;	100	glTranslate $sx0 - 32, $sy0 - 32, 0;
99		101
100	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
101		103
…		…
106	GL_CONVOLUTION_2D,	108	GL_CONVOLUTION_2D,
107	GL_ALPHA,	109	GL_ALPHA,
108	3, 3,	110	3, 3,
109	GL_ALPHA, GL_FLOAT,	111	GL_ALPHA, GL_FLOAT,
110	pack "f*",	112	pack "f*",
111	0.1, 0.1, 0.1,	113	0.05, 0.13, 0.05,
112	0.1, 0.2, 0.1,	114	0.13, 0.30, 0.13,
113	0.1, 0.1, 0.1,	115	0.05, 0.13, 0.05,
114	);	116	);
115	glEnable GL_CONVOLUTION_2D;	117	glEnable GL_CONVOLUTION_2D;
116	}	118	}
		119
		120	# try to re-use the texture name: TODO improve texture class instead
		121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
117		122
118	$self->{fow_texture} = new CFClient::Texture	123	$self->{fow_texture} = new CFClient::Texture
119	w => $w,	124	w => $w,
120	h => $h,	125	h => $h,
121	data => $data,	126	data => $data,
		127	name => $prev_name, # a bit hackish
122	internalformat => GL_ALPHA,	128	internalformat => GL_ALPHA,
123	format => GL_ALPHA;	129	format => GL_ALPHA;
124		130
125	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
126		132
127	glEnable GL_BLEND;
128	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129	glEnable GL_TEXTURE_2D;	133	glEnable GL_TEXTURE_2D;
130	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131		135
132	glColor +($::CFG->{fow_intensity}) x 3, 1;	136	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	137	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
134		138
135	glDisable GL_TEXTURE_2D;	139	glDisable GL_TEXTURE_2D;
136	glDisable GL_BLEND;
137	}	140	}
138		141
139	# HACK BEGIN	142	glPopMatrix;
140	{
141	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142	my ($w, $h) = (250, 250);
143
144	glEnable GL_BLEND;
145	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
146	glEnable GL_TEXTURE_2D;
147	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
148
149	$self->{mapmap_texture} =
150	new CFClient::Texture
151	w => $w,
152	h => $h,
153	data => $::MAP->mapmap ($w, $h),
154	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
155
156	$self->{mapmap_texture}->draw_quad (100, 100);
157
158	glDisable GL_TEXTURE_2D;
159	glDisable GL_BLEND;
160	}
161	# HACK END
162	}	143	}
163		144
164	glEndList;	145	glEndList;
165	}	146	}
166		147
167	glPushMatrix;	148	glPushMatrix;
168	glCallList $self->{list};	149	glCallList $self->{list};
169	glPopMatrix;	150	glPopMatrix;
170		151
		152	# TNT2 emulates logops in software (or worse :)
171	if ($CFClient::UI::FOCUS != $self) {	153	if ($CFClient::UI::FOCUS == $self) {
172	glColor 64/255, 64/255, 64/255;	154	(delete $self->{out_of_focus})->destroy
173	glLogicOp GL_AND;	155	if $self->{out_of_focus};
174	glEnable GL_COLOR_LOGIC_OP;	156	} else {
		157	glColor 0.4, 0.2, 0.2, 0.6;
		158	glEnable GL_BLEND;
		159	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
175	glBegin GL_QUADS;	160	glBegin GL_QUADS;
176	glVertex 0, 0;	161	glVertex 0, 0;
177	glVertex 0, $::HEIGHT;	162	glVertex 0, $::HEIGHT;
178	glVertex $::WIDTH, $::HEIGHT;	163	glVertex $::WIDTH, $::HEIGHT;
179	glVertex $::WIDTH, 0;	164	glVertex $::WIDTH, 0;
180	glEnd;	165	glEnd;
181	glDisable GL_COLOR_LOGIC_OP;	166	glDisable GL_BLEND;
		167
		168	$self->{out_of_focus} \|\|= do {
		169	my $label = new CFClient::UI::Label
		170	x => 0,
		171	y => 0,
		172	z => 1,
		173	ellipsise => 0,
		174	text => "map out of focus (click map to play)";
		175
		176	$label->show;
		177	$label->update;
		178
		179	$CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
		180	$label->move (
		181	($::WIDTH - $label->{w}) * 0.5,
		182	($::HEIGHT - $label->{h}) * 0.5,
		183	);
		184	});
		185
		186	$label
		187	};
182	}	188	}
183	}	189	}
184		190
185	my %DIR = (	191	my %DIR = (
186	CFClient::SDLK_KP8, [1, "north"],	192	CFClient::SDLK_KP8, [1, "north"],
…		…
199	);	205	);
200		206
201	sub key_down {	207	sub key_down {
202	my ($self, $ev) = @_;	208	my ($self, $ev) = @_;
203		209
		210	return unless $::CONN;
		211
204	my $mod = $ev->key_mod;	212	my $mod = $ev->{mod};
205	my $sym = $ev->key_sym;	213	my $sym = $ev->{sym};
		214	my $uni = $ev->{unicode};
206		215
207	if ($sym == CFClient::SDLK_KP5) {	216	if ($sym == CFClient::SDLK_KP5) {
208	$::CONN->user_send ("stay fire");	217	$::CONN->user_send ("stay fire");
209	} elsif ($sym == ord "a") {	218	} elsif ($uni == ord ",") {
		219	$::CONN->user_send ("take");
		220	} elsif ($uni == ord "\t" or $uni == ord " ") {
210	$::CONN->user_send ("apply");	221	$::CONN->user_send ("apply");
		222	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
		223	$::CONN->user_send ("rotateshoottype +");
		224	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		225	$::CONN->user_send ("rotateshoottype -");
211	} elsif ($sym == ord "'") {	226	} elsif ($uni == ord "'") {
212	$self->emit ('activate_console');	227	$self->emit ('activate_console');
213	} elsif ($sym == ord "/") {	228	} elsif ($uni == ord "/") {
214	$self->emit ('activate_console' => '/');	229	$self->emit (activate_console => '/');
215	} elsif (exists $DIR{$sym}) {	230	} elsif (exists $DIR{$sym}) {
216	if ($mod & CFClient::KMOD_SHIFT) {	231	if ($mod & CFClient::KMOD_SHIFT) {
217	$self->{shft}++;	232	$self->{shft}++;
218	$::CONN->user_send ("fire $DIR{$sym}[0]");	233	$::CONN->user_send ("fire $DIR{$sym}[0]");
219	} elsif ($mod & CFClient::KMOD_CTRL) {	234	} elsif ($mod & CFClient::KMOD_CTRL) {
220	$self->{ctrl}++;	235	$self->{ctrl}++;
221	$::CONN->user_send ("run $DIR{$sym}[0]");	236	$::CONN->user_send ("run $DIR{$sym}[0]");
222	} else {	237	} else {
223	$::CONN->user_send ("$DIR{$sym}[1]");	238	$::CONN->user_send ("$DIR{$sym}[1]");
224	}	239	}
		240	} elsif ($ev->{unicode}) {
		241	$self->{command_widget} \|\|=
		242	new CFClient::MapWidget::Command::
		243	command => $self->{command},
		244	can_focus => 1,
		245	connect_execute => sub {
		246	# todo: support callback instead of user_send
		247	$::CONN->user_send ($_[1]);
		248	},
		249	connect_close => sub {
		250	(delete $self->{command_widget})->hide;
		251	$self->focus_in;
		252	},
		253	;
		254	$self->{command_widget}->key_down ($ev)
		255	unless $ev->{unicode} == 20;
		256	return unless $self->{command_widget};
		257	$self->{command_widget}->show;
		258	$self->{command_widget}->focus_in;
225	}	259	}
226	}	260	}
227		261
228	sub key_up {	262	sub key_up {
229	my ($self, $ev) = @_;	263	my ($self, $ev) = @_;
230		264
231	my $mod = $ev->key_mod;	265	my $mod = $ev->{mod};
232	my $sym = $ev->key_sym;	266	my $sym = $ev->{sym};
233		267
234	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	268	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
235	$::CONN->user_send ("fire_stop");	269	$::CONN->user_send ("fire_stop");
236	}	270	}
237	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	271	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
238	$::CONN->user_send ("run_stop");	272	$::CONN->user_send ("run_stop");
239	}	273	}
240	}	274	}
241		275
242	sub add_command {	276	sub add_command {
243	my ($self, $command, $widget, $cb) = @_;	277	my ($self, $command, $tooltip, $widget, $cb) = @_;
244		278
245	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	279	(my $data = $command) =~ s/\\//g;
246	warn "$command\|$abbrev\|$widget\n";#d#	280
		281	$tooltip =~ s/^\s+//;
		282
		283	$tooltip = "<big>$data</big>\n\n$tooltip";
		284
		285	$tooltip =~ s/\s+$//;
		286
		287	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		288	}
		289
		290	sub clr_commands {
		291	my ($self) = @_;
		292
		293	%{$self->{command}} = ();
		294	}
		295
		296	package CFClient::MapWidget::MapMap;
		297
		298	our @ISA = CFClient::UI::Base::;
		299
		300	use Time::HiRes qw(time);
		301	use CFClient::OpenGL;
		302
		303	sub size_request {
		304	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		305	}
		306
		307	sub size_allocate {
		308	my ($self, $w, $h) = @_;
		309
		310	$self->SUPER::size_allocate ($w, $h);
		311	$self->update;
		312	}
		313
		314	sub update {
		315	my ($self) = @_;
		316
		317	delete $self->{texture_atime};
		318	$self->SUPER::update;
		319	}
		320
		321	sub _draw {
		322	my ($self) = @_;
		323
		324	$::MAP or return;
		325
		326	my ($w, $h) = @$self{qw(w h)};
		327
		328	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		329	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		330
		331	my $sx = int $::CFG->{map_shift_x} / 32;
		332	my $sy = int $::CFG->{map_shift_y} / 32;
		333
		334	my $ox = 0.5 * ($w - $sw);
		335	my $oy = 0.5 * ($h - $sh);
		336
		337	glEnable GL_BLEND;
		338	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		339	glEnable GL_TEXTURE_2D;
		340	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		341
		342	if ($self->{texture_atime} < time) {
		343	$self->{texture_atime} = time + 1/3;
		344
		345	$self->{texture} =
		346	new CFClient::Texture
		347	w => $w,
		348	h => $h,
		349	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		350	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		351	}
		352
		353	$self->{texture}->draw_quad (0, 0);
		354
		355	glDisable GL_TEXTURE_2D;
		356
		357	glTranslate 0.375, 0.375;
		358
		359	#TODO: map scale is completely borked
		360
		361	my $x0 = int $ox - $sx + 0.5;
		362	my $y0 = int $oy - $sy + 0.5;
		363
		364	glColor 1, 1, 0, 1;
		365	glBegin GL_LINE_LOOP;
		366	glVertex $x0 , $y0 ;
		367	glVertex $x0 , $y0 + $sh;
		368	glVertex $x0 + $sw, $y0 + $sh;
		369	glVertex $x0 + $sw, $y0 ;
		370	glEnd;
		371
		372	glDisable GL_BLEND;
		373	}
		374
		375	package CFClient::MapWidget::Command;
		376
		377	use strict;
		378
		379	use CFClient::OpenGL;
		380
		381	our @ISA = CFClient::UI::Frame::;
		382
		383	sub new {
		384	my $class = shift;
		385
		386	my $self = $class->SUPER::new (
		387	bg => [0, 0, 0, 0.8],
		388	@_,
		389	);
		390
		391	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		392
		393	$self->{label} = [
		394	map
		395	CFClient::UI::Label->new (
		396	can_hover => 1,
		397	can_events => 1,
		398	tooltip_width => 0.33,
		399	fontsize => $_,
		400	), (0.8) x 16
		401	];
		402
		403	$self->{entry} = new CFClient::UI::Entry
		404	connect_changed => sub {
		405	$self->update_labels;
		406	};
		407
		408	$self->{vbox}->add (
		409	$self->{entry},
		410	@{$self->{label}},
		411	);
		412
		413	$self
		414	}
		415
		416	sub size_allocate {
		417	my ($self, $w, $h) = @_;
		418
		419	$self->SUPER::size_allocate ($w, $h);
		420	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		421	}
		422
		423	sub key_down {
		424	my ($self, $ev) = @_;
		425
		426	if ($ev->{sym} == 13) {
		427	if (exists $self->{select}) {
		428	$self->emit (execute => $self->{select});
		429	$self->emit ("close");
		430	}
		431	} elsif ($ev->{sym} == 27) {
		432	$self->{entry}->set_text ("");
		433	$self->emit ("close");
		434	return;
		435	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		436	++$self->{select_offset}
		437	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		438	$self->update_labels;
		439	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		440	--$self->{select_offset}
		441	if $self->{select_offset};
		442	$self->update_labels;
		443	} else {
		444	#$self->{entry}{force_alloc} = 1;
		445	$self->{entry}->key_down ($ev);
		446	}
		447	}
		448
		449	sub update_labels {
		450	my ($self) = @_;
		451
		452	my $text = $self->{entry}->get_text;
		453
		454	length $text
		455	or return $self->emit ("close");
		456
		457	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		458
		459	if ($cmd ne $self->{last_search}) {
		460	my $regexp = do {
		461	my ($beg, @chr) = split //, lc $cmd;
		462
		463	# the following regex is used to match our "completion entry"
		464	# to an actual command - the parentheses match kind of "overhead"
		465	# - the more characters the parentheses match, the less attractive
		466	# is the match.
		467	my $regexp = "^\Q$beg\E"
		468	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		469	qr<$regexp>
		470	};
		471
		472	my @match;
		473	my @penalty;
		474
		475	for (keys %{$self->{command}}) {
		476	if (@penalty = $_ =~ $regexp) {
		477	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		478	}
		479	}
		480
		481	@match = map $self->{command}{$_->[0]},
		482	sort {
		483	$a->[1] <=> $b->[1]
		484	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		485	or (length $a->[0]) <=> (length $b->[0])
		486	} @match;
		487
		488	$self->{last_search} = $cmd;
		489	$self->{last_match} = \@match;
		490
		491	$self->{select_offset} = 0;
		492	}
		493
		494	my @labels = @{ $self->{label} };
		495	my @matches = @{ $self->{last_match} \|\| [] };
		496
		497	if ($self->{select_offset}) {
		498	splice @matches, 0, $self->{select_offset}, ();
		499
		500	my $label = shift @labels;
		501	$label->set_text ("...");
		502	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		503	}
		504
		505	for my $label (@labels) {
		506	$label->{fg} = [1, 1, 1, 1];
		507	$label->{bg} = [0, 0, 0, 0];
		508	}
		509
		510	if (@matches) {
		511	$self->{select} = "$matches[0][0]$arg";
		512
		513	$labels[0]->{fg} = [0, 0, 0, 1];
		514	$labels[0]->{bg} = [1, 1, 1, 0.8];
		515	} else {
		516	$self->{select} = "$cmd$arg";
		517	}
		518
		519	for my $match (@matches) {
		520	my $label = shift @labels;
		521
		522	if (@labels) {
		523	$label->set_text ("$match->[0]$arg");
		524	$label->set_tooltip ($match->[1]);
		525	} else {
		526	$label->set_text ("...");
		527	$label->set_tooltip ("Use Cursor-Down to view more matches");
		528	last;
		529	}
		530	}
		531
		532	for my $label (@labels) {
		533	$label->set_text ("");
		534	$label->set_tooltip ("");
		535	}
		536
		537	$self->update;
		538	###
		539	}
		540
		541	sub _draw {
		542	my ($self) = @_;
		543
		544	# hack
		545	local $CFClient::UI::FOCUS = $self->{entry};
		546
		547	$self->SUPER::_draw;
247	}	548	}
248		549
249	1	550	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.4 by root, Wed Apr 19 23:37:49 2006 UTC vs. Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.4 by root, Wed Apr 19 23:37:49 2006 UTC vs.
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC