[Bf-blender-cvs] [dda9762a16d] xr-controller-support: Remove old TinyGLTF files
Peter Kim
noreply at git.blender.org
Thu Sep 23 04:42:10 CEST 2021
Commit: dda9762a16d65a7cfb9744a3530d2cdcbcb429f0
Author: Peter Kim
Date: Wed Sep 22 19:27:14 2021 -0700
Branches: xr-controller-support
https://developer.blender.org/rBdda9762a16d65a7cfb9744a3530d2cdcbcb429f0
Remove old TinyGLTF files
===================================================================
D extern/tinygltf/LICENSE
D extern/tinygltf/README.md
D extern/tinygltf/json.hpp
D extern/tinygltf/stb_image.h
D extern/tinygltf/stb_image_write.h
M intern/ghost/CMakeLists.txt
M intern/ghost/intern/GHOST_XrControllerModel.cpp
===================================================================
diff --git a/extern/tinygltf/LICENSE b/extern/tinygltf/LICENSE
deleted file mode 100644
index 34398adf072..00000000000
--- a/extern/tinygltf/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Syoyo Fujita, Aurélien Chatelain and many 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
-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.
diff --git a/extern/tinygltf/README.md b/extern/tinygltf/README.md
deleted file mode 100644
index bcf53fd17d2..00000000000
--- a/extern/tinygltf/README.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# Header only C++ tiny glTF library(loader/saver).
-
-`TinyGLTF` is a header only C++11 glTF 2.0 https://github.com/KhronosGroup/glTF library.
-
-`TinyGLTF` uses Niels Lohmann's json library(https://github.com/nlohmann/json), so now it requires C++11 compiler.
-If you are looking for old, C++03 version, please use `devel-picojson` branch(but not maintained anymore).
-
-## Status
-
- - v2.4.0 Experimental RapidJSON support. Experimental C++14 support(C++14 may give better performance)
- - v2.3.0 Modified Material representation according to glTF 2.0 schema(and introduced TextureInfo class)
- - v2.2.0 release(Support loading 16bit PNG. Sparse accessor support)
- - v2.1.0 release(Draco support)
- - v2.0.0 release(22 Aug, 2018)!
-
-### Branches
-
-* `sajson` : Use sajson to parse JSON. Parsing only but faster compile time(2x reduction compared to json.hpp and RapidJson)
-
-## Builds
-
-[](https://travis-ci.org/syoyo/tinygltf)
-
-[](https://ci.appveyor.com/project/syoyo/tinygltf)
-
-
-
-## Features
-
-* Written in portable C++. C++-11 with STL dependency only.
- * [x] macOS + clang(LLVM)
- * [x] iOS + clang
- * [x] Linux + gcc/clang
- * [x] Windows + MinGW
- * [x] Windows + Visual Studio 2015 Update 3 or later.
- * Visual Studio 2013 is not supported since they have limited C++11 support and failed to compile `json.hpp`.
- * [x] Android NDK
- * [x] Android + CrystaX(NDK drop-in replacement) GCC
- * [x] Web using Emscripten(LLVM)
-* Moderate parsing time and memory consumption.
-* glTF specification v2.0.0
- * [x] ASCII glTF
- * [x] Load
- * [x] Save
- * [x] Binary glTF(GLB)
- * [x] Load
- * [x] Save(.bin embedded .glb)
-* Buffers
- * [x] Parse BASE64 encoded embedded buffer data(DataURI).
- * [x] Load `.bin` file.
-* Image(Using stb_image)
- * [x] Parse BASE64 encoded embedded image data(DataURI).
- * [x] Load external image file.
- * [x] Load PNG(8bit and 16bit)
- * [x] Load JPEG(8bit only)
- * [x] Load BMP
- * [x] Load GIF
- * [x] Custom Image decoder callback(e.g. for decoding OpenEXR image)
-* Morph traget
- * [x] Sparse accessor
-* Load glTF from memory
-* Custom callback handler
- * [x] Image load
- * [x] Image save
-* Extensions
- * [x] Draco mesh decoding
- * [ ] Draco mesh encoding
-
-## Note on extension property
-
-In extension(`ExtensionMap`), JSON number value is parsed as int or float(number) and stored as `tinygltf::Value` object. If you want a floating point value from `tinygltf::Value`, use `GetNumberAsDouble()` method.
-
-`IsNumber()` returns true if the underlying value is an int value or a floating point value.
-
-## Examples
-
-* [glview](examples/glview) : Simple glTF geometry viewer.
-* [validator](examples/validator) : Simple glTF validator with JSON schema.
-* [basic](examples/basic) : Basic glTF viewer with texturing support.
-
-## Projects using TinyGLTF
-
-* px_render Single header C++ Libraries for Thread Scheduling, Rendering, and so on... https://github.com/pplux/px
-* Physical based rendering with Vulkan using glTF 2.0 models https://github.com/SaschaWillems/Vulkan-glTF-PBR
-* GLTF loader plugin for OGRE 2.1. Support for PBR materials via HLMS/PBS https://github.com/Ybalrid/Ogre_glTF
-* [TinyGltfImporter](http://doc.magnum.graphics/magnum/classMagnum_1_1Trade_1_1TinyGltfImporter.html) plugin for [Magnum](https://github.com/mosra/magnum), a lightweight and modular C++11/C++14 graphics middleware for games and data visualization.
-* [Diligent Engine](https://github.com/DiligentGraphics/DiligentEngine) - A modern cross-platform low-level graphics library and rendering framework
-* Lighthouse 2: a rendering framework for real-time ray tracing / path tracing experiments. https://github.com/jbikker/lighthouse2
-* [QuickLook GLTF](https://github.com/toshiks/glTF-quicklook) - quicklook plugin for macos. Also SceneKit wrapper for tinygltf.
-* [GlslViewer](https://github.com/patriciogonzalezvivo/glslViewer) - live GLSL coding for MacOS and Linux
-* [Vulkan-Samples](https://github.com/KhronosGroup/Vulkan-Samples) - The Vulkan Samples is collection of resources to help you develop optimized Vulkan applications.
-* [TDME2](https://github.com/andreasdr/tdme2) - TDME2 - ThreeDeeMiniEngine2 is a lightweight 3D engine including tools suited for 3D game development using C++11
-* Your projects here! (Please send PR)
-
-## TODOs
-
-* [ ] Write C++ code generator which emits C++ code from JSON schema for robust parsing.
-* [ ] Mesh Compression/decompression(Open3DGC, etc)
- * [x] Load Draco compressed mesh
- * [ ] Save Draco compressed mesh
- * [ ] Open3DGC?
-* [x] Support `extensions` and `extras` property
-* [ ] HDR image?
- * [ ] OpenEXR extension through TinyEXR.
-* [ ] 16bit PNG support in Serialization
-* [ ] Write example and tests for `animation` and `skin`
-
-## Licenses
-
-TinyGLTF is licensed under MIT license.
-
-TinyGLTF uses the following third party libraries.
-
-* json.hpp : Copyright (c) 2013-2017 Niels Lohmann. MIT license.
-* base64 : Copyright (C) 2004-2008 René Nyffenegger
-* stb_image.h : v2.08 - public domain image loader - [Github link](https://github.com/nothings/stb/blob/master/stb_image.h)
-* stb_image_write.h : v1.09 - public domain image writer - [Github link](https://github.com/nothings/stb/blob/master/stb_image_write.h)
-
-
-## Build and example
-
-Copy `stb_image.h`, `stb_image_write.h`, `json.hpp` and `tiny_gltf.h` to your project.
-
-### Loading glTF 2.0 model
-
-```c++
-// Define these only in *one* .cc file.
-#define TINYGLTF_IMPLEMENTATION
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-// #define TINYGLTF_NOEXCEPTION // optional. disable exception handling.
-#include "tiny_gltf.h"
-
-using namespace tinygltf;
-
-Model model;
-TinyGLTF loader;
-std::string err;
-std::string warn;
-
-bool ret = loader.LoadASCIIFromFile(&model, &err, &warn, argv[1]);
-//bool ret = loader.LoadBinaryFromFile(&model, &err, &warn, argv[1]); // for binary glTF(.glb)
-
-if (!warn.empty()) {
- printf("Warn: %s\n", warn.c_str());
-}
-
-if (!err.empty()) {
- printf("Err: %s\n", err.c_str());
-}
-
-if (!ret) {
- printf("Failed to parse glTF\n");
- return -1;
-}
-```
-
-#### Loader options
-
-* `TinyGLTF::SetPreserveimageChannels(bool onoff)`. `true` to preserve image channels as stored in image file for loaded image. `false` by default for backward compatibility(image channels are widen to `RGBA` 4 channels). Effective only when using builtin image loader(STB image loader).
-
-## Compile options
-
-* `TINYGLTF_NOEXCEPTION` : Disable C++ exception in JSON parsing. You can use `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION` and `TINYGLTF_NOEXCEPTION` to fully remove C++ exception codes when compiling TinyGLTF.
-* `TINYGLTF_NO_STB_IMAGE` : Do not load images with stb_image. Instead use `TinyGLTF::SetImageLoader(LoadimageDataFunction LoadImageData, void *user_data)` to set a callback for loading images.
-* `TINYGLTF_NO_STB_IMAGE_WRITE` : Do not write images with stb_image_write. Instead use `TinyGLTF::SetImageWriter(WriteimageDataFunction WriteImageData, void *user_data)` to set a callback for writing images.
-* `TINYGLTF_NO_EXTERNAL_IMAGE` : Do not try to load external image file. This option would be helpful if you do not want to load image files during glTF parsing.
-* `TINYGLTF_ANDROID_LOAD_FROM_ASSETS`: Load all files from packaged app assets instead of the regular file system. **Note:** You must pass a valid asset manager from your android app to `tinygltf::asset_manager` beforehand.
-* `TINYGLTF_ENABLE_DRACO`: Enable Draco compression. User must provide include path and link correspnding libraries in your project file.
-* `TINYGLTF_NO_INCLUDE_JSON `: Disable including `json.hpp` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_NO_INCLUDE_STB_IMAGE `: Disable including `stb_image.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE `: Disable including `stb_image_write.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
-* `TINYGLTF_USE_RAPIDJSON` : Use RapidJSON as a JSON parser/serializer. RapidJSON files are not included in TinyGLTF repo. Please set an include path to RapidJSON if you enable this fe
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list