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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.5 by root, Wed Apr 19 23:43:07 2006 UTC vs.
Revision 1.25 by root, Wed May 17 15:18:57 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	}
29
30	sub key_down {
31	print "MAPKEYDOWN\n";
32	}
33
34	sub key_up {
35	}	31	}
36		32
37	sub button_down {	33	sub button_down {
38	my ($self, $ev, $x, $y) = @_;	34	my ($self, $ev, $x, $y) = @_;
39		35
87		83
88	if (delete $self->{need_update}) {	84	if (delete $self->{need_update}) {
89	glNewList $self->{list};	85	glNewList $self->{list};
90		86
91	if ($::MAP) {	87	if ($::MAP) {
92	my $sw = int $::WIDTH / 32;	88	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
93	my $sh = int $::HEIGHT / 32;	89	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
94		90
95	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	91	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;	92	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		93
		94	glPushMatrix;
		95	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
97		96
98	glTranslate $sx0 - 32, $sy0 - 32, 0;	97	glTranslate $sx0 - 32, $sy0 - 32, 0;
99		98
100	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	99	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
101		100
…		…
106	GL_CONVOLUTION_2D,	105	GL_CONVOLUTION_2D,
107	GL_ALPHA,	106	GL_ALPHA,
108	3, 3,	107	3, 3,
109	GL_ALPHA, GL_FLOAT,	108	GL_ALPHA, GL_FLOAT,
110	pack "f*",	109	pack "f*",
111	0.1, 0.1, 0.1,	110	0.05, 0.13, 0.05,
112	0.1, 0.2, 0.1,	111	0.13, 0.30, 0.13,
113	0.1, 0.1, 0.1,	112	0.05, 0.13, 0.05,
114	);	113	);
115	glEnable GL_CONVOLUTION_2D;	114	glEnable GL_CONVOLUTION_2D;
116	}	115	}
117		116
118	$self->{fow_texture} = new CFClient::Texture	117	$self->{fow_texture} = new CFClient::Texture
…		…
127	glEnable GL_BLEND;	126	glEnable GL_BLEND;
128	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	127	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129	glEnable GL_TEXTURE_2D;	128	glEnable GL_TEXTURE_2D;
130	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	129	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131		130
132	glColor +($::CFG->{fow_intensity}) x 3, 1;	131	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	132	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
134		133
135	glDisable GL_TEXTURE_2D;	134	glDisable GL_TEXTURE_2D;
136	glDisable GL_BLEND;	135	glDisable GL_BLEND;
137	}	136	}
138		137
139	# HACK BEGIN	138	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	}	139	}
163		140
164	glEndList;	141	glEndList;
165	}	142	}
166		143
…		…
199	);	176	);
200		177
201	sub key_down {	178	sub key_down {
202	my ($self, $ev) = @_;	179	my ($self, $ev) = @_;
203		180
		181	return unless $::CONN;
		182
204	my $mod = $ev->{mod};	183	my $mod = $ev->{mod};
205	my $sym = $ev->{sym};	184	my $sym = $ev->{sym};
		185	my $uni = $ev->{unicode};
206		186
207	if ($sym == CFClient::SDLK_KP5) {	187	if ($sym == CFClient::SDLK_KP5) {
208	$::CONN->user_send ("stay fire");	188	$::CONN->user_send ("stay fire");
209	} elsif ($sym == ord "a") {	189	} elsif ($uni == ord ",") {
		190	$::CONN->user_send ("take");
		191	} elsif ($uni == ord "\t") {
210	$::CONN->user_send ("apply");	192	$::CONN->user_send ("apply");
211	} elsif ($sym == ord "'") {	193	} elsif ($uni == ord "'") {
212	$self->emit ('activate_console');	194	$self->emit ('activate_console');
213	} elsif ($sym == ord "/") {	195	} elsif ($uni == ord "/") {
214	$self->emit ('activate_console' => '/');	196	$self->emit (activate_console => '/');
215	} elsif (exists $DIR{$sym}) {	197	} elsif (exists $DIR{$sym}) {
216	if ($mod & CFClient::KMOD_SHIFT) {	198	if ($mod & CFClient::KMOD_SHIFT) {
217	$self->{shft}++;	199	$self->{shft}++;
218	$::CONN->user_send ("fire $DIR{$sym}[0]");	200	$::CONN->user_send ("fire $DIR{$sym}[0]");
219	} elsif ($mod & CFClient::KMOD_CTRL) {	201	} elsif ($mod & CFClient::KMOD_CTRL) {
220	$self->{ctrl}++;	202	$self->{ctrl}++;
221	$::CONN->user_send ("run $DIR{$sym}[0]");	203	$::CONN->user_send ("run $DIR{$sym}[0]");
222	} else {	204	} else {
223	$::CONN->user_send ("$DIR{$sym}[1]");	205	$::CONN->user_send ("$DIR{$sym}[1]");
224	}	206	}
		207	} elsif ($ev->{unicode}) {
		208	$self->{command_widget} \|\|=
		209	new CFClient::MapWidget::Command::
		210	command => $self->{command},
		211	can_focus => 1,
		212	connect_execute => sub {
		213	# todo: support callback instead of user_send
		214	$::CONN->user_send ($_[1]);
		215	},
		216	connect_close => sub {
		217	(delete $self->{command_widget})->hide;
		218	$self->focus_in;
		219	},
		220	;
		221	$self->{command_widget}->key_down ($ev)
		222	unless $ev->{unicode} == 20;
		223	return unless $self->{command_widget};
		224	$self->{command_widget}->show;
		225	$self->{command_widget}->focus_in;
225	}	226	}
226	}	227	}
227		228
228	sub key_up {	229	sub key_up {
229	my ($self, $ev) = @_;	230	my ($self, $ev) = @_;
…		…
238	$::CONN->user_send ("run_stop");	239	$::CONN->user_send ("run_stop");
239	}	240	}
240	}	241	}
241		242
242	sub add_command {	243	sub add_command {
243	my ($self, $command, $widget, $cb) = @_;	244	my ($self, $command, $tooltip, $widget, $cb) = @_;
244		245
245	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	246	(my $data = $command) =~ s/\\//g;
246	warn "$command\|$abbrev\|$widget\n";#d#	247
		248	$tooltip =~ s/^\s+//;
		249
		250	$tooltip = "<big>$data</big>\n\n$tooltip";
		251
		252	$tooltip =~ s/\s+$//;
		253
		254	$self->{command}{$command} = [$data, $tooltip, $widget, $cb];
		255	}
		256
		257	sub clr_commands {
		258	my ($self) = @_;
		259
		260	%{$self->{command}} = ();
		261	}
		262
		263	package CFClient::MapWidget::MapMap;
		264
		265	our @ISA = CFClient::UI::Base::;
		266
		267	use Time::HiRes qw(time);
		268	use CFClient::OpenGL;
		269
		270	sub size_request {
		271	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		272	}
		273
		274	sub size_allocate {
		275	my ($self, $w, $h) = @_;
		276
		277	$self->SUPER::size_allocate ($w, $h);
		278	$self->update;
		279	}
		280
		281	sub update {
		282	my ($self) = @_;
		283
		284	delete $self->{texture_atime};
		285	$self->SUPER::update;
		286	}
		287
		288	sub _draw {
		289	my ($self) = @_;
		290
		291	$::MAP or return;
		292
		293	my ($w, $h) = @$self{qw(w h)};
		294
		295	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		296	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		297
		298	my $sx = int $::CFG->{map_shift_x} / 32;
		299	my $sy = int $::CFG->{map_shift_y} / 32;
		300
		301	my $ox = 0.5 * ($w - $sw);
		302	my $oy = 0.5 * ($h - $sh);
		303
		304	glEnable GL_BLEND;
		305	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		306	glEnable GL_TEXTURE_2D;
		307	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		308
		309	if ($self->{texture_atime} < time) {
		310	$self->{texture_atime} = time + 1/3;
		311
		312	$self->{texture} =
		313	new CFClient::Texture
		314	w => $w,
		315	h => $h,
		316	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		317	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		318	}
		319
		320	$self->{texture}->draw_quad (0, 0);
		321
		322	glDisable GL_TEXTURE_2D;
		323
		324	glTranslate 0.375, 0.375;
		325
		326	#TODO: map scale is completely borked
		327
		328	my $x0 = int $ox - $sx + 0.5;
		329	my $y0 = int $oy - $sy + 0.5;
		330
		331	glColor 1, 1, 0, 1;
		332	glBegin GL_LINE_LOOP;
		333	glVertex $x0 , $y0 ;
		334	glVertex $x0 , $y0 + $sh;
		335	glVertex $x0 + $sw, $y0 + $sh;
		336	glVertex $x0 + $sw, $y0 ;
		337	glEnd;
		338
		339	glDisable GL_BLEND;
		340	}
		341
		342	package CFClient::MapWidget::Command;
		343
		344	use strict;
		345
		346	use CFClient::OpenGL;
		347
		348	our @ISA = CFClient::UI::Frame::;
		349
		350	sub new {
		351	my $class = shift;
		352
		353	my $self = $class->SUPER::new (
		354	bg => [0, 0, 0, 0.8],
		355	@_,
		356	);
		357
		358	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		359
		360	$self->{label} = [
		361	map
		362	CFClient::UI::Label->new (
		363	can_hover => 1,
		364	can_events => 1,
		365	tooltip_width => 0.33,
		366	fontsize => $_,
		367	), (0.8) x 6
		368	];
		369
		370	$self->{entry} = new CFClient::UI::Entry
		371	connect_changed => sub {
		372	$self->update_labels;
		373	};
		374
		375	$self->{vbox}->add (
		376	$self->{entry},
		377	@{$self->{label}},
		378	);
		379
		380	$self
		381	}
		382
		383	sub size_allocate {
		384	my ($self, $w, $h) = @_;
		385
		386	$self->SUPER::size_allocate ($w, $h);
		387	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		388	}
		389
		390	sub key_down {
		391	my ($self, $ev) = @_;
		392
		393	if ($ev->{sym} == 13) {
		394	if (exists $self->{select}) {
		395	$self->emit (execute => $self->{select});
		396	$self->emit ("close");
		397	}
		398	} elsif ($ev->{sym} == 27) {
		399	$self->{entry}->set_text ("");
		400	$self->emit ("close");
		401	return;
		402	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		403	++$self->{select_offset}
		404	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		405	$self->update_labels;
		406	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		407	--$self->{select_offset}
		408	if $self->{select_offset};
		409	$self->update_labels;
		410	} else {
		411	#$self->{entry}{force_alloc} = 1;
		412	$self->{entry}->key_down ($ev);
		413	}
		414	}
		415
		416	sub update_labels {
		417	my ($self) = @_;
		418
		419	my $text = $self->{entry}->get_text;
		420
		421	length $text
		422	or return $self->emit ("close");
		423
		424	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		425
		426	if ($cmd ne $self->{last_search}) {
		427	my $regexp = do {
		428	my ($beg, @chr) = split //, lc $cmd;
		429
		430	# the following regex is used to match our "completion entry"
		431	# to an actual command - the parentheses match kind of "overhead"
		432	# - the more characters the parentheses match, the less attractive
		433	# is the match.
		434	my $regexp = "^\Q$beg\E"
		435	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		436	qr<$regexp>
		437	};
		438
		439	my @match;
		440	my @penalty;
		441
		442	for (keys %{$self->{command}}) {
		443	if (@penalty = $_ =~ $regexp) {
		444	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		445	}
		446	}
		447
		448	@match = map $self->{command}{$_->[0]},
		449	sort {
		450	$a->[1] <=> $b->[1]
		451	or (length $a->[0]) <=> (length $b->[0])
		452	} @match;
		453
		454	$self->{last_search} = $cmd;
		455	$self->{last_match} = \@match;
		456
		457	$self->{select_offset} = 0;
		458	}
		459
		460	my @labels = @{ $self->{label} };
		461	my @matches = @{ $self->{last_match} \|\| [] };
		462
		463	if ($self->{select_offset}) {
		464	splice @matches, 0, $self->{select_offset}, ();
		465
		466	my $label = shift @labels;
		467	$label->set_text ("...");
		468	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		469	}
		470
		471	for my $label (@labels) {
		472	$label->{fg} = [1, 1, 1, 1];
		473	$label->{bg} = [0, 0, 0, 0];
		474	}
		475
		476	if (@matches) {
		477	$self->{select} = "$matches[0][0]$arg";
		478
		479	$labels[0]->{fg} = [0, 0, 0, 1];
		480	$labels[0]->{bg} = [1, 1, 1, 0.8];
		481	} else {
		482	$self->{select} = "$cmd$arg";
		483	}
		484
		485	for my $match (@matches) {
		486	my $label = shift @labels;
		487
		488	if (@labels) {
		489	$label->set_text ("$match->[0]$arg");
		490	$label->set_tooltip ($match->[1]);
		491	} else {
		492	$label->set_text ("...");
		493	$label->set_tooltip ("Use Cursor-Down to view more matches");
		494	last;
		495	}
		496	}
		497
		498	for my $label (@labels) {
		499	$label->set_text ("");
		500	$label->set_tooltip ("");
		501	}
		502
		503	$self->update;
		504	###
		505	}
		506
		507	sub _draw {
		508	my ($self) = @_;
		509
		510	# hack
		511	local $CFClient::UI::FOCUS = $self->{entry};
		512
		513	$self->SUPER::_draw;
247	}	514	}
248		515
249	1	516	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.5 by root, Wed Apr 19 23:43:07 2006 UTC vs. Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.5 by root, Wed Apr 19 23:43:07 2006 UTC vs.
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC