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.19 by root, Mon Apr 10 19:34:03 2006 UTC vs.
Revision 1.29 by root, Wed Apr 12 20:42:52 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 SDL::OpenGL;
23 25
24our %GL_EXT; 26our %GL_EXT;
25our $GL_VERSION; 27our $GL_VERSION;
26 28
27our $GL_NPOT; 29our $GL_NPOT;
… …
30 $GL_VERSION = gl_version * 1; 32 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 34
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 35 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
34 36
37 glClearColor 0.45, 0.45, 0.45, 1;
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;
46
35 Crossfire::Client::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
36
37# $GL_NPOT=0;#d#
38} 48}
39 49
40sub find_rcfile($) { 50sub find_rcfile($) {
41 my $path; 51 my $path;
42 52
43 for (@INC) { 53 for (@INC) {
44 $path = "$_/Crossfire/resources/$_[0]"; 54 $path = "$_/CFClient/resources/$_[0]";
45 return $path if -r $path; 55 return $path if -r $path;
46 } 56 }
47 57
48 die "FATAL: can't find required file $_[0]\n"; 58 die "FATAL: can't find required file $_[0]\n";
49} 59}
… …
78 } 88 }
79 89
80 close CFG; 90 close CFG;
81} 91}
82 92
83package Crossfire::Client::Texture; 93package CFClient::Texture;
94
95use strict;
84 96
85use Scalar::Util; 97use Scalar::Util;
86 98
87use SDL::OpenGL; 99use SDL::OpenGL;
88 100
… …
92 my ($class, %data) = @_; 104 my ($class, %data) = @_;
93 105
94 my $self = bless { 106 my $self = bless {
95 internalformat => GL_RGBA, 107 internalformat => GL_RGBA,
96 format => GL_RGBA, 108 format => GL_RGBA,
109 type => GL_UNSIGNED_BYTE,
97 %data, 110 %data,
98 }, $class; 111 }, $class;
99 112
100 push @textures, $self; 113 push @textures, $self;
101 Scalar::Util::weaken $textures[-1]; 114 Scalar::Util::weaken $textures[-1];
… …
126# 139#
127# $surface->rgba; 140# $surface->rgba;
128# 141#
129# $class->new ( 142# $class->new (
130# data => $surface->pixels, 143# data => $surface->pixels,
131# width => $surface->width, 144# w => $surface->width,
132# height => $surface->height, 145# h => $surface->height,
133# ) 146# )
134#} 147#}
135 148
136sub new_from_text { 149sub new_from_layout {
137 my ($class, $text, $height) = @_; 150 my ($class, $layout) = @_;
138 151
139 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; 152 my ($w, $h, $data) = $layout->render;
140 153
141 $class->new ( 154 $class->new (
142 width => $w, 155 w => $w,
143 height => $h, 156 h => $h,
144 data => $data, 157 data => $data,
145 internalformat => GL_ALPHA4, 158 internalformat => GL_ALPHA4,
146 format => GL_ALPHA, 159 format => GL_ALPHA,
160 type => GL_UNSIGNED_BYTE,
147 ) 161 )
148} 162}
149 163
150sub new_from_opengl { 164sub new_from_opengl {
151 my ($class, $w, $h, $cb) = @_; 165 my ($class, $w, $h, $cb) = @_;
152 166
153 $class->new (width => $w, height => $h, rendercb => $cb) 167 $class->new (w => $w, h => $h, render_cb => $cb)
154} 168}
155 169
156sub topot { 170sub topot {
157 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 171 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
158} 172}
159 173
160sub upload { 174sub upload {
161 my ($self) = @_; 175 my ($self) = @_;
162 176
163 return unless $SDL::App::USING_OPENGL; 177 return unless $GL_VERSION;
164 178
165 my $data; 179 my $data;
166 180
167 if (exists $self->{data}) { 181 if (exists $self->{data}) {
168 $data = $self->{data}; 182 $data = $self->{data};
183
169 } elsif (exists $self->{rendercb}) { 184 } elsif (exists $self->{render_cb}) {
170 glViewport 0, 0, $self->{width}, $self->{height}; 185 glViewport 0, 0, $self->{w}, $self->{h};
186 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
171 glMatrixMode GL_PROJECTION; 187 glMatrixMode GL_PROJECTION;
172 glLoadIdentity; 188 glLoadIdentity;
173 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
174 glMatrixMode GL_MODELVIEW; 189 glMatrixMode GL_MODELVIEW;
175 glPushmatrix;
176 glLoadIdentity; 190 glLoadIdentity;
177 glClear GL_COLOR_BUFFER_BIT; 191 glClear GL_COLOR_BUFFER_BIT;
178
179 $self->{rendercb}->($self, $self->{width}, $self->{height}); 192 $self->{render_cb}->($self, $self->{w}, $self->{h});
193
180 } else { 194 } else {
181 my $pb = new Gtk2::Gdk::PixbufLoader; 195 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
182 $pb->write ($self->{image}); 196 = CFClient::load_image_inline $self->{image};
183 $pb->close;
184
185 $pb = $pb->get_pixbuf;
186 $pb = $pb->add_alpha (0, 0, 0, 0);
187
188 $self->{width} = $pb->get_width;
189 $self->{height} = $pb->get_height;
190
191 $data = $pb->get_pixels;
192 } 197 }
193 198
194 my ($tw, $th) = @$self{qw(width height)}; 199 my ($tw, $th) = @$self{qw(w h)};
195 200
201 unless ($tw && $th) {
202 $tw = $th = 1;
203 $data = "\x00" x 64;
204 }
205
196 unless ($NPOT) { 206 unless ($GL_NPOT) {
207 # TODO: does not work for zero-sized textures
197 $tw = topot $tw; 208 $tw = topot $tw;
198 $th = topot $th; 209 $th = topot $th;
199 210
200 if (defined $data) { 211 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
201 $data = pack "(a$tw)*", (unpack "(a$self->{width})*", $data); 212 my $bpp = (length $data) / ($self->{w} * $self->{h});
213 $data = pack "(a" . ($tw * $bpp) . ")*",
214 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
202 $data .= ("\x00" x $tw) x ($th - $self->{height}); 215 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
203 } 216 }
204 } 217 }
205 218
206 $self->{u} = $self->{width} / $tw; 219 $self->{s} = $self->{w} / $tw;
207 $self->{v} = $self->{height} / $th; 220 $self->{t} = $self->{h} / $th;
208 221
209 $self->{name} ||= (glGenTextures 1)->[0]; 222 $self->{name} ||= (glGenTextures 1)->[0];
210 223
211 glBindTexture GL_TEXTURE_2D, $self->{name}; 224 glBindTexture GL_TEXTURE_2D, $self->{name};
212 225
213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_LINEAR; 227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 228 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 229 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
217 230
218 glGetError;
219 if (defined $data) { 231 if (defined $data) {
220 glTexImage2D GL_TEXTURE_2D, 0, 232 glTexImage2D GL_TEXTURE_2D, 0,
221 $self->{internalformat}, 233 $self->{internalformat},
222 $tw, $th, # need to pad texture first 234 $tw, $th, # need to pad texture first
223 0, 235 0,
224 $self->{format}, 236 $self->{format},
225 GL_UNSIGNED_BYTE, 237 $self->{type},
226 $data; 238 $data;
227 glGetError and die; 239 glGetError and die;
228 } else { 240 } else {
229 glCopyTexImage2D GL_TEXTURE_2D, 0, 241 glCopyTexImage2D GL_TEXTURE_2D, 0,
230 $self->{internalformat}, 242 $self->{internalformat},
231 0, 0, 243 0, 0,
232 $tw, $th, 244 $tw, $th,
233 0; 245 0;
234 glPopmatrix; 246 glGetError and die;
235 } 247 }
236} 248}
237 249
238sub DESTROY { 250sub DESTROY {
239 my ($self) = @_; 251 my ($self) = @_;

Diff Legend

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