diff --git a/CMakeLists.txt b/CMakeLists.txt index ceb0126b..22e053ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,7 @@ set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-mapper") set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}") -set(CPACK_DEBIAN_PROJECT_HOMEPAGE "https://sat-mtl.gitlab.io/documentation/splash") +set(CPACK_DEBIAN_PROJECT_HOMEPAGE "https://splashmapper.gitlab.io") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR} ") diff --git a/Contributing.md b/Contributing.md index b10b0f17..bd8d2b18 100644 --- a/Contributing.md +++ b/Contributing.md @@ -16,16 +16,16 @@ By participating in this project, you agree to abide by the Splash [Code of Cond ## Important Resources * [README](index.md) -* [Issue tracker](https://gitlab.com/sat-mtl/tools/splash/splash/-/issues) +* [Issue tracker](https://gitlab.com/splashmapper/splash/-/issues) ## Contributing Contributing to Splash is achieved through Gitlab's Merge Request (MR) system. This include contribution by the core team. We also welcome external contributions through the contribution process described here. -Please send your merge request to [Splash repository](https://gitlab.com/sat-mtl/tools/splash/splash/-/merge_requests). Merge requests must refer to a gitlab issue in the [Splash issues list](https://gitlab.com/sat-mtl/tools/splash/splash/-/issues). If your merge request does not refer to a gitlab issue, you may be asked to fill an issue before a decision is made. For more technical details regarding MRs, see the section about the [Merge Request Process](#merge-request-process). +Please send your merge request to [Splash repository](https://gitlab.com/splashmapper/splash/-/merge_requests). Merge requests must refer to a gitlab issue in the [Splash issues list](https://gitlab.com/splashmapper/splash/-/issues). If your merge request does not refer to a gitlab issue, you may be asked to fill an issue before a decision is made. For more technical details regarding MRs, see the section about the [Merge Request Process](#merge-request-process). -Before you submit your issue, please [search the issue tracker](https://gitlab.com/sat-mtl/tools/splash/splash/-/issues) - maybe your question or issue has already been identified or addressed. +Before you submit your issue, please [search the issue tracker](https://gitlab.com/splashmapper/splash/-/issues) - maybe your question or issue has already been identified or addressed. Splash has several issue types: @@ -34,7 +34,7 @@ Splash has several issue types: - Feature request: ask for a new feature. - Request For Comment: propose a significant change , such as code refactoring, CI deployment, or any change in the repository that impacts the Splash community. See a more detailled description of the [RFC process](./RFC.md). -The preferred way of asking question to us is through opening a default issue on [Splash repository](https://gitlab.com/sat-mtl/tools/splash/splash/~/issues). We'll get back to you as soon as possible! +The preferred way of asking question to us is through opening a default issue on [Splash repository](https://gitlab.com/splashmapper/splash/-/issues). We'll get back to you as soon as possible! **If you find a security vulnerability, do NOT open an issue. Email metalab-dev@sat.qc.ca instead.** @@ -101,7 +101,7 @@ A `coverage` subdirectory will be created, containing the results. You just have Should you have a suggestion for the documentation, you can open an issue and outline the problem or improvement you have - however, creating the fix yourself is much better! -All the documentation for Splash can be found [Splash website](https://sat-mtl.gitlab.io/documentation/splash), and in the [source repository](https://gitlab.com/sat-mtl/documentation/splash). Please refer to this repository to help with improving the documentation. +All the documentation for Splash can be found [Splash website](https://splashmapper.gitlab.io), and in the [source repository](https://gitlab.com/splashmapper/splashmapper.gitlab.io). Please refer to this repository to help with improving the documentation. If you want to help improve the docs and it's a substantial change, create a new issue (or comment on a related existing one) in the documentation repository to let others know what you're working on. Small changes (typos, improvements to phrasing) do not need an issue. @@ -167,7 +167,7 @@ The resulting file can be opened the svg with your browser. As of now, there is ### Fixing an Issue -The list of outstanding feature requests and bugs can be found on the [GitLab issue tracker](https://gitlab.com/sat-mtl/tools/splash/splash/-/issues). Pick an unassigned issue that you think you can accomplish and add a comment that you are attempting to do it. +The list of outstanding feature requests and bugs can be found on the [GitLab issue tracker](https://gitlab.com/splashmapper/splash/-/issues). Pick an unassigned issue that you think you can accomplish and add a comment that you are attempting to do it. ### Debugging @@ -227,7 +227,7 @@ To add an integration test, the steps are: ### Coding style -We use LLVM style for the C++ code, with a few exceptions. See the [clang-format configuration](https://gitlab.com/sat-mtl/tools/splash/splash/tree/master/.clang-format) for more about this. +We use LLVM style for the C++ code, with a few exceptions. See the [clang-format configuration](https://gitlab.com/splashmapper/splash/tree/master/.clang-format) for more about this. It is possible to let git ensure that you are conforming to the standards by using pre-commit hooks and clang-format: ``` @@ -240,7 +240,7 @@ For Python code we follow the [PEP 8 style guide](https://www.python.org/dev/pep ### Branching strategy with git -The [master](https://gitlab.com/sat-mtl/tools/splash/splash/tree/master) branch contains Splash releases. Validated new developments are into the [develop](https://gitlab.com/sat-mtl/tools/splash/splash/tree/develop) branch. +The [master](https://gitlab.com/splashmapper/splash/tree/master) branch contains Splash releases. Validated new developments are into the [develop](https://gitlab.com/splashmapper/splash/tree/develop) branch. Modifications are made into a dedicated branch that needs to be merged into the **develop** branch through a Gitlab merge request. When you modification is ready, you need to prepare your merge request as follow: @@ -262,7 +262,7 @@ Core developers will prepare new releases regularly by creating a *release branc ### CI pipeline -This repository includes a CI pipeline, used to validate that incoming commits do not break the build, and that all unit tests still pass. It will be run automatically when a new commit is pushed to the repository. If the pipeline fails, it is your responsability to checkout the [CI Jobs page](https://gitlab.com/sat-mtl/tools/splash/splash/-/jobs) and figure out how to fix it. A Merge Requests that breaks the pipeline will not be merged by the core developers. +This repository includes a CI pipeline, used to validate that incoming commits do not break the build, and that all unit tests still pass. It will be run automatically when a new commit is pushed to the repository. If the pipeline fails, it is your responsability to checkout the [CI Jobs page](https://gitlab.com/splashmapper/splash/-/jobs) and figure out how to fix it. A Merge Requests that breaks the pipeline will not be merged by the core developers. ## Merge Request Process diff --git a/README.md b/README.md index 89e05cc8..0e435c9a 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Splash, a multi-projector video-mapping software ================================================ [![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](http://perso.crans.org/besson/LICENSE.html) -[![pipeline status](https://gitlab.com/sat-mtl/tools/splash/splash/badges/develop/pipeline.svg)](https://gitlab.com/sat-mtl/tools/splash/splash/commits/develop) -[![coverage report](https://gitlab.com/sat-mtl/tools/splash/splash/badges/develop/coverage.svg)](https://gitlab.com/sat-mtl/tools/splash/splash/commits/develop) +[![pipeline status](https://gitlab.com/splashmapper/splash/badges/develop/pipeline.svg)](https://gitlab.com/splashmapper/splash/commits/develop) +[![coverage report](https://gitlab.com/splashmapper/splash/badges/develop/coverage.svg)](https://gitlab.com/splashmapper/splash/commits/develop) -For a more complete documentation, go visit the [official website](https://sat-mtl.gitlab.io/documentation/splash). +For a more complete documentation, go visit the [official website](https://splashmapper.gitlab.io). ## Table of Contents @@ -41,7 +41,7 @@ This program uses external libraries, some of them being bundled in the source c See [AUTHORS.md](docs/Authors.md) ### Project URL -This project can be found either on [its official website](https://sat-mtl.gitlab.io/documentation/splash), on the [SAT Metalab repository](https://gitlab.com/sat-mtl/tools/splash) or on [Github](https://github.com/paperManu/splash). +This project can be found either on [its official website](https://splashmapper.gitlab.io), on the [Gitlab repository](https://gitlab.com/splashmapper/splash) or on [Github](https://github.com/paperManu/splash). ### Sponsors This project is made possible thanks to the [Society for Arts and Technologies](http://www.sat.qc.ca) (also known as SAT). @@ -88,7 +88,7 @@ Splash can be installed from a pre-built package, or compiled by hand. Newcomers #### Install from packages -To install from the binary packages, please refer to [Splash documentation](https://sat-mtl.gitlab.io/documentation/splash). +To install from the binary packages, please refer to [Splash documentation](https://splashmapper.gitlab.io). #### Build from sources @@ -127,7 +127,7 @@ pacman -Sy git cmake make gcc yasm pkgconfig libxi libxinerama libxrandr libxcur Once everything is installed, you can go on with building Splash. To build and link it against the bundled libraries: ```bash -git clone https://gitlab.com/sat-mtl/tools/splash/splash +git clone https://gitlab.com/splashmapper/splash cd splash ./make_deps.sh mkdir -p build && cd build @@ -138,7 +138,7 @@ make -j$(nproc) && sudo make install Otherwise, to build Splash and link it against the system libraries: ```bash -git clone https://gitlab.com/sat-mtl/tools/splash/splash +git clone https://gitlab.com/splashmapper/splash cd splash mkdir -p build && cd build cmake -DUSE_SYSTEM_LIBS=ON .. @@ -169,7 +169,7 @@ Then log out and log back in. If you want to specify some defaults values for the objects, you can set the environment variable SPLASH_DEFAULTS with the path to a file defining default values for given types. An example of such a file can be found in [data/config/splashrc](data/config/splashrc) -And that's it, you can move on to the [First steps](https://sat-mtl.gitlab.io/documentation/splash/en/tutorials/first_steps.html) page. +And that's it, you can move on to the [First steps](https://splashmapper.gitlab.io/en/tutorials/first_steps.html) page. #### Uninstall Splash (when built from sources) @@ -188,4 +188,4 @@ Contributions are welcome ! See [CONTRIBUTING.md](Contributing.md) and [CODE_OF_ ## Going forward -To learn how to configure and use Splash, the best resource is [its official website](https://sat-mtl.gitlab.io/documentation/splash). +To learn how to configure and use Splash, the best resource is [its official website](https://splashmapper.gitlab.io). diff --git a/addons/blender/splash/__init__.py b/addons/blender/splash/__init__.py index 40141e63..6541d27a 100644 --- a/addons/blender/splash/__init__.py +++ b/addons/blender/splash/__init__.py @@ -24,7 +24,7 @@ bl_info = { "blender": (2, 80, 0), "location": "3D View > Toolbox, File > Export", "description": "Utility tools to connect Blender to the Splash videomapper", - "wiki_url": "https://sat-mtl.gitlab.io/documentation/splash", + "wiki_url": "https://splashmapper.gitlab.io", "category": "Object", } diff --git a/data/share/metainfo/com.gitlab.sat_metalab.Splash.metainfo.xml b/data/share/metainfo/com.gitlab.sat_metalab.Splash.metainfo.xml index 1d676f97..34d62874 100644 --- a/data/share/metainfo/com.gitlab.sat_metalab.Splash.metainfo.xml +++ b/data/share/metainfo/com.gitlab.sat_metalab.Splash.metainfo.xml @@ -11,10 +11,10 @@ Splash is a free (as in GPL) modular mapping software. Provided that the user creates a 3D model with UV mapping of the projection surface, Splash will take care of calibrating the videoprojectors (intrinsic and extrinsic parameters, blending and color), and feed them with the input video sources. Splash can handle multiple inputs, mapped on multiple 3D models, and has been tested with up to eight outputs on two graphic cards. It currently runs on a single computer but support for multiple computers is planned.

