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.28 by root, Wed Apr 12 20:06:36 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
… …
126# 138#
127# $surface->rgba; 139# $surface->rgba;
128# 140#
129# $class->new ( 141# $class->new (
130# data => $surface->pixels, 142# data => $surface->pixels,
131# width => $surface->width, 143# w => $surface->width,
132# height => $surface->height, 144# h => $surface->height,
133# ) 145# )
134#} 146#}
135 147
136sub new_from_text { 148sub new_from_layout {
137 my ($class, $text, $height) = @_; 149 my ($class, $layout) = @_;
138 150
139 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; 151 my ($w, $h, $data) = $layout->render;
140 152
141 $class->new ( 153 $class->new (
142 width => $w, 154 w => $w,
143 height => $h, 155 h => $h,
144 data => $data, 156 data => $data,
145 internalformat => GL_ALPHA4, 157 internalformat => GL_ALPHA4,
146 format => GL_ALPHA, 158 format => GL_ALPHA,
147 ) 159 )
148} 160}
149 161
150sub new_from_opengl { 162sub new_from_opengl {
151 my ($class, $w, $h, $cb) = @_; 163 my ($class, $w, $h, $cb) = @_;
152 164
153 $class->new (width => $w, height => $h, rendercb => $cb) 165 $class->new (w => $w, h => $h, render_cb => $cb)
154} 166}
155 167
156sub topot { 168sub topot {
157 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 169 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
158} 170}
159 171
160sub upload { 172sub upload {
161 my ($self) = @_; 173 my ($self) = @_;
162 174
163 return unless $SDL::App::USING_OPENGL; 175 return unless $GL_VERSION;
164 176
165 my $data; 177 my $data;
166 178
167 if (exists $self->{data}) { 179 if (exists $self->{data}) {
168 $data = $self->{data}; 180 $data = $self->{data};
181
169 } elsif (exists $self->{rendercb}) { 182 } elsif (exists $self->{render_cb}) {
170 glViewport 0, 0, $self->{width}, $self->{height}; 183 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
171 glMatrixMode GL_PROJECTION; 185 glMatrixMode GL_PROJECTION;
172 glLoadIdentity; 186 glLoadIdentity;
173 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
174 glMatrixMode GL_MODELVIEW; 187 glMatrixMode GL_MODELVIEW;
175 glPushmatrix;
176 glLoadIdentity; 188 glLoadIdentity;
177 glClear GL_COLOR_BUFFER_BIT; 189 glClear GL_COLOR_BUFFER_BIT;
178
179 $self->{rendercb}->($self, $self->{width}, $self->{height}); 190 $self->{render_cb}->($self, $self->{w}, $self->{h});
191
180 } else { 192 } else {
193 use Gtk2;#d# TODO kill
181 my $pb = new Gtk2::Gdk::PixbufLoader; 194 my $pb = new Gtk2::Gdk::PixbufLoader;
182 $pb->write ($self->{image}); 195 $pb->write ($self->{image});
183 $pb->close; 196 $pb->close;
184 197
185 $pb = $pb->get_pixbuf; 198 $pb = $pb->get_pixbuf;
186 $pb = $pb->add_alpha (0, 0, 0, 0); 199 $pb = $pb->add_alpha (0, 0, 0, 0);
187 200
188 $self->{width} = $pb->get_width; 201 $self->{w} = $pb->get_width;
189 $self->{height} = $pb->get_height; 202 $self->{h} = $pb->get_height;
190 203
191 $data = $pb->get_pixels; 204 $data = $pb->get_pixels;
192 } 205 }
193 206
194 my ($tw, $th) = @$self{qw(width height)}; 207 my ($tw, $th) = @$self{qw(w h)};
195 208
209 unless ($tw && $th) {
210 $tw = $th = 1;
211 $data = "\x00" x 64;
212 }
213
196 unless ($NPOT) { 214 unless ($GL_NPOT) {
215 # TODO: does not work for zero-sized textures
197 $tw = topot $tw; 216 $tw = topot $tw;
198 $th = topot $th; 217 $th = topot $th;
199 218
200 if (defined $data) { 219 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
201 $data = pack "(a$tw)*", (unpack "(a$self->{width})*", $data); 220 my $bpp = (length $data) / ($self->{w} * $self->{h});
221 $data = pack "(a" . ($tw * $bpp) . ")*",
222 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
202 $data .= ("\x00" x $tw) x ($th - $self->{height}); 223 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
203 } 224 }
204 } 225 }
205 226
206 $self->{u} = $self->{width} / $tw; 227 $self->{s} = $self->{w} / $tw;
207 $self->{v} = $self->{height} / $th; 228 $self->{t} = $self->{h} / $th;
208 229
209 $self->{name} ||= (glGenTextures 1)->[0]; 230 $self->{name} ||= (glGenTextures 1)->[0];
210 231
211 glBindTexture GL_TEXTURE_2D, $self->{name}; 232 glBindTexture GL_TEXTURE_2D, $self->{name};
212 233
213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 234 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; 235 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 236 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 237 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
217 238
218 glGetError;
219 if (defined $data) { 239 if (defined $data) {
220 glTexImage2D GL_TEXTURE_2D, 0, 240 glTexImage2D GL_TEXTURE_2D, 0,
221 $self->{internalformat}, 241 $self->{internalformat},
222 $tw, $th, # need to pad texture first 242 $tw, $th, # need to pad texture first
223 0, 243 0,
… …
229 glCopyTexImage2D GL_TEXTURE_2D, 0, 249 glCopyTexImage2D GL_TEXTURE_2D, 0,
230 $self->{internalformat}, 250 $self->{internalformat},
231 0, 0, 251 0, 0,
232 $tw, $th, 252 $tw, $th,
233 0; 253 0;
234 glPopmatrix; 254 glGetError and die;
235 } 255 }
236} 256}
237 257
238sub DESTROY { 258sub DESTROY {
239 my ($self) = @_; 259 my ($self) = @_;

Diff Legend

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