iiiypuk/lodepng_example
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Alexander Popov 2015-10-17 15:03:57 +03:00
parent 778801b175
commit 194e34e849
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,10 +1,10 @@
CC=gcc CC=gcc
LDFLAGS= -lglfw -lGL
OUT=run OUT=run
all: lodepng.o all: lodepng.o
$(CC) -O2 -o $(OUT) \ $(CC) -O2 -o $(OUT) \
lodepng.o \ main.c lodepng.o $(LDFLAGS)
main.c -lglfw -lGL -lGLU
lodepng.o: lodepng.o:
$(CC) -c ./deps/lodepng/lodepng.c $(CC) -c ./deps/lodepng/lodepng.c

9
main.c
View File

@ -14,8 +14,6 @@ int main(int argc, char const *argv[])
if (!glfwInit()) if (!glfwInit())
return -1; return -1;
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 1);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 4);
glfwWindowHint(GLFW_RESIZABLE, GL_FALSE); glfwWindowHint(GLFW_RESIZABLE, GL_FALSE);
window = glfwCreateWindow(400, 400, "Example Lodepng", NULL, NULL); window = glfwCreateWindow(400, 400, "Example Lodepng", NULL, NULL);
@ -38,7 +36,7 @@ int main(int argc, char const *argv[])
unsigned char *image; unsigned char *image;
unsigned int width, height; unsigned int width, height;
const char *filename = argc > 1 ? argv[1] : "textures/Nav.png"; const char *filename = argc > 1 ? argv[1] : "textures/nav.png";
error = lodepng_decode32_file(&image, &width, &height, filename); error = lodepng_decode32_file(&image, &width, &height, filename);
if (error) if (error)
@ -56,17 +54,18 @@ int main(int argc, char const *argv[])
glLoadIdentity(); glLoadIdentity();
glOrtho(0, 400, 400, 0, -1, 1); glOrtho(0, 400, 400, 0, -1, 1);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glClearColor(1, 1, 1, 0); glClearColor(1, 1, 1, 0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glLoadIdentity();
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
glColor3ub(255, 235, 115); glColor3ub(255, 235, 115);
glBegin(GL_QUADS); glBegin(GL_POLYGON);
glTexCoord2f(0, 0); glVertex2f(50, 50); glTexCoord2f(0, 0); glVertex2f(50, 50);
glTexCoord2f(1, 0); glVertex2f(350, 50); glTexCoord2f(1, 0); glVertex2f(350, 50);
glTexCoord2f(1, 1); glVertex2f(350, 350); glTexCoord2f(1, 1); glVertex2f(350, 350);