merge(dev): release 18.1.0

.gitlab-ci.yml

@@ -42,7 +42,7 @@ doxygen:
   image: python:3
   stage: build
   script:
-    - pip install sphinx sphinx_rtd_theme
+    - pip install sphinx sphinx_rtd_theme sphinx-tabs
     - apt-get update && apt-get install -yqq make
     - make html
   artifacts:

.gitlab/issue_templates/Bug.md

@@ -33,4 +33,4 @@ logs, and code as it's very hard to read otherwise.)
 
 (If you can, link to the line of code that might be responsible for the problem)
 
-/label ~Type:bugfix
+/label ~"Type:bugfix"

.gitlab/issue_templates/Feature.md

@@ -16,4 +16,4 @@
 
 During implementation, this can then be copied and used as a starter for the documentation.)
 
-/label ~Type:feature
+/label ~"Type:feature"

.gitlab/issue_templates/Research.md

+# Goal and general information
+
+_Brief description of the goal of this algorithm research task._
+
+# Specification
+
+_Specifications include functional, performance, language and data. The algorithms should focus on solving a specific problem with well-defined interfaces._
+
+# Background
+
+_Background check to see what algorithms exist for solving the problem. Do they meet our needs? Have better new algorithms been published?_
+
+# Data
+
+_Collection of data required for testing (or training in the case of learning-based algorithms). Formatting of data so that it can be inputted to the algorithm._
+
+# Evaluation
+
+_Evaluation framework is used to test the algorithm for correctness and meeting performance specification._
+
+# Baseline
+
+_Existing algorithm selection, implementation and evaluation._
+
+# Prototyping
+
+_The main algorithm research cycle: evaluate performance, make improvements, repeat._
+
+# Integration
+
+_Integration of algorithm code into production system._
+
+# Communication
+
+_Communicate how the algorithm works (internal and/or article publication)._
+
+/label ~"Type:research"

COPYING.LESSER

+                 GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+

CodingStyle/index.rst

@@ -11,4 +11,5 @@ Coding style
    src/04-documentation
    src/05-xml-style
    src/06-cmake-style
-   src/07-license
+   src/07-glsl-style
+   src/08-license

CodingStyle/src/07-glsl-style.rst

+Glsl coding
+============
+
+Source and files
+-----------------
+
+.. rule :: Files extensions
+
+    Implementation files use the extension ``.glsl``.
+
+.. rule :: version
+
+    Always specify the GL target version, we only allow versions up to 410 for maximum portability.
+
+.. rule:: Document the code
+
+    The code must be documented, especially the mathematical parts of the code.
+
+Naming conventions
+------------------
+
+.. rule :: File
+
+    The file's name should end with the shader's type, ``_VP`` for vertex programs, ``_TC`` for tessellation control programs, ``_FE`` for tessellation evalutaion programs, ``_GP`` for geometry programs and ``_FP`` for fragment programs, ``_VP`` for vertex programs and ``_GP`` for geometry programs.
+
+.. rule :: Function and method names
+
+    Functions and methods names must be written in camel case.
+
+.. recommendation :: Correct naming of functions
+
+    Try as much as possible to help the users of your code by using comprehensive names.
+
+.. rule :: Variable naming
+
+    #. Variable names must start with their storage qualifier :
+
+        - Uniform variables must begin with ``u_``.
+        - Function parameters must begin with ``_``.
+        - Vertex shader inputs must begin with ``v_in_``.
+        - Vertex shader outputs must begin with ``v_out_``.
+        - Tessellation control shader outputs must begin with ``tc_out_``.
+        - Tessellation evaluation shader outputs must begin with ``te_out_``.
+        - Geometry shader outputs must begin with ``g_out_``.
+        - Fragment shader outputs must begin with ``f_out_``.
+
+    #. The following characters must specify the type of the variable :
+
+        - int         : i
+        - bool        : b
+        - uint        : ui
+        - double      : d
+        - float       : f
+        - sampler2D   : s2
+        - sampler3D   : s3
+        - vec2        : f2
+        - vec3        : f3
+        - vec4        : f4
+        - mat2        : m2
+        - mat3        : m3
+        - mat4        : m4
+        - ...
+
+    #. Vectors can end by some information to specify their type if it's possible ;
+
+        - Position    : Pos
+        - Origin      : Ori
+        - Direction   : Dir
+        - Color       : Col
+        - Length      : Len
+        - Size        : Size
+
+    #. Vectors representing geometrical and matrices transform. You should specify, if possible, their coordinate system. We define the following notation for the most commonly used spaces: (You may read this `documentation <https://www.khronos.org/opengl/wiki/Vertex_Post-Processing#Perspective_divide>`_ if you don't know them) :
+
+        - Texture space             : Ts
+        - Model space               : Ms
+        - World space               : Ws
+        - View space                : Vs
+        - Clip space                : Cs
+        - Normalized device space   : Ns
+        - Window space              : Ss
+
+        For vectors, the coordinate system should be appended to the name. In the case of transform matrices, we need to define both, the destination and source spaces, these should be separated by an underscore with the source being last.
+
+        e.g. m4Ss_Ms defines a matrix transforming model vertices to window space points (often known as the model-view-projection matrix)
+
+    #. If the variable is normalized, the last character must be ``N``.
+
+    .. code-block :: glsl
+
+        uniform float u_fClippingNearLen;
+        uniform float u_fClippingFarLen;
+
+        /// Converts a position in OpenGL's normalized device coordinates (NDC) to the model space.
+        vec3 ndcToModelSpacePosition(in vec3 _f3FragPos_Ns, in mat4 _m4Ms_Cs)
+        {
+            vec4 f4ClipPos_Cs;
+            f4ClipPos_Cs.w   = (2 * u_fClippingNearLen * u_fClippingFarLen)  / (u_fClippingNearLen + u_fClippingFarLen + _f3FragPos_Ns.z * (u_fClippingNearLen - u_fClippingFarLen));
+            f4ClipPos_Cs.xyz = _f3FragPos_Ns * f4ClipPos_Cs.w;
+
+            return _m4Ms_Cs * f4ClipPos_Cs;
+        }

Installation/index.rst

@@ -4,10 +4,29 @@
 Installation
 ******************************************
 
+
+Installation from source
+------------------------
+
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    src/WindowsInstall
    src/LinuxInstall
    src/MacOSXInstall
 
+Installation With Conan (pre-built dependencies)
+------------------------------------------------
+
+.. toctree::
+   :maxdepth: 1
+
+   src/InstallationWithConan
+
+Miscellaneous installations
+---------------------------
+
+.. toctree::
+   :maxdepth: 1
+
+   src/QtCreatorSetup

Installation/src/CommonSrc.rst

@@ -6,7 +6,8 @@ If you get compilation errors at this step, please ensure you installed all the
 Source
 --------
 
-* `Clone <http://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository>`_ the following repositories in the (Dev/Src) source folder:
+* `Clone <http://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository#Cloning-an-Existing-Repository>`_ the following repository in the (Dev/Src) source folder:
+
     * `sight <https://git.ircad.fr/Sight/sight.git>`_