From 64b9c3dbd8df0a35df9c6a05625efa1fffaf0c9b Mon Sep 17 00:00:00 2001 From: weaponsforge Date: Sun, 22 Mar 2020 11:15:15 +0800 Subject: [PATCH 1/5] Updated README. Added gh pages demo link. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7293a5a..9e932da 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ > Three.js model loader for 3d object (**.obj**) files. + ### Prerequisites 1. NodeJS @@ -15,6 +16,11 @@ - version r114 +### Demo + +[https://muonlineph.github.io/webgl-jsonloader/](https://muonlineph.github.io/webgl-jsonloader/) + + ## Installation 1. Clone this repository. @@ -49,4 +55,4 @@ @weaponsforge -20200101 \ No newline at end of file +20200320 \ No newline at end of file From 6644bea5ecbc7de0eaf1b820c7496e8eb2ae96fb Mon Sep 17 00:00:00 2001 From: weaponsforge Date: Sun, 22 Mar 2020 11:27:49 +0800 Subject: [PATCH 2/5] Added actions cd to gh-pages. --- .github/workflows/ghpages.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/ghpages.yml diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml new file mode 100644 index 0000000..672b2e5 --- /dev/null +++ b/.github/workflows/ghpages.yml @@ -0,0 +1,20 @@ +name: Deploy to Github Pages + +on: + push: + branches: + - ghpages-cd + +jobs: + deploy: + name: Deploy to GH Pages + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@master + - name: Deploy + uses: peaceiris/actions-gh-pages@v2.5.0 + env: + PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }} + PUBLISH_BRANCH: gh-pages + PUBLISH_DIR: public \ No newline at end of file From e044b7d0ceef79f31b12a2b12664bcc6705de3a4 Mon Sep 17 00:00:00 2001 From: weaponsforge Date: Sun, 22 Mar 2020 11:31:12 +0800 Subject: [PATCH 3/5] Renamed actions yml file. --- .github/workflows/{ghpages.yml => main.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{ghpages.yml => main.yml} (100%) diff --git a/.github/workflows/ghpages.yml b/.github/workflows/main.yml similarity index 100% rename from .github/workflows/ghpages.yml rename to .github/workflows/main.yml From 5024590aa7d20359ff23729d25d195e1594bd969 Mon Sep 17 00:00:00 2001 From: weaponsforge Date: Sun, 22 Mar 2020 11:47:54 +0800 Subject: [PATCH 4/5] Testing cd. --- public/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/main.js b/public/main.js index 678ca90..e4ea65e 100644 --- a/public/main.js +++ b/public/main.js @@ -24,7 +24,7 @@ const init = function() { renderer = new THREE.WebGLRenderer() renderer.setPixelRatio(window.devicePixelRatio) renderer.setSize(window.innerWidth, window.innerHeight) - renderer.setClearColor (0xE0E0E0, 1); + renderer.setClearColor (0xb3f0ff, 1); document.body.appendChild(renderer.domElement) // Events From c03792d415b583cb87928e8f137cb5b12b2d15fe Mon Sep 17 00:00:00 2001 From: weaponsforge Date: Sun, 22 Mar 2020 12:15:33 +0800 Subject: [PATCH 5/5] Set cd to trigger only on master. --- .github/workflows/main.yml | 2 +- public/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 672b2e5..78d4f6f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Deploy to Github Pages on: push: branches: - - ghpages-cd + - master jobs: deploy: diff --git a/public/main.js b/public/main.js index e4ea65e..678ca90 100644 --- a/public/main.js +++ b/public/main.js @@ -24,7 +24,7 @@ const init = function() { renderer = new THREE.WebGLRenderer() renderer.setPixelRatio(window.devicePixelRatio) renderer.setSize(window.innerWidth, window.innerHeight) - renderer.setClearColor (0xb3f0ff, 1); + renderer.setClearColor (0xE0E0E0, 1); document.body.appendChild(renderer.domElement) // Events