Merge branch 'master' of https://github.com/appleseedhq/appleseed-maya

CMakeLists.txt

@@ -1,11 +1,11 @@
 
 #
 # This source file is part of appleseed.
-# Visit http://appleseedhq.net/ for additional information and resources.
+# Visit https://appleseedhq.net/ for additional information and resources.
 #
 # This software is released under the MIT license.
 #
-# Copyright (c) 2016-2017 Esteban Tovagliari, The appleseedhq Organization
+# Copyright (c) 2016-2018 Esteban Tovagliari, The appleseedhq Organization
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -67,8 +67,8 @@ set (CMAKE_MODULE_PATH
 #--------------------------------------------------------------------------------------------------
 
 set (appleseed_maya_version_major       1)
-set (appleseed_maya_version_minor       0)
-set (appleseed_maya_version_patch       1)
+set (appleseed_maya_version_minor       1)
+set (appleseed_maya_version_patch       0)
 set (appleseed_maya_version_maturity    beta)
 
 

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 The appleseedhq Organization
+Copyright (c) 2016-2018 The appleseedhq Organization
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindImath.cmake

@@ -1,11 +1,11 @@
 
 #
 # This source file is part of appleseed.
-# Visit http://appleseedhq.net/ for additional information and resources.
+# Visit https://appleseedhq.net/ for additional information and resources.
 #
 # This software is released under the MIT license.
 #
-# Copyright (c) 2013-2017 Esteban Tovagliari, The appleseedhq Organization
+# Copyright (c) 2013-2018 Esteban Tovagliari, The appleseedhq Organization
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindOSL.cmake

@@ -1,11 +1,11 @@
 
 #
 # This source file is part of appleseed.
-# Visit http://appleseedhq.net/ for additional information and resources.
+# Visit https://appleseedhq.net/ for additional information and resources.
 #
 # This software is released under the MIT license.
 #
-# Copyright (c) 2013-2017 Esteban Tovagliari, The appleseedhq Organization
+# Copyright (c) 2013-2018 Esteban Tovagliari, The appleseedhq Organization
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindOpenImageIO.cmake

@@ -1,11 +1,11 @@
 
 #
 # This source file is part of appleseed.
-# Visit http://appleseedhq.net/ for additional information and resources.
+# Visit https://appleseedhq.net/ for additional information and resources.
 #
 # This software is released under the MIT license.
 #
-# Copyright (c) 2013-2017 Esteban Tovagliari, The appleseedhq Organization
+# Copyright (c) 2013-2018 Esteban Tovagliari, The appleseedhq Organization
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindXGen.cmake

@@ -1,12 +1,11 @@
 
 #
 # This source file is part of appleseed.
-# Visit http://appleseedhq.net/ for additional information and resources.
+# Visit https://appleseedhq.net/ for additional information and resources.
 #
 # This software is released under the MIT license.
 #
-# Copyright (c) 2016 Esteban Tovagliari, The appleseedhq Organization
-# Copyright (c) 2016 Luis Barrancos, The appleseedhq Organization
+# Copyright (c) 2016-2018 Esteban Tovagliari, The appleseedhq Organization
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

deploy/appleseed-maya.package.py

@@ -2,11 +2,11 @@
 
 #
 # This source file is part of appleseed.
-# Visit http://appleseedhq.net/ for additional information and resources.
+# Visit https://appleseedhq.net/ for additional information and resources.
 #
 # This software is released under the MIT license.
 #
-# Copyright (c) 2017 Esteban Tovagliari, The appleseedhq Organization
+# Copyright (c) 2017-2018 Esteban Tovagliari, The appleseedhq Organization
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

docs/source/_images/icons/asBump.png

@@ -0,0 +1 @@
+../../../../icons/asBump.png

docs/source/bibtex/references.bib

@@ -636,3 +636,56 @@ @misc{mansencal_thomas_2017_821825
     url = {https://doi.org/10.5281/zenodo.821825}
 }
 
+@article{Blinn:1978:SWS:965139.507101,
+    author = {Blinn, James F.},
+    title = {Simulation of Wrinkled Surfaces},
+    journal = {SIGGRAPH Comput. Graph.},
+    issue_date = {August 1978},
+    volume = {12},
+    number = {3},
+    month = aug,
+    year = {1978},
+    issn = {0097-8930},
+    pages = {286--292},
+    numpages = {7},
+    url = {http://doi.acm.org/10.1145/965139.507101},
+    doi = {10.1145/965139.507101},
+    acmid = {507101},
+    publisher = {ACM},
+    address = {New York, NY, USA},
+}
+
+@inproceedings{Cohen:1998:AS:280814.280832,
+    author = {Cohen, Jonathan and Olano, Marc and Manocha, Dinesh},
+    title = {Appearance-preserving Simplification},
+    booktitle = {Proceedings of the 25th Annual Conference on Computer Graphics and Interactive Techniques},
+    series = {SIGGRAPH '98},
+    year = {1998},
+    isbn = {0-89791-999-8},
+    pages = {115--122},
+    numpages = {8},
+    url = {http://doi.acm.org/10.1145/280814.280832},
+    doi = {10.1145/280814.280832},
+    acmid = {280832},
+    publisher = {ACM},
+    address = {New York, NY, USA},
+    keywords = {attributes, color, maps, normal, parameterization, simplification, texture},
+}
+
+@inproceedings{Cignoni:1998:GMP:288216.288224,
+    author = {Cignoni, P. and Montani, C. and Scopigno, R. and Rocchini, C.},
+    title = {A General Method for Preserving Attribute Values on Simplified Meshes},
+    booktitle = {Proceedings of the Conference on Visualization '98},
+    series = {VIS '98},
+    year = {1998},
+    isbn = {1-58113-106-2},
+    location = {Research Triangle Park, North Carolina, USA},
+    pages = {59--66},
+    numpages = {8},
+    url = {http://dl.acm.org/citation.cfm?id=288216.288224},
+    acmid = {288224},
+    publisher = {IEEE Computer Society Press},
+    address = {Los Alamitos, CA, USA},
+    keywords = {detail preservation, surface simplication, texture mapping},
+}
+

docs/source/conf.py

@@ -23,7 +23,7 @@
 from sphinx.util import compat
 compat.make_admonition = BaseAdmonition
 
-needs_sphinx = '1.6.7'
+needs_sphinx = '1.6.6'
 
 # For automagical GIT versioning (describe, tags)
 #
@@ -168,7 +168,7 @@ def get_version():
         ("Installation", "installation/installation"),
         ("Reference", "shaders/shaders"),
         ("Tutorials", "tutorials/tutorials"),
-        ("appleseedhq", "http://appleseedhq.net", True),
+        ("appleseedhq", "https://appleseedhq.net", True),
         ("vimeo", "https://vimeo.com/appleseedhq", True)
     ],
 
@@ -406,7 +406,7 @@ def setup(app):
 
 # The scheme of the identifier. Typical schemes are ISBN or URL.
 
-epub_scheme = 'http://appleseedhq.net'
+epub_scheme = 'https://appleseedhq.net'
 
 # The unique identifier of the text. This can be a ISBN number
 # or the project homepage.
@@ -465,5 +465,5 @@ def setup(app):
 epub_writing_mode = 'horizontal'
 
 # Example configuration for intersphinx: refer to the Python standard library.
-# intersphinx_mapping = {'http://appleseedhq.net/docs.html': None}
+# intersphinx_mapping = {'https://appleseedhq.net/docs.html': None}
 

docs/source/shaders/material/as_standard_surface.rst

@@ -51,6 +51,17 @@ Subsurface Parameters
     Overall scaling factor for the MFP color, which is expected in [0,1] range.
     Values above 1.0 are possible, resulting in increased translucency appearance.
 
+Advanced
+~~~~~~~~
+
+*Subsurface Profile*
+    The diffusion profiles to use in the BSSDRF [#]_. This parameter can take the following values:
+
+    * Gaussian :cite:`dEon:2007:ERH:2383847.2383869`
+    * Better Dipole
+    * Normalized Diffusion :cite:`Christensen:2015:ARP:2775280.2792555`
+    * Random Walk :cite:`Meng:2016:IDS:3071773.3071778`
+
 -----
 
 Translucency Parameters
@@ -144,8 +155,8 @@ Coating Parameters
 Coating Absorption
 """"""""""""""""""
 
-*Coating Depth*
-    Intensity of coating absorption, with 0 being no absorption, 1 near full absorption.
+*Coating Thickness*
+    Thickness of the coating layer, controlling the intensity of coating absorption, with 0 being no absorption, 1 being full absorption.
 
 *Coating Absorption*
     Absorption color for the coating, white has no effect, black absorbs fully.

docs/source/shaders/shaders.rst

@@ -50,6 +50,7 @@ General Utilities
 
 * :ref:`asAnisotropyVectorField <label_as_anisotropy_vector_field>`
 * :ref:`asAttributes <label_as_attributes>`
+* :ref:`asBump <label_as_bump>`
 * :ref:`asCreateMask <label_as_create_mask>`
 * :ref:`asDoubleShade <label_as_double_shade>`
 * :ref:`asFalloffAngle <label_as_falloff_angle>`

docs/source/shaders/utilities/as_bump.rst

@@ -0,0 +1,110 @@
+.. _label_as_bump:
+
+.. fix_img_align::
+
+|
+ 
+.. image:: /_images/icons/asBump.png
+   :width: 128px
+   :align: left
+   :height: 128px
+   :alt: Bump Icon
+
+asBump
+******
+
+A node that allows the user to apply scalar bump mapping, or normal mapping.
+
+|
+
+Parameters
+----------
+
+.. bogus directive to silence warnings::
+
+-----
+
+.. _label_bump_mode_parameters:
+
+Mode Parameters
+^^^^^^^^^^^^^^^
+
+*Mode*
+    The choice of bump mapping algorithm to use. It can be one of:
+
+        * Bump :cite:`Blinn:1978:SWS:965139.507101`
+        * Normal Map :cite:`Cohen:1998:AS:280814.280832`, :cite:`Cignoni:1998:GMP:288216.288224`
+
+
+.. _label_bump_parameters:
+
+Bump Parameters
+^^^^^^^^^^^^^^^
+
+*Bump Value*
+    A scalar value controlling the magnitude of the bump effect.
+
+*Bump Depth*
+    A scalar value controlling the bump depth of the bump effect. Unlike the *bump value* which expects a value in [0,1] range, the *bump depth* can be a positive or negative value, in which case it will apply the bump effect outwards or inwards respectively.
+
+Normal Map
+^^^^^^^^^^
+
+*Normal Map Weight*
+    A scaling factor that defines the contribution weight of the normal map. With a value of 0.0, no contribution takes place and the regular surface normal is used. A value of 1.0 defines full contribution of the normal map input.
+
+*Normal Map*
+    The input normal map color.
+
+*Map Coordinate System*
+    The coordinate system of the input normal map used [#]_. It can be one of:
+
+        * *Tangent Space*
+        * *Object Space*
+        * *World Space*
+
+Advanced Parameters
+"""""""""""""""""""
+
+*Map Signedness*
+    The signedness of the input normal map. If your map is in [-1,1] range, use *Signed*. If your map is in [0,1] range, used *Unsigned*.
+
+*Flip R*
+    Flip the *red* channel of the input tangent space normal map.
+
+*Flip G*
+    Flip the *green* channel of the input tangent space normal map.
+
+*Swap RG*
+    Swap the *red* and *green* channels of the input tangent space normal map.
+
+.. note:: The channel flipping and swapping options **only** have effect on the tangent space normal maps. They are ignored when the *Map Coordinate System* is *Object Space* or *World Space*.
+
+Surface Parameters
+^^^^^^^^^^^^^^^^^^
+
+*Surface Normal*
+    The base surface normal to use. It can be the result of a previous bump node, or the global variable *N* from the :ref:`asAttributes node <label_as_attributes>`. 
+    If not set, it defaults to the (world space) surface normal N.
+
+-----
+
+Outputs
+-------
+
+*Result*
+    The unit length world space bumped normal.
+
+-----
+
+.. rubric:: Footnotes
+
+.. [#] Usually one uses *tangent space* normal maps, but the option is provided here to use *object* and *world* space normal maps, which sometimes can be exported from other applications.  
+
+-----
+
+.. rubric:: References
+
+.. bibliography:: /bibtex/references.bib
+    :filter: docname in docnames
+

docs/source/shaders/utilities/as_globals.rst

@@ -71,6 +71,9 @@ Outputs
 *V Coordinate*
     Texture coordinate *v*.
 
+*UV Coordinates*
+    A float array containing both the *u* and *v* coordinates, sometimes required for some applications that expect this specific data type.
+
 *dN/du*
     The global variable *dNdu* is a appleseed specific global variable, and denotes the change of *N* in regard to *u*.