From fce1f694673b85fb6d008cf22da62b83b6431866 Mon Sep 17 00:00:00 2001 From: Morten Nobel-Joergensen Date: Sun, 13 May 2018 14:11:51 +0200 Subject: [PATCH] Update location of examples --- {html_examples => docs/examples}/07_matcap.html | 0 {html_examples => docs/examples}/07_matcap.html.mem | Bin {html_examples => docs/examples}/07_matcap.js | 0 {html_examples => docs/examples}/07_matcap.png | Bin {html_examples => docs/examples}/09_picking.html | 0 .../examples}/09_picking.html.mem | Bin {html_examples => docs/examples}/09_picking.js | 0 {html_examples => docs/examples}/09_picking.png | Bin .../examples}/10_skybox-example.html | 0 .../examples}/10_skybox-example.html.mem | Bin .../examples}/10_skybox-example.js | 0 .../examples}/10_skybox-example.png | Bin .../examples}/12_render-to-texture.html | 0 .../examples}/12_render-to-texture.html.mem | Bin .../examples}/12_render-to-texture.js | 0 .../examples}/12_render-to-texture.png | Bin .../examples}/15_cloth_simulation.html | 0 .../examples}/15_cloth_simulation.html.mem | Bin .../examples}/15_cloth_simulation.js | 0 .../examples}/15_cloth_simulation.png | Bin {html_examples => docs/examples}/16_shadows.html | 0 .../examples}/16_shadows.html.mem | Bin {html_examples => docs/examples}/16_shadows.js | 0 {html_examples => docs/examples}/16_shadows.png | Bin {html_examples => docs/examples}/convert_img.sh | 0 em-build-release.sh | 12 ++++++------ 26 files changed, 6 insertions(+), 6 deletions(-) rename {html_examples => docs/examples}/07_matcap.html (100%) rename {html_examples => docs/examples}/07_matcap.html.mem (100%) rename {html_examples => docs/examples}/07_matcap.js (100%) rename {html_examples => docs/examples}/07_matcap.png (100%) rename {html_examples => docs/examples}/09_picking.html (100%) rename {html_examples => docs/examples}/09_picking.html.mem (100%) rename {html_examples => docs/examples}/09_picking.js (100%) rename {html_examples => docs/examples}/09_picking.png (100%) rename {html_examples => docs/examples}/10_skybox-example.html (100%) rename {html_examples => docs/examples}/10_skybox-example.html.mem (100%) rename {html_examples => docs/examples}/10_skybox-example.js (100%) rename {html_examples => docs/examples}/10_skybox-example.png (100%) rename {html_examples => docs/examples}/12_render-to-texture.html (100%) rename {html_examples => docs/examples}/12_render-to-texture.html.mem (100%) rename {html_examples => docs/examples}/12_render-to-texture.js (100%) rename {html_examples => docs/examples}/12_render-to-texture.png (100%) rename {html_examples => docs/examples}/15_cloth_simulation.html (100%) rename {html_examples => docs/examples}/15_cloth_simulation.html.mem (100%) rename {html_examples => docs/examples}/15_cloth_simulation.js (100%) rename {html_examples => docs/examples}/15_cloth_simulation.png (100%) rename {html_examples => docs/examples}/16_shadows.html (100%) rename {html_examples => docs/examples}/16_shadows.html.mem (100%) rename {html_examples => docs/examples}/16_shadows.js (100%) rename {html_examples => docs/examples}/16_shadows.png (100%) rename {html_examples => docs/examples}/convert_img.sh (100%) diff --git a/html_examples/07_matcap.html b/docs/examples/07_matcap.html similarity index 100% rename from html_examples/07_matcap.html rename to docs/examples/07_matcap.html diff --git a/html_examples/07_matcap.html.mem b/docs/examples/07_matcap.html.mem similarity index 100% rename from html_examples/07_matcap.html.mem rename to docs/examples/07_matcap.html.mem diff --git a/html_examples/07_matcap.js b/docs/examples/07_matcap.js similarity index 100% rename from html_examples/07_matcap.js rename to docs/examples/07_matcap.js diff --git a/html_examples/07_matcap.png b/docs/examples/07_matcap.png similarity index 100% rename from html_examples/07_matcap.png rename to docs/examples/07_matcap.png diff --git a/html_examples/09_picking.html b/docs/examples/09_picking.html similarity index 100% rename from html_examples/09_picking.html rename to docs/examples/09_picking.html diff --git a/html_examples/09_picking.html.mem b/docs/examples/09_picking.html.mem similarity index 100% rename from html_examples/09_picking.html.mem rename to docs/examples/09_picking.html.mem diff --git a/html_examples/09_picking.js b/docs/examples/09_picking.js similarity index 100% rename from html_examples/09_picking.js rename to docs/examples/09_picking.js diff --git a/html_examples/09_picking.png b/docs/examples/09_picking.png similarity index 100% rename from html_examples/09_picking.png rename to docs/examples/09_picking.png diff --git a/html_examples/10_skybox-example.html b/docs/examples/10_skybox-example.html similarity index 100% rename from html_examples/10_skybox-example.html rename to docs/examples/10_skybox-example.html diff --git a/html_examples/10_skybox-example.html.mem b/docs/examples/10_skybox-example.html.mem similarity index 100% rename from html_examples/10_skybox-example.html.mem rename to docs/examples/10_skybox-example.html.mem diff --git a/html_examples/10_skybox-example.js b/docs/examples/10_skybox-example.js similarity index 100% rename from html_examples/10_skybox-example.js rename to docs/examples/10_skybox-example.js diff --git a/html_examples/10_skybox-example.png b/docs/examples/10_skybox-example.png similarity index 100% rename from html_examples/10_skybox-example.png rename to docs/examples/10_skybox-example.png diff --git a/html_examples/12_render-to-texture.html b/docs/examples/12_render-to-texture.html similarity index 100% rename from html_examples/12_render-to-texture.html rename to docs/examples/12_render-to-texture.html diff --git a/html_examples/12_render-to-texture.html.mem b/docs/examples/12_render-to-texture.html.mem similarity index 100% rename from html_examples/12_render-to-texture.html.mem rename to docs/examples/12_render-to-texture.html.mem diff --git a/html_examples/12_render-to-texture.js b/docs/examples/12_render-to-texture.js similarity index 100% rename from html_examples/12_render-to-texture.js rename to docs/examples/12_render-to-texture.js diff --git a/html_examples/12_render-to-texture.png b/docs/examples/12_render-to-texture.png similarity index 100% rename from html_examples/12_render-to-texture.png rename to docs/examples/12_render-to-texture.png diff --git a/html_examples/15_cloth_simulation.html b/docs/examples/15_cloth_simulation.html similarity index 100% rename from html_examples/15_cloth_simulation.html rename to docs/examples/15_cloth_simulation.html diff --git a/html_examples/15_cloth_simulation.html.mem b/docs/examples/15_cloth_simulation.html.mem similarity index 100% rename from html_examples/15_cloth_simulation.html.mem rename to docs/examples/15_cloth_simulation.html.mem diff --git a/html_examples/15_cloth_simulation.js b/docs/examples/15_cloth_simulation.js similarity index 100% rename from html_examples/15_cloth_simulation.js rename to docs/examples/15_cloth_simulation.js diff --git a/html_examples/15_cloth_simulation.png b/docs/examples/15_cloth_simulation.png similarity index 100% rename from html_examples/15_cloth_simulation.png rename to docs/examples/15_cloth_simulation.png diff --git a/html_examples/16_shadows.html b/docs/examples/16_shadows.html similarity index 100% rename from html_examples/16_shadows.html rename to docs/examples/16_shadows.html diff --git a/html_examples/16_shadows.html.mem b/docs/examples/16_shadows.html.mem similarity index 100% rename from html_examples/16_shadows.html.mem rename to docs/examples/16_shadows.html.mem diff --git a/html_examples/16_shadows.js b/docs/examples/16_shadows.js similarity index 100% rename from html_examples/16_shadows.js rename to docs/examples/16_shadows.js diff --git a/html_examples/16_shadows.png b/docs/examples/16_shadows.png similarity index 100% rename from html_examples/16_shadows.png rename to docs/examples/16_shadows.png diff --git a/html_examples/convert_img.sh b/docs/examples/convert_img.sh similarity index 100% rename from html_examples/convert_img.sh rename to docs/examples/convert_img.sh diff --git a/em-build-release.sh b/em-build-release.sh index 4c305206..12b5b0c6 100755 --- a/em-build-release.sh +++ b/em-build-release.sh @@ -33,7 +33,7 @@ emcc -Iinclude src/imgui/imgui.cpp \ src/sre/Skybox.cpp \ src/sre/impl/UniformSet.cpp \ examples/10_skybox-example.cpp \ - -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' --embed-file examples_data/cube-negx.png --embed-file examples_data/cube-negy.png --embed-file examples_data/cube-negz.png --embed-file examples_data/cube-posx.png --embed-file examples_data/cube-posy.png --embed-file examples_data/cube-posz.png -s USE_SDL=2 -o html_examples/10_skybox-example.html + -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' --embed-file examples_data/cube-negx.png --embed-file examples_data/cube-negy.png --embed-file examples_data/cube-negz.png --embed-file examples_data/cube-posx.png --embed-file examples_data/cube-posy.png --embed-file examples_data/cube-posz.png -s USE_SDL=2 -o docs/examples/10_skybox-example.html emcc -Iinclude src/imgui/imgui.cpp \ @@ -61,7 +61,7 @@ emcc -Iinclude src/imgui/imgui.cpp \ src/sre/Skybox.cpp \ src/sre/impl/UniformSet.cpp \ examples/12_render-to-texture.cpp \ - -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o html_examples/12_render-to-texture.html + -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o docs/examples/12_render-to-texture.html emcc -Iinclude src/imgui/imgui.cpp \ src/imgui/imgui_draw.cpp \ @@ -88,7 +88,7 @@ emcc -Iinclude src/imgui/imgui.cpp \ src/sre/Skybox.cpp \ src/sre/impl/UniformSet.cpp \ examples/07_matcap.cpp \ - -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' --embed-file examples_data/suzanne.obj --embed-file examples_data/matcap_00001.png --embed-file examples_data/matcap_00002.png --embed-file examples_data/matcap_00003.png --embed-file examples_data/matcap_00004.png -s USE_SDL=2 -o html_examples/07_matcap.html + -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' --embed-file examples_data/suzanne.obj --embed-file examples_data/matcap_00001.png --embed-file examples_data/matcap_00002.png --embed-file examples_data/matcap_00003.png --embed-file examples_data/matcap_00004.png -s USE_SDL=2 -o docs/examples/07_matcap.html emcc -Iinclude src/imgui/imgui.cpp \ src/imgui/imgui_draw.cpp \ @@ -115,7 +115,7 @@ emcc -Iinclude src/imgui/imgui.cpp \ src/sre/Skybox.cpp \ src/sre/impl/UniformSet.cpp \ examples/09_picking.cpp \ - -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o html_examples/09_picking.html + -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o docs/examples/09_picking.html emcc -Iinclude src/imgui/imgui.cpp \ src/imgui/imgui_draw.cpp \ @@ -142,7 +142,7 @@ emcc -Iinclude src/imgui/imgui.cpp \ src/sre/Skybox.cpp \ src/sre/impl/UniformSet.cpp \ examples/15_cloth_simulation.cpp \ - -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o html_examples/15_cloth_simulation.html + -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o docs/examples/15_cloth_simulation.html emcc -Iinclude src/imgui/imgui.cpp \ src/imgui/imgui_draw.cpp \ @@ -169,4 +169,4 @@ emcc -Iinclude src/imgui/imgui.cpp \ src/sre/Skybox.cpp \ src/sre/impl/UniformSet.cpp \ examples/16_shadows.cpp \ - -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 --embed-file examples_data/suzanne.obj -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o html_examples/16_shadows.html + -O2 -std=c++14 -s USE_WEBGL2=1 -s FORCE_FILESYSTEM=1 -s TOTAL_MEMORY=33554432 --embed-file examples_data/suzanne.obj -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[]' -s USE_SDL=2 -o docs/examples/16_shadows.html