Skip to content

Commit

Permalink
WIP-FIX: solving heavy rhino again
Browse files Browse the repository at this point in the history
  • Loading branch information
@9and3
9and3 committed Dec 29, 2024
1 parent ca18ecb commit cccbb50
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 2,215 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ f:/augmented-carpentry/assets/illustration/hardware_overview/hardware_overview.3
assets/illustration/hardware_overview/hardware_overview.3dm filter=lfs diff=lfs merge=lfs -text
assets/illustration/hardware_overview/hardware_overview_v10.3dm filter=lfs diff=lfs merge=lfs -text
assets/illustration/hardware_overview/hardware_overview_v9.3dm filter=lfs diff=lfs merge=lfs -text
assets/illustration/hardware_overview/hardware_overview_v9.3dmbak filter=lfs diff=lfs merge=lfs -text
assets/illustration/hardware_overview/hardware_overview_v9.3dm.rhl filter=lfs diff=lfs merge=lfs -text
4 changes: 2 additions & 2 deletions assets/illustration/hardware_overview/hardware_overview_v9.3dm
View file
Git LFS file not shown
3 changes: 0 additions & 3 deletions assets/illustration/hardware_overview/hardware_overview_v9.3dm.rhl
View file

This file was deleted.

3 changes: 3 additions & 0 deletions assets/illustration/hardware_overview/hardware_overview_v9.3dmbak
View file
Git LFS file not shown
2 changes: 1 addition & 1 deletion docs/publications/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Yves Weinand <a title="ORCID, Yves Weinand" href="https://orcid.org/0000-0002-80

Andrea Settimi <a title="ORCID, Andrea Settimi" href="https://orcid.org/0000-0001-5020-7331"><img width="15" alt="ORCID iD - settimi" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a>,
Naravich Chutisilp <a title="ORCID, Naravich Chutisilp" href="https://orcid.org/0009-0005-8782-732X"><img width="15" alt="ORCID iD - chutisilp" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a>,
Florian Aymanns <a title="ORCID, Florain Aymanns" href="https://orcid.org/0000-0003-4290-7244"><img width="15" alt="ORCID iD - aymanns" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a>,
Florian Aymanns <a title="ORCID, Florain Aymanns" href="http://orcid.org/0000-0003-4290-7244"><img width="15" alt="ORCID iD - aymanns" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a>,
Julien Gamerro <a title="ORCID, Julien Gamerro" href="https://orcid.org/0000-0001-7802-5345"><img width="15" alt="ORCID iD - gamerro" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a>,
Yves Weinand <a title="ORCID, Yves Weinand" href="https://orcid.org/0000-0002-8088-6504"><img width="15" alt="ORCID iD - weinand" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a>

Expand Down
241 changes: 0 additions & 241 deletions docs/publishing-your-site.md
View file

This file was deleted.

1 change: 0 additions & 1 deletion docs/team/index.md
View file

This file was deleted.

31 changes: 31 additions & 0 deletions docs/team/research_team.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
hide:
- title
---

## Thesis Group

Augmented Carpentry is the outcome of a thesis from the [Laboratory of Timber Constructions (IBOIS)](https://ibois.epfl.ch/) at the [École Polytechnique Fédérale de Lausanne (EPFL)](https://www.epfl.ch/en/) from 2021 to 2025. The software and the documentation are currently maintained by [Andrea Settimi](https://github.com/9and3).

| Role | Name | Contact | Affiliation |
|-------------------|----------------------------------------------------------------------|---------|-------------|
| PhD Researcher | Andrea Settimi <a title="ORCID, Andrea Settimi" href="https://orcid.org/0000-0001-5020-7331"><img width="15" alt="ORCID iD - settimi" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | [IBOIS, EPFL](https://ibois.epfl.ch/) |
| PhD Co-director | Dr. Julien Gamerro <a title="ORCID, Julien Gamerro" href="https://orcid.org/0000-0001-7802-5345"><img width="15" alt="ORCID iD - gamerro" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | Indipendent Researcher |
| PhD & Laboratory Director | Prof. Yves Weinand <a title="ORCID, Yves Weinand" href="https://orcid.org/0000-0002-8088-6504"><img width="15" alt="ORCID iD - weinand" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | [IBOIS, EPFL](https://ibois.epfl.ch/) |

## Contributors

Augmented Carpentry was also possible thanks to the numerous contributions across multiple disciplines of many talented programmers, software engineers, imaging specialist, roboticists, construction assistants and techniciens:

| Role | Name | Contact | Affiliation |
|-------------------|----------------------------------------------------------------------|---------|-------------|
| Software developer | Hong-Bin Yang <a title="ORCID, Hong-Bin Yang" href="https://orcid.org/0000-0001-8422-5263"><img width="15" alt="ORCID iD - yang" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | [IBOIS, EPFL](https://ibois.epfl.ch/) |
| Software developer | Naravich Chutisilp <a title="ORCID, Naravich Chutisilp" href="https://orcid.org/0009-0005-8782-732X"><img width="15" alt="ORCID iD - chutisilp" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | [IBOIS, EPFL](https://ibois.epfl.ch/) |
| Software developer | Nazgul Zholmagambetova | [[email protected]](mailto:[email protected]) | [IBOIS, EPFL](https://ibois.epfl.ch/) |
| Image Analyst | Dr. Florian Aymanns <a title="ORCID, Florain Aymanns" href="https://orcid.org/0000-0003-4290-7244"><img width="15" alt="ORCID iD - aymanns" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | [Center For Imaging, EPFL](https://imaging.epfl.ch/) |
| Image Scientist | Dr. Edward Andò <a title="ORCID, Edward Andò" href="https://orcid.org/0000-0002-0000-0000"><img width="15" alt="ORCID iD - thiran" src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/ORCID_iD.svg/512px-ORCID_iD.svg.png?20190308043226"></a> | [[email protected]](mailto:[email protected]) | [Center For Imaging, EPFL](https://imaging.epfl.ch/) |
| Software engineer | Nicolas Richard | [[email protected]](mailto:[email protected]) | [SCITAS, EPFL](https://scitas.epfl.ch/) |
| Construction Assistant | Arthur Billotte | [[email protected]](mailto:[email protected]) | [IBOIS, EPFL](https://ibois.epfl.ch/) |
| Roboticist | Gregory Spirlet | [[email protected]](mailto:gregory.spirlet) | [GIS, EPFL](https://www.epfl.ch/schools/enac/gis/) |
| Carpenter Technicien | François Perrin | [[email protected]](mailto:[email protected]) | [GIS, EPFL](https://ibois.epfl.ch/) |
| Technicien | Krkic Armin | [[email protected]](mailto:[email protected]) | [GIS, EPFL](https://ibois.epfl.ch/) |
Loading

0 comments on commit cccbb50

Please sign in to comment.