diff --git a/.gitignore b/.gitignore index 235eb29c..509afee5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ *.slo *.lo *.o -*.obj # Precompiled Headers *.gch diff --git a/assets/models/cube.obj b/assets/models/cube.obj new file mode 100644 index 00000000..b7a86be1 --- /dev/null +++ b/assets/models/cube.obj @@ -0,0 +1,36 @@ +# cube.obj +# +o cube +mtllib cube.mtl +v -1 -1 1 +v 1 -1 1 +v -1 1 1 +v 1 1 1 +v -1 1 -1 +v 1 1 -1 +v -1 -1 -1 +v 1 -1 -1 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +g cube +usemtl cube +f 1/3/1 2/1/1 3/4/1 +f 3/4/1 2/1/1 4/2/1 +f 3/1/2 4/2/2 5/3/2 +f 5/3/2 4/2/2 6/4/2 +f 5/4/3 6/3/3 7/2/3 +f 7/2/3 6/3/3 8/1/3 +f 7/1/4 8/2/4 1/3/4 +f 1/3/4 8/2/4 2/4/4 +f 2/1/5 8/2/5 4/3/5 +f 4/3/5 8/2/5 6/4/5 +f 7/1/6 1/2/6 5/3/6 +f 5/3/6 1/2/6 3/4/6 \ No newline at end of file diff --git a/scripts/compile_shaders.sh b/scripts/compile_shaders.sh old mode 100644 new mode 100755 index d57bb9ed..5c0f01e3 --- a/scripts/compile_shaders.sh +++ b/scripts/compile_shaders.sh @@ -1,13 +1,13 @@ # https://github.com/google/shaderc/blob/main/downloads.md to download glslc -# /usr/local/bin/glslc simple_shader.vert -o simple_shader.vert.spv -# /usr/local/bin/glslc simple_shader.frag -o simple_shader.frag.spv +# /usr/local/bin/glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv +# /usr/local/bin/glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv -# ./glslc simple_shader.vert -o simple_shader.vert.spv -# ./glslc simple_shader.frag -o simple_shader.frag.spv +# ./glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv +# ./glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv ./external/glslc/glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv ./external/glslc/glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv -# glslang -V simple_shader.vert -o simple_shader.vert.spv -# glslang -V simple_shader.frag -o simple_shader.frag.spv +# glslang -V shaders/simple_shader.vert -o shaders/simple_shader.vert.spv +# glslang -V shaders/simple_shader.frag -o shaders/simple_shader.frag.spv