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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.15 by root, Sun Apr 9 00:12:58 2006 UTC vs.
Revision 1.49 by root, Sun Apr 30 08:09:44 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire::Client - undocumented utility garbage for our crossfire client 3CFClient - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Crossfire::Client; 7 use CFClient;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Crossfire::Client; 15package CFClient;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22}
23
24use Carp ();
25use AnyEvent;
26use BerkeleyDB;
27use CFClient::OpenGL;
28
29our %GL_EXT;
30our $GL_VERSION;
31
32our $GL_NPOT;
33our $GL_DEBUG = 1;
34
35sub gl_init {
36 $GL_VERSION = gl_version * 1;
37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
38
39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
40
41 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT;
43 glDisable GL_DITHER;
44 glDisable GL_DEPTH_TEST;
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
47 CFClient::Texture::restore_state ();
48}
49
50sub gl_check {
51 return unless $GL_DEBUG;
52
53 if (my $error = glGetError) {
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
55 }
22} 56}
23 57
24sub find_rcfile($) { 58sub find_rcfile($) {
25 my $path; 59 my $path;
26 60
27 for (@INC) { 61 for (grep !ref, @INC) {
28 $path = "$_/Crossfire/resources/$_[0]"; 62 $path = "$_/CFClient/resources/$_[0]";
29 return $path if -r $path; 63 return $path if -r $path;
30 } 64 }
31 65
32 die "FATAL: can't find required file $_[0]\n"; 66 die "FATAL: can't find required file $_[0]\n";
33} 67}
… …
62 } 96 }
63 97
64 close CFG; 98 close CFG;
65} 99}
66 100
101mkdir "$Crossfire::VARDIR/pclient", 0777;
102
103our $DB_ENV = new BerkeleyDB::Env
104 -Home => "$Crossfire::VARDIR/pclient",
105 -Cachesize => 1_000_000,
106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
107# -ErrPrefix => "DATABASE",
108 -Verbose => 1,
109 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
110 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
111
112sub db_table($) {
113 my ($table) = @_;
114
115 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
116
117 new CFClient::Database
118 -Env => $DB_ENV,
119 -Filename => $table,
120# -Filename => "database",
121# -Subname => $table,
122 -Flags => DB_CREATE | DB_UPGRADE,
123 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
124}
125
126package CFClient::Database;
127
128our @ISA = BerkeleyDB::Btree::;
129
130sub get($$) {
131 my $data;
132
133 $_[0]->db_get ($_[1], $data) == 0
134 ? $data
135 : ()
136}
137
138my %DB_SYNC;
139
140sub put($$$) {
141 my ($db, $key, $data) = @_;
142
143 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
144
145 $db->db_put ($key => $data)
146}
147
67package Crossfire::Client::Texture; 148package CFClient::Texture;
149
150use strict;
68 151
69use Scalar::Util; 152use Scalar::Util;
70 153
71use SDL::OpenGL; 154use CFClient::OpenGL;
72 155
73my @textures; 156my %TEXTURES;
74 157
75sub new { 158sub new {
76 my ($class, %data) = @_; 159 my ($class, %data) = @_;
77 160
78 my $self = bless { 161 my $self = bless {
79 internalformat => GL_RGBA, 162 internalformat => GL_RGBA,
80 format => GL_RGBA, 163 format => GL_RGBA,
164 type => GL_UNSIGNED_BYTE,
81 %data, 165 %data,
82 }, $class; 166 }, $class;
83 167
84 push @textures, $self; 168 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
85 Scalar::Util::weaken $textures[-1];
86 169
87 $self->upload; 170 $self->upload;
88 171
89 $self 172 $self
90} 173}
91 174
92sub new_from_image { 175sub new_from_image {
93 my ($class, $image) = @_; 176 my ($class, $image, %arg) = @_;
94 177
95 $class->new (image => $image) 178 $class->new (image => $image, %arg)
96} 179}
97 180
98sub new_from_file { 181sub new_from_file {
99 my ($class, $path) = @_; 182 my ($class, $path, %arg) = @_;
100 183
101 open my $fh, "<:raw", $path 184 open my $fh, "<:raw", $path
102 or die "$path: $!"; 185 or die "$path: $!";
103 186
104 local $/; 187 local $/;
105 $class->new_from_image (<$fh>) 188 $class->new_from_image (<$fh>, %arg)
106} 189}
107 190
108#sub new_from_surface { 191#sub new_from_surface {
109# my ($class, $surface) = @_; 192# my ($class, $surface) = @_;
110# 193#
111# $surface->rgba; 194# $surface->rgba;
112# 195#
113# $class->new ( 196# $class->new (
114# data => $surface->pixels, 197# data => $surface->pixels,
115# width => $surface->width, 198# w => $surface->width,
116# height => $surface->height, 199# h => $surface->height,
117# ) 200# )
118#} 201#}
119 202
120sub new_from_text { 203sub new_from_layout {
121 my ($class, $text, $height) = @_; 204 my ($class, $layout, %arg) = @_;
122 205
123 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; 206 my ($w, $h, $data) = $layout->render;
124 207
125 $class->new ( 208 $class->new (
126 width => $w, 209 w => $w,
127 height => $h, 210 h => $h,
128 data => $data, 211 data => $data,
129 internalformat => GL_ALPHA8,
130 format => GL_ALPHA, 212 format => GL_ALPHA,
213 internalformat => GL_ALPHA,
214 type => GL_UNSIGNED_BYTE,
215 %arg,
131 ) 216 )
132} 217}
133 218
134sub new_from_opengl { 219sub new_from_opengl {
135 my ($class, $w, $h, $cb) = @_; 220 my ($class, $w, $h, $cb) = @_;
136 221
137 $class->new (width => $w, height => $h, rendercb => $cb) 222 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
223}
224
225sub topot {
226 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
138} 227}
139 228
140sub upload { 229sub upload {
141 my ($self) = @_; 230 my ($self) = @_;
142 231
143 return unless $SDL::App::USING_OPENGL; 232 return unless $GL_VERSION;
144 233
145 my $data; 234 my $data;
146 235
147 if (exists $self->{data}) { 236 if (exists $self->{data}) {
148 $data = $self->{data}; 237 $data = $self->{data};
238
149 } elsif (exists $self->{rendercb}) { 239 } elsif (exists $self->{render_cb}) {
150 glViewport 0, 0, $self->{width}, $self->{height}; 240 glViewport 0, 0, $self->{w}, $self->{h};
151 glMatrixMode GL_PROJECTION; 241 glMatrixMode GL_PROJECTION;
152 glLoadIdentity; 242 glLoadIdentity;
153 glOrtho 0, $self->{width}, 0, $self->{height}, -100, 100; 243 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
154 glMatrixMode GL_MODELVIEW; 244 glMatrixMode GL_MODELVIEW;
155 glPushmatrix;
156 glLoadIdentity; 245 glLoadIdentity;
157 glClear GL_COLOR_BUFFER_BIT;
158
159 $self->{rendercb}->($self, $self->{width}, $self->{height}); 246 $self->{render_cb}->($self, $self->{w}, $self->{h});
247
160 } else { 248 } else {
161 my $pb = new Gtk2::Gdk::PixbufLoader; 249 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
162 $pb->write ($self->{image}); 250 = CFClient::load_image_inline $self->{image};
163 $pb->close;
164
165 $pb = $pb->get_pixbuf;
166 $pb = $pb->add_alpha (0, 0, 0, 0);
167
168 $self->{width} = $pb->get_width;
169 $self->{height} = $pb->get_height;
170
171 $data = $pb->get_pixels;
172 } 251 }
173 252
253 my ($tw, $th) = @$self{qw(w h)};
254
255 unless ($tw > 0 && $th > 0) {
256 $tw = $th = 1;
257 $data = "\x00" x 64;
258 }
259
260 $self->{minified} = [CFClient::average $tw, $th, $data]
261 if $self->{minify};
262
263 unless ($GL_NPOT) {
264 # TODO: does not work for zero-sized textures
265 $tw = topot $tw;
266 $th = topot $th;
267
268 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
269 my $bpp = (length $data) / ($self->{w} * $self->{h});
270 $data = pack "(a" . ($tw * $bpp) . ")*",
271 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
272 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
273 }
274 }
275
276 $self->{s} = $self->{w} / $tw;
277 $self->{t} = $self->{h} / $th;
278
174 ($self->{name}) = @{glGenTextures 1}; 279 $self->{name} ||= glGenTexture;
175 280
176 glBindTexture GL_TEXTURE_2D, $self->{name}; 281 glBindTexture GL_TEXTURE_2D, $self->{name};
177 282
178 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
179 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_LINEAR;
180 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 283 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
285
286 if ($::FAST) {
287 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
289 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
290 # alternatively check for 0x8191
291 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
292 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
294 } else {
295 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
296 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
298 }
182 299
300 glGetError;
301
183 if (defined $data) { 302 if (defined $data) {
184 glTexImage2D GL_TEXTURE_2D, 0, 303 glTexImage2D GL_TEXTURE_2D, 0,
185 $self->{internalformat}, 304 $self->{internalformat},
186 $self->{width}, $self->{height}, 305 $tw, $th, # need to pad texture first
187 0, 306 0,
188 $self->{format}, 307 $self->{format},
189 GL_UNSIGNED_BYTE, 308 $self->{type},
190 $data; 309 $data;
310 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
311 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
191 } else { 312 } else {
192 glCopyTexImage2D GL_TEXTURE_2D, 0, 313 glCopyTexImage2D GL_TEXTURE_2D, 0,
193 $self->{internalformat}, 314 $self->{internalformat},
194 0, 0, 315 0, 0,
195 $self->{width}, $self->{height}, 316 $tw, $th,
196 0; 317 0;
197 glPopmatrix; 318 CFClient::gl_check "copying to texture %dx%d if=%x",
198 #SDL::GLSwapBuffers; 319 $tw, $th, $self->{internalformat};
199 #sleep 1;
200 } 320 }
201} 321}
202 322
203sub DESTROY { 323sub DESTROY {
204 my ($self) = @_; 324 my ($self) = @_;
205 325
206 return unless exists $self->{name}; 326 delete $TEXTURES{$self+0};
207 327
208 glDeleteTextures delete $self->{name}; 328 glDeleteTexture delete $self->{name}
329 if $self->{name};
209} 330}
210 331
211push @::GLINIT, sub { 332sub restore_state{
212 $_->upload 333 $_->upload
213 for grep $_, @textures; 334 for values %TEXTURES;
214}; 335};
215 336
2161; 3371;
217 338
218=back 339=back

Diff Legend

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