Merge pull request #7 from Dicarvajalb/cambios-angela

ultimos cambios

Author: Dicarvajalb

README.md

@@ -1,23 +1,6 @@
-# Showcase Template
+# Grupo de estudio
+- Angela Cardenas
+- Diego Carvajal
+- Brayan Portela
+- David Muñoz
 
-Welcome to the [gohugo](https://gohugo.io/) template to create rich content [academic reports](https://www.wordy.com/writers-workshop/writing-an-academic-report/) having [p5.js](https://p5js.org/) sketches.
-
-## Hacking
-
-Install the [gohugo](https://gohugo.io/) [static site generator](https://jamstack.org/generators/) then:
-
-```sh
-$git clone https://github.com/VisualComputing/showcase
-$cd showcase
-$git submodule update --init --recursive
-$hugo server -D --disableFastRender
-```
-
-Deploy with `$git push` after redefined `baseURL` in `config.toml` which should point to your actual public remote.
-
-### Remarks
-
-1. If you renamed the repo, say to `newreponame`, don't forget to update all url references of the markdown and js file sources, to reflect that change, i.e., look in all the [content folder](https://github.com/VisualComputing/showcase/tree/main/content) files for `showcase` occurrences and replace them by `newreponame`.
-2. If you forked the repo don't forget to activate the [actions](https://github.com/VisualComputing/showcase/actions).
-3. Don't forget to select the `gh-pages` branch as the one to serve your site from at the [pages section of your repo configuration page](https://docs.github.com/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site), if it is no so by default.
-4. The **showcase** template uses the [hugo-book](https://github.com/alex-shpak/hugo-book) theme by default. Check the [hugo themes site](https://themes.gohugo.io/) if you wish to add other ones.

config.toml

@@ -1,6 +1,6 @@
 baseURL = "https://dicarvajalb.github.io/visual_computing"
 languageCode = "en-us"
-title = "Showcase Template"
+title = "Grupo de estudio"
 theme = "book"
 
 # Book configuration

content/_index.md

@@ -3,37 +3,8 @@ title: Introduction
 type: docs
 ---
 
-# Showcase Template
-
-Welcome to the [gohugo](https://gohugo.io/) template to create rich content [academic reports](https://www.wordy.com/writers-workshop/writing-an-academic-report/) having [p5.js](https://p5js.org/) sketches.
-
-## Hacking
-
-Install the [gohugo](https://gohugo.io/) [static site generator](https://jamstack.org/generators/) then:
-
-```sh
-$git clone https://github.com/VisualComputing/showcase
-$cd showcase
-$git submodule update --init --recursive
-$hugo server -D --disableFastRender
-```
-
-Deploy with `$git push` after redefined `baseURL` in `config.toml` which should point to your actual public remote.
-
-### Remarks
-
-{{< hint info >}}
-If you renamed the repo, say to `newreponame`, don't forget to update all url references of the markdown and js file sources, to reflect that change, i.e., look in all the [content folder](https://github.com/VisualComputing/showcase/tree/main/content) files for `showcase` occurrences and replace them by `newreponame`.
-{{< /hint >}}
-
-{{< hint info >}}
-If you forked the repo don't forget to activate the [actions](https://github.com/VisualComputing/showcase/actions).
-{{< /hint >}}
-
-{{< hint info >}}
-Don't forget to select the `gh-pages` branch as the one to serve your site from at the [pages section of your repo configuration page](https://docs.github.com/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site), if it is no so by default.
-{{< /hint >}}
-
-{{< hint info >}}
-The **showcase** template uses the [hugo-book](https://github.com/alex-shpak/hugo-book) theme by default. Check the [hugo themes site](https://themes.gohugo.io/) if you wish to add other ones.
-{{< /hint >}}
+# Grupo de estudio
+- Angela Cardenas
+- Diego Carvajal
+- Brayan Portela
+- David Muñoz

content/docs/shortcodes/Taller 1/Multiplicacion RGB.md

@@ -13,40 +13,36 @@ Pasos dentro del código:
 
 {{< details title="source code" open=false >}}
 {{< highlight html >}}
-let angle = 0;
-let speed = 0.05;
-let circleColor = true;
-
+let backgroundColor;
+let color1, color2
 function setup() {
-createCanvas(400, 400);
+  createCanvas(200, 200);
+  let c1 = createInput("0,0,0",'color')
+  let c2 = createInput("0,0,0",'color')
+  
+  
+  c1.input(()=> setColor1(c1,c2))
+  c2.input(()=> setColor1(c1,c2))
 }
 
-function draw() {
-background(220);
-angle += speed;
-strokeWeight(1)
-circle(200,200,400);
-cirrcle(375)
-}
+function setColor1(c1,c2){
+  let color1 = color(red(c1.value()), green(c1.value()), blue(c1.value()))
+ let black = color(0,0,0)
+   fill(color1)
+  rect(0,0, 130,130)
+  let color2 = color(red(c2.value()), green(c2.value()), blue(c2.value()))
+  fill(color2)
+  rect(70,70, 130,130)
+  
+   //let white = color(255,255,255)
+   
+  const cred = (red(c1.value()) * red(c2.value())) / 255;
+  const cblue = (blue(c1.value()) * blue(c2.value())) / 255;
+  const cgreen = (green(c1.value()) * green(c2.value())) /255;
+  fill(color(cred, cgreen,cblue))
+  rect(70,70, 60,60)
+  //background(cred,cgreen,cblue)
 
-function cirrcle(size){
-fill(255,255,0)
-if(circleColor){
-fill(0,0,255)  
- }
-circleColor = !circleColor
-
-if(size>100){
-translate(p5.Vector.fromAngle(millis() / 1000, 12.5));
-strokeWeight(0)
-circle(200,200, size);
-cirrcle(size-25)
-}else if(size>0){
-translate(p5.Vector.fromAngle(millis() / 1000, -12.5));
-circle(200,200, size);  
- cirrcle(size-25)
-}
-return
 }
 {{< /highlight >}}
 {{< /details >}}

content/sketches/histogram.js

@@ -50,4 +50,6 @@ function preload() {
       line(xPos, y1, xPos, y2);
     }
     pop()
-  }
+  }
+
+  //Bibliografia: https://editor.p5js.org/ebenjmuse/sketches/HyPfeGkCZ