[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/libtexture filereader.texture
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gfx/libtexture filereader.texture |
Date: |
Mon, 02 Sep 2002 08:58:01 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/02 08:58:01
Modified files:
gfx/libtexture : filereader.texture
Log message:
Read also pure raw files
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtexture/filereader.texture.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gzz/gfx/libtexture/filereader.texture
diff -c gzz/gfx/libtexture/filereader.texture:1.3
gzz/gfx/libtexture/filereader.texture:1.4
*** gzz/gfx/libtexture/filereader.texture:1.3 Fri Aug 30 09:20:54 2002
--- gzz/gfx/libtexture/filereader.texture Mon Sep 2 08:58:00 2002
***************
*** 8,13 ****
--- 8,15 ----
FPARAM(scale, 1.0);
FPARAM(bias, 0);
+ FPARAM(raw, 1);
+
const char *file = params->getString("file", "");
FILE *f = fopen(file, "r");
if (!f) {
***************
*** 19,27 ****
int y = (int)params->getFloat("y", 0);
int z = (int)params->getFloat("z", 0);
int c, n0, n1, n2;
! if (fscanf(f, "%d %d %d %d\n", &n2, &n1, &n0, &c) != 4) {
! return;
}
fprintf(stderr, "Reading %dx%dx%dx%d numbers\n", n2, n1, n0, c);
--- 21,37 ----
int y = (int)params->getFloat("y", 0);
int z = (int)params->getFloat("z", 0);
+
int c, n0, n1, n2;
! if(raw) {
! c = components;
! n0 = width;
! n1 = height;
! n2 = (depth==0?1:depth);
! } else {
! if (fscanf(f, "%d %d %d %d\n", &n2, &n1, &n0, &c) != 4) {
! return;
! }
}
fprintf(stderr, "Reading %dx%dx%dx%d numbers\n", n2, n1, n0, c);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx/libtexture filereader.texture,
Tuomas J. Lukka <=