From 0ed2c0a93f8125edfc5289e091fbb7f83f882e10 Mon Sep 17 00:00:00 2001 From: Alex <28486541+IwakuraRein@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:39:47 -0400 Subject: [PATCH 1/2] Update README.md --- README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6526d9b..0b294ca 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,19 @@ Let's play with color! ## 1. Stripes -Fork [this base code](https://www.shadertoy.com/view/flyfWR) and replicate (to the best of your ability) this animation. And imagine I made the gif loop perfectly -![f813a51b776ad07701ad925c57ac0c4f](https://user-images.githubusercontent.com/1758825/192643224-503d1e99-dd27-40fd-9f6c-cd0bc4355703.gif) +https://github.com/IwakuraRein/lab04-color/assets/28486541/4464b0ef-9ff4-477b-bd13-351232fb50be + +[ShaderToy](https://www.shadertoy.com/view/ms3fWj) ## 2. Damaged VCR -Fork [this base code](https://www.shadertoy.com/view/stGBWR) and replicate this animation. Don't worry about getting it exactly right!! Go for overall flavor. -![4bfb5193037528965a9590e4a69514f4 (1)](https://user-images.githubusercontent.com/1758825/192655484-1fcef422-b611-48ea-a7ab-f1a7de8f3fb1.gif) + +https://github.com/IwakuraRein/lab04-color/assets/28486541/4eb62976-a84b-4873-9278-eff4d9d16a96 + +[ShaderToy](https://www.shadertoy.com/view/ddcfWj) ## Extra Credit -Too easy? Give [nyan cat](https://www.shadertoy.com/view/stGBDR) a rainbow! -## Submission -- Create a pull request to this repository -- In the README, include the names of both your team members -- In the README, create a link to your shader toy solutions -- Make sure your shadertoy is set to UNLISTED or PUBLIC (so we can see them!) + +https://github.com/IwakuraRein/lab04-color/assets/28486541/1fe182cd-39df-415c-bed3-ecb8b08fd3a3 + +[ShaderToy](https://www.shadertoy.com/view/mscBW2) From 26dfbcdcc4141bbc36d78b227179afc897b8f0f0 Mon Sep 17 00:00:00 2001 From: Alex <28486541+IwakuraRein@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:43:09 -0400 Subject: [PATCH 2/2] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b294ca..27f8867 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # lab04-color -Let's play with color! + +Team: Alex Fu and Jiefu Ling ## 1. Stripes