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

Diff Legend

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