From d643780d6a3515f733644bae931670396afb16e3 Mon Sep 17 00:00:00 2001 From: sijmenhuizenga Date: Mon, 27 Jul 2020 19:21:13 +0200 Subject: [PATCH 1/6] Clarify 3d model sharing --- docs/import-car-3d-model.md | 9 ++++++++- docs/integration-handbook.md | 4 ++++ mkdocs.yml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/import-car-3d-model.md b/docs/import-car-3d-model.md index fc6740ac..4c3b9712 100644 --- a/docs/import-car-3d-model.md +++ b/docs/import-car-3d-model.md @@ -120,4 +120,11 @@ Next, in the details pane: # 7. Selecting a car Update your settings.json `PawnPaths -> DefaultCar -> PawnBP` to point at the newly created pawn. -It should (tm) work. \ No newline at end of file +It should (tm) work. + +# 8. Sharing your vehicle with the world! + +Wouldn't it be amazing if other people could enjoy your vehicle 3d model as well? +You are welcome to create a pull request with your vehicle and it might be added to the reop! +Contribution will be given in the readme of the project. +Please not that only GPLv2 licensed material is accepted into this repository. \ No newline at end of file diff --git a/docs/integration-handbook.md b/docs/integration-handbook.md index c3591d99..26ed879a 100644 --- a/docs/integration-handbook.md +++ b/docs/integration-handbook.md @@ -228,6 +228,10 @@ All vehicles will have a width of 100cm, a length of 180cm and a height of 50cm. This is the bounding box of the vehicle (the part of the vehicle that interacts with the world) The 3d models are not restricted to this size. +Teams participating in FSOnline can provide their 3d vehicle models to be used during competition. +If you want the 3d model to be public, you can create a pr to this repo. +If you want it to be kept private, [send an email to FSOnline](sijmen.huizenga@formulastudentonline.com) with the uasset files required for your car to drive. + ## Competition deployment A few weeks before the competition, each team will receive the ssh credentials to an Ubuntu google cloud instance. This instance will have 8 vCPU cores, 30 GB memory (configuration n1-standard-8), 1 Nvidia Tesla T4 video card and 100GB SSD disk. diff --git a/mkdocs.yml b/mkdocs.yml index c8a9ba76..58e10c92 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -18,7 +18,7 @@ nav: - "Lidar": "lidar.md" - "Camera": "camera.md" - "GPS": "gps.md" - - "GSS": "gss.md" + - "GSS": "ground-speed-sensor.md" - "#tech madness": - "ROS Bridge": "ros-bridge.md" - "ROS Bridge statistics": "statistics.md" From c2caf972f5917e16b861b3be47edc257889ae75e Mon Sep 17 00:00:00 2001 From: Sijmen Date: Tue, 28 Jul 2020 00:54:48 +0200 Subject: [PATCH 2/6] Update docs/integration-handbook.md Co-authored-by: Marek Szeles --- docs/integration-handbook.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integration-handbook.md b/docs/integration-handbook.md index 26ed879a..b8bd98a3 100644 --- a/docs/integration-handbook.md +++ b/docs/integration-handbook.md @@ -229,7 +229,7 @@ This is the bounding box of the vehicle (the part of the vehicle that interacts The 3d models are not restricted to this size. Teams participating in FSOnline can provide their 3d vehicle models to be used during competition. -If you want the 3d model to be public, you can create a pr to this repo. +If you want the 3d model to be public, you can create a pull request to this repository. If you want it to be kept private, [send an email to FSOnline](sijmen.huizenga@formulastudentonline.com) with the uasset files required for your car to drive. ## Competition deployment From 6a2e70de4299dfbc70cfdeeb92a027319b12c5f3 Mon Sep 17 00:00:00 2001 From: Sijmen Date: Tue, 28 Jul 2020 00:54:56 +0200 Subject: [PATCH 3/6] Update docs/import-car-3d-model.md Co-authored-by: Marek Szeles --- docs/import-car-3d-model.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/import-car-3d-model.md b/docs/import-car-3d-model.md index 4c3b9712..9675620a 100644 --- a/docs/import-car-3d-model.md +++ b/docs/import-car-3d-model.md @@ -124,7 +124,7 @@ It should (tm) work. # 8. Sharing your vehicle with the world! -Wouldn't it be amazing if other people could enjoy your vehicle 3d model as well? +Wouldn't it be amazing if other people could enjoy your team's vehicle 3d model as well? You are welcome to create a pull request with your vehicle and it might be added to the reop! Contribution will be given in the readme of the project. -Please not that only GPLv2 licensed material is accepted into this repository. \ No newline at end of file +Please not that only GPLv2 licensed material is accepted into this repository. From c1af86f04380f3fa9857202409b3e8dfd5dfc44c Mon Sep 17 00:00:00 2001 From: Sijmen Date: Tue, 28 Jul 2020 00:55:12 +0200 Subject: [PATCH 4/6] Update docs/import-car-3d-model.md Co-authored-by: Marek Szeles --- docs/import-car-3d-model.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/import-car-3d-model.md b/docs/import-car-3d-model.md index 9675620a..d29d426f 100644 --- a/docs/import-car-3d-model.md +++ b/docs/import-car-3d-model.md @@ -126,5 +126,5 @@ It should (tm) work. Wouldn't it be amazing if other people could enjoy your team's vehicle 3d model as well? You are welcome to create a pull request with your vehicle and it might be added to the reop! -Contribution will be given in the readme of the project. +Submit the new model as a pull request which is up to date with the current project state, with the vehicle model and pawn files added. Contribution will be given in the readme of the project. Please not that only GPLv2 licensed material is accepted into this repository. From a1da0f51e39d2aa1b4a5f0a4bf0d971b1e5ad59c Mon Sep 17 00:00:00 2001 From: Sijmen Date: Tue, 28 Jul 2020 00:55:25 +0200 Subject: [PATCH 5/6] Update docs/import-car-3d-model.md Co-authored-by: Marek Szeles --- docs/import-car-3d-model.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/import-car-3d-model.md b/docs/import-car-3d-model.md index d29d426f..fbcb3dbc 100644 --- a/docs/import-car-3d-model.md +++ b/docs/import-car-3d-model.md @@ -125,6 +125,6 @@ It should (tm) work. # 8. Sharing your vehicle with the world! Wouldn't it be amazing if other people could enjoy your team's vehicle 3d model as well? -You are welcome to create a pull request with your vehicle and it might be added to the reop! +You are welcome to create a pull request with your vehicle and it might be added to the base project repository! Submit the new model as a pull request which is up to date with the current project state, with the vehicle model and pawn files added. Contribution will be given in the readme of the project. Please not that only GPLv2 licensed material is accepted into this repository. From 0aab2452d12b5ce6162eecded51e4800b3fa83ff Mon Sep 17 00:00:00 2001 From: Sijmen Date: Tue, 28 Jul 2020 00:58:01 +0200 Subject: [PATCH 6/6] Update import-car-3d-model.md --- docs/import-car-3d-model.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/import-car-3d-model.md b/docs/import-car-3d-model.md index fbcb3dbc..75266c5d 100644 --- a/docs/import-car-3d-model.md +++ b/docs/import-car-3d-model.md @@ -127,4 +127,4 @@ It should (tm) work. Wouldn't it be amazing if other people could enjoy your team's vehicle 3d model as well? You are welcome to create a pull request with your vehicle and it might be added to the base project repository! Submit the new model as a pull request which is up to date with the current project state, with the vehicle model and pawn files added. Contribution will be given in the readme of the project. -Please not that only GPLv2 licensed material is accepted into this repository. +Please note that only GPLv2 licensed material is accepted into this repository.