- https://sat-mtl.gitlab.io/documentation/splash + https://splashmapper.gitlab.io - https://sat-mtl.gitlab.io/documentation/splash/en/_images/splash_multiview_gui.jpg + https://splashmapper.gitlab.io/en/_images/splash_multiview_gui.jpg Splash user interface showing a fulldome project diff --git a/docs/Home.md b/docs/Home.md index 596d081c..21b25832 100644 --- a/docs/Home.md +++ b/docs/Home.md @@ -1,8 +1,8 @@ ![Icon](./images/icon.png) [![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](http://perso.crans.org/besson/LICENSE.html) -[![pipeline status](https://gitlab.com/sat-mtl/tools/splash/splash/badges/master/pipeline.svg)](https://gitlab.com/sat-mtl/tools/splash/splash/commits/develop) -[![coverage report](https://gitlab.com/sat-mtl/tools/splash/splash/badges/develop/coverage.svg)](https://gitlab.com/sat-mtl/tools/splash/splash/commits/develop) +[![pipeline status](https://gitlab.com/splashmapper/splash/badges/master/pipeline.svg)](https://gitlab.com/splashmapper/splash/commits/develop) +[![coverage report](https://gitlab.com/splashmapper/splash/badges/develop/coverage.svg)](https://gitlab.com/splashmapper/splash/commits/develop) ## Introduction @@ -25,10 +25,10 @@ Splash can read videos from various sources amoung which video files (most commo - experimental automatic colorimetric calibration (with a gPhoto compatible camera) ## Community -Don't hesitate to report any issues with the [Gitlab issue tracker](https://gitlab.com/sat-mtl/tools/splash/splash/issues), and share your thoughts and success on IRC, [channel ##splash on Freenode](http://webchat.freenode.net/?randomnick=1&channels=%23%23splash&uio=d4)! +Don't hesitate to report any issues with the [Gitlab issue tracker](https://gitlab.com/splashmapper/splash/issues), and share your thoughts and success on IRC, [channel ##splash on Freenode](http://webchat.freenode.net/?randomnick=1&channels=%23%23splash&uio=d4)! ## Projet URL -This project can be found either on [its official website](https://sat-mtl.gitlab.io/documentation/splash), on the [SAT Metalab repository](https://gitlab.com/sat-mtl/tools/splash/splash) or on [Github](https://github.com/paperManu/splash). +This project can be found either on [its official website](https://splashmappercumentation/splash), on the [Gitlab repository](https://gitlab.com/splashmapper/splash) or on [Github](https://github.com/paperManu/splash). ### Licenses This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/docs/RFC.md b/docs/RFC.md index f30ff79c..d0db2cbd 100644 --- a/docs/RFC.md +++ b/docs/RFC.md @@ -53,7 +53,7 @@ Subject: RFC: Deprecate BadFeature A new RFC (request for comment) has been opened here: -https://gitlab.com/sat-mtl/tools/splash/splash/-/issues/333 +https://gitlab.com/splashmapper/splash/-/issues/333 Please visit the above link for discussion. @@ -90,7 +90,7 @@ Subject: RFC Final Comment Period: Deprecate BadFeature An RFC has now entered Final Comment Period. In 14 days, discussion will end and the proposal will either be accepted, rejected or withdrawn: -https://gitlab.com/sat-mtl/tools/splash/splash/-/issues/333 +https://gitlab.com/splashmapper/splash/-/issues/333 Please visit the above link for discussion. diff --git a/external/datapath/README.md b/external/datapath/README.md index 1ae01f69..a8df2d86 100644 --- a/external/datapath/README.md +++ b/external/datapath/README.md @@ -10,7 +10,7 @@ To justify a bit more that it is OK to include these headers into Splash reposit ``` Hello, -We have been developing for a few years now an open source projection-mapping software for Linux, which supports (among other video input) Datapath capture cards. For reference, here is its website: https://sat-mtl.gitlab.io/documentation/splash/. +We have been developing for a few years now an open source projection-mapping software for Linux, which supports (among other video input) Datapath capture cards. For reference, here is its website: https://splashmapper.gitlab.io. We use the Datapath SDK, and for now support is only activated whenever the user compiles the software him/herself. We would like to include it be default in the various pre-built packages (namely for Flatpak, and as a Ubuntu package), but for this we must include part of your SDK with the package sources. diff --git a/src/controller/controller_gui.cpp b/src/controller/controller_gui.cpp index d2a63f41..04606893 100644 --- a/src/controller/controller_gui.cpp +++ b/src/controller/controller_gui.cpp @@ -752,8 +752,7 @@ void Gui::renderSplashScreen() ImGui::Text("Splash, a modular video-mapping engine"); ImGui::Text("Version %s", PACKAGE_VERSION); ImGui::Spacing(); - ImGui::Text("Developed at the Société des Arts Technologiques"); - ImGui::Text("https://sat-mtl.gitlab.io/documentation/splash"); + ImGui::Text("https://splashmapper.gitlab.io"); ImGui::Columns(1); auto& io = ImGui::GetIO(); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d30a9496..996ef8e0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -65,7 +65,7 @@ link_directories(${Python3_LIBRARY_DIRS}) # Custom target to download the splash-assets repository # add_custom_command(OUTPUT clone_splash_assets - COMMAND if [ ! -d ${CMAKE_CURRENT_SOURCE_DIR}/integration_tests/assets ]; then $(git clone https://gitlab.com/sat-mtl/tools/splash/splash-assets ${CMAKE_CURRENT_SOURCE_DIR}/integration_tests/assets); fi + COMMAND if [ ! -d ${CMAKE_CURRENT_SOURCE_DIR}/integration_tests/assets ]; then $(git clone https://gitlab.com/splashmapper/assets ${CMAKE_CURRENT_SOURCE_DIR}/integration_tests/assets); fi COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/integration_tests/assets && git pull origin master ) add_custom_target(download_splash_assets DEPENDS clone_splash_assets) diff --git a/tools/docker/build_package.sh b/tools/docker/build_package.sh index 27123fa5..737bd8d6 100755 --- a/tools/docker/build_package.sh +++ b/tools/docker/build_package.sh @@ -13,7 +13,7 @@ fi echo "Checking out branch $git_branch" -git clone https://gitlab.com/sat-mtl/tools/splash/splash.git +git clone https://gitlab.com/splashmapper/splash.git cd splash git checkout $git_branch git submodule update --init diff --git a/tools/package_ubuntu.py b/tools/package_ubuntu.py index e1bca8a9..1a6f0702 100755 --- a/tools/package_ubuntu.py +++ b/tools/package_ubuntu.py @@ -27,7 +27,7 @@ packaging_root_path = os.path.join(os.path.expanduser("~"), "src", "releases") version_file = "CMakeLists.txt" version_pattern = "\s+VERSION (\d+).(\d+).(\d+)" -git_path = "git@gitlab.com:sat-mtl/tools/splash" +git_path = "git@gitlab.com:splashmapper/splash" repo = "splash" package_name = "splash-mapper" remote_repo = "origin" diff --git a/tools/release_version.py b/tools/release_version.py index 496509bb..c428477c 100755 --- a/tools/release_version.py +++ b/tools/release_version.py @@ -27,8 +27,8 @@ desktop_file = os.path.join("data", "share", "applications", "splash.desktop") blender_addon_init_file = os.path.join("addons", "blender", "splash", "__init__.py") version_pattern = "\s+VERSION (\d+).(\d+).(\d+)" -git_path = "git@gitlab.com:sat-mtl/tools/splash" -git_project = "Splash" +git_path = "git@gitlab.com:splashmapper" +git_project = "splash" remote_repo = 'origin' bringup_branch = "master" working_branch = "develop"