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.24 by root, Tue Apr 11 18:06:52 2006 UTC vs.
Revision 1.34 by root, Sat Apr 15 21:16:49 2006 UTC

… …
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23
24use AnyEvent;
25use BerkeleyDB;
26use SDL::OpenGL;
23 27
24our %GL_EXT; 28our %GL_EXT;
25our $GL_VERSION; 29our $GL_VERSION;
26 30
27our $GL_NPOT; 31our $GL_NPOT;
… …
29sub gl_init { 33sub gl_init {
30 $GL_VERSION = gl_version * 1; 34 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 36
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
34 46
35 CFClient::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
36} 48}
37 49
38sub find_rcfile($) { 50sub find_rcfile($) {
… …
76 } 88 }
77 89
78 close CFG; 90 close CFG;
79} 91}
80 92
93mkdir "$Crossfire::VARDIR/pclient", 0777;
94
95our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2",
99 -ErrPrefix => "DATABASE",
100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103
104sub db_table($) {
105 new CFClient::Database
106 -Env => $DB_ENV,
107 -Filename => "database",
108 -Subname => $_[0],
109 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111}
112
113package CFClient::Database;
114
115our @ISA = BerkeleyDB::Btree::;
116
117sub get($$) {
118 my $data;
119
120 $_[0]->db_get ($_[1], $data) == 0
121 ? $data
122 : ();
123}
124
125my %DB_SYNC;
126
127sub put($$$) {
128 my ($db, $key, $data) = @_;
129
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
133
134}
135
81package CFClient::Texture; 136package CFClient::Texture;
137
138use strict;
82 139
83use Scalar::Util; 140use Scalar::Util;
84 141
85use SDL::OpenGL; 142use SDL::OpenGL;
86 143
… …
90 my ($class, %data) = @_; 147 my ($class, %data) = @_;
91 148
92 my $self = bless { 149 my $self = bless {
93 internalformat => GL_RGBA, 150 internalformat => GL_RGBA,
94 format => GL_RGBA, 151 format => GL_RGBA,
152 type => GL_UNSIGNED_BYTE,
95 %data, 153 %data,
96 }, $class; 154 }, $class;
97 155
98 push @textures, $self; 156 push @textures, $self;
99 Scalar::Util::weaken $textures[-1]; 157 Scalar::Util::weaken $textures[-1];
… …
102 160
103 $self 161 $self
104} 162}
105 163
106sub new_from_image { 164sub new_from_image {
107 my ($class, $image) = @_; 165 my ($class, $image, %arg) = @_;
108 166
109 $class->new (image => $image) 167 $class->new (image => $image, %arg)
110} 168}
111 169
112sub new_from_file { 170sub new_from_file {
113 my ($class, $path) = @_; 171 my ($class, $path) = @_;
114 172
… …
140 w => $w, 198 w => $w,
141 h => $h, 199 h => $h,
142 data => $data, 200 data => $data,
143 internalformat => GL_ALPHA4, 201 internalformat => GL_ALPHA4,
144 format => GL_ALPHA, 202 format => GL_ALPHA,
203 type => GL_UNSIGNED_BYTE,
145 ) 204 )
146} 205}
147 206
148sub new_from_opengl { 207sub new_from_opengl {
149 my ($class, $w, $h, $cb) = @_; 208 my ($class, $w, $h, $cb) = @_;
… …
156} 215}
157 216
158sub upload { 217sub upload {
159 my ($self) = @_; 218 my ($self) = @_;
160 219
161 return unless $SDL::App::USING_OPENGL; 220 return unless $GL_VERSION;
162 221
163 my $data; 222 my $data;
164 223
165 if (exists $self->{data}) { 224 if (exists $self->{data}) {
166 $data = $self->{data}; 225 $data = $self->{data};
226
167 } elsif (exists $self->{render_cb}) { 227 } elsif (exists $self->{render_cb}) {
168 glViewport 0, 0, $self->{w}, $self->{h}; 228 glViewport 0, 0, $self->{w}, $self->{h};
169 glMatrixMode GL_PROJECTION; 229 glMatrixMode GL_PROJECTION;
170 glLoadIdentity; 230 glLoadIdentity;
171 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; 231 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
172 glMatrixMode GL_MODELVIEW; 232 glMatrixMode GL_MODELVIEW;
173 glPushmatrix;
174 glLoadIdentity; 233 glLoadIdentity;
175 glClear GL_COLOR_BUFFER_BIT;
176
177 $self->{render_cb}->($self, $self->{w}, $self->{h}); 234 $self->{render_cb}->($self, $self->{w}, $self->{h});
235
178 } else { 236 } else {
179 my $pb = new Gtk2::Gdk::PixbufLoader; 237 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
180 $pb->write ($self->{image}); 238 = 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->{w} = $pb->get_width;
187 $self->{h} = $pb->get_height;
188
189 $data = $pb->get_pixels;
190 } 239 }
191 240
192 my ($tw, $th) = @$self{qw(w h)}; 241 my ($tw, $th) = @$self{qw(w h)};
193 242
194 unless ($tw || $th) { 243 unless ($tw && $th) {
195 $tw = $th = 1; 244 $tw = $th = 1;
196 $data = "\x00" x 64; 245 $data = "\x00" x 64;
197 } 246 }
247
248 $self->{minified} = [CFClient::average $tw, $th, $data]
249 if $self->{minify};
198 250
199 unless ($GL_NPOT) { 251 unless ($GL_NPOT) {
200 # TODO: does not work for zero-sized textures 252 # TODO: does not work for zero-sized textures
201 $tw = topot $tw; 253 $tw = topot $tw;
202 $th = topot $th; 254 $th = topot $th;
203 255
204 if (defined $data) { 256 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
205 my $bpp = (length $data) / ($self->{w} * $self->{h}); 257 my $bpp = (length $data) / ($self->{w} * $self->{h});
206 $data = pack "(a" . ($tw * $bpp) . ")*", 258 $data = pack "(a" . ($tw * $bpp) . ")*",
207 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 259 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
208 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 260 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
209 } 261 }
… …
214 266
215 $self->{name} ||= (glGenTextures 1)->[0]; 267 $self->{name} ||= (glGenTextures 1)->[0];
216 268
217 glBindTexture GL_TEXTURE_2D, $self->{name}; 269 glBindTexture GL_TEXTURE_2D, $self->{name};
218 270
219 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
220 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
221 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 273 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
222 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 274 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
223 275
224 glGetError;
225 if (defined $data) { 276 if (defined $data) {
226 glTexImage2D GL_TEXTURE_2D, 0, 277 glTexImage2D GL_TEXTURE_2D, 0,
227 $self->{internalformat}, 278 $self->{internalformat},
228 $tw, $th, # need to pad texture first 279 $tw, $th, # need to pad texture first
229 0, 280 0,
230 $self->{format}, 281 $self->{format},
231 GL_UNSIGNED_BYTE, 282 $self->{type},
232 $data; 283 $data;
233 glGetError and die; 284 glGetError and die;
234 } else { 285 } else {
235 glCopyTexImage2D GL_TEXTURE_2D, 0, 286 glCopyTexImage2D GL_TEXTURE_2D, 0,
236 $self->{internalformat}, 287 $self->{internalformat},
237 0, 0, 288 0, 0,
238 $tw, $th, 289 $tw, $th,
239 0; 290 0;
240 glPopmatrix; 291 glGetError and die "glCopyTexImage2D $tw,$th";
241 } 292 }
242} 293}
243 294
244sub DESTROY { 295sub DESTROY {
245 my ($self) = @_; 296 my ($self) = @_;

Diff Legend

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