--- deliantra/Deliantra-Client/bin/pclient 2006/04/06 21:43:17 1.7 +++ deliantra/Deliantra-Client/bin/pclient 2006/04/07 16:30:23 1.13 @@ -2,12 +2,8 @@ use strict; -use Crossfire::Client; -use Crossfire::Protocol; - -package Crossfire::Client; # uh, yeah - -use strict; +use Glib; +use Gtk2 -init; use SDL; use SDL::App; @@ -16,62 +12,100 @@ use SDL::OpenGL; use SDL::OpenGL::Constants; -my $conn; -my $app; +use Crossfire; +use Crossfire::Client; +use Crossfire::Protocol; + +use Client::Util; + +our $VERSION = '0.1'; -my $WIDTH = 640; -my $HEIGHT = 480; +our $CFG; +our $CONN; -sub glinit { +our $SDL_TIMER; +our $SDL_APP; +our $SDL_EV = new SDL::Event; +our %SDL_CB; + +sub init_screen { # nuke all gl context data - $app = new SDL::App + $SDL_APP = new SDL::App -flags => SDL_ANYFORMAT | SDL_HWSURFACE, -title => "Crossfire+ Client", - -width => $WIDTH, - -height => $HEIGHT, + -width => $CFG->{width}, + -height => $CFG->{height}, -opengl => 1, -red_size => 8, -green_size => 8, -blue_size => 8, -double_buffer => 1, + -fullscreen => $CFG->{fullscreen}, -resizeable => 0; glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; glShadeModel GL_FLAT; glDisable GL_DEPTH_TEST; - glMatrixMode GL_PROJECTION; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_BLEND; + glMatrixMode GL_PROJECTION; glLoadIdentity; - glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1; + glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; # re-bind all textures } +sub start_game { + $SDL_TIMER = add Glib::Timeout 1000/20, sub { + while ($SDL_EV->poll) { + ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); + } + + 1 + }; + + init_screen; + + $CONN = new conn + host => $CFG->{host}, + port => $CFG->{port}; +} + +sub stop_game { + remove Glib::Source $SDL_TIMER; + + undef $SDL_APP; + SDL::Quit; +} + sub refresh { - glClearColor 0.5, 0.5, 0.7, 0; + glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; - my $map = $conn->{map}; + my $map = $CONN->{map}; - for my $x (0 .. $conn->{mapw} - 1) { - for my $y (0 .. $conn->{maph} - 1) { + for my $x (0 .. $CONN->{mapw} - 1) { + for my $y (0 .. $CONN->{maph} - 1) { my $cell = $map->[$x][$y] or next; + my $darkness = $cell->[3] * (1 / 255); + glColor $darkness, $darkness, $darkness; + for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { - my $tex = $conn->{face}[$num]{texture} || 0; + my $tex = $CONN->{face}[$num]{texture} || 0; glBindTexture GL_TEXTURE_2D, $tex; - glColor 1,0,1; glBegin GL_QUADS; glTexCoord 0, 0; glVertex $x, $y; - glTexCoord 0, 1; glVertex $x, $y + 0.9; - glTexCoord 1, 1; glVertex $x + 0.9, $y + 0.9; - glTexCoord 1, 0; glVertex $x + 0.9, $y; + glTexCoord 0, 1; glVertex $x, $y + 1; + glTexCoord 1, 1; glVertex $x + 1, $y + 1; + glTexCoord 1, 0; glVertex $x + 1, $y; glEnd; } } @@ -80,52 +114,31 @@ SDL::GLSwapBuffers; } -my $ev = new SDL::Event; -my %ev_cb; - -sub event(&$) { - $ev_cb{$_[0]->()} = $_[1]; -} - -sub does(&) { shift } - -event {SDL_QUIT} does { - exit; -}; - -event {SDL_VIDEORESIZE} does { - print "resize\n"; -}; - -event {SDL_VIDEOEXPOSE} does { - refresh; -}; - -event {SDL_KEYDOWN} does { - print "keypress\n"; -}; - -event {SDL_KEYUP} does { - print "keyup\n";#d# -}; - -event {SDL_MOUSEMOTION} does { - print "motion\n"; -}; - -event {SDL_MOUSEBUTTONDOWN} does { - print "button\n"; -}; - -event {SDL_MOUSEBUTTONUP} does { - print "buttup\n"; -}; - -event {SDL_ACTIVEEVENT} does { - print "active\n"; -}; - -package Crossfire::Client; +%SDL_CB = ( + SDL_QUIT() => sub { + warn "sdl quit\n";#d# + exit; + }, + SDL_VIDEORESIZE() => sub { + }, + SDL_VIDEOEXPOSE() => sub { + refresh; + }, + SDL_KEYDOWN() => sub { + }, + SDL_KEYUP() => sub { + }, + SDL_MOUSEMOTION() => sub { + warn "sdl motion\n";#d# + }, + SDL_MOUSEBUTTONDOWN() => sub { + }, + SDL_MOUSEBUTTONUP() => sub { + }, + SDL_ACTIVEEVENT() => sub { + warn "active\n";#d# + }, +); @conn::ISA = Crossfire::Protocol::; @@ -150,18 +163,15 @@ sub conn::face_update { my ($self, $num, $face) = @_; - warn "up face $self,$num,$face\n";#d# - #TODO - open my $fh, ">:raw", "/tmp/x~"; - syswrite $fh, $face->{image}; - close $fh; - - my $surface = new SDL::Surface -name => "/tmp/x~"; + my $pb = new Gtk2::Gdk::PixbufLoader; + $pb->write ($face->{image}); + $pb->close; - unlink "/tmp/x~"; + $pb = $pb->get_pixbuf; + $pb = $pb->add_alpha (0, 0, 0, 0); - my ($tex) = @{glGenTextures 1}; glGetError(); + my ($tex) = @{glGenTextures 1}; $face->{texture} = $tex; @@ -173,34 +183,29 @@ glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; - $surface->rgba; - glTexImage2D GL_TEXTURE_2D, 0, - 4, # components - $surface->width, $surface->height, + GL_RGBA8, + $pb->get_width, $pb->get_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, - $surface->pixels; + $pb->get_pixels; my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr; } ############################################################################# -use Event; - -glinit; +Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; -$conn = new conn - host => "cf.schmorp.de", - port => 13327; - -Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub { - while ($ev->poll) { - ($ev_cb{$ev->type} || sub { warn "unhandled event ", $ev->type })->(); - } -}); +$CFG ||= { + width => 640, + height => 480, + fullscreen => 0, + host => "crossfire.schmorp.de", + port => 13327, +}; -Event::loop; +Client::Util::run_config_dialog; +main Gtk2;