ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.15 by elmex, Fri Apr 7 17:18:22 2006 UTC vs.
Revision 1.102 by elmex, Fri Apr 14 11:43:51 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use Glib; 6use Time::HiRes 'time';
6use Gtk2 -init; 7use Event;
7 8
8use SDL; 9use SDL;
9use SDL::App; 10use SDL::App;
10use SDL::Event; 11use SDL::Event;
11use SDL::Surface; 12use SDL::Surface;
12use SDL::OpenGL; 13use SDL::OpenGL;
13use SDL::OpenGL::Constants;
14 14
15use Crossfire; 15use Crossfire;
16use Crossfire::Client;
17use Crossfire::Protocol; 16use Crossfire::Protocol;
18 17
18use CFClient;
19use Client::Util; 19use CFClient::UI;
20use Client::Widget;
21 20
22our $VERSION = '0.1'; 21our $VERSION = '0.1';
22
23my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused as of yet
25
26our $FACECACHE;
27
28our $LAST_REFRESH;
29our $NOW;
23 30
24our $CFG; 31our $CFG;
25our $CONN; 32our $CONN;
33our $FAST; # fast, low-quality mode, possibly useful for software-rendering
26 34
35our @SDL_MODES;
36our $WIDTH;
37our $HEIGHT;
38our $FULLSCREEN;
39our $FONTSIZE;
40
41our $MAP;
42our $MAPWIDGET;
43
27our $SDL_TIMER; 44our $SDL_ACTIVE;
28our $SDL_APP; 45our $SDL_EV;
29our $SDL_EV = new SDL::Event;
30our %SDL_CB; 46our %SDL_CB;
31 47
48our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE;
50our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
53our $CONSOLE;
54
55sub status {
56 $STATUS_LINE->set_text ($_[0]);
57 my ($w, $h) = $STATUS_LINE->size_request;
58 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
59}
60
61sub debug {
62 $DEBUG_STATUS->set_text ($_[0]);
63 my ($w, $h) = $DEBUG_STATUS->size_request;
64 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
65}
66
67sub start_game {
68 status "logging in...";
69
70 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
71
72 $MAP = new CFClient::Map $mapsize, $mapsize;
73
74 $CONN = new conn
75 host => $CFG->{host},
76 port => $CFG->{port},
77 user => $CFG->{user},
78 pass => $CFG->{password},
79 mapw => $mapsize,
80 maph => $mapsize,
81 ;
82
83 status "login successful";
84
85 CFClient::lowdelay fileno $CONN->{fh};
86}
87
88sub stop_game {
89 undef $CONN;
90}
91
92sub config_dialog {
93 my $dialog = new CFClient::UI::FancyFrame
94 child => (my $vbox = new CFClient::UI::VBox);
95 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97
98 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
99 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
100
101 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
102 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
103
104 $mode_slider->connect (changed => sub {
105 my ($self, $value) = @_;
106
107 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
108 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
109 });
110 $mode_slider->emit (changed => $mode_slider->{range}[0]);
111
112 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
113 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114 my ($self, $value) = @_;
115 $CFG->{fullscreen} = $value;
116 });
117
118 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
119 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
120 my ($self, $value) = @_;
121 $CFG->{fast} = $value;
122 });
123
124 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
125 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
126 my ($self, $value) = @_;
127 $CFG->{fow_enable} = $value;
128 });
129
130 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
131 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
132 my ($self, $value) = @_;
133 $CFG->{fow_intensity} = $value;
134 });
135
136 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
137 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
138 my ($self, $value) = @_;
139 $CFG->{fow_smooth} = $value;
140 });
141
142 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
143 destroy_screen ();
144 init_screen ();
145 });
146
147 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
148 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
149 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
150 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
151 my ($self, $value) = @_;
152 $CFG->{host} = $value;
153 });
154
155 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
156 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
157 my ($self, $value) = @_;
158 $CFG->{port} = $value;
159 });
160
161 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
162 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
163 my ($self, $value) = @_;
164 $CFG->{user} = $value;
165 });
166
167 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
168 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
169 my ($self, $value) = @_;
170 $CFG->{password} = $value;
171 });
172
173 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
174 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
175 my ($self, $value) = @_;
176 $CFG->{say_command} = $value;
177 });
178
179 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
180 $table->add (1, 7, new CFClient::UI::Slider
181 req_w => 100,
182 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
183 connect_changed => sub {
184 my ($self, $value) = @_;
185
186 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
187 },
188 );
189
190 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
191 start_game;
192 });
193
194 $vbox->add (my $hbox = new CFClient::UI::HBox);
195
196 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
197 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
198 status "Configuration Saved";
199 });
200
201 $dialog
202}
203
204sub console_window {
205 my $window = new CFClient::UI::FancyFrame
206 border_bg => [1, 1, 1, 0.5],
207 bg => [0.3, 0.3, 0.3, 0.8],
208 child => (my $vbox = new CFClient::UI::VBox);
209
210 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
211 $vbox->add (my $input = new CFClient::UI::LineEntry);
212 $input->connect (activate => sub {
213 my ($input, $text) = @_;
214 $input->set_text ('');
215
216 if ($text =~ /^\/(.*)/) {
217 $::CONN->user_send ("command $1");
218 } else {
219 my $say_cmd = $::CFG->{say_command} || 'say';
220 $::CONN->user_send ("command $say_cmd $text");
221 }
222 1
223 });
224 $input->connect (escape => sub {
225 $MAPWIDGET->focus_in
226 });
227 $input->focus_in;
228
229 $CONSOLE = {
230 window => $window,
231 input => $input
232 };
233
234 $window
235}
236
237sub sdl_init {
238 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
239 and die "SDL::Init failed!\n";
240}
241
32sub init_screen { 242sub init_screen {
33 # nuke all gl context data 243 sdl_init;
244
245 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
246 $FULLSCREEN = $CFG->{fullscreen};
247 $FAST = $CFG->{fast};
248
249 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
250 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
251 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
252 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
253
254 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
255 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
256 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
257 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
258
259 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
260 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
261 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
262
263 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
264 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
265 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
266 or die "SDL::SetVideoMode failed!\n";
267
268 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
269
270 $SDL_EV = new SDL::Event;
271 $SDL_EV->set_unicode (1);
272
273 $SDL_ACTIVE = 1;
274
275 $LAST_REFRESH = time - 0.01;
276
277 CFClient::gl_init;
278
279 $FONTSIZE = int $HEIGHT / 40;
280
281 #############################################################################
282
283 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
284 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
34 285
35 $SDL_APP = new SDL::App 286 $STATUS_LINE = new CFClient::UI::Label
36 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 287 padding => 0,
37 -title => "Crossfire+ Client", 288 y => $HEIGHT * 44 / 45 - $FONTSIZE;
38 -width => $CFG->{width}, 289 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
39 -height => $CFG->{height},
40 -opengl => 1,
41 -red_size => 8,
42 -green_size => 8,
43 -blue_size => 8,
44 -double_buffer => 1,
45 -fullscreen => $CFG->{fullscreen},
46 -resizeable => 0;
47 290
48 glEnable GL_TEXTURE_2D; 291 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
49 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 292 padding => 0,
50 glShadeModel GL_FLAT; 293 y => $HEIGHT * 44 / 45,
51 glDisable GL_DEPTH_TEST; 294 height => $HEIGHT / 45,
52 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 295 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
53 glEnable GL_BLEND; 296 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
297
298 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
299 $MAPWIDGET->focus_in;
300 $MAPWIDGET->connect (activate_console => sub {
301 if ($CONSOLE) {
302 $CONSOLE->{input}->focus_in;
303 }
304 });
305
306 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
307
308 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
309 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
310}
311
312sub destroy_screen {
313 $CFClient::UI::TOPLEVEL->{children} = [];
314 undef $SDL_ACTIVE;
315 undef $SDL_EV;
316 SDL::Quit;
317}
318
319my %animate_object;
320my $animate_timer;
321
322my $want_refresh;
323my $can_refresh;
324
325my $fps = 9;
326
327sub force_refresh {
328 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
329 debug sprintf "%3.2f", $fps;
330
331 $want_refresh = 0;
332 $can_refresh = 0;
333
334 glViewport 0, 0, $WIDTH, $HEIGHT;
54 335
55 glMatrixMode GL_PROJECTION; 336 glMatrixMode GL_PROJECTION;
56 glLoadIdentity; 337 glLoadIdentity;
57 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1; 338 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
339 glMatrixMode GL_MODELVIEW;
340 glLoadIdentity;
58 341
59 # re-bind all textures 342 glClearColor +($CFG->{fow_intensity}) x 3, 1;
60} 343 glClear GL_COLOR_BUFFER_BIT;
61 344
62sub start_game { 345 $CFClient::UI::TOPLEVEL->draw;
63 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 346
64 while ($SDL_EV->poll) { 347 SDL::GLSwapBuffers;
348
349 $LAST_REFRESH = $NOW;
350}
351
352my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
353 $NOW = time;
354
65 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 355 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
66 } 356 while $SDL_EV->poll;
67 357
68 1 358 if (%animate_object) {
359 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
360 $want_refresh++;
69 }; 361 }
70 362
71 init_screen; 363 if ($want_refresh) {
72 364 force_refresh;
73 $CONN = new conn 365 } else {
74 host => $CFG->{host}, 366 $can_refresh = 1;
75 port => $CFG->{port}; 367 }
76} 368});
77
78sub stop_game {
79 remove Glib::Source $SDL_TIMER;
80
81 undef $SDL_APP;
82 SDL::Quit;
83}
84 369
85sub refresh { 370sub refresh {
86 glClearColor 0, 0, 0, 0; 371 $want_refresh++;
87 glClear GL_COLOR_BUFFER_BIT; 372}
88 373
89 my $map = $CONN->{map}; 374sub animation_start {
375 my ($widget) = @_;
376 $animate_object{$widget} = $widget;
377}
90 378
91 for my $x (0 .. $CONN->{mapw} - 1) { 379sub animation_stop {
92 for my $y (0 .. $CONN->{maph} - 1) { 380 my ($widget) = @_;
381 delete $animate_object{$widget};
382}
93 383
94 my $cell = $map->[$x][$y] 384@conn::ISA = Crossfire::Protocol::;
95 or next;
96 385
97 my $darkness = $cell->[3] * (1 / 255); 386sub conn::user_send {
98 glColor $darkness, $darkness, $darkness; 387 my ($self, $command) = @_;
99 388
100 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 389 $self->send ($command);
101 my $tex = $CONN->{face}[$num]{texture} || 0; 390 status $command;
102 391}
103 glBindTexture GL_TEXTURE_2D, $tex;
104 392
105 glBegin GL_QUADS; 393sub conn::feed_map1a {
106 glTexCoord 0, 0; glVertex $x, $y; 394 my ($self, $data) = @_;
107 glTexCoord 0, 1; glVertex $x, $y + 1;
108 glTexCoord 1, 1; glVertex $x + 1, $y + 1;
109 glTexCoord 1, 0; glVertex $x + 1, $y;
110 glEnd;
111 }
112 }
113 }
114 395
115 SDL::GLSwapBuffers; 396# $self->Crossfire::Protocol::feed_map1a ($data);
397
398 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
399 $MAP->map1a_update ($data);
400 $MAPWIDGET->update;
401}
402
403#sub conn::map_update {
404# my ($self, $dirty) = @_;
405#
406# $MAPWIDGET->update;
407#}
408
409sub conn::map_clear {
410 my ($self) = @_;
411
412 $MAP->clear;
413
414# refresh;
415}
416
417sub conn::face_find {
418 my ($self, $face) = @_;
419
420 $FACECACHE->{"$face->{chksum},$face->{name}"}
421}
422
423sub conn::face_update {
424 my ($self, $facenum, $face) = @_;
425
426 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
427
428 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
429
430 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
431 $MAPWIDGET->update;
432}
433
434sub conn::query {
435 my ($self, $flags, $prompt) = @_;
436
437 #TODO
438 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
439}
440
441sub conn::drawinfo {
442 my ($self, $color, $text) = @_;
443
444 my @color = (
445 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
446 [1.00, 1.00, 1.00],
447 [0.00, 0.00, 0.55],
448 [1.00, 0.00, 0.00],
449 [1.00, 0.54, 0.00],
450 [0.11, 0.56, 1.00],
451 [0.93, 0.46, 0.00],
452 [0.18, 0.54, 0.34],
453 [0.56, 0.73, 0.56],
454 [0.80, 0.80, 0.80],
455 [0.55, 0.41, 0.13],
456 [0.99, 0.77, 0.26],
457 [0.74, 0.65, 0.41],
458 );
459
460 $LOGVIEW->add_paragraph ($color[$color], $text);
116} 461}
117 462
118%SDL_CB = ( 463%SDL_CB = (
119 SDL_QUIT() => sub { 464 SDL_QUIT() => sub {
120 warn "sdl quit\n";#d# 465 Event::unloop -1;
121 exit;
122 }, 466 },
123 SDL_VIDEORESIZE() => sub { 467 SDL_VIDEORESIZE() => sub {
124 }, 468 },
125 SDL_VIDEOEXPOSE() => sub { 469 SDL_VIDEOEXPOSE() => sub {
126 refresh; 470 refresh;
127 }, 471 },
128 SDL_KEYDOWN() => sub { 472 SDL_KEYDOWN() => sub {
473 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
474 # alt-enter
475 destroy_screen;
476 $CFG->{fullscreen} = !$CFG->{fullscreen};
477 init_screen;
478 } else {
129# Client::Widget::feed_sdl_key_down_event ($SDL_EV); 479 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
480 }
130 }, 481 },
131 SDL_KEYUP() => sub { 482 SDL_KEYUP() => sub {
132# Client::Widget::feed_sdl_key_up_event ($SDL_EV); 483 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
133 }, 484 },
134 SDL_MOUSEMOTION() => sub { 485 SDL_MOUSEMOTION() => sub {
135 warn "sdl motion\n";#d# 486 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
136 }, 487 },
137 SDL_MOUSEBUTTONDOWN() => sub { 488 SDL_MOUSEBUTTONDOWN() => sub {
138# Client::Widget::feed_sdl_button_down_event ($SDL_EV); 489 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
139 }, 490 },
140 SDL_MOUSEBUTTONUP() => sub { 491 SDL_MOUSEBUTTONUP() => sub {
141# Client::Widget::feed_sdl_button_up_event ($SDL_EV); 492 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
142 }, 493 },
143 SDL_ACTIVEEVENT() => sub { 494 SDL_ACTIVEEVENT() => sub {
144 warn "active\n";#d# 495# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
145 }, 496 },
146); 497);
147 498
148@conn::ISA = Crossfire::Protocol::;
149
150sub conn::map_update {
151 my ($self, $dirty) = @_;
152
153 refresh;
154}
155
156sub conn::map_scroll {
157 my ($self, $dx, $dy) = @_;
158
159 refresh;
160}
161
162sub conn::map_clear {
163 my ($self) = @_;
164
165 refresh;
166}
167
168sub conn::face_update {
169 my ($self, $num, $face) = @_;
170
171 my $pb = new Gtk2::Gdk::PixbufLoader;
172 $pb->write ($face->{image});
173 $pb->close;
174
175 $pb = $pb->get_pixbuf;
176 $pb = $pb->add_alpha (0, 0, 0, 0);
177
178 glGetError();
179 my ($tex) = @{glGenTextures 1};
180
181 $face->{texture} = $tex;
182
183 glBindTexture GL_TEXTURE_2D, $tex;
184 my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
185
186 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
187 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
188 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
189 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
190
191 glTexImage2D GL_TEXTURE_2D, 0,
192 GL_RGBA8,
193 $pb->get_width, $pb->get_height,
194 0,
195 GL_RGBA,
196 GL_UNSIGNED_BYTE,
197 $pb->get_pixels;
198 my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
199}
200
201############################################################################# 499#############################################################################
202 500
203Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc"; 501CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
204 502
205$CFG ||= { 503my %DEF_CFG = (
206 width => 640, 504 width => 640,
207 height => 480, 505 height => 480,
506 fast => 0,
507 fow_enable => 1,
508 fow_intensity => 0.45,
509 fow_smooth => 0,
208 fullscreen => 0, 510 fullscreen => 0,
511 sdl_mode => 0,
512 mapsize => 100,
209 host => "crossfire.schmorp.de", 513 host => "crossfire.schmorp.de",
210 port => 13327, 514 port => 13327,
211}; 515 say_command => 'say',
516);
212 517
213Client::Util::run_config_dialog 518while (my ($k, $v) = each %DEF_CFG) {
214 login => sub { start_game }, 519 $CFG->{$k} = $v unless exists $CFG->{$k};
215 logout => sub { stop_game }, 520}
216 521
217main Gtk2; 522sdl_init;
523
524@SDL_MODES = reverse
525 grep $_->[0] >= 640 && $_->[1] >= 480,
526 map [SDL::RectW ($_), SDL::RectH ($_)],
527 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
528
529@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
530
531$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
532
533init_screen;
534
535{
536 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
537
538 CFClient::add_font $_ for @fonts;
539 CFClient::set_font $fonts[0];
540}
541
542$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
543
544Event::loop;
545
546Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
547

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines