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.33 by root, Sat Apr 8 18:15:59 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 00:09:50 2006 UTC

… …
30 30
31our $WIDTH; 31our $WIDTH;
32our $HEIGHT; 32our $HEIGHT;
33our $FULLSCREEN; 33our $FULLSCREEN;
34 34
35our $UIFONT; 35our $FONTSIZE;
36 36
37our $SDL_TIMER; 37our $SDL_TIMER;
38our $SDL_APP; 38our $SDL_APP;
39our $SDL_EV = new SDL::Event; 39our $SDL_EV = new SDL::Event;
40our %SDL_CB; 40our %SDL_CB;
41 41
42our @GL_INIT; # hooks called on every gl init 42our @GL_INIT; # hooks called on every gl init
43 43
44our $ALT_ENTER_MESSAGE; 44our $ALT_ENTER_MESSAGE;
45 45
46our $tw; 46our $tw; # Test widget #d#
47 47
48sub init_screen { 48sub init_screen {
49 $SDL_APP = new SDL::App 49 $SDL_APP = new SDL::App
50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
51 -title => "Crossfire+ Client", 51 -title => "Crossfire+ Client",
… …
62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
63 63
64 $GL_EXT{GL_ARB_texture_non_power_of_two} 64 $GL_EXT{GL_ARB_texture_non_power_of_two}
65 or warn "WARNING: non-power-of-two opengl extension required"; 65 or warn "WARNING: non-power-of-two opengl extension required";
66 66
67 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40 67 $FONTSIZE = int $HEIGHT / 40;
68 or die "TTFOpenFont: $!";
69 68
70 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode"; 69 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE, "Alt-Enter toggles fullscreen mode";
71 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]); 70 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
72 $ALT_ENTER_MESSAGE->activate; 71 $ALT_ENTER_MESSAGE->activate;
73 72
73 # Test code #d#
74 {
75 my $frm = new Crossfire::Client::Widget::Frame;
74 $tw = new Crossfire::Client::Widget::Window; 76 $tw = new Crossfire::Client::Widget::Window;
75 $tw->add (my $lbl = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!"); 77 $frm->add (new Crossfire::Client::Widget::Label 0, 0, 10, $FONTSIZE, "Foo in the garden!");
76# $tw = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!"; 78 $tw->add ($frm);
77 79
78 $tw->move (0, $HEIGHT - 50); 80 $tw->move (0, $HEIGHT - 120);
79 $tw->activate; 81 $tw->activate;
82 }
80 83
81 glClearColor 0, 0, 0, 0; 84 glClearColor 0, 0, 0, 0;
82 85
83 glEnable GL_TEXTURE_2D; 86 glEnable GL_TEXTURE_2D;
87 glEnable GL_COLOR_MATERIAL;
84 glShadeModel GL_FLAT; 88 glShadeModel GL_FLAT;
85 glDisable GL_DEPTH_TEST; 89 glDisable GL_DEPTH_TEST;
86 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 90 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
87
88 glMatrixMode GL_PROJECTION;
89 glLoadIdentity;
90 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
91
92 glMatrixMode GL_MODELVIEW;
93 91
94 $_->() for @GL_INIT; 92 $_->() for @GL_INIT;
95} 93}
96 94
97sub start_game { 95sub start_game {
… …
110 108
111 $CONN = new conn 109 $CONN = new conn
112 host => $CFG->{host}, 110 host => $CFG->{host},
113 port => $CFG->{port}, 111 port => $CFG->{port},
114 user => $CFG->{user}, 112 user => $CFG->{user},
115 pass => $CFG->{password}; 113 pass => $CFG->{password},
114 mapw => 50,
115 maph => 37,
116 ;
116} 117}
117 118
118sub stop_game { 119sub stop_game {
119 remove Glib::Source $SDL_TIMER; 120 remove Glib::Source $SDL_TIMER;
120 121
… …
123} 124}
124 125
125 126
126sub force_refresh { 127sub force_refresh {
127 glViewport 0, 0, $WIDTH, $HEIGHT; 128 glViewport 0, 0, $WIDTH, $HEIGHT;
129
130 glMatrixMode GL_PROJECTION;
131 glLoadIdentity;
132 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
133 glMatrixMode GL_MODELVIEW;
134
128 glClear GL_COLOR_BUFFER_BIT; 135 glClear GL_COLOR_BUFFER_BIT;
129 136
130 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 137 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;
131 138
132 SDL::GLSwapBuffers; 139 SDL::GLSwapBuffers;
… …
310 317
311 318
312############################################################################# 319#############################################################################
313 320
314SDL::Init SDL_INIT_EVERYTHING; 321SDL::Init SDL_INIT_EVERYTHING;
315SDL::TTFInit;
316 322
317my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 323my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
318 324
319$mapwidget->activate; 325$mapwidget->activate;
320$mapwidget->focus_in; 326$mapwidget->focus_in;

Diff Legend

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