From 36cd4d682d130d45d43bdc3150713920d9d19124 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Tue, 20 Feb 2024 17:33:59 +0100 Subject: [PATCH] Add copyright and license to UrlAssetAccessor.cpp Update ThirdParty.extra.json. --- CHANGES.md | 1 + ThirdParty.extra.json | 9 +++++++++ ThirdParty.json | 9 +++++++++ src/core/src/UrlAssetAccessor.cpp | 25 ++++++++++++++++++++++++- 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c8ba7fcc3..73a2e1075 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/ThirdParty.extra.json b/ThirdParty.extra.json index 9c2e3e313..0826d48fe 100644 --- a/ThirdParty.extra.json +++ b/ThirdParty.extra.json @@ -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." } ] diff --git a/ThirdParty.json b/ThirdParty.json index e7b22ef95..b19eae68f 100644 --- a/ThirdParty.json +++ b/ThirdParty.json @@ -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": [ diff --git a/src/core/src/UrlAssetAccessor.cpp b/src/core/src/UrlAssetAccessor.cpp index 17c6bd1f9..2a9f8622c 100644 --- a/src/core/src/UrlAssetAccessor.cpp +++ b/src/core/src/UrlAssetAccessor.cpp @@ -1,4 +1,27 @@ -// Copyright(c) 2023 Timothy Moore +/* + +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. + + */ + // Copyright 2024 CesiumGS, Inc. and Contributors #include "cesium/omniverse/UrlAssetAccessor.h"