ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.22 by elmex, Sat Apr 8 18:18:09 2006 UTC vs.
Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC

… …
123use SDL::OpenGL; 123use SDL::OpenGL;
124 124
125sub add { 125sub add {
126 my ($self, $chld) = @_; 126 my ($self, $chld) = @_;
127 $self->SUPER::add ($chld); 127 $self->SUPER::add ($chld);
128 $self->render_chld; 128 $self->render_chld; #TODO: Move this to the size_request event propably?
129} 129}
130 130
131sub render_chld { 131sub render_chld {
132 my ($self) = @_; 132 my ($self) = @_;
133 my $chld = $self->get; 133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request; 134 my ($w, $h) = $self->size_request;
135 135
136 $w = $h = 256;
137
138 $self->{texture} = 136 $self->{texture} =
139 Crossfire::Client::Texture->new_from_opengl ( 137 Crossfire::Client::Texture->new_from_opengl (
140 $w, $h, sub { 138 $w, $h, sub { $chld->draw }
141 glPushMatrix;
142 glLoadIdentity;
143 $chld->_draw;
144 glPopMatrix;
145 }
146 ); 139 );
147 $self->{texture}->upload; 140 $self->{texture}->upload;
148} 141}
149 142
150sub size_request { 143sub size_request {
… …
155} 148}
156 149
157sub _draw { 150sub _draw {
158 my ($self) = @_; 151 my ($self) = @_;
159 152
160 my ($w, $h) = $self->size_request; 153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
154
161 my $tex = $self->{texture} 155 my $tex = $self->{texture}
162 or return; 156 or return;
163 157
164 glEnable GL_BLEND; 158 glEnable GL_BLEND;
165 glEnable GL_TEXTURE_2D; 159 glEnable GL_TEXTURE_2D;
… …
167 glBindTexture GL_TEXTURE_2D, $tex->{name}; 161 glBindTexture GL_TEXTURE_2D, $tex->{name};
168 162
169 glColor 1, 1, 1; 163 glColor 1, 1, 1;
170 164
171 glBegin GL_QUADS; 165 glBegin GL_QUADS;
172 glTexCoord 0, 0; glVertex 0 , 0; 166 glTexCoord 0, 0; glVertex 0, 0;
173 glTexCoord 0, 1; glVertex 0 , $h; 167 glTexCoord 0, 1; glVertex 0, $h;
174 glTexCoord 1, 1; glVertex $w , $h; 168 glTexCoord 1, 1; glVertex $w, $h;
175 glTexCoord 1, 0; glVertex $w , 0; 169 glTexCoord 1, 0; glVertex $w, 0;
176 glEnd; 170 glEnd;
177 171
178 glDisable GL_BLEND; 172 glDisable GL_BLEND;
179 glDisable GL_TEXTURE_2D; 173 glDisable GL_TEXTURE_2D;
180} 174}
… …
187 181
188sub size_request { 182sub size_request {
189 my ($self) = @_; 183 my ($self) = @_;
190 my $chld = $self->get 184 my $chld = $self->get
191 or return (0, 0); 185 or return (0, 0);
186
187 $chld->move (2, 2);
188
192 map { $_ + 4 } $chld->size_request; 189 map { $_ + 4 } $chld->size_request;
193} 190}
194 191
195sub _draw { 192sub _draw {
196 my ($self) = @_; 193 my ($self) = @_;
197 194
198 my $chld = $self->get; 195 my $chld = $self->get;
199 196
200 my ($w, $h) = $chld->size_request; 197 my ($w, $h) = $chld->size_request;
201 198
202 glColor 1, 0, 0;
203 glBegin GL_QUADS; 199 glBegin GL_QUADS;
200 glColor 0, 0, 0;
204 glTexCoord 0, 0; glVertex 0 , 0; 201 glTexCoord 0, 0; glVertex 0 , 0;
205 glTexCoord 0, 1; glVertex 0 , $h + 4; 202 glTexCoord 0, 1; glVertex 0 , $h + 4;
206 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
207 glTexCoord 1, 0; glVertex $w + 4 , 0; 204 glTexCoord 1, 0; glVertex $w + 4 , 0;
208 glEnd; 205 glEnd;
209 206
210 glPushMatrix;
211 glTranslate (2, 2, 0);
212 $chld->_draw; 207 $chld->draw;
213 glPopMatrix;
214} 208}
215 209
216package Crossfire::Client::Widget::Table; 210package Crossfire::Client::Widget::Table;
217 211
218our @ISA = Crossfire::Client::Widget::Container::; 212our @ISA = Crossfire::Client::Widget::Container::;
… …
279 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 273 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
280 my $x = 0; 274 my $x = 0;
281 275
282 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 276 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
283 277
284 glPushMatrix;
285 glTranslate ($x, $y, 0);
286 my $c = $self->{childs}->[$yi]->[$xi]; 278 my $c = $self->{childs}->[$yi]->[$xi];
279 if ($c) {
280 $c->move ($x, $y, 0); #TODO: Move to size_request
287 $c->_draw if $c; 281 $c->draw if $c;
288 glPopMatrix; 282 }
289 283
290 $x += $self->max_col_width ($xi); 284 $x += $self->max_col_width ($xi);
291 } 285 }
292 286
293 $y += $self->max_row_height ($yi); 287 $y += $self->max_row_height ($yi);
… …
321sub _draw { 315sub _draw {
322 my ($self) = @_; 316 my ($self) = @_;
323 317
324 my ($x, $y); 318 my ($x, $y);
325 for (@{$self->{childs} || []}) { 319 for (@{$self->{childs} || []}) {
326 glPushMatrix; 320 $_->move (0, $y, 0); #TODO: move to size_request
327 glTranslate (0, $y, 0);
328 $_->_draw; 321 $_->draw;
329 glPopMatrix;
330 my ($w, $h) = $_->size_request; 322 my ($w, $h) = $_->size_request;
331 $y += $h; 323 $y += $h;
332 } 324 }
333} 325}
334 326
… …
337our @ISA = Crossfire::Client::Widget::; 329our @ISA = Crossfire::Client::Widget::;
338 330
339use SDL::OpenGL; 331use SDL::OpenGL;
340 332
341sub new { 333sub new {
342 my ($class, $x, $y, $z, $ttf, $text) = @_; 334 my ($class, $x, $y, $z, $height, $text) = @_;
343 335
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 336 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
345 337
346 $self->set_text ($text); 338 $self->set_text ($text);
347 339
348 $self 340 $self
349} 341}
350 342
351sub set_text { 343sub set_text {
352 my ($self, $text) = @_; 344 my ($self, $text) = @_;
345
346 $self->{text} = $text;
347
353 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 348 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
354} 349}
355 350
356sub get_text { 351sub get_text {
357 my ($self, $text) = @_; 352 my ($self, $text) = @_;
353
358 $self->{text} 354 $self->{text}
359} 355}
360 356
361sub size_request { 357sub size_request {
362 my ($self) = @_; 358 my ($self) = @_;
… …
372 368
373 my $tex = $self->{texture}; 369 my $tex = $self->{texture};
374 370
375 glEnable GL_BLEND; 371 glEnable GL_BLEND;
376 glEnable GL_TEXTURE_2D; 372 glEnable GL_TEXTURE_2D;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
377 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
378 glBindTexture GL_TEXTURE_2D, $tex->{name}; 375 glBindTexture GL_TEXTURE_2D, $tex->{name};
379 376
380 glColor 1, 1, 1; 377 glColor 1, 1, 1, 0.8;
381 378
382 glBegin GL_QUADS; 379 glBegin GL_QUADS;
383 glTexCoord 0, 0; glVertex 0 , 0; 380 glTexCoord 0, 0; glVertex 0 , 0;
384 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 381 glTexCoord 0, 1; glVertex 0 , $tex->{height};
385 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 382 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
411 408
412package Crossfire::Client::Widget::MapWidget; 409package Crossfire::Client::Widget::MapWidget;
413 410
414use strict; 411use strict;
415 412
416our @ISA = qw/Crossfire::Client::Widget/; 413use List::Util qw(min max);
417 414
418use SDL; 415use SDL;
419use SDL::OpenGL; 416use SDL::OpenGL;
420use SDL::OpenGL::Constants; 417use SDL::OpenGL::Constants;
418
419our @ISA = Crossfire::Client::Widget::;
421 420
422sub key_down { 421sub key_down {
423 print "MAPKEYDOWN\n"; 422 print "MAPKEYDOWN\n";
424} 423}
425 424
426sub key_up { 425sub key_up {
427} 426}
428 427
429sub _draw { 428sub _draw {
430 my ($self) = @_; 429 my ($self) = @_;
430
431 my $mx = $::CONN->{mapx};
432 my $my = $::CONN->{mapy};
433
434 my $map = $::CONN->{map};
435
436 my ($xofs, $yofs);
437
438 my $sw = 1 + int $::WIDTH / 32;
439 my $sh = 1 + int $::HEIGHT / 32;
440
441 if ($::CONN->{mapw} > $sw) {
442 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
443 } else {
444 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
445 }
446
447 if ($::CONN->{maph} > $sh) {
448 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
449 } else {
450 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
451 }
431 452
432 glEnable GL_TEXTURE_2D; 453 glEnable GL_TEXTURE_2D;
433 glEnable GL_BLEND; 454 glEnable GL_BLEND;
434 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
435 456
436 my $map = $::CONN->{map}; 457 for my $x (0 .. $sw - 1) {
458 for my $y (0 .. $sh - 1) {
437 459
438 for my $x (0 .. int $::WIDTH / 32) { 460 my $cell = $map->[$x + $xofs][$y + $yofs]
439 for my $y (0 .. int $::HEIGHT / 32) {
440
441 my $cell = $map->[$x + $::CONN->{mapx}]
442 [$y + $::CONN->{mapy}]
443 or next; 461 or next;
444 462
445 my $darkness = $cell->[0] * (1 / 255); 463 my $darkness = $cell->[0] * (1 / 255);
446 if ($darkness < 0) { 464 if ($darkness < 0) {
447 $darkness = 0.5; 465 glColor 0.3, 0.3, 0.3;
466 } else {
467 glColor $darkness, $darkness, $darkness;
448 } 468 }
449 glColor $darkness, $darkness, $darkness;
450 469
451 for my $num (grep $_, @$cell[1,2,3]) { 470 for my $num (grep $_, @$cell[1,2,3]) {
452 my $tex = $::CONN->{face}[$num]{texture} || next; 471 my $tex = $::CONN->{face}[$num]{texture} || next;
453 472
454 glBindTexture GL_TEXTURE_2D, $tex->{name}; 473 glBindTexture GL_TEXTURE_2D, $tex->{name};

Diff Legend

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