Skip to content

Commit

Permalink
Add copyright and license to UrlAssetAccessor.cpp
Browse files Browse the repository at this point in the history
Update ThirdParty.extra.json.
  • Loading branch information
timoore committed Feb 20, 2024
1 parent 9020f34 commit 36cd4d6
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* The movie capture tool now waits for tilesets to complete loading before it captures a frame.
* Added support for WMS raster overlays.
* Added raster overlay options: `maximumScreenSpaceError`, `maximumTextureSize`, `maximumSimultaneousTileLoads`, `subTileCacheBytes`.
* Changed to use UrlAssetAccessor from vsgCs, which does a better job of managing libcurl handles than the existing HttpAssetAccessor.

### v0.17.0 - 2024-02-01

Expand Down
9 changes: 9 additions & 0 deletions ThirdParty.extra.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,14 @@
"version": "0.6.1",
"url": "https://github.com/KhronosGroup/glTF-Asset-Generator",
"notes": "A selection of test models from this generator are used for testing."
},
{
"name": "vsgCs",
"license": [
"MIT"
],
"version": "0.4",
"url": "https://github.com/timoore/vsgCs",
"notes": "UrlAssetAccessor.{cpp,h} are taken from vsgCs."
}
]
9 changes: 9 additions & 0 deletions ThirdParty.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,15 @@
"version": "cci.20220909",
"url": "https://github.com/nothings/stb"
},
{
"name": "vsgCs",
"license": [
"MIT"
],
"version": "0.4",
"url": "https://github.com/timoore/vsgCs",
"notes": "UrlAssetAccessor.{cpp,h} are taken from vsgCs."
},
{
"name": "yaml-cpp",
"license": [
Expand Down
25 changes: 24 additions & 1 deletion src/core/src/UrlAssetAccessor.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
// Copyright(c) 2023 Timothy Moore
/* <editor-fold desc="MIT License">
Copyright(c) 2023 Timothy Moore
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.
</editor-fold> */

// Copyright 2024 CesiumGS, Inc. and Contributors

#include "cesium/omniverse/UrlAssetAccessor.h"
Expand Down

0 comments on commit 36cd4d6

Please sign in to comment.