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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.1 by root, Wed Apr 19 06:21:07 2006 UTC vs. Revision 1.21 by root, Mon May 8 17:23:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.1 by root, Wed Apr 19 06:21:07 2006 UTC vs.
Revision 1.21 by root, Mon May 8 17:23:08 2006 UTC