Skip to content

Actualizacion #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 49 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1687e34
Create pages.yml
Dicarvajalb Aug 21, 2022
ce0a014
Luminocidad e ilusiones
Dicarvajalb Sep 5, 2022
83799fe
Merge pull request #1 from Dicarvajalb/dicarvajalb
Dicarvajalb Sep 5, 2022
6890650
Reparación al nombre según el repo
Dicarvajalb Sep 5, 2022
ab18baf
Merge pull request #2 from Dicarvajalb/dicarvajalb
Dicarvajalb Sep 5, 2022
3c33805
Ilusion rectangulos
acardenasor Sep 5, 2022
cb5d842
Cambios de convolucion y MB
bjportelac Sep 5, 2022
9350995
Merge pull request #3 from Dicarvajalb/Cambios-Bjportelac
Dicarvajalb Sep 5, 2022
683b4e4
hola
acardenasor Sep 5, 2022
35fd8ec
cambio feet
acardenasor Sep 5, 2022
1bf74a1
cambio feet2
acardenasor Sep 5, 2022
1b7fe2b
Merge pull request #4 from Dicarvajalb/cambios-angela
Dicarvajalb Sep 5, 2022
479b267
cambio 6
acardenasor Sep 5, 2022
9db51cd
Merge pull request #5 from Dicarvajalb/cambios-angela
Dicarvajalb Sep 5, 2022
c20d60c
kernels nuevos
daviidlyon Sep 5, 2022
7b53973
Merge pull request #6 from Dicarvajalb/dleon
Dicarvajalb Sep 5, 2022
668bf50
ultimos cambios
acardenasor Sep 5, 2022
53b88fe
Merge pull request #7 from Dicarvajalb/cambios-angela
Dicarvajalb Sep 5, 2022
157dec3
Nombres kernels
daviidlyon Sep 5, 2022
8cb515f
Merge pull request #8 from Dicarvajalb/dleon
Dicarvajalb Sep 5, 2022
41f615f
ultimos cambios a
acardenasor Sep 7, 2022
dfcea61
Merge pull request #9 from Dicarvajalb/cambios-angela
Dicarvajalb Sep 7, 2022
ac92d3c
MCA rasterizacion
daviidlyon Oct 18, 2022
5fbb35f
Laberinto
bjportelac Oct 18, 2022
1b7470f
Merge pull request #11 from Dicarvajalb/t2/bjportelac
Dicarvajalb Oct 19, 2022
1f0da73
laberinto terminado
Dicarvajalb Oct 19, 2022
d3a8adc
Merge pull request #12 from Dicarvajalb/t2/bjportelac
Dicarvajalb Oct 19, 2022
dc0c448
Ultimos cambios
acardenasor Oct 19, 2022
31705c3
Merge pull request #13 from Dicarvajalb/t2/bjportelac
Dicarvajalb Oct 19, 2022
3b3f6e7
coloring-exercises
daviidlyon Nov 9, 2022
831278e
Merge pull request #14 from Dicarvajalb/coloring
Dicarvajalb Nov 9, 2022
762d018
photomosaic-hardware
daviidlyon Nov 24, 2022
23b527a
Merge pull request #15 from Dicarvajalb/dleonmu/photomosaic
Dicarvajalb Nov 24, 2022
a284c8f
neg
daviidlyon Nov 26, 2022
a863b81
Merge pull request #16 from Dicarvajalb/dleonmu/n_e_g
Dicarvajalb Nov 26, 2022
f38fa8e
Texturing & Image Procesing
bjportelac Nov 27, 2022
2caa8ce
Procedural texturing
acardenasor Nov 28, 2022
2147520
Ambient light finalizada
Dicarvajalb Nov 28, 2022
66aeb59
Merge pull request #17 from Dicarvajalb/ambientShader
Dicarvajalb Nov 28, 2022
f827410
Correcciones
acardenasor Nov 28, 2022
5075bf0
Merge pull request #18 from Dicarvajalb/t3-bjportelac
Dicarvajalb Nov 28, 2022
dc83a49
Merge pull request #19 from Dicarvajalb/t3-angela
Dicarvajalb Nov 28, 2022
d4d8d1a
references
daviidlyon Nov 28, 2022
99a363e
Merge pull request #20 from Dicarvajalb/dleon/codess
Dicarvajalb Nov 28, 2022
796c448
Ambient light con código de referencia
Dicarvajalb Nov 30, 2022
6d7144a
Merge pull request #21 from Dicarvajalb/incluirCodigo
Dicarvajalb Nov 30, 2022
2e8bc20
borrado de información innecesaria
Dicarvajalb Nov 30, 2022
d2a3df4
Merge pull request #22 from Dicarvajalb/aincluirCodigo
Dicarvajalb Nov 30, 2022
af0c977
referencias
acardenasor Dec 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Sample workflow for building and deploying a Hugo site to GitHub Pages
name: Deploy Hugo site to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: "pages"
cancel-in-progress: true

# Default to bash
defaults:
run:
shell: bash

jobs:
# Build job
build:
runs-on: ubuntu-latest
env:
HUGO_VERSION: 0.99.0
steps:
- name: Install Hugo CLI
run: |
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.deb \
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive
- name: Setup Pages
id: pages
uses: actions/configure-pages@v1
- name: Build with Hugo
run: |
hugo \
--minify \
--baseURL ${{ steps.pages.outputs.base_url }}
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: ./public

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
# Logs
*.log
.hugo_build.lock
.DS_Store
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "themes/book"]
path = themes/book
url = https://github.com/alex-shpak/hugo-book
[submodule "themes/ananke"]
path = themes/ananke
url = https://github.com/theNewDynamic/gohugo-theme-ananke.git
20 changes: 5 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
# Showcase Template
# Grupo de estudio
- Angela Cardenas
- Diego Carvajal: Estudiante de sistemas con intereses en el desarollo de mecánicas interactivas en la web,
- 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.
9 changes: 5 additions & 4 deletions config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
baseURL = "https://visualcomputing.github.io/showcase"
baseURL = "https://dicarvajalb.github.io/visual_computing"
languageCode = "en-us"
title = "Showcase Template"
theme = 'book'
title = "Grupo de estudio"
theme = "book"

# Book configuration
disablePathToLower = true
Expand All @@ -22,7 +22,7 @@ enableGitInfo = true

# Set source repository location.
# Used for 'Last Modified' and 'Edit this page' links.
BookRepo = 'https://github.com/visualcomputing/showcase'
BookRepo = 'https://github.com/Dicarvajalb/visual_computing'

# Configure the date format used on the pages
# - In git information
Expand All @@ -35,3 +35,4 @@ enableGitInfo = true
# Theme will print warning if page referenced in markdown does not exists.
BookPortableLinks = false


37 changes: 6 additions & 31 deletions content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,12 @@ 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 >}}
# Grupo de estudio
- Angela Cardenas

{{< hint info >}}
If you forked the repo don't forget to activate the [actions](https://github.com/VisualComputing/showcase/actions).
**Diego Carvajal:**
Soy estudiante de sistemas con intereses en el desarollo de mecánicas interactivas en la web, me gusta correr, las películas de suspenso, los libros de ciencia ficción y el arte/estilo ciberpunk.
{{< /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 >}}
- Brayan Portela
- David Muñoz
Loading