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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.22 by root, Sat May 13 00:27:08 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->add_command ("killpets", "kills all your summoned and charmed creates");
		23
		24	$self
20	}	25	}
21		26
22	sub DESTROY {	27	sub DESTROY {
23	my $self = shift;	28	my $self = shift;
24		29
25	glDeleteList $self->{list};	30	glDeleteList $self->{list};
26		31
27	$self->SUPER::DESTROY;	32	$self->SUPER::DESTROY;
28	}
29
30	sub key_down {
31	print "MAPKEYDOWN\n";
32	}
33
34	sub key_up {
35	}	33	}
36		34
37	sub button_down {	35	sub button_down {
38	my ($self, $ev, $x, $y) = @_;	36	my ($self, $ev, $x, $y) = @_;
39		37
87		85
88	if (delete $self->{need_update}) {	86	if (delete $self->{need_update}) {
89	glNewList $self->{list};	87	glNewList $self->{list};
90		88
91	if ($::MAP) {	89	if ($::MAP) {
92	my $sw = int $::WIDTH / 32;	90	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
93	my $sh = int $::HEIGHT / 32;	91	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
94		92
95	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	93	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;	94	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		95
		96	glPushMatrix;
		97	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
97		98
98	glTranslate $sx0 - 32, $sy0 - 32, 0;	99	glTranslate $sx0 - 32, $sy0 - 32, 0;
99		100
100	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	101	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
101		102
…		…
106	GL_CONVOLUTION_2D,	107	GL_CONVOLUTION_2D,
107	GL_ALPHA,	108	GL_ALPHA,
108	3, 3,	109	3, 3,
109	GL_ALPHA, GL_FLOAT,	110	GL_ALPHA, GL_FLOAT,
110	pack "f*",	111	pack "f*",
111	0.1, 0.1, 0.1,	112	0.05, 0.13, 0.05,
112	0.1, 0.2, 0.1,	113	0.13, 0.30, 0.13,
113	0.1, 0.1, 0.1,	114	0.05, 0.13, 0.05,
114	);	115	);
115	glEnable GL_CONVOLUTION_2D;	116	glEnable GL_CONVOLUTION_2D;
116	}	117	}
117		118
118	$self->{fow_texture} = new CFClient::Texture	119	$self->{fow_texture} = new CFClient::Texture
…		…
127	glEnable GL_BLEND;	128	glEnable GL_BLEND;
128	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	129	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129	glEnable GL_TEXTURE_2D;	130	glEnable GL_TEXTURE_2D;
130	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131		132
132	glColor +($::CFG->{fow_intensity}) x 3, 1;	133	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	134	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
134		135
135	glDisable GL_TEXTURE_2D;	136	glDisable GL_TEXTURE_2D;
136	glDisable GL_BLEND;	137	glDisable GL_BLEND;
137	}	138	}
138		139
139	# HACK BEGIN	140	glPopMatrix;
140	{
141	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142
143	glTranslate 0, 30;
144	my ($w, $h) = (250, 250);
145
146	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
147
148	glEnable GL_BLEND;
149	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
150	glEnable GL_TEXTURE_2D;
151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
152
153	$self->{mapmap_texture} =
154	new CFClient::Texture
155	w => $w,
156	h => $h,
157	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
158	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
159
160	$self->{mapmap_texture}->draw_quad (0, 0);
161
162	glDisable GL_TEXTURE_2D;
163
164	glTranslate 0.375, 0.375;
165
166	glColor 1, 1, 0, 1;
167	glBegin GL_LINE_LOOP;
168	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
169	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
170	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
171	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
172	glEnd;
173
174	glDisable GL_BLEND;
175	}
176	# HACK END
177	}	141	}
178		142
179	glEndList;	143	glEndList;
180	}	144	}
181		145
…		…
214	);	178	);
215		179
216	sub key_down {	180	sub key_down {
217	my ($self, $ev) = @_;	181	my ($self, $ev) = @_;
218		182
		183	return unless $::CONN;
		184
219	my $mod = $ev->{mod};	185	my $mod = $ev->{mod};
220	my $sym = $ev->{sym};	186	my $sym = $ev->{sym};
		187	my $uni = $ev->{unicode};
221		188
222	if ($sym == CFClient::SDLK_KP5) {	189	if ($sym == CFClient::SDLK_KP5) {
223	$::CONN->user_send ("stay fire");	190	$::CONN->user_send ("stay fire");
		191	} elsif ($uni == ord ",") {
		192	$::CONN->user_send ("take");
224	} elsif ($sym == ord "a") {	193	} elsif ($uni == ord "a") {
225	$::CONN->user_send ("apply");	194	$::CONN->user_send ("apply");
226	} elsif ($sym == ord "'") {	195	} elsif ($uni == ord "'") {
227	$self->emit ('activate_console');	196	$self->emit ('activate_console');
228	} elsif ($sym == ord "/") {	197	} elsif ($uni == ord "/") {
229	$self->emit ('activate_console' => '/');	198	$self->emit (activate_console => '/');
230	} elsif (exists $DIR{$sym}) {	199	} elsif (exists $DIR{$sym}) {
231	if ($mod & CFClient::KMOD_SHIFT) {	200	if ($mod & CFClient::KMOD_SHIFT) {
232	$self->{shft}++;	201	$self->{shft}++;
233	$::CONN->user_send ("fire $DIR{$sym}[0]");	202	$::CONN->user_send ("fire $DIR{$sym}[0]");
234	} elsif ($mod & CFClient::KMOD_CTRL) {	203	} elsif ($mod & CFClient::KMOD_CTRL) {
235	$self->{ctrl}++;	204	$self->{ctrl}++;
236	$::CONN->user_send ("run $DIR{$sym}[0]");	205	$::CONN->user_send ("run $DIR{$sym}[0]");
237	} else {	206	} else {
238	$::CONN->user_send ("$DIR{$sym}[1]");	207	$::CONN->user_send ("$DIR{$sym}[1]");
239	}	208	}
		209	} elsif ($ev->{unicode}) {
		210	$self->{command_widget} \|\|=
		211	new CFClient::MapWidget::Command::
		212	command => $self->{command},
		213	can_focus => 1,
		214	connect_execute => sub {
		215	# todo: support callback instead of user_send
		216	$::CONN->user_send ($_[1][1]);
		217	},
		218	connect_close => sub {
		219	(delete $self->{command_widget})->hide;
		220	$self->focus_in;
		221	},
		222	;
		223	$self->{command_widget}->key_down ($ev);
		224	return unless $self->{command_widget};
		225	$self->{command_widget}->show;
		226	$self->{command_widget}->focus_in;
240	}	227	}
241	}	228	}
242		229
243	sub key_up {	230	sub key_up {
244	my ($self, $ev) = @_;	231	my ($self, $ev) = @_;
…		…
253	$::CONN->user_send ("run_stop");	240	$::CONN->user_send ("run_stop");
254	}	241	}
255	}	242	}
256		243
257	sub add_command {	244	sub add_command {
258	my ($self, $command, $widget, $cb) = @_;	245	my ($self, $command, $tooltip, $widget, $cb) = @_;
259		246
260	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	247	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
261	warn "$command\|$abbrev\|$widget\n";#d#	248
		249	$self->{command} = [
		250	[$abbrev, $command, $tooltip, $widget, $cb],
		251	grep $_->[1] ne $command, @{ $self->{command} },
		252	];
		253	}
		254
		255	package CFClient::MapWidget::MapMap;
		256
		257	our @ISA = CFClient::UI::Base::;
		258
		259	use Time::HiRes qw(time);
		260	use CFClient::OpenGL;
		261
		262	sub size_request {
		263	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		264	}
		265
		266	sub size_allocate {
		267	my ($self, $w, $h) = @_;
		268
		269	$self->SUPER::size_allocate ($w, $h);
		270	$self->update;
		271	}
		272
		273	sub update {
		274	my ($self) = @_;
		275
		276	delete $self->{texture_atime};
		277	$self->SUPER::update;
		278	}
		279
		280	sub _draw {
		281	my ($self) = @_;
		282
		283	$::MAP or return;
		284
		285	my ($w, $h) = @$self{qw(w h)};
		286
		287	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		288	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		289
		290	my $sx = int $::CFG->{map_shift_x} / 32;
		291	my $sy = int $::CFG->{map_shift_y} / 32;
		292
		293	my $ox = 0.5 * ($w - $sw);
		294	my $oy = 0.5 * ($h - $sh);
		295
		296	glEnable GL_BLEND;
		297	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		298	glEnable GL_TEXTURE_2D;
		299	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		300
		301	if ($self->{texture_atime} < time) {
		302	$self->{texture_atime} = time + 1/3;
		303
		304	$self->{texture} =
		305	new CFClient::Texture
		306	w => $w,
		307	h => $h,
		308	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		309	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		310	}
		311
		312	$self->{texture}->draw_quad (0, 0);
		313
		314	glDisable GL_TEXTURE_2D;
		315
		316	glTranslate 0.375, 0.375;
		317
		318	#TODO: map scale is completely borked
		319
		320	my $x0 = int $ox - $sx + 0.5;
		321	my $y0 = int $oy - $sy + 0.5;
		322
		323	glColor 1, 1, 0, 1;
		324	glBegin GL_LINE_LOOP;
		325	glVertex $x0 , $y0 ;
		326	glVertex $x0 , $y0 + $sh;
		327	glVertex $x0 + $sw, $y0 + $sh;
		328	glVertex $x0 + $sw, $y0 ;
		329	glEnd;
		330
		331	glDisable GL_BLEND;
		332	}
		333
		334	package CFClient::MapWidget::Command;
		335
		336	use strict;
		337
		338	use CFClient::OpenGL;
		339
		340	our @ISA = CFClient::UI::VBox::;
		341
		342	sub new {
		343	my $class = shift;
		344
		345	my $self = $class->SUPER::new (
		346	@_,
		347	children => [map
		348	CFClient::UI::Label->new (
		349	can_hover => 1,
		350	can_events => 1,
		351	fontsize => $_,
		352	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
		353	],
		354	);
		355
		356	$self
		357	}
		358
		359	sub size_allocate {
		360	my ($self, $w, $h) = @_;
		361
		362	$self->SUPER::size_allocate ($w, $h);
		363	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		364	}
		365
		366	sub update_labels {
		367	my ($self) = @_;
		368
		369	my $command = $self->{command};
		370	my $search_abbrev = qr/^\Q$self->{search}/;
		371	my $search_full = qr/\Q$self->{search}/;
		372
		373	my @found;
		374
		375	for (@$command) {
		376	if ($_->[0] =~ $search_abbrev) {
		377	push @found, [$_->[0], $_];
		378	} elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
		379	push @found, [$_->[1], $_];
		380	}
		381	}
		382
		383	@found = sort { $a->[0] cmp $b->[0] } @found;
		384
		385	$self->{children}[0]->set_text ("$self->{search}_");
		386
		387	for (0..5) {
		388	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
		389	$self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
		390	}
		391
		392	$self->{select} = $found[0][1]
		393	if @found;
		394
		395	if (@found > 6) {
		396	$self->{children}[6]->set_text ("...");
		397	}
		398
		399	$self->check_size;
		400	}
		401
		402	sub key_down {
		403	my ($self, $ev) = @_;
		404
		405	if ($ev->{sym} == 8) {
		406	substr $self->{search}, -1, 1, "";
		407	$self->update_labels;
		408	} elsif ($ev->{sym} == 13) {
		409	if (exists $self->{select}) {
		410	$self->emit (execute => $self->{select});
		411	$self->emit ("close");
		412	}
		413	} elsif ($ev->{sym} == 27) {
		414	$self->emit ("close");
		415	return;
		416	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
		417	$self->{search} .= chr $ev->{unicode};
		418	$self->update_labels;
		419	}
		420
		421	length $self->{search}
		422	or $self->emit ("close");
262	}	423	}
263		424
264	1	425	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs. Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC