Skip to content

Commit

Permalink
ThirdParty library consistency.
Browse files Browse the repository at this point in the history
Make the files match their upstream form as closely as possible.  We should not be aggressively rewriting and reformatting our third-party libraries to match our own coding standards, because it makes it much harder to diff against the original when trying to upgrade.

Also adjust the licensing comments to:
* be correctly preserved in minified output by both r.js (UglifyJS) and Dojo (Closure Compiler)
* clearly indicate the names and URLs of the components each license applies to.
  • Loading branch information
shunter committed Jan 3, 2013
1 parent a39f082 commit add6d9e
Show file tree
Hide file tree
Showing 15 changed files with 1,244 additions and 1,230 deletions.
2 changes: 1 addition & 1 deletion .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="Source/ThirdParty/when.js|Source/Workers/cesiumWorkerBootstrapper.js|ThirdParty/" kind="src" path=""/>
<classpathentry excluding="Source/ThirdParty/Tween.js|Source/ThirdParty/Uri.js|Source/ThirdParty/sprintf.js|Source/ThirdParty/when.js|Source/Workers/cesiumWorkerBootstrapper.js|ThirdParty/" kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary/StandardBrowser/html5"/>
<classpathentry kind="output" path=""/>
Expand Down
2 changes: 1 addition & 1 deletion .settings/com.eclipsesource.jshint.ui.prefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
excluded=Apps/Sandcastle/Cesium-hint.js\:Source/ThirdParty/Chain.js\:Source/ThirdParty/Tween.js\:Source/ThirdParty/when.js\:Source/Workers/cesiumWorkerBootstrapper.js\:ThirdParty//*
excluded=Apps/Sandcastle/Cesium-hint.js\:Source/ThirdParty/Chain.js\:Source/ThirdParty/Tween.js\:Source/ThirdParty/Uri.js\:Source/ThirdParty/sprintf.js\:Source/ThirdParty/when.js\:Source/Workers/cesiumWorkerBootstrapper.js\:ThirdParty//*
included=//*.js
options=bitwise \: false,\r\ncamelcase \: false,\r\ncurly \: true,\r\neqeqeq \: true,\r\nforin \: true,\r\nimmed \: false,\r\nlatedef \: true,\r\nnewcap \: true,\r\nnoarg \: true,\r\nnoempty \: false,\r\nnonew \: true,\r\nplusplus \: false,\r\nquotmark \: false,\r\nregexp \: false,\r\nundef \: true,\r\nunused \: false,\r\nstrict \: true,\r\ntrailing \: true,\r\nasi \: false,\r\nboss \: false,\r\ndebug \: false,\r\neqnull \: false,\r\nes5 \: false,\r\nesnext \: false,\r\nevil \: false,\r\nexpr \: false,\r\nfuncscope \: false,\r\nglobalstrict \: false,\r\niterator \: false,\r\nlastsemic \: false,\r\nlaxbreak \: false,\r\nlaxcomma \: false,\r\nloopfunc \: false,\r\nmultistr \: false,\r\nonecase \: false,\r\nproto \: false,\r\nregexdash \: false,\r\nscripturl \: false,\r\nsmarttabs \: false,\r\nshadow \: false,\r\nsub \: false,\r\nsupernew \: false,\r\nvalidthis \: false,\r\nbrowser \: true
projectSpecificOptions=true
3 changes: 2 additions & 1 deletion Apps/CesiumViewer/CesiumViewer.profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ var profile = {
'dojo/dojo' : {
include : ['dojo/dojo', 'CesiumViewer/CesiumViewer', 'CesiumViewer/boot'],
boot : true,
customBase : true
customBase : true,
copyright : 'Source/copyrightHeader.js'
}
},

Expand Down
44 changes: 1 addition & 43 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ http://hg.grauw.nl/grauw-lib
>
> Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
### when
### when.js

https://github.com/cujojs/when

Expand Down Expand Up @@ -128,48 +128,6 @@ https://github.com/Pomax/fontmetrics.js
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
### Microsoft

http://msdn.microsoft.com/en-us/library/bb259689.aspx

http://msdn.microsoft.com/en-us/cc300389.aspx#O

> Copyright (c) 2006-2009 Microsoft Corporation. All rights reserved.
>
> MICROSOFT LIMITED PUBLIC LICENSE
>
> This license governs use of code marked as "sample" or "example" available on this web site without a license agreement, as provided under the section above titled "NOTICE SPECIFIC TO SOFTWARE AVAILABLE ON THIS WEB SITE." If you use such code (the "software"), you accept this license. If you do not accept the license, do not use the software.
>
> 1. Definitions
>
> The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
>
> A "contribution" is the original software, or any additions or changes to the software.
>
> A "contributor" is any person that distributes its contribution under this license.
>
> "Licensed patents" are a contributor's patent claims that read directly on its contribution.
>
> 2. Grant of Rights
>
> (A) Copyright Grant - Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
>
> (B) Patent Grant - Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
>
> 3. Conditions and Limitations
>
> (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
>
> (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
>
> (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
>
> (D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
>
> (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
>
> (F) Platform Limitation - The licenses granted in sections 2(A) and 2(B) extend only to the software or derivative works that you create that run on a Microsoft Windows operating system product.
### almond

https://github.com/jrburke/almond
Expand Down
6 changes: 4 additions & 2 deletions Source/Shaders/Noise.glsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#ifndef czm_NOISE
#define czm_NOISE 1

/*!
/**
* @license
* Description : Array and textureless GLSL 2D/3D/4D simplex
* noise functions.
* Author : Ian McEwan, Ashima Arts.
Expand Down Expand Up @@ -285,7 +286,8 @@ float czm_snoise(vec4 v)

///////////////////////////////////////////////////////////////////////////////

/*!
/**
* @license
* Cellular noise ("Worley noise") in 2D in GLSL.
* Copyright (c) Stefan Gustavson 2011-04-19. All rights reserved.
* This code is released under the conditions of the MIT license.
Expand Down
3 changes: 2 additions & 1 deletion Source/Shaders/SkyAtmosphereFS.glsl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*!
/**
* @license
* Copyright (c) 2000-2005, Sean O'Neil ([email protected])
* All rights reserved.
*
Expand Down
3 changes: 2 additions & 1 deletion Source/Shaders/SkyAtmosphereVS.glsl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*!
/**
* @license
* Copyright (c) 2000-2005, Sean O'Neil ([email protected])
* All rights reserved.
*
Expand Down
27 changes: 27 additions & 0 deletions Source/ThirdParty/Tween.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
/**
@license
tween.js - https://github.com/sole/tween.js
Copyright (c) 2010-2012 Tween.js authors.
Easing equations Copyright (c) 2001 Robert Penner http://robertpenner.com/easing/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

/**
* @author sole / http://soledadpenades.com
* @author mrdoob / http://mrdoob.com
Expand Down
Loading

0 comments on commit add6d9e

Please sign in to comment.