From dc34b8bc5279b448350533c5b02a52b2b73ec45d Mon Sep 17 00:00:00 2001 From: Jonathan Giroux Date: Wed, 22 Nov 2017 22:10:24 +0100 Subject: [PATCH] Put shaders into a folder --- 01-anton.glsl => 2017-06-22/01-anton.glsl | 0 01-eybor.glsl => 2017-06-22/01-eybor.glsl | 0 02-flopine.glsl => 2017-06-22/02-flopine.glsl | 0 02-wsmind.glsl => 2017-06-22/02-wsmind.glsl | 0 03-lamogui.glsl => 2017-06-22/03-lamogui.glsl | 0 03-sicarde.glsl => 2017-06-22/03-sicarde.glsl | 0 04-ponk.glsl => 2017-06-22/04-ponk.glsl | 0 04-semtoraap.glsl => 2017-06-22/04-semtoraap.glsl | 0 05-anton.glsl => 2017-06-22/05-anton.glsl | 0 05-pasta.glsl => 2017-06-22/05-pasta.glsl | 0 06-koltes.glsl => 2017-06-22/06-koltes.glsl | 0 .../06-pouletvert.glsl | 0 07-flopine.glsl => 2017-06-22/07-flopine.glsl | 0 07-wsmind.glsl => 2017-06-22/07-wsmind.glsl | 0 2017-06-22/Readme.md | 15 +++++++++++++++ Readme.md | 14 ++------------ 16 files changed, 17 insertions(+), 12 deletions(-) rename 01-anton.glsl => 2017-06-22/01-anton.glsl (100%) rename 01-eybor.glsl => 2017-06-22/01-eybor.glsl (100%) rename 02-flopine.glsl => 2017-06-22/02-flopine.glsl (100%) rename 02-wsmind.glsl => 2017-06-22/02-wsmind.glsl (100%) rename 03-lamogui.glsl => 2017-06-22/03-lamogui.glsl (100%) rename 03-sicarde.glsl => 2017-06-22/03-sicarde.glsl (100%) rename 04-ponk.glsl => 2017-06-22/04-ponk.glsl (100%) rename 04-semtoraap.glsl => 2017-06-22/04-semtoraap.glsl (100%) rename 05-anton.glsl => 2017-06-22/05-anton.glsl (100%) rename 05-pasta.glsl => 2017-06-22/05-pasta.glsl (100%) rename 06-koltes.glsl => 2017-06-22/06-koltes.glsl (100%) rename 06-pouletvert.glsl => 2017-06-22/06-pouletvert.glsl (100%) rename 07-flopine.glsl => 2017-06-22/07-flopine.glsl (100%) rename 07-wsmind.glsl => 2017-06-22/07-wsmind.glsl (100%) create mode 100644 2017-06-22/Readme.md diff --git a/01-anton.glsl b/2017-06-22/01-anton.glsl similarity index 100% rename from 01-anton.glsl rename to 2017-06-22/01-anton.glsl diff --git a/01-eybor.glsl b/2017-06-22/01-eybor.glsl similarity index 100% rename from 01-eybor.glsl rename to 2017-06-22/01-eybor.glsl diff --git a/02-flopine.glsl b/2017-06-22/02-flopine.glsl similarity index 100% rename from 02-flopine.glsl rename to 2017-06-22/02-flopine.glsl diff --git a/02-wsmind.glsl b/2017-06-22/02-wsmind.glsl similarity index 100% rename from 02-wsmind.glsl rename to 2017-06-22/02-wsmind.glsl diff --git a/03-lamogui.glsl b/2017-06-22/03-lamogui.glsl similarity index 100% rename from 03-lamogui.glsl rename to 2017-06-22/03-lamogui.glsl diff --git a/03-sicarde.glsl b/2017-06-22/03-sicarde.glsl similarity index 100% rename from 03-sicarde.glsl rename to 2017-06-22/03-sicarde.glsl diff --git a/04-ponk.glsl b/2017-06-22/04-ponk.glsl similarity index 100% rename from 04-ponk.glsl rename to 2017-06-22/04-ponk.glsl diff --git a/04-semtoraap.glsl b/2017-06-22/04-semtoraap.glsl similarity index 100% rename from 04-semtoraap.glsl rename to 2017-06-22/04-semtoraap.glsl diff --git a/05-anton.glsl b/2017-06-22/05-anton.glsl similarity index 100% rename from 05-anton.glsl rename to 2017-06-22/05-anton.glsl diff --git a/05-pasta.glsl b/2017-06-22/05-pasta.glsl similarity index 100% rename from 05-pasta.glsl rename to 2017-06-22/05-pasta.glsl diff --git a/06-koltes.glsl b/2017-06-22/06-koltes.glsl similarity index 100% rename from 06-koltes.glsl rename to 2017-06-22/06-koltes.glsl diff --git a/06-pouletvert.glsl b/2017-06-22/06-pouletvert.glsl similarity index 100% rename from 06-pouletvert.glsl rename to 2017-06-22/06-pouletvert.glsl diff --git a/07-flopine.glsl b/2017-06-22/07-flopine.glsl similarity index 100% rename from 07-flopine.glsl rename to 2017-06-22/07-flopine.glsl diff --git a/07-wsmind.glsl b/2017-06-22/07-wsmind.glsl similarity index 100% rename from 07-wsmind.glsl rename to 2017-06-22/07-wsmind.glsl diff --git a/2017-06-22/Readme.md b/2017-06-22/Readme.md new file mode 100644 index 0000000..ac4a225 --- /dev/null +++ b/2017-06-22/Readme.md @@ -0,0 +1,15 @@ +# Shader Showdown Paris #1 + +On June 22th, 2017 at [Kawaii Café](http://www.kawaiicafe.fr/). + +[Video on YouTube](https://youtu.be/TZeZ3Mmi4VY) + +## Rounds + +1. Anton vs Eybor +2. Flopine vs wsmind +3. Lamogui vs Sicarde +4. ponk vs Semtoraap +5. Anton vs Pasta +6. Koltes vs Poulet Vert +7. Flopine vs wsmind diff --git a/Readme.md b/Readme.md index 2aa84e1..426f461 100644 --- a/Readme.md +++ b/Readme.md @@ -1,13 +1,3 @@ -# Shader Showdown Paris #1 +# Shader Showdown Paris -Shader Showdown: 2 participants, 25 minutes, live coding the best visual effect. - -[Video on YouTube](https://youtu.be/TZeZ3Mmi4VY) - -* Round 1: Anton vs Eybor -* Round 2: Flopine vs wsmind -* Round 3: Lamogui vs Sicarde -* Round 4: ponk vs Semtoraap -* Round 5: Anton vs Pasta -* Round 6: Koltes vs Poulet Vert -* Round 7: Flopine vs wsmind +This is the collection of shaders written at the Shader Showdown Paris, which is a live coding battle where two artists have 25 minutes to program the best visuals.