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.18 by root, Sat Apr 8 13:36:26 2006 UTC vs.
Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC

… …
39 $self->{x} = $x; 39 $self->{x} = $x;
40 $self->{y} = $y; 40 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 41 $self->{z} = $z if defined $z;
42} 42}
43 43
44sub needs_redraw {
45 0
46}
47
44sub size_request { 48sub size_request {
45 die "size_request is abtract"; 49 die "size_request is abtract";
46} 50}
47 51
48sub focus_in { 52sub focus_in {
… …
110 114
111sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
112 116
113sub _draw { die "Containers can't be drawn!" } 117sub _draw { die "Containers can't be drawn!" }
114 118
115package Crossfire::Client::Widget::Frame; 119package Crossfire::Client::Widget::Window;
116 120
117our @ISA = Crossfire::Client::Widget::Container::; 121our @ISA = Crossfire::Client::Widget::Container::;
118 122
119use SDL::OpenGL; 123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_;
127 $self->SUPER::add ($chld);
128 $self->render_chld; #TODO: Move this to the size_request event propably?
129}
130
131sub render_chld {
132 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135
136 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw }
139 );
140 $self->{texture}->upload;
141}
120 142
121sub size_request { 143sub size_request {
122 my ($self) = @_; 144 my ($self) = @_;
123 my $chld = $self->get 145 my $chld = $self->get
124 or return (0, 0); 146 or return (0, 0);
147 $chld->size_request
148}
149
150sub _draw {
151 my ($self) = @_;
152
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
154
155 my $tex = $self->{texture}
156 or return;
157
158 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 1, 1;
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171
172 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D;
174}
175
176package Crossfire::Client::Widget::Frame;
177
178our @ISA = Crossfire::Client::Widget::Container::;
179
180use SDL::OpenGL;
181
182sub size_request {
183 my ($self) = @_;
184 my $chld = $self->get
185 or return (0, 0);
186
187 $chld->move (2, 2);
188
125 map { $_ + 4 } $chld->size_request; 189 map { $_ + 4 } $chld->size_request;
126} 190}
127 191
128sub _draw { 192sub _draw {
129 my ($self) = @_; 193 my ($self) = @_;
130 194
131 my $chld = $self->get; 195 my $chld = $self->get;
132 196
133 my ($w, $h) = $chld->size_request; 197 my ($w, $h) = $chld->size_request;
134 198
135 glColor 1, 0, 0;
136 glBegin GL_QUADS; 199 glBegin GL_QUADS;
200 glColor 0, 0, 0;
137 glTexCoord 0, 0; glVertex 0 , 0; 201 glTexCoord 0, 0; glVertex 0 , 0;
138 glTexCoord 0, 1; glVertex 0 , $h + 4; 202 glTexCoord 0, 1; glVertex 0 , $h + 4;
139 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
140 glTexCoord 1, 0; glVertex $w + 4 , 0; 204 glTexCoord 1, 0; glVertex $w + 4 , 0;
141 glEnd; 205 glEnd;
142 206
143 glPushMatrix;
144 glTranslate (2, 2, 0);
145 $chld->_draw; 207 $chld->draw;
146 glPopMatrix;
147} 208}
148 209
149package Crossfire::Client::Widget::Table; 210package Crossfire::Client::Widget::Table;
150 211
151our @ISA = Crossfire::Client::Widget::Container::; 212our @ISA = Crossfire::Client::Widget::Container::;
… …
212 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 273 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
213 my $x = 0; 274 my $x = 0;
214 275
215 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 276 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
216 277
217 glPushMatrix;
218 glTranslate ($x, $y, 0);
219 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
220 $c->_draw if $c; 281 $c->draw if $c;
221 glPopMatrix; 282 }
222 283
223 $x += $self->max_col_width ($xi); 284 $x += $self->max_col_width ($xi);
224 } 285 }
225 286
226 $y += $self->max_row_height ($yi); 287 $y += $self->max_row_height ($yi);
… …
254sub _draw { 315sub _draw {
255 my ($self) = @_; 316 my ($self) = @_;
256 317
257 my ($x, $y); 318 my ($x, $y);
258 for (@{$self->{childs} || []}) { 319 for (@{$self->{childs} || []}) {
259 glPushMatrix; 320 $_->move (0, $y, 0); #TODO: move to size_request
260 glTranslate (0, $y, 0);
261 $_->_draw; 321 $_->draw;
262 glPopMatrix;
263 my ($w, $h) = $_->size_request; 322 my ($w, $h) = $_->size_request;
264 $y += $h; 323 $y += $h;
265 } 324 }
266} 325}
267 326
… …
270our @ISA = Crossfire::Client::Widget::; 329our @ISA = Crossfire::Client::Widget::;
271 330
272use SDL::OpenGL; 331use SDL::OpenGL;
273 332
274sub new { 333sub new {
275 my ($class, $x, $y, $z, $ttf, $text) = @_; 334 my ($class, $x, $y, $z, $height, $text) = @_;
276 335
277 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);
278 337
279 $self->set_text ($text); 338 $self->set_text ($text);
280 339
281 $self 340 $self
282} 341}
283 342
284sub set_text { 343sub set_text {
285 my ($self, $text) = @_; 344 my ($self, $text) = @_;
345
346 $self->{text} = $text;
347
286 $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};
287} 349}
288 350
289sub get_text { 351sub get_text {
290 my ($self, $text) = @_; 352 my ($self, $text) = @_;
353
291 $self->{text} 354 $self->{text}
292} 355}
293 356
294sub size_request { 357sub size_request {
295 my ($self) = @_; 358 my ($self) = @_;
… …
305 368
306 my $tex = $self->{texture}; 369 my $tex = $self->{texture};
307 370
308 glEnable GL_BLEND; 371 glEnable GL_BLEND;
309 glEnable GL_TEXTURE_2D; 372 glEnable GL_TEXTURE_2D;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
311 glBindTexture GL_TEXTURE_2D, $tex->{name}; 375 glBindTexture GL_TEXTURE_2D, $tex->{name};
312 376
313 glColor 1, 1, 1; 377 glColor 1, 1, 1, 0.8;
314 378
315 glBegin GL_QUADS; 379 glBegin GL_QUADS;
316 glTexCoord 0, 0; glVertex 0 , 0; 380 glTexCoord 0, 0; glVertex 0 , 0;
317 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 381 glTexCoord 0, 1; glVertex 0 , $tex->{height};
318 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 382 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
344 408
345package Crossfire::Client::Widget::MapWidget; 409package Crossfire::Client::Widget::MapWidget;
346 410
347use strict; 411use strict;
348 412
349our @ISA = qw/Crossfire::Client::Widget/; 413use List::Util qw(min max);
350 414
351use SDL; 415use SDL;
352use SDL::OpenGL; 416use SDL::OpenGL;
353use SDL::OpenGL::Constants; 417use SDL::OpenGL::Constants;
418
419our @ISA = Crossfire::Client::Widget::;
354 420
355sub key_down { 421sub key_down {
356 print "MAPKEYDOWN\n"; 422 print "MAPKEYDOWN\n";
357} 423}
358 424
359sub key_up { 425sub key_up {
360} 426}
361 427
362sub _draw { 428sub _draw {
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 }
452
363 glEnable GL_TEXTURE_2D; 453 glEnable GL_TEXTURE_2D;
364 glEnable GL_BLEND; 454 glEnable GL_BLEND;
365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
366 456
367 my $map = $::CONN->{map}; 457 for my $x (0 .. $sw - 1) {
368
369 for my $x (0 .. $::CONN->{mapw} - 1) {
370 for my $y (0 .. $::CONN->{maph} - 1) { 458 for my $y (0 .. $sh - 1) {
371 459
372 my $cell = $map->[$x][$y] 460 my $cell = $map->[$x + $xofs][$y + $yofs]
373 or next; 461 or next;
374 462
375 my $darkness = $cell->[3] * (1 / 255); 463 my $darkness = $cell->[0] * (1 / 255);
464 if ($darkness < 0) {
465 glColor 0.3, 0.3, 0.3;
466 } else {
376 glColor $darkness, $darkness, $darkness; 467 glColor $darkness, $darkness, $darkness;
468 }
377 469
378 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 470 for my $num (grep $_, @$cell[1,2,3]) {
379 my $tex = $::CONN->{face}[$num]{texture} || next; 471 my $tex = $::CONN->{face}[$num]{texture} || next;
380 472
381 glBindTexture GL_TEXTURE_2D, $tex->{name}; 473 glBindTexture GL_TEXTURE_2D, $tex->{name};
382 474
475 my $w = $tex->{width};
476 my $h = $tex->{height};
477
478 my $px = ($x + 1) * 32 - $w;
479 my $py = ($y + 1) * 32 - $h;
480
383 glBegin GL_QUADS; 481 glBegin GL_QUADS;
384 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 482 glTexCoord 0, 0; glVertex $px , $py;
385 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 483 glTexCoord 0, 1; glVertex $px , $py + $h;
386 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 484 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
387 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 485 glTexCoord 1, 0; glVertex $px + $w, $py;
388 glEnd; 486 glEnd;
389 } 487 }
390 } 488 }
391 } 489 }
392 490

Diff Legend

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