Fixed the order of drawing (for blending) added the data files
authorEleni Maria Stea <estea@igalia.com>
Sun, 27 Jan 2019 16:08:49 +0000 (18:08 +0200)
committerEleni Maria Stea <estea@igalia.com>
Sun, 27 Jan 2019 16:08:49 +0000 (18:08 +0200)
.gitignore [new file with mode: 0644]
data/eye.jpg [new file with mode: 0644]
data/eyebrow001.png [new file with mode: 0644]
data/eyelashes03.png [new file with mode: 0644]
data/young_lightskinned_female_diffuse.png [new file with mode: 0644]
src/main.cc

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..f2154ff
--- /dev/null
@@ -0,0 +1,4 @@
+*.o
+*.d
+*.swp
+hair
diff --git a/data/eye.jpg b/data/eye.jpg
new file mode 100644 (file)
index 0000000..f53a9b4
Binary files /dev/null and b/data/eye.jpg differ
diff --git a/data/eyebrow001.png b/data/eyebrow001.png
new file mode 100644 (file)
index 0000000..e875472
Binary files /dev/null and b/data/eyebrow001.png differ
diff --git a/data/eyelashes03.png b/data/eyelashes03.png
new file mode 100644 (file)
index 0000000..e072cdb
Binary files /dev/null and b/data/eyelashes03.png differ
diff --git a/data/young_lightskinned_female_diffuse.png b/data/young_lightskinned_female_diffuse.png
new file mode 100644 (file)
index 0000000..2f7ee25
Binary files /dev/null and b/data/young_lightskinned_female_diffuse.png differ
index c409322..0c5561c 100644 (file)
@@ -159,7 +159,12 @@ static void display()
        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 */
        for(size_t i=0; i<meshes.size(); i++) {
-               meshes[i]->draw();
+               if(!meshes[i]->mtl.tex || meshes[i]->mtl.tex_opaque)
+                       meshes[i]->draw();
+       }
+       for(size_t i=0; i<meshes.size(); i++) {
+               if(meshes[i]->mtl.tex && !meshes[i]->mtl.tex_opaque)
+                       meshes[i]->draw();
        }
 /*
        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);