From 6ab30805bad7b91416e1a6d9eafc473342ef5c9a Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Mon, 31 Jul 2017 13:50:44 -0700 Subject: [PATCH 1/2] Use scene.skyBox instead of copy of default starmap. --- Source/Scene/Scene.js | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index 23a19c81fbec..7ce1b5d96d5d 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -633,22 +633,6 @@ define([ this._brdfLutGenerator = new BrdfLutGenerator(); - this._environmentMap = undefined; - var that = this; - var texturePath = buildModuleUrl('Assets/Textures/SkyBox/'); - var paths = { - positiveX : texturePath + 'tycho2t3_80_px.jpg', - negativeX : texturePath + 'tycho2t3_80_mx.jpg', - positiveY : texturePath + 'tycho2t3_80_py.jpg', - negativeY : texturePath + 'tycho2t3_80_my.jpg', - positiveZ : texturePath + 'tycho2t3_80_pz.jpg', - negativeZ : texturePath + 'tycho2t3_80_mz.jpg' - }; - loadCubeMap(context, paths).then(function(environmentMap) { - that._environmentMap = environmentMap; - environmentMap.sampler = new Sampler(); - }); - this._terrainExaggeration = defaultValue(options.terrainExaggeration, 1.0); this._performanceDisplay = undefined; @@ -1306,7 +1290,7 @@ define([ frameState.commandList.length = 0; frameState.shadowMaps.length = 0; frameState.brdfLutGenerator = scene._brdfLutGenerator; - frameState.environmentMap = scene._environmentMap; + frameState.environmentMap = scene.skyBox && scene.skyBox._cubeMap; frameState.mode = scene._mode; frameState.morphTime = scene.morphTime; frameState.mapProjection = scene.mapProjection; @@ -3356,7 +3340,6 @@ define([ this._transitioner.destroy(); this._debugFrustumPlanes = this._debugFrustumPlanes && this._debugFrustumPlanes.destroy(); this._brdfLutGenerator = this._brdfLutGenerator && this._brdfLutGenerator.destroy(); - this._environmentMap = this._environmentMap && this._environmentMap.destroy(); if (defined(this._globeDepth)) { this._globeDepth.destroy(); From ecd676d936954a3d4331be2c1935ca49b8c324bb Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Mon, 31 Jul 2017 18:24:04 -0700 Subject: [PATCH 2/2] Fix some issues with LICENSE.md --- LICENSE.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a15cd43b593f..61b0e64e78f5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -426,21 +426,21 @@ https://github.com/NVIDIAGameWorks/GraphicsSamples > > License: Subject to the terms of this Agreement, NVIDIA hereby grants to Developer a royalty-free, non-exclusive license to possess and to use the Materials. The following terms apply to the specified type of Material: > -> Source Code: Developer shall have the right to modify and create derivative works with the Source Code. Developer shall own any derivative works ("Derivatives") it creates to the Source Code, provided that Developer uses the Materials in accordance with the terms of this Agreement. Developer may distribute the Derivatives, provided that all NVIDIA copyright notices and trademarks are used properly and the Derivatives include the following statement: "This software contains source code provided by NVIDIA Corporation." +> Source Code: Developer shall have the right to modify and create derivative works with the Source Code. Developer shall own any derivative works ("Derivatives") it creates to the Source Code, provided that Developer uses the Materials in accordance with the terms of this Agreement. Developer may distribute the Derivatives, provided that all NVIDIA copyright notices and trademarks are used properly and the Derivatives include the following statement: "This software contains source code provided by NVIDIA Corporation." > > Object Code: Developer agrees not to disassemble, decompile or reverse engineer the Object Code versions of any of the Materials. Developer acknowledges that certain of the Materials provided in Object Code version may contain third party components that may be subject to restrictions, and expressly agrees not to attempt to modify or distribute such Materials without first receiving consent from NVIDIA. > -> Art Assets: Developer shall have the right to modify and create Derivatives of the Art Assets, but may not distribute any of the Art Assets or Derivatives created therefrom without NVIDIA?s prior written consent. +> Art Assets: Developer shall have the right to modify and create Derivatives of the Art Assets, but may not distribute any of the Art Assets or Derivatives created therefrom without NVIDIA's prior written consent. > -> Government End Users: If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees the Software and documentation were developed at private expense and are provided with ?RESTRICTED RIGHTS?. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time. In the event that this License, or any part thereof, is deemed inconsistent with the minimum rights identified in the Restricted Rights provisions, the minimum rights shall prevail. +> Government End Users: If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees the Software and documentation were developed at private expense and are provided with "RESTRICTED RIGHTS". Use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time. In the event that this License, or any part thereof, is deemed inconsistent with the minimum rights identified in the Restricted Rights provisions, the minimum rights shall prevail. > No Other License. No rights or licenses are granted by NVIDIA under this License, expressly or by implication, with respect to any proprietary information or patent, copyright, trade secret or other intellectual property right owned or controlled by NVIDIA, except as expressly provided in this License. -> Term: This License is effective until terminated. NVIDIA may terminate this Agreement (and with it, all of Developer?s right to the Materials) immediately upon written notice (which may include email) to Developer, with or without cause. +> Term: This License is effective until terminated. NVIDIA may terminate this Agreement (and with it, all of Developer's right to the Materials) immediately upon written notice (which may include email) to Developer, with or without cause. > > Support: NVIDIA has no obligation to support or to continue providing or updating any of the Materials. > > No Warranty: THE SOFTWARE AND ANY OTHER MATERIALS PROVIDED BY NVIDIA TO DEVELOPER HEREUNDER ARE PROVIDED "AS IS." NVIDIA DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. > -> LIMITATION OF LIABILITY: NVIDIA SHALL NOT BE LIABLE TO DEVELOPER, DEVELOPER?S CUSTOMERS, OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER DEVELOPER FOR ANY LOSS OF PROFITS, INCOME, SAVINGS, OR ANY OTHER CONSEQUENTIAL, INCIDENTAL, SPECIAL, PUNITIVE, DIRECT OR INDIRECT DAMAGES (WHETHER IN AN ACTION IN CONTRACT, TORT OR BASED ON A WARRANTY), EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF THE ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. IN NO EVENT SHALL NVIDIA?S AGGREGATE LIABILITY TO DEVELOPER OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER DEVELOPER EXCEED THE AMOUNT OF MONEY ACTUALLY PAID BY DEVELOPER TO NVIDIA FOR THE SOFTWARE OR ANY OTHER MATERIALS. +> LIMITATION OF LIABILITY: NVIDIA SHALL NOT BE LIABLE TO DEVELOPER, DEVELOPER'S CUSTOMERS, OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER DEVELOPER FOR ANY LOSS OF PROFITS, INCOME, SAVINGS, OR ANY OTHER CONSEQUENTIAL, INCIDENTAL, SPECIAL, PUNITIVE, DIRECT OR INDIRECT DAMAGES (WHETHER IN AN ACTION IN CONTRACT, TORT OR BASED ON A WARRANTY), EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF THE ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. IN NO EVENT SHALL NVIDIA'S AGGREGATE LIABILITY TO DEVELOPER OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER DEVELOPER EXCEED THE AMOUNT OF MONEY ACTUALLY PAID BY DEVELOPER TO NVIDIA FOR THE SOFTWARE OR ANY OTHER MATERIALS. ### NoSleep.js @@ -655,21 +655,21 @@ https://github.com/KhronosGroup/glTF-WebGL-PBR > >Copyright (c) 2016-2017 Mohamad Moneimne and Contributors > ->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 +>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 +>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 +>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. Tests @@ -697,7 +697,7 @@ The Cesium documentation files include the following third-party content. ### Source Sans Pro (Font) -Source? Sans Pro, Adobe's first open source typeface family, was designed by Paul D. Hunt. It is a sans serif typeface intended to work well in user interfaces. +Source® Sans Pro, Adobe's first open source typeface family, was designed by Paul D. Hunt. It is a sans serif typeface intended to work well in user interfaces. [SIL Open Font License, 1.1](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) ([text](http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=OFL_plaintext&filename=OFL.txt)) @@ -779,7 +779,7 @@ http://svs.gsfc.nasa.gov/vis/a000000/a003500/a003572/ Terms of use: http://www.nasa.gov/audience/formedia/features/MP_Photo_Guidelines.html -### Some vector icons from (or inspired by) Rapha?l JS +### Some vector icons from (or inspired by) Raphaël JS http://raphaeljs.com/icons/