ecker/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch GLdc:master into glCompressedTexSubImage2D-recreated

Browse Source
This commit is contained in:
Troy Davis 2025-02-05 18:00:14 +00:00
commit 9d2c1fb3e8
4 changed files with 159 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GL/glu.c
View File

@ -4,9 +4,9 @@
/* Set the Perspective */ /* Set the Perspective */
void APIENTRY gluPerspective(GLdouble angle, GLdouble aspect, void APIENTRY gluPerspective(GLdouble angle, GLdouble aspect,
GLdouble znear, GLdouble zfar) { GLdouble znear, GLdouble zfar) {
GLfloat fW, fH; GLdouble fW, fH;
fH = tanf(angle * (M_PI / 360.0f)) * znear; fH = tan(angle * (M_PI / 360.0)) * znear;
fW = fH * aspect; fW = fH * aspect;
glFrustum(-fW, fW, -fH, fH, znear, zfar); glFrustum(-fW, fW, -fH, fH, znear, zfar);

180
samples/depth_funcs_alpha_testing/gl_png.c
View File

@ -14,27 +14,7 @@
GLfloat global_diffuse[] = {1.0, 1.0, 1.0, 1.0}; GLfloat global_diffuse[] = {1.0, 1.0, 1.0, 1.0};
GLfloat global_ambient[] = {1.0, 1.0, 1.0, 1.0}; GLfloat global_ambient[] = {1.0, 1.0, 1.0, 1.0};
static int decode_dtex(Image* image, FILE* file) {
int dtex_to_gl_texture(texture *tex, char* filename) {
// Load Texture
Image *image;
// allocate space for texture
image = (Image *) malloc(sizeof(Image));
if (image == NULL) {
printf("No memory for .DTEX file\n");
return(0);
}
FILE* file = NULL;
// make sure the file is there.
if ((file = fopen(filename, "rb")) == NULL)
{
printf("File not found");
return 0;
}
struct { struct {
char id[4]; // 'DTEX' char id[4]; // 'DTEX'
GLushort width; GLushort width;
@ -45,9 +25,9 @@ int dtex_to_gl_texture(texture *tex, char* filename) {
fread(&header, sizeof(header), 1, file); fread(&header, sizeof(header), 1, file);
GLboolean twiddled = (header.type & (1 << 26)) < 1; image->twiddled = (header.type & (1 << 26)) < 1;
GLboolean compressed = (header.type & (1 << 30)) > 0; image->compressed = (header.type & (1 << 30)) > 0;
GLboolean mipmapped = (header.type & (1 << 31)) > 0; image->mipmapped = (header.type & (1 << 31)) > 0;
GLuint format = (header.type >> 27) & 0b111; GLuint format = (header.type >> 27) & 0b111;
image->data = (char *) malloc (header.size); image->data = (char *) malloc (header.size);
@ -55,134 +35,148 @@ int dtex_to_gl_texture(texture *tex, char* filename) {
image->sizeY = header.height; image->sizeY = header.height;
image->dataSize = header.size; image->dataSize = header.size;
GLuint expected = 2 * header.width * header.height;
GLuint ratio = (GLuint) (((GLfloat) expected) / ((GLfloat) header.size));
fread(image->data, image->dataSize, 1, file); fread(image->data, image->dataSize, 1, file);
fclose(file); fclose(file);
if(compressed) { if(image->compressed && image->twiddled) {
printf("Compressed - ");
if(twiddled) {
printf("Twiddled - ");
switch(format) { switch(format) {
case 0: { case 0:
if(mipmapped) { puts("Compressed & Twiddled - ARGB 1555");
if(image->mipmapped) {
image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_MIPMAP_TWID_KOS; image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_MIPMAP_TWID_KOS;
} else { } else {
image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_TWID_KOS; image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_TWID_KOS;
} }
} break; return 1;
case 1: {
if(mipmapped) { case 1:
puts("Compressed & Twiddled - RGB 565");
if(image->mipmapped) {
image->internalFormat = GL_COMPRESSED_RGB_565_VQ_MIPMAP_TWID_KOS; image->internalFormat = GL_COMPRESSED_RGB_565_VQ_MIPMAP_TWID_KOS;
} else { } else {
image->internalFormat = GL_COMPRESSED_RGB_565_VQ_TWID_KOS; image->internalFormat = GL_COMPRESSED_RGB_565_VQ_TWID_KOS;
} }
} break; return 1;
case 2: {
if(mipmapped) { case 2:
puts("Compressed & Twiddled - ARGB 4444");
if(image->mipmapped) {
image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_MIPMAP_TWID_KOS; image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_MIPMAP_TWID_KOS;
} else { } else {
image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_TWID_KOS; image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_TWID_KOS;
} }
return 1;
} }
break; } else if (image->compressed) {
default:
fprintf(stderr, "Invalid texture format");
return 0;
}
} else {
switch(format) { switch(format) {
case 0: { case 0:
if(mipmapped) { puts("Compressed - ARGB 1555");
if(image->mipmapped) {
image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_MIPMAP_KOS; image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_MIPMAP_KOS;
} else { } else {
image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_KOS; image->internalFormat = GL_COMPRESSED_ARGB_1555_VQ_KOS;
} }
} break; return 1;
case 1: {
if(mipmapped) { case 1:
puts("Compressed - RGB 565");
if(image->mipmapped) {
image->internalFormat = GL_COMPRESSED_RGB_565_VQ_MIPMAP_KOS; image->internalFormat = GL_COMPRESSED_RGB_565_VQ_MIPMAP_KOS;
} else { } else {
image->internalFormat = GL_COMPRESSED_RGB_565_VQ_KOS; image->internalFormat = GL_COMPRESSED_RGB_565_VQ_KOS;
} }
} break; return 1;
case 2: {
if(mipmapped) { case 2:
puts("Compressed - ARGB 4444");
if(image->mipmapped) {
image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_MIPMAP_KOS; image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_MIPMAP_KOS;
} else { } else {
image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_KOS; image->internalFormat = GL_COMPRESSED_ARGB_4444_VQ_KOS;
} }
} return 1;
break;
default:
fprintf(stderr, "Invalid texture format");
return 0;
}
} }
} else { } else {
printf("Uncompressed - ");
//printf("Color:%u -", format);
switch (format) { switch (format) {
case 0: case 0:
image->internalFormat = GL_UNSIGNED_SHORT_1_5_5_5_REV_TWID_KOS; puts("Uncompressed - ARGB 1555");
//image->internalFormat = GL_UNSIGNED_SHORT_1_5_5_5_REV; image->internalFormat = GL_ARGB1555_TWID_KOS;
break; image->transferFormat = GL_BGRA;
image->transferType = GL_UNSIGNED_SHORT_1_5_5_5_REV_TWID_KOS;
return 1;
case 1: case 1:
image->internalFormat = GL_UNSIGNED_SHORT_5_6_5_REV; puts("Uncompressed - RGB 565");
break; image->internalFormat = GL_RGB565_TWID_KOS;
image->transferFormat = GL_RGB;
image->transferType = GL_UNSIGNED_SHORT_5_6_5_TWID_KOS;
return 1;
case 2: case 2:
image->internalFormat = GL_UNSIGNED_SHORT_4_4_4_4_REV; puts("Uncompressed - ARGB 4444");
break; image->internalFormat = GL_ARGB4444_TWID_KOS;
image->transferFormat = GL_BGRA;
image->transferType = GL_UNSIGNED_SHORT_4_4_4_4_REV_TWID_KOS;
return 1;
} }
} }
printf("\n");
fprintf(stderr, "Invalid texture format %u\n", header.type);
return 0;
}
int dtex_to_gl_texture(texture *tex, char* filename) {
// Load Texture
Image image = { 0 };
FILE* file = NULL;
// make sure the file is there.
if ((file = fopen(filename, "rb")) == NULL)
{
printf("File not found");
return 0;
}
decode_dtex(&image, file);
// Create Texture // Create Texture
GLuint texture_id; GLuint texture_id;
glGenTextures(1, &texture_id); glGenTextures(1, &texture_id);
glBindTexture(GL_TEXTURE_2D, texture_id); // 2d texture (x and y size) glBindTexture(GL_TEXTURE_2D, texture_id); // 2d texture (x and y size)
GLint newFormat = format; if (image.compressed) {
GLint colorType = GL_RGB; glCompressedTexImage2D(GL_TEXTURE_2D, 0,
image.internalFormat, image.sizeX, image.sizeY,
if (image->internalFormat == GL_UNSIGNED_SHORT_1_5_5_5_REV_TWID_KOS || 0, image.dataSize, image.data);
image->internalFormat == GL_UNSIGNED_SHORT_4_4_4_4_REV){ } else {
newFormat = GL_BGRA;
colorType = GL_RGBA;
printf("Reversing RGBA\n");
}
if (image->internalFormat == GL_UNSIGNED_SHORT_5_6_5_REV){
newFormat = GL_RGB;
colorType = GL_RGB;
printf("Reversing RGB\n");
}
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
colorType, image->sizeX, image->sizeY, 0, image.internalFormat, image.sizeX, image.sizeY, 0,
newFormat, image->internalFormat, image->data); image.transferFormat, image.transferType, image.data);
}
tex->id = texture_id; tex->id = texture_id;
tex->w = image->sizeX; tex->w = image.sizeX;
tex->h = image->sizeY; tex->h = image.sizeY;
tex->u = 0.f; tex->u = 0.f;
tex->v = 0.f; tex->v = 0.f;
tex->a = tex->light = 1; tex->a = tex->light = 1;
tex->color[0] = tex->color[1] = tex->color[2] = 1.0f; tex->color[0] = tex->color[1] = tex->color[2] = 1.0f;
tex->uSize = tex->vSize = 1.0f; tex->uSize = tex->vSize = 1.0f;
tex->xScale = tex->yScale = 1.0f; tex->xScale = tex->yScale = 1.0f;
tex->format = image->internalFormat; tex->format = image.internalFormat;
tex->min_filter = tex->mag_filter = GL_NEAREST; tex->min_filter = tex->mag_filter = GL_NEAREST;
tex->blend_source = GL_SRC_ALPHA; tex->blend_source = GL_SRC_ALPHA;
tex->blend_dest = GL_ONE_MINUS_SRC_ALPHA; tex->blend_dest = GL_ONE_MINUS_SRC_ALPHA;
strcpy(tex->path, filename); strcpy(tex->path, filename);
printf("Texture size: %lu x %lu\n", image->sizeX, image->sizeY); GLuint expected = 2 * image.sizeX * image.sizeY;
GLuint ratio = (GLuint) (((GLfloat) expected) / ((GLfloat) image.dataSize));
printf("Texture size: %lu x %lu\n", image.sizeX, image.sizeY);
printf("Texture ratio: %d\n", ratio); printf("Texture ratio: %d\n", ratio);
printf("Texture size: %lu x %lu\n", image->sizeX, image->sizeY); printf("Texture size: %lu x %lu\n", image.sizeX, image.sizeY);
printf("Texture %s loaded\n", tex->path); printf("Texture %s loaded\n", tex->path);
return(1); return(1);

4
samples/depth_funcs_alpha_testing/gl_png.h
View File

@ -29,8 +29,8 @@ typedef struct Image {
unsigned long sizeX; unsigned long sizeX;
unsigned long sizeY; unsigned long sizeY;
char *data; char *data;
GLenum internalFormat; GLenum internalFormat, transferFormat, transferType;
GLboolean mipmapped; unsigned int mipmapped, compressed, twiddled;
unsigned int dataSize; unsigned int dataSize;
} Image; } Image;

2
samples/depth_funcs_alpha_testing/main.c
View File

@ -88,7 +88,7 @@ void DrawGLScene()
glLoadIdentity(); glLoadIdentity();
glTranslated(-1 , -1, -5); glTranslated(-1 , -1, -5);
glDepthFunc(GL_LESS); glDepthFunc(GL_LESS);
glEnable(GL_DEPTH_FUNC); glEnable(GL_DEPTH_TEST);
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
glTranslated(0.5, 0, -0.2); glTranslated(0.5, 0, -0.2);