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.3 by root, Fri Apr 7 18:20:13 2006 UTC vs.
Revision 1.11 by elmex, Sat Apr 8 18:18:09 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "Crossfire::Client", $VERSION;
22} 22}
23 23
24sub find_rcfile($) {
25 my $path;
26
27 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]";
29 return $path if -r $path;
30 }
31
32 die "FATAL: can't find required file $_[0]\n";
33}
34
35sub read_cfg {
36 my ($file) = @_;
37
38 open CFG, $file
39 or return;
40
41 my $CFG;
42
43 local $/;
44 $CFG = eval <CFG>;
45
46 $::CFG = $CFG;
47
48 close CFG;
49}
50
51sub write_cfg {
52 my ($file) = @_;
53
54 open CFG, ">$file"
55 or return;
56
57 {
58 require Data::Dumper;
59 local $Data::Dumper::Purity = 1;
60 $::CFG->{VERSION} = $::VERSION;
61 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
62 }
63
64 close CFG;
65}
66
24package Crossfire::Client::Texture; 67package Crossfire::Client::Texture;
25 68
26use Scalar::Util; 69use Scalar::Util;
27 70
28use SDL::OpenGL; 71use SDL::OpenGL;
29 72
30my @textures; 73my @textures;
74
75sub _new {
76 my ($class, %data) = @_;
77
78 my $self = bless \%data, $class;
79
80 push @textures, $self;
81 Scalar::Util::weaken $textures[-1];
82
83 $self->upload;
84
85 $self
86}
87
88sub new_from_image {
89 my ($class, $image) = @_;
90
91 $class->_new (image => $image)
92}
31 93
32sub new_from_file { 94sub new_from_file {
33 my ($class, $path) = @_; 95 my ($class, $path) = @_;
34 96
35 open my $fh, "<:raw", $path 97 open my $fh, "<:raw", $path
36 or die "$path: $!"; 98 or die "$path: $!";
37 99
38 local $/; 100 local $/;
39 $class->new_from_data (<$fh>) 101 $class->new_from_image (<$fh>)
40} 102}
41 103
42sub new_from_image { 104sub new_from_surface {
43 my ($class, $image) = @_; 105 my ($class, $surface) = @_;
44 106
45 my $self = bless { 107 $surface->rgba;
46 image => $data,
47 };
48 108
49 push @textures, $self; 109 $class->_new (
50 Scalar::Util::weaken $textures[-1]; 110 data => $surface->pixels,
111 width => $surface->width,
112 height => $surface->height,
113 )
114}
51 115
52 $self->upload; 116sub new_from_ttf {
117 my ($class, $ttf, $text) = @_;
53 118
54 $self 119 utf8::encode $text;
120
121 my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
122 (new SDL::Color -r => 255, -g => 255, -b => 255);
123
124 $class->new_from_surface (bless \$surface, SDL::Surface::)
125}
126
127sub new_from_opengl {
128 my ($class, $w, $h, $cb) = @_;
129
130 $class->_new (width => $w, height => $h, rendercb => $cb)
55} 131}
56 132
57sub upload { 133sub upload {
58 my ($self) = @_; 134 my ($self) = @_;
59 135
60 return unless $SDL::App::USING_OPENGL; 136 return unless $SDL::App::USING_OPENGL;
61 137
62 my ($data, $width, $height); 138 my $data;
63 139
64 if (exists $self->{data}) { 140 if (exists $self->{data}) {
65 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 141 $data = $self->{data};
142 } elsif (exists $self->{rendercb}) {
143 glViewport 0, 0, $self->{width}, $self->{height};
144 glClear GL_COLOR_BUFFER_BIT;
145
146 $self->{rendercb}->($self, $self->{width}, $self->{height});
66 } else { 147 } else {
67 my $pb = new Gtk2::Gdk::PixbufLoader; 148 my $pb = new Gtk2::Gdk::PixbufLoader;
68 $pb->write ($self->{data}); 149 $pb->write ($self->{image});
69 $pb->close; 150 $pb->close;
70 151
71 $pb = $pb->get_pixbuf; 152 $pb = $pb->get_pixbuf;
72 $pb = $pb->add_alpha (0, 0, 0, 0); 153 $pb = $pb->add_alpha (0, 0, 0, 0);
73 154
74 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 155 $self->{width} = $pb->get_width;
156 $self->{height} = $pb->get_height;
157
158 $data = $pb->get_pixels;
75 } 159 }
76 160
77 ($self->{name}) = @{glGenTextures 1}; 161 ($self->{name}) = @{glGenTextures 1};
78 162
79 glBindTexture GL_TEXTURE_2D, $self->{name}; 163 glBindTexture GL_TEXTURE_2D, $self->{name};
… …
81 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 165 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
82 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 166 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
83 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 167 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
84 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 168 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
85 169
170 if (defined $data) {
86 glTexImage2D GL_TEXTURE_2D, 0, 171 glTexImage2D GL_TEXTURE_2D, 0,
87 GL_RGBA8, 172 GL_RGBA8,
88 $width, $height, 173 $self->{width}, $self->{height},
89 0, 174 0,
90 GL_RGBA, 175 GL_RGBA,
91 GL_UNSIGNED_BYTE, 176 GL_UNSIGNED_BYTE,
92 $data; 177 $data;
178 } else {
179 warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n";
180 warn "ERR: ". (glGetError). "\n";
181 my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER));
182 warn "BUF:[$bd $br]\n";
183
184 glCopyTexImage2D GL_TEXTURE_2D, 0,
185 GL_RGBA8,
186 0, 0,
187 $self->{width}, $self->{height},
188 0;
189 warn "ERR: ". (glGetError). "\n";
190 }
93} 191}
94 192
95sub DESTROY { 193sub DESTROY {
96 my ($self) = @_; 194 my ($self) = @_;
97 195

Diff Legend

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