diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2017-12-07 10:51:38 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-07 14:07:35 +0000 |
| commit | 8a71e623b1ddfeed455d89be1f188996836053a3 (patch) | |
| tree | eb9ed1780d7ae1e00e574995536cd76c127832db /res/effectlib/gradientGetPosition.glsllib | |
| parent | 71b625cdebae8f15a7e3a9c861a2628099254bb7 (diff) | |
Sync effectlib changes from Qt 3D Studio
There were not too many differences, but some notable ones are:
Copyright headers are back.
UIC -> QT3DS renames
Removal of (f) from float literals (which was not valid GLSL)
Task-number: QT3DS-367
Change-Id: Ieb21f0e5a46c9513f166d8fe3944af3271770acd
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'res/effectlib/gradientGetPosition.glsllib')
| -rw-r--r-- | res/effectlib/gradientGetPosition.glsllib | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/res/effectlib/gradientGetPosition.glsllib b/res/effectlib/gradientGetPosition.glsllib index 569b4d7..26b687d 100644 --- a/res/effectlib/gradientGetPosition.glsllib +++ b/res/effectlib/gradientGetPosition.glsllib @@ -1,3 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2014 NVIDIA Corporation. +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt 3D Studio. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + // calculate the length of the hypotenuse of a right-angle triangle float hypot( in float x, in float y ) { |