Skip to content

Commit

Permalink
Merge pull request #172 from open-pv/glb-tiles-rebased-reactThree
Browse files Browse the repository at this point in the history
Glb tiles rebased react three
  • Loading branch information
FlorianK13 authored Aug 16, 2024
2 parents d7f27bc + 3c24ac9 commit 9ec6253
Show file tree
Hide file tree
Showing 95 changed files with 21,632 additions and 19,919 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ jobs:
runs-on: ubuntu-latest
environment: production
steps:
- name: Checkout
uses: actions/checkout@v3
with:
persist-credentials: false
- name: Setup Node
uses: actions/setup-node@v3
- name: Install
run: npm ci
- name: Build and Deploy
env:
NODE_ENV: production
# This is set automatically by github
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
- name: Checkout
uses: actions/checkout@v3
with:
persist-credentials: false
- name: Setup Node
uses: actions/setup-node@v3
- name: Install
run: npm ci
- name: Build and Deploy
env:
NODE_ENV: production
# This is set automatically by github
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config user.name "Automated"
git config user.email "actions@users.noreply.github.com"
git remote set-url origin https://git:${GITHUB_TOKEN}@github.com/open-pv/website.git
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
"source.fixAll": "explicit",
"source.sortImports": "explicit"
},
"prettier.semi": false
"prettier.semi": false,
"prettier.jsxSingleQuote": false
}
33,143 changes: 18,251 additions & 14,892 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,35 @@
"deploy": "gh-pages -d build -b build"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "0.2.0",
"@chakra-ui/react": "^2.8.2",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@react-three/drei": "^9.77.10",
"driver.js": "^1.1.0",
"gh-pages": "^5.0.0",
"framer-motion": "^11.3.21",
"gl-matrix": "^3.4.3",
"i18next": "^23.2.11",
"i18next-browser-languagedetector": "^7.1.0",
"i18next-http-backend": "^2.2.1",
"jszip": "^3.10.1",
"laz-perf": "^0.0.6",
"markdown-to-jsx": "^7.2.1",
"proj4": "^2.9.0",
"react": "^18.2.0",
"react-burger-menu": "^3.0.9",
"react-dom": "^18.2.0",
"react-helmet-async": "^1.3.0",
"react-i18next": "^13.0.2",
"react-router-dom": "^6.14.1",
"react-scripts": "^5.0.1",
"react-spinners": "^0.13.8",
"react-three-fiber": "^6.0.13",
"suncalc": "^1.9.0",
"three": "^0.163.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.7",
"@babel/preset-env": "^7.22.9",
"@babel/preset-react": "^7.22.5",
"babel-jest": "^29.6.2",
"gh-pages": "^6.1.1",
"rimraf": "^5.0.0",
"sass": "^1.64.1",
"source-map-explorer": "^2.5.3"
Expand Down
32 changes: 32 additions & 0 deletions public/draco/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Draco 3D Data Compression

Draco is an open-source library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.

[Website](https://google.github.io/draco/) | [GitHub](https://github.com/google/draco)

## Contents

This folder contains three utilities:

* `draco_decoder.js` — Emscripten-compiled decoder, compatible with any modern browser.
* `draco_decoder.wasm` — WebAssembly decoder, compatible with newer browsers and devices.
* `draco_wasm_wrapper.js` — JavaScript wrapper for the WASM decoder.

Each file is provided in two variations:

* **Default:** Latest stable builds, tracking the project's [master branch](https://github.com/google/draco).
* **glTF:** Builds targeted by the [glTF mesh compression extension](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression), tracking the [corresponding Draco branch](https://github.com/google/draco/tree/gltf_2.0_draco_extension).

Either variation may be used with `THREE.DRACOLoader`:

```js
var dracoLoader = new THREE.DRACOLoader();
dracoLoader.setDecoderPath('path/to/decoders/');
dracoLoader.setDecoderConfig({type: 'js'}); // (Optional) Override detection of WASM support.
```

Further [documentation on GitHub](https://github.com/google/draco/tree/master/javascript/example#static-loading-javascript-decoder).

## License

[Apache License 2.0](https://github.com/google/draco/blob/master/LICENSE)
34 changes: 34 additions & 0 deletions public/draco/draco_decoder.js

Large diffs are not rendered by default.

Binary file added public/draco/draco_decoder.wasm
Binary file not shown.
33 changes: 33 additions & 0 deletions public/draco/draco_encoder.js

Large diffs are not rendered by default.

117 changes: 117 additions & 0 deletions public/draco/draco_wasm_wrapper.js

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions public/draco/gltf/draco_decoder.js

Large diffs are not rendered by default.

Binary file added public/draco/gltf/draco_decoder.wasm
Binary file not shown.
33 changes: 33 additions & 0 deletions public/draco/gltf/draco_encoder.js

Large diffs are not rendered by default.

116 changes: 116 additions & 0 deletions public/draco/gltf/draco_wasm_wrapper.js

Large diffs are not rendered by default.

Binary file added public/images/WelcomeMessage1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/WelcomeMessage2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/WelcomeMessage3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9ec6253

Please sign in to comment.