diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18ec436af..8aa27f4a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif()
find_package(OpenGL REQUIRED)
+find_package(CUDAToolkit REQUIRED)
if(UNIX)
include_directories("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")
@@ -110,7 +111,11 @@ add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers} ${imgui_sources} ${im
target_link_libraries(${CMAKE_PROJECT_NAME}
${GL_LIBRARIES}
#stream_compaction # TODO: uncomment if using your stream compaction
+ CUDA::cudart
)
+
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CUDAToolkit_INCLUDE_DIRS})
+
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_ARCHITECTURES native)
diff --git a/README.md b/README.md
index 110697ce7..930026965 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,182 @@ CUDA Path Tracer
**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 3**
-* (TODO) YOUR NAME HERE
-* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
+* Griffin Evans
+* Tested on: Windows 11 Education, i9-12900F @ 2.40GHz 64.0GB, NVIDIA GeForce RTX 3090 (Levine 057 SIGLAB-02 (though marked 3 on the label))
-### (TODO: Your README)
+
+
+
+
-*DO NOT* leave the README to the last minute! It is a crucial part of the
-project, and we will not be able to grade you without a good README.
+## Setup instructions
+The process of building the project is as follows:
+1. Clone the project to a folder and navigate into it in Bash.
+2. `mkdir build`
+3. `cd build`
+4. `cmake-gui ..`
+5. Within CMake GUI, configure the project, selecting Visual Studio 17 2022 as the generator and x64 as the platform.
+6. Select "generate".
+7. Open the generated `.sln` file within the build folder in Visual Studio.
+8. Build the project from the toolbar in Visual Studio.
+
+## Features and analysis
+
+### Materials—Diffusion, Reflection, and Refraction with Fresnel effects
+
+
+
+
+
+
+Four categories of shaded material are included, along with an emissive material which applies a flat color value and terminates the ray. These are, as shown in order via the sphere in the above images, perfectly diffuse (bouncing incoming rays out in all directions), specular reflective (bouncing incoming rays exactly reflected about the surface normal), specular transmissive (refracting incoming rays into the material), and "glass" which uses both reflection and transmission/refraction. The specular models use the [Fresnel formula as adapted from PBRT](https://pbr-book.org/4ed/Reflection_Models/Dielectric_BSDF) to determine reflectance.
+
+
+
+The materials in these scenes overall have little impact on the render time, but the scene does run slightly faster when only using diffuse as with only a single material there is less branching in the shading kernel and hence warps run more efficiently. The combined reflective+refractive material appeared to perform very slightly worse than the other specular materials, as it has an additional source of branching in that each ray intersecting the material picks randomly between reflecting or refracting, each of which has a separate branch (whereas the other specular materials only use one of these two branches).
+
+A potential further optimization is that these kernels could be restructured to combine more areas which use the same operations (for instance calling the `fresnelDielectricEval` only once by modifying input variables depending on which interaction is involved, rather than calling it separately in each branch). Another potential development related to these materials will be discussed in the later section on "Material Sorting".
+
+This feature could be implemented very similarly on a CPU implementation, as nothing here particularly interacts with paralellism outside of the fact that we have multiple paths receiving shading at the same time. Because of that simulatenousness though the GPU is hence largely a benefit here, though the branching that occurs does make this particular implementation not totally optimized for the GPU.
+
+
+### Antialiasing and physically-based depth-of-field
+
+
+
+
+
+Antialiasing is achieved through a jittering of the coordinates in the image plane which we use to set the direction of our rays from the camera. Instead of picking a single consistent direction for each pixel in every frame, in each frame for each pixel we generate a random value and use that to sample a random location within that pixel's grid cell send the ray towards. By varying these samples each frame, as we accumulate pixel color we effectively average out the results from many possible ray directions, diminishing the aliasing effect that comes from picking a discrete point within a pixel. Note that this method takes advantage of the Monte Carlo nature of this path tracing algorithm—unlike in a rasterized approach, we don't need an increase in number of samples used or any sort of additional information stored to achieve an antialiasing effect.
+
+Depth of field uses a similar technique to antialiasing, except now perturbing the origin of the ray rather than just the direction. By varying the starting location of the ray, we approximate over multiple frames the variety of locations that light hits on the surface of the lens. In order to replicate a circular lens, we hence choose points within a disk whose radius is our simulated lens' radius. We can also simulate an adjusting of focal distance by modifying the distance between this disk and the image plane. As the rays shot from the disk to the grid of the image plane converge only at a particular distance from the disk, this gives us an unblurred view of that particular distance, while becoming progressively more blurred further from that distance either towards or away from the camera.
+
+
+
+This depth of field effect seems to have little to no impact on performance—in testing we see a very slight increase in the time taken to generate a ray, but as the variance that occurs test-to-test in the running of the other kernels is far greater than the difference observed here, it appears that this is not a significant change.
+
+Because of this insignificant performance impact, it does not seem optimization is particularly necessary, but if one wanted to then one could potentially attempt to reduce the number of steps involved in the math or find a scheme to map values such that we need fewer calls to a random number generator than used here (e.g. rather than having four random numbers, could use one number and derive from it four lower-precision values).
+
+Again this being on the GPU as opposed to the CPU is not particularly relevant for this feature, beyond that we can easily perform this sampling for many pixels at the same time.
+
+### Motion blur
+
+
+
+
+
+
+
+Motion blur here is achieved through the same concept of varying how we render each iteration, but rather than changing the ray we instead change the scene being rendered. Within the JSON files which store each scene, one can create an object using a series of keyframes with translation, rotation, and scale set at specified times rather than having a single constant set of transformations. In each iteration, we then randomly select a time between the first and last keyframes' times and perform linear interpolation of these translation, rotation, and scale values for each object for the set of keyframes about the specified time. The objects in the scene are transformed accordingly, and the color values we obtain of that transformed state are averaged with the values obtained for all of the other iterations as normal. This means that over a number of frames we approach taking an average of the image of all of the positions the objects had throughout the specified timespan. Hence we produce an image that blurs corresponding to the motion seen in the image—for example, the duck in the latter two images above is set to move right, up, and towards the camera across multiple keyframes, with later keyframes having their translations made closer together than the earlier keyframes. This means we produce a blur where the duck is barely visible on the lower left side, as it spent very little of the time there, and becomes more solid as it approaches the right side as it begins to slow down.
+
+
+
+The performance impact of this effect is dependent on the amount and complexity of geometry that needs to be transformed. For a scene which simply moves a sphere, the performance impact is minimal, but when moving a more complex object it becomes much more significant. The duck used in the testing here is a glTF model which is loaded in as a set of triangles and has intersections tested using a BVH data structure (as will be discussed below). In order to render each frame, we hence need to construct a BVH corresponding to the positions of the duck's triangles in that particular frame (since the spatially-dependent data structure is no longer accurate if the duck has moved), which here requires us to apply the duck's transformation to each triangle it contains to find their updated positions before we can re-apply the BVH construction algorithm.
+
+A likely means to improve the performance would thus be to implement some way to more smartly update the BVH. Since we're here only applying a simple series of transformations, it seems likely that we could often keep the same structure of BVH and simply update the coordinates used within it—for example, if we are only changing a model's translation, we could translate all of the coordinates within the BVH while keeping the same structure of volumes. Additional considerations may be necessary for other transformations (e.g. rotation would affect the bounding volumes' rotation) or for transforming only a part of the models used within a whole scene (currently, all triangle-based models share a single BVH in this implementation, meaning that if we have many models loaded and transform even one of them we would need to recalculate the BVH for all of them; hence a way to identify unaffected regions may be of benefit).
+
+While this approach would be similarly applicable in a CPU-side path tracer, note that this is highly dependent on obtaining a very large number of samples in order to converge to a smoothly blurred image. Hence in contexts where we are not able to obtain so many frames this quickly we would potentially prefer an approach where we render at a single sample time but track some additional information about the object's motion about that frame (e.g. a buffer of motion directions and magnitudes) and apply some blur effect based on that, possibly as a post process as one may in real-time contexts.
+
+### Arbitrary mesh rendering via glTF and BVH spatial data structure
+
+
+Triangle data can be loaded in from .gltf and .glb files and used as surfaces in a scene, leveraging functions from the [tinygltf library](https://github.com/syoyo/tinygltf/). Since high-quality models involve an incredibly large number of triangles, we use the BVH (bounding volume hierarchy) spatial data structure to store the loaded triangles in a way that we can more efficiently iterate through when testing for ray intersections, rather than needing to check against every triangle in the scene per each ray.
+
+
+
+The performance benefit of incorporating BVH is enormous. For the above image of a duck inside a box, even though the duck is a relatively simple asset compared to many of those used today, iterating without BVH is still roughly ten times slower than with BVH, and this difference would likely increase even further as we add more triangles to the scene.
+
+This implementation however is only a relatively basic version of BVH, and hence many improvements to its performance are possible. An obvious instance of this is that the triangles currently are accessed in the intersection function through a separate array of triangle indices, which means we have additional memory reads occurring in each iteration that could be avoided by instead rearranging the array of triangles before it is passed to the GPU. The BVH is also constructed using a naïve method of dividing volumes, simply splitting along the longest axis of the bounding volume, which does not necessarily result in the most useful divisions of volumes when it comes to performing intersection tests with them. The code to initially construct the volumes is also rather under-optimized, which is not hugely an issue here as it's fine enough for the scenes tested we're looking mostly about the performance once we've actually started rendering the scene, but could become problematic especially if trying to apply the above motion blur effect to particularly complex models, as the time spent on building the BVH each frame would begin to signficiantly affect the render speed. Note also the construction is performed entirely on the CPU, so part of this improvement could involve translating relevant aspects to the GPU side.
+
+### Environment mapping
+
+
+
+
+
+
+
+
+
+
+Backgrounds are applied through tinting each ray which has no intersections and hence exits the scene, rather than simply setting them to black as they are terminated. The scene files can be set either to use a flat color, as in the blue shown above, or they can use an environment map, here a texture loaded from a .hdr image. When using a environment map, whenever a ray exits the scene we use its direction in order to sample a point on the surface of a sphere (with the direction corresponding to the normal out at that point), then tint the ray with the appropriate color of the texture mapped onto that sphere's surface. Through using an .hdr image which maps smoothly onto the surface of a sphere, we hence obtain a 360º depiction of an environment about and lighting our scene.
+
+
+
+The aspect of our code which this feature effects is the shadeMaterial kernel, which in the case of a ray failing to intersect the scene performs the aforementioned mapping of sphere to UV coordinates and draws the color value from an array which we filled with data from the loaded image. For the non-image cases, the same code is actually run, but the array is only a single value long, containing the color that we have set as the background (defaulting to black (0,0,0)). While the same code is run however, we do see some worsening performance when using the environment map texture. This likely comes from the variety of memory read locations necessary to sample colors from the array, as we may have many rays simulatenously hitting very disparate regions of the environment map and hence loading in values spread far across the array. In the single-color case, while we still read from the array, we always are reading from the same location and hence we don't need that disparate memory access. It could also be that the compiler is smart enough to ignore the unnecessary mapping operations in the case where the later coordinate values are ensured to be 0 regardless, but if not, this would be an easy starting place for an optimization in the non-textured case. The textured case could probably be improved by figuring out a smarter structure for storing the color information—here the 2D texture is converted to a long 1D array, and hence points which are very adjacent to each other in one direction become strided.
+
+This feature could again be achieved similarly on a CPU implementation, as it does not particularly rely on parallelism beyond the parallelism of our shading multiple paths at once.
+
+### Stream Compaction and Material Sorting
+
+
+
+
+Stream compaction is applied in order to only invoke our kernels for paths which have not already terminated (i.e. those that have not exited the scene, hit lights, or run out of bounces). We do this by partitioning the array of paths based on whether their stored `.remainingBounces` value is greater than 0, and we set this value to 0 in the other kernels whenever we find a condition that should terminate the path, otherwise decrementing it by 1 each bounce. The paths which fulfil this condition are used in the next depth step, while the other paths are kept at the end of the array and ignored until the iteration is finished. Once there are no paths with bounces left, we use the colors stored in all of the paths to update the state of our rendered image. We also have an option to enable sorting of the path array by what material the path is intersecting with, such that similarly behaving rays will be more so in the same blocks and warps.
+
+
+
+
+
+These features add overhead to each iteartion however, which for relatively simple scenes can dominate the running time such that despite getting faster behavior in ther intersection and shading kernels we take longer overall. This is especially true for the material sorting, which adds about twice the time as using compaction does. Note though that as we get into later steps of each iteration we see more and more benefit from the compaction, as the number of rays reduces more and more compared to the constant amount used by the non-compacting approach, as can be seen in the above chart comparing the 5th and 6th steps of an iteration, where the compacting approach begins to see faster performance even when combining both compaction and intersection times.
+
+
+
+
+
+
+In a closed scene we see very little change between methods, as the ray very rarely terminates. The complex open scene shown here however showcases very odd behavior, as it appears to perform significantly worse with stream compaction despite smaller scenes seeing benefits from it. My best estimation is that this has to do with the array being rearranged, somehow causing more erratic behavior between the paths adjacent to each other in warps such that they access memory or branch in a very inefficient way.
+
+A potential optimization for material sorting would be to pre-calculate random values used in the next iteration. For example, in the reflective-refractive material used here we have a 50% chance of using either reflection or refraction, with each leading to a different branch of code. If we stored the value used for this chance in advance, we could account for it in our sorting and hence have many more warps that entirely reside within one of the two branches.
+
+While the benefits of compacting would be present in a CPU implementation, as we'd still be iterating over fewer elements in each step, material sorting is only really relevant to the GPU, as it serves to avoid performance issues particular to its parallelism.
+
+### Russian roulette path termination
+
+
+We add an additional means for paths to terminate: when the magnitude of its color is below some threshold, we give it a random chance to terminate early, and if it doesn't then we multiply its color value. this results in the results appearing the same on average, while spending less time on paths that don't particularly impact the result. The benefits of this grow as the threshold is increased, here showing a noticeable improvement when tried on colors less than 0.1 in magnitude, with each example here using a 25% chance to terminate.
+
+This is another technique which would also be of great benefit to a hypothetical CPU implementation, as it still reduces the amount of paths we have to perform operations on regardless of whether those paths are parallelized.
+
+The main room for optimization would be further investigation of a variety of thresholds and termination chances, in order to see what maximizes the performance benefit without producing noticeable changes in per-frame render quality. It is possible that these values may need to be tuned depending on particular scenes, as the amount of light present could vary drastically.
+
+## Third Party Sources
+I made use of the [tinygltf library](https://github.com/syoyo/tinygltf/) as suggested in order to load in model data from glTF files. I feel I should note I did look at Ruipeng Wang's code from last year in regards to using the aforementioned tinygltf library when I was talking with him in office hours about trying to fix a bug I was having with loading the vertex indices.
+
+I also referenced [the article "How to build a BVH" by Jacco Bikker](https://jacco.ompf2.com/2022/04/13/how-to-build-a-bvh-part-1-basics/) in order to understand how to implement the BVH construction and traversal algorithms. Similarly [Physically Based Rendering: From Theory To Implementation (4ed), by Matt Pharr, Wenzel Jakob, and Greg Humphreys](https://pbr-book.org/4ed/) was referenced for information on refraction and depth of field.
+
+Reused timer code from Stream Compaction project for performance testing, due to having issues running Nsight on the machine I was using.
+
+Environment map textures used are [Dam Wall, by Dimitrios Savva and Jarod Guest](https://polyhaven.com/a/dam_wall), and [Industrial Sunset (Pure Sky), by Sergej Majboroda and Jarod Guest](https://polyhaven.com/a/industrial_sunset_puresky), both from Poly Haven.
+
+All glTF files used were either created by me using Maya (those in the `scenes/glTF` folder) or obtained from [the Khronos Group's sample asset repository](https://github.com/KhronosGroup/glTF-Sample-Assets) (those in the `scenes/glTF-Samples` folder):
+
+"A Beautiful Game" Credit:
+© 2020, ASWF. CC BY 4.0 International
+- MaterialX Project for Original model
+© 2022, Ed Mackey. CC BY 4.0 International
+- Ed Mackey for Conversion to glTF
+
+"Avocado" Credit:
+© 2017, Public. CC0 1.0 Universal
+- Microsoft for Everything
+
+"Box" Credit:
+© 2017, Cesium. CC BY 4.0 International
+- Cesium for Everything
+
+"Duck" Credit:
+© 2006, Sony. SCEA Shared Source License, Version 1.0
+- Sony for Everything
+
+"Fox" Credit:
+© 2014, Public. CC0 1.0 Universal
+- PixelMannen for Model
+© 2014, tomkranis. CC BY 4.0 International
+- tomkranis for Rigging & Animation
+© 2017, @AsoboStudio and @scurest. CC BY 4.0 International
+- @AsoboStudio and @scurest for Conversion to glTF
+
+"Triangle" Credit:
+© 2017, Public. CC0 1.0 Universal
+- Marco Hutter (https://github.com/javagl/) for Everything
diff --git a/external/include/stb_image.h b/external/include/stb_image.h
index b9b265fa2..5d2ec798f 100644
--- a/external/include/stb_image.h
+++ b/external/include/stb_image.h
@@ -1,5 +1,6 @@
-/* stb_image - v2.06 - public domain image loader - http://nothings.org/stb_image.h
- no warranty implied; use at your own risk
+#pragma once
+/* stb_image - v2.28 - public domain image loader - http://nothings.org/stb
+ no warranty implied; use at your own risk
Do this:
#define STB_IMAGE_IMPLEMENTATION
@@ -21,17 +22,20 @@
avoid problematic images and only need the trivial interface
JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib)
- PNG 1/2/4/8-bit-per-channel (16 bpc not supported)
+ PNG 1/2/4/8/16-bit-per-channel
TGA (not sure what subset, if a subset)
BMP non-1bpp, non-RLE
- PSD (composited view only, no extra channels)
+ PSD (composited view only, no extra channels, 8/16 bit-per-channel)
GIF (*comp always reports as 4-channel)
HDR (radiance rgbE format)
PIC (Softimage PIC)
PNM (PPM and PGM binary only)
+ Animated GIF still needs a proper API, but here's one way to do it:
+ http://gist.github.com/urraka/685d9a6340b26b830d49
+
- decode from memory or through FILE (define STBI_NO_STDIO to remove code)
- decode from arbitrary I/O callbacks
- SIMD acceleration on x86/x64 (SSE2) and ARM (NEON)
@@ -39,177 +43,86 @@
Full documentation under "DOCUMENTATION" below.
- Revision 2.00 release notes:
-
- - Progressive JPEG is now supported.
-
- - PPM and PGM binary formats are now supported, thanks to Ken Miller.
-
- - x86 platforms now make use of SSE2 SIMD instructions for
- JPEG decoding, and ARM platforms can use NEON SIMD if requested.
- This work was done by Fabian "ryg" Giesen. SSE2 is used by
- default, but NEON must be enabled explicitly; see docs.
-
- With other JPEG optimizations included in this version, we see
- 2x speedup on a JPEG on an x86 machine, and a 1.5x speedup
- on a JPEG on an ARM machine, relative to previous versions of this
- library. The same results will not obtain for all JPGs and for all
- x86/ARM machines. (Note that progressive JPEGs are significantly
- slower to decode than regular JPEGs.) This doesn't mean that this
- is the fastest JPEG decoder in the land; rather, it brings it
- closer to parity with standard libraries. If you want the fastest
- decode, look elsewhere. (See "Philosophy" section of docs below.)
-
- See final bullet items below for more info on SIMD.
-
- - Added STBI_MALLOC, STBI_REALLOC, and STBI_FREE macros for replacing
- the memory allocator. Unlike other STBI libraries, these macros don't
- support a context parameter, so if you need to pass a context in to
- the allocator, you'll have to store it in a global or a thread-local
- variable.
-
- - Split existing STBI_NO_HDR flag into two flags, STBI_NO_HDR and
- STBI_NO_LINEAR.
- STBI_NO_HDR: suppress implementation of .hdr reader format
- STBI_NO_LINEAR: suppress high-dynamic-range light-linear float API
-
- - You can suppress implementation of any of the decoders to reduce
- your code footprint by #defining one or more of the following
- symbols before creating the implementation.
-
- STBI_NO_JPEG
- STBI_NO_PNG
- STBI_NO_BMP
- STBI_NO_PSD
- STBI_NO_TGA
- STBI_NO_GIF
- STBI_NO_HDR
- STBI_NO_PIC
- STBI_NO_PNM (.ppm and .pgm)
-
- - You can request *only* certain decoders and suppress all other ones
- (this will be more forward-compatible, as addition of new decoders
- doesn't require you to disable them explicitly):
-
- STBI_ONLY_JPEG
- STBI_ONLY_PNG
- STBI_ONLY_BMP
- STBI_ONLY_PSD
- STBI_ONLY_TGA
- STBI_ONLY_GIF
- STBI_ONLY_HDR
- STBI_ONLY_PIC
- STBI_ONLY_PNM (.ppm and .pgm)
-
- Note that you can define multiples of these, and you will get all
- of them ("only x" and "only y" is interpreted to mean "only x&y").
-
- - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
- want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
-
- - Compilation of all SIMD code can be suppressed with
- #define STBI_NO_SIMD
- It should not be necessary to disable SIMD unless you have issues
- compiling (e.g. using an x86 compiler which doesn't support SSE
- intrinsics or that doesn't support the method used to detect
- SSE2 support at run-time), and even those can be reported as
- bugs so I can refine the built-in compile-time checking to be
- smarter.
-
- - The old STBI_SIMD system which allowed installing a user-defined
- IDCT etc. has been removed. If you need this, don't upgrade. My
- assumption is that almost nobody was doing this, and those who
- were will find the built-in SIMD more satisfactory anyway.
-
- - RGB values computed for JPEG images are slightly different from
- previous versions of stb_image. (This is due to using less
- integer precision in SIMD.) The C code has been adjusted so
- that the same RGB values will be computed regardless of whether
- SIMD support is available, so your app should always produce
- consistent results. But these results are slightly different from
- previous versions. (Specifically, about 3% of available YCbCr values
- will compute different RGB results from pre-1.49 versions by +-1;
- most of the deviating values are one smaller in the G channel.)
-
- - If you must produce consistent results with previous versions of
- stb_image, #define STBI_JPEG_OLD and you will get the same results
- you used to; however, you will not get the SIMD speedups for
- the YCbCr-to-RGB conversion step (although you should still see
- significant JPEG speedup from the other changes).
-
- Please note that STBI_JPEG_OLD is a temporary feature; it will be
- removed in future versions of the library. It is only intended for
- near-term back-compatibility use.
-
-
- Latest revision history:
- 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value
- 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning
- 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit
- 2.03 (2015-04-12) additional corruption checking
- stbi_set_flip_vertically_on_load
- fix NEON support; fix mingw support
- 2.02 (2015-01-19) fix incorrect assert, fix warning
- 2.01 (2015-01-17) fix various warnings
- 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
- 2.00 (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD
- progressive JPEG
- PGM/PPM support
- STBI_MALLOC,STBI_REALLOC,STBI_FREE
- STBI_NO_*, STBI_ONLY_*
- GIF bugfix
- 1.48 (2014-12-14) fix incorrectly-named assert()
- 1.47 (2014-12-14) 1/2/4-bit PNG support (both grayscale and paletted)
- optimize PNG
- fix bug in interlaced PNG with user-specified channel count
+LICENSE
+
+ See end of file for license information.
+
+RECENT REVISION HISTORY:
+
+ 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff
+ 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
+ 2.26 (2020-07-13) many minor fixes
+ 2.25 (2020-02-02) fix warnings
+ 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically
+ 2.23 (2019-08-11) fix clang static analysis warning
+ 2.22 (2019-03-04) gif fixes, fix warnings
+ 2.21 (2019-02-25) fix typo in comment
+ 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs
+ 2.19 (2018-02-11) fix warning
+ 2.18 (2018-01-30) fix warnings
+ 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings
+ 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes
+ 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC
+ 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
+ 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
+ 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
+ 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64
+ RGB-format JPEG; remove white matting in PSD;
+ allocate large structures on the stack;
+ correct channel count for PNG & BMP
+ 2.10 (2016-01-22) avoid warning introduced in 2.09
+ 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED
See end of file for full revision history.
============================ Contributors =========================
- Image formats Bug fixes & warning fixes
- Sean Barrett (jpeg, png, bmp) Marc LeBlanc
- Nicolas Schulz (hdr, psd) Christpher Lloyd
- Jonathan Dummer (tga) Dave Moore
- Jean-Marc Lienher (gif) Won Chun
- Tom Seddon (pic) the Horde3D community
- Thatcher Ulrich (psd) Janez Zemva
- Ken Miller (pgm, ppm) Jonathan Blow
- Laurent Gomila
- Aruelien Pocheville
- Extensions, features Ryamond Barbiero
- Jetro Lauha (stbi_info) David Woo
- Martin "SpartanJ" Golini (stbi_info) Martin Golini
- James "moose2000" Brown (iPhone PNG) Roy Eltham
- Ben "Disch" Wenger (io callbacks) Luke Graham
- Omar Cornut (1/2/4-bit PNG) Thomas Ruf
- Nicolas Guillemot (vertical flip) John Bartholomew
- Ken Hamada
- Optimizations & bugfixes Cort Stratton
- Fabian "ryg" Giesen Blazej Dariusz Roszkowski
- Arseny Kapoulkine Thibault Reuille
- Paul Du Bois
- Guillaume George
- If your name should be here but Jerry Jansson
- isn't, let Sean know. Hayaki Saito
- Johan Duparc
- Ronny Chevalier
- Michal Cichon
- Tero Hanninen
- Sergio Gonzalez
- Cass Everitt
- Engin Manap
- Martins Mozeiko
- Joseph Thomson
- Phil Jordan
-
-LICENSE
-
-This software is in the public domain. Where that dedication is not
-recognized, you are granted a perpetual, irrevocable license to copy,
-distribute, and modify this file as you see fit.
-
+ Image formats Extensions, features
+ Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info)
+ Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info)
+ Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG)
+ Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks)
+ Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG)
+ Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip)
+ Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD)
+ github:urraka (animated gif) Junggon Kim (PNM comments)
+ Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA)
+ socks-the-fox (16-bit PNG)
+ Jeremy Sawicki (handle all ImageNet JPGs)
+ Optimizations & bugfixes Mikhail Morozov (1-bit BMP)
+ Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query)
+ Arseny Kapoulkine Simon Breuss (16-bit PNM)
+ John-Mark Allen
+ Carmelo J Fdez-Aguera
+
+ Bug & warning fixes
+ Marc LeBlanc David Woo Guillaume George Martins Mozeiko
+ Christpher Lloyd Jerry Jansson Joseph Thomson Blazej Dariusz Roszkowski
+ Phil Jordan Dave Moore Roy Eltham
+ Hayaki Saito Nathan Reed Won Chun
+ Luke Graham Johan Duparc Nick Verigakis the Horde3D community
+ Thomas Ruf Ronny Chevalier github:rlyeh
+ Janez Zemva John Bartholomew Michal Cichon github:romigrou
+ Jonathan Blow Ken Hamada Tero Hanninen github:svdijk
+ Eugene Golushkov Laurent Gomila Cort Stratton github:snagar
+ Aruelien Pocheville Sergio Gonzalez Thibault Reuille github:Zelex
+ Cass Everitt Ryamond Barbiero github:grim210
+ Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw
+ Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus
+ Josh Tobin Neil Bickford Matthew Gregan github:poppolopoppo
+ Julian Raschke Gregory Mullen Christian Floisand github:darealshinji
+ Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007
+ Brad Weinberger Matvey Cherevko github:mosra
+ Luca Sas Alexander Veselov Zack Middleton [reserved]
+ Ryan C. Gordon [reserved] [reserved]
+ DO NOT ADD YOUR NAME HERE
+
+ Jacko Dirks
+
+ To add your name to the credits, pick a random blank space in the middle and fill it.
+ 80% of merge conflicts on stb PRs are due to people adding their name at the end
+ of the credits.
*/
#ifndef STBI_INCLUDE_STB_IMAGE_H
@@ -218,10 +131,8 @@ distribute, and modify this file as you see fit.
// DOCUMENTATION
//
// Limitations:
-// - no 16-bit-per-channel PNG
// - no 12-bit-per-channel JPEG
// - no JPEGs with arithmetic coding
-// - no 1-bit BMP
// - GIF always returns *comp=4
//
// Basic usage (see HDR discussion below for HDR usage):
@@ -231,13 +142,13 @@ distribute, and modify this file as you see fit.
// // ... x = width, y = height, n = # 8-bit components per pixel ...
// // ... replace '0' with '1'..'4' to force that many components per pixel
// // ... but 'n' will always be the number that it would have been if you said 0
-// stbi_image_free(data)
+// stbi_image_free(data);
//
// Standard parameters:
-// int *x -- outputs image width in pixels
-// int *y -- outputs image height in pixels
-// int *comp -- outputs # of image components in image file
-// int req_comp -- if non-zero, # of image components requested in result
+// int *x -- outputs image width in pixels
+// int *y -- outputs image height in pixels
+// int *channels_in_file -- outputs # of image components in image file
+// int desired_channels -- if non-zero, # of image components requested in result
//
// The return value from an image loader is an 'unsigned char *' which points
// to the pixel data, or NULL on an allocation failure or if the image is
@@ -245,11 +156,12 @@ distribute, and modify this file as you see fit.
// with each pixel consisting of N interleaved 8-bit components; the first
// pixel pointed to is top-left-most in the image. There is no padding between
// image scanlines or between pixels, regardless of format. The number of
-// components N is 'req_comp' if req_comp is non-zero, or *comp otherwise.
-// If req_comp is non-zero, *comp has the number of components that _would_
-// have been output otherwise. E.g. if you set req_comp to 4, you will always
-// get RGBA output, but you can check *comp to see if it's trivially opaque
-// because e.g. there were only 3 channels in the source image.
+// components N is 'desired_channels' if desired_channels is non-zero, or
+// *channels_in_file otherwise. If desired_channels is non-zero,
+// *channels_in_file has the number of components that _would_ have been
+// output otherwise. E.g. if you set desired_channels to 4, you will always
+// get RGBA output, but you can check *channels_in_file to see if it's trivially
+// opaque because e.g. there were only 3 channels in the source image.
//
// An output image with N components has the following components interleaved
// in this order in each pixel:
@@ -261,14 +173,50 @@ distribute, and modify this file as you see fit.
// 4 red, green, blue, alpha
//
// If image loading fails for any reason, the return value will be NULL,
-// and *x, *y, *comp will be unchanged. The function stbi_failure_reason()
-// can be queried for an extremely brief, end-user unfriendly explanation
-// of why the load failed. Define STBI_NO_FAILURE_STRINGS to avoid
-// compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
+// and *x, *y, *channels_in_file will be unchanged. The function
+// stbi_failure_reason() can be queried for an extremely brief, end-user
+// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS
+// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
// more user-friendly ones.
//
// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized.
//
+// To query the width, height and component count of an image without having to
+// decode the full file, you can use the stbi_info family of functions:
+//
+// int x,y,n,ok;
+// ok = stbi_info(filename, &x, &y, &n);
+// // returns ok=1 and sets x, y, n if image is a supported format,
+// // 0 otherwise.
+//
+// Note that stb_image pervasively uses ints in its public API for sizes,
+// including sizes of memory buffers. This is now part of the API and thus
+// hard to change without causing breakage. As a result, the various image
+// loaders all have certain limits on image size; these differ somewhat
+// by format but generally boil down to either just under 2GB or just under
+// 1GB. When the decoded image would be larger than this, stb_image decoding
+// will fail.
+//
+// Additionally, stb_image will reject image files that have any of their
+// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS,
+// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit,
+// the only way to have an image with such dimensions load correctly
+// is for it to have a rather extreme aspect ratio. Either way, the
+// assumption here is that such larger images are likely to be malformed
+// or malicious. If you do need to load an image with individual dimensions
+// larger than that, and it still fits in the overall size limit, you can
+// #define STBI_MAX_DIMENSIONS on your own to be something larger.
+//
+// ===========================================================================
+//
+// UNICODE:
+//
+// If compiling for Windows and you wish to use Unicode filenames, compile
+// with
+// #define STBI_WINDOWS_UTF8
+// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert
+// Windows wchar_t filenames to utf8.
+//
// ===========================================================================
//
// Philosophy
@@ -281,15 +229,15 @@ distribute, and modify this file as you see fit.
//
// Sometimes I let "good performance" creep up in priority over "easy to maintain",
// and for best performance I may provide less-easy-to-use APIs that give higher
-// performance, in addition to the easy to use ones. Nevertheless, it's important
+// performance, in addition to the easy-to-use ones. Nevertheless, it's important
// to keep in mind that from the standpoint of you, a client of this library,
-// all you care about is #1 and #3, and stb libraries do not emphasize #3 above all.
+// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all.
//
// Some secondary priorities arise directly from the first two, some of which
-// make more explicit reasons why performance can't be emphasized.
+// provide more explicit reasons why performance can't be emphasized.
//
// - Portable ("ease of use")
-// - Small footprint ("easy to maintain")
+// - Small source code footprint ("easy to maintain")
// - No dependencies ("ease of use")
//
// ===========================================================================
@@ -321,13 +269,6 @@ distribute, and modify this file as you see fit.
// (at least this is true for iOS and Android). Therefore, the NEON support is
// toggled by a build flag: define STBI_NEON to get NEON loops.
//
-// The output of the JPEG decoder is slightly different from versions where
-// SIMD support was introduced (that is, for versions before 1.49). The
-// difference is only +-1 in the 8-bit RGB channels, and only on a small
-// fraction of pixels. You can force the pre-1.49 behavior by defining
-// STBI_JPEG_OLD, but this will disable some of the SIMD decoding path
-// and hence cost some performance.
-//
// If for some reason you do not want to use any of SIMD code, or if
// you have issues compiling it, you can disable it entirely by
// defining STBI_NO_SIMD.
@@ -336,11 +277,10 @@ distribute, and modify this file as you see fit.
//
// HDR image support (disable by defining STBI_NO_HDR)
//
-// stb_image now supports loading HDR images in general, and currently
-// the Radiance .HDR file format, although the support is provided
-// generically. You can still load any file through the existing interface;
-// if you attempt to load an HDR file, it will be automatically remapped to
-// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
+// stb_image supports loading HDR images in general, and currently the Radiance
+// .HDR file format specifically. You can still load any file through the existing
+// interface; if you attempt to load an HDR file, it will be automatically remapped
+// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
// both of these constants can be reconfigured through this interface:
//
// stbi_hdr_to_ldr_gamma(2.2f);
@@ -372,18 +312,59 @@ distribute, and modify this file as you see fit.
//
// iPhone PNG support:
//
-// By default we convert iphone-formatted PNGs back to RGB, even though
-// they are internally encoded differently. You can disable this conversion
-// by by calling stbi_convert_iphone_png_to_rgb(0), in which case
-// you will always just get the native iphone "format" through (which
-// is BGR stored in RGB).
+// We optionally support converting iPhone-formatted PNGs (which store
+// premultiplied BGRA) back to RGB, even though they're internally encoded
+// differently. To enable this conversion, call
+// stbi_convert_iphone_png_to_rgb(1).
//
// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per
// pixel to remove any premultiplied alpha *only* if the image file explicitly
// says there's premultiplied data (currently only happens in iPhone images,
// and only if iPhone convert-to-rgb processing is on).
//
-
+// ===========================================================================
+//
+// ADDITIONAL CONFIGURATION
+//
+// - You can suppress implementation of any of the decoders to reduce
+// your code footprint by #defining one or more of the following
+// symbols before creating the implementation.
+//
+// STBI_NO_JPEG
+// STBI_NO_PNG
+// STBI_NO_BMP
+// STBI_NO_PSD
+// STBI_NO_TGA
+// STBI_NO_GIF
+// STBI_NO_HDR
+// STBI_NO_PIC
+// STBI_NO_PNM (.ppm and .pgm)
+//
+// - You can request *only* certain decoders and suppress all other ones
+// (this will be more forward-compatible, as addition of new decoders
+// doesn't require you to disable them explicitly):
+//
+// STBI_ONLY_JPEG
+// STBI_ONLY_PNG
+// STBI_ONLY_BMP
+// STBI_ONLY_PSD
+// STBI_ONLY_TGA
+// STBI_ONLY_GIF
+// STBI_ONLY_HDR
+// STBI_ONLY_PIC
+// STBI_ONLY_PNM (.ppm and .pgm)
+//
+// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
+// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
+//
+// - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater
+// than that size (in either width or height) without further processing.
+// This is to let programs in the wild set an upper bound to prevent
+// denial-of-service attacks on untrusted data, as one could generate a
+// valid image of gigantic dimensions and force stb_image to allocate a
+// huge block of memory and spend disproportionate time decoding it. By
+// default this is set to (1 << 24), which is 16777216, but that's still
+// very big.
#ifndef STBI_NO_STDIO
#include
@@ -393,7 +374,7 @@ distribute, and modify this file as you see fit.
enum
{
- STBI_default = 0, // only used for req_comp
+ STBI_default = 0, // only used for desired_channels
STBI_grey = 1,
STBI_grey_alpha = 2,
@@ -401,17 +382,21 @@ enum
STBI_rgb_alpha = 4
};
+#include
typedef unsigned char stbi_uc;
+typedef unsigned short stbi_us;
#ifdef __cplusplus
extern "C" {
#endif
+#ifndef STBIDEF
#ifdef STB_IMAGE_STATIC
#define STBIDEF static
#else
#define STBIDEF extern
#endif
+#endif
//////////////////////////////////////////////////////////////////////////////
//
@@ -429,34 +414,64 @@ typedef struct
int (*eof) (void *user); // returns nonzero if we are at end of file/data
} stbi_io_callbacks;
-STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *comp, int req_comp);
-STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *comp, int req_comp);
-STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *comp, int req_comp);
+////////////////////////////////////
+//
+// 8-bits-per-channel interface
+//
+
+STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *channels_in_file, int desired_channels);
#ifndef STBI_NO_STDIO
-STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *comp, int req_comp);
+STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
// for stbi_load_from_file, file pointer is left pointing immediately after image
#endif
+#ifndef STBI_NO_GIF
+STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
+#endif
+
+#ifdef STBI_WINDOWS_UTF8
+STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input);
+#endif
+
+////////////////////////////////////
+//
+// 16-bits-per-channel interface
+//
+
+STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
+
+#ifndef STBI_NO_STDIO
+STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+#endif
+
+////////////////////////////////////
+//
+// float-per-channel interface
+//
#ifndef STBI_NO_LINEAR
- STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *comp, int req_comp);
- STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
- STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp);
+ STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
+ STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
#ifndef STBI_NO_STDIO
- STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *comp, int req_comp);
+ STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+ STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
#endif
#endif
#ifndef STBI_NO_HDR
STBIDEF void stbi_hdr_to_ldr_gamma(float gamma);
STBIDEF void stbi_hdr_to_ldr_scale(float scale);
-#endif
+#endif // STBI_NO_HDR
#ifndef STBI_NO_LINEAR
STBIDEF void stbi_ldr_to_hdr_gamma(float gamma);
STBIDEF void stbi_ldr_to_hdr_scale(float scale);
-#endif // STBI_NO_HDR
+#endif // STBI_NO_LINEAR
// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR
STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user);
@@ -468,7 +483,7 @@ STBIDEF int stbi_is_hdr_from_file(FILE *f);
// get a VERY brief reason for failure
-// NOT THREADSAFE
+// on most compilers (and ALL modern mainstream compilers) this is threadsafe
STBIDEF const char *stbi_failure_reason (void);
// free the loaded image -- this is just free()
@@ -477,11 +492,14 @@ STBIDEF void stbi_image_free (void *retval_from_stbi_load);
// get image dimensions & components without fully decoding
STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp);
+STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len);
+STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user);
#ifndef STBI_NO_STDIO
-STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp);
-STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp);
-
+STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp);
+STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp);
+STBIDEF int stbi_is_16_bit (char const *filename);
+STBIDEF int stbi_is_16_bit_from_file(FILE *f);
#endif
@@ -498,6 +516,13 @@ STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert);
// flip the image vertically, so the first pixel in the output array is the bottom left
STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip);
+// as above, but only applies to images loaded on the thread that calls the function
+// this function is only available if your compiler supports thread-local variables;
+// calling it will fail to link if your compiler doesn't
+STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply);
+STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert);
+STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip);
+
// ZLIB client - used by PNG, available for other purposes
STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
@@ -562,9 +587,10 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch
#include // ptrdiff_t on osx
#include
#include
+#include
#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-#include // ldexp
+#include // ldexp, pow
#endif
#ifndef STBI_NO_STDIO
@@ -576,6 +602,12 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch
#define STBI_ASSERT(x) assert(x)
#endif
+#ifdef __cplusplus
+#define STBI_EXTERN extern "C"
+#else
+#define STBI_EXTERN extern
+#endif
+
#ifndef _MSC_VER
#ifdef __cplusplus
@@ -587,8 +619,25 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch
#define stbi_inline __forceinline
#endif
+#ifndef STBI_NO_THREAD_LOCALS
+ #if defined(__cplusplus) && __cplusplus >= 201103L
+ #define STBI_THREAD_LOCAL thread_local
+ #elif defined(__GNUC__) && __GNUC__ < 5
+ #define STBI_THREAD_LOCAL __thread
+ #elif defined(_MSC_VER)
+ #define STBI_THREAD_LOCAL __declspec(thread)
+ #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
+ #define STBI_THREAD_LOCAL _Thread_local
+ #endif
-#ifdef _MSC_VER
+ #ifndef STBI_THREAD_LOCAL
+ #if defined(__GNUC__)
+ #define STBI_THREAD_LOCAL __thread
+ #endif
+ #endif
+#endif
+
+#if defined(_MSC_VER) || defined(__SYMBIAN32__)
typedef unsigned short stbi__uint16;
typedef signed short stbi__int16;
typedef unsigned int stbi__uint32;
@@ -617,21 +666,25 @@ typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
#ifdef STBI_HAS_LROTL
#define stbi_lrot(x,y) _lrotl(x,y)
#else
- #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (32 - (y))))
+ #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (-(y) & 31)))
#endif
-#if defined(STBI_MALLOC) && defined(STBI_FREE) && defined(STBI_REALLOC)
+#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED))
// ok
-#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC)
+#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED)
// ok
#else
-#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC."
+#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)."
#endif
#ifndef STBI_MALLOC
-#define STBI_MALLOC(sz) malloc(sz)
-#define STBI_REALLOC(p,sz) realloc(p,sz)
-#define STBI_FREE(p) free(p)
+#define STBI_MALLOC(sz) malloc(sz)
+#define STBI_REALLOC(p,newsz) realloc(p,newsz)
+#define STBI_FREE(p) free(p)
+#endif
+
+#ifndef STBI_REALLOC_SIZED
+#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz)
#endif
// x86/x64 detection
@@ -641,12 +694,14 @@ typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
#define STBI__X86_TARGET
#endif
-#if defined(__GNUC__) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
-// NOTE: not clear do we actually need this for the 64-bit path?
+#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
// gcc doesn't support sse2 intrinsics unless you compile with -msse2,
-// (but compiling with -msse2 allows the compiler to use SSE2 everywhere;
-// this is just broken and gcc are jerks for not fixing it properly
-// http://www.virtualdub.org/blog/pivot/entry.php?id=363 )
+// which in turn means it gets to use SSE2 everywhere. This is unfortunate,
+// but previous attempts to provide the SSE2 functions with runtime
+// detection caused numerous issues. The way architecture extensions are
+// exposed in GCC/Clang is, sadly, not really suited for one-file libs.
+// New behavior: if compiled with -msse2, we use SSE2 without any
+// detection; if not, we don't use it at all.
#define STBI_NO_SIMD
#endif
@@ -665,7 +720,7 @@ typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
#define STBI_NO_SIMD
#endif
-#if !defined(STBI_NO_SIMD) && defined(STBI__X86_TARGET)
+#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET))
#define STBI_SSE2
#include
@@ -694,25 +749,27 @@ static int stbi__cpuid3(void)
#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
-static int stbi__sse2_available()
+#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2)
+static int stbi__sse2_available(void)
{
int info3 = stbi__cpuid3();
return ((info3 >> 26) & 1) != 0;
}
+#endif
+
#else // assume GCC-style if not VC++
#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-static int stbi__sse2_available()
+#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2)
+static int stbi__sse2_available(void)
{
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later
- // GCC 4.8+ has a nice way to do this
- return __builtin_cpu_supports("sse2");
-#else
- // portable way to do this, preferably without using GCC inline ASM?
- // just bail for now.
- return 0;
-#endif
+ // If we're even attempting to compile this on GCC/Clang, that means
+ // -msse2 is on, which means the compiler is allowed to use SSE2
+ // instructions at will, and so are we.
+ return 1;
}
+#endif
+
#endif
#endif
@@ -723,14 +780,21 @@ static int stbi__sse2_available()
#ifdef STBI_NEON
#include
-// assume GCC or Clang on ARM targets
+#ifdef _MSC_VER
+#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
+#else
#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
#endif
+#endif
#ifndef STBI_SIMD_ALIGN
#define STBI_SIMD_ALIGN(type, name) type name
#endif
+#ifndef STBI_MAX_DIMENSIONS
+#define STBI_MAX_DIMENSIONS (1 << 24)
+#endif
+
///////////////////////////////////////////////
//
// stbi__context struct and start_xxx functions
@@ -748,9 +812,10 @@ typedef struct
int read_from_callbacks;
int buflen;
stbi_uc buffer_start[128];
+ int callback_already_read;
stbi_uc *img_buffer, *img_buffer_end;
- stbi_uc *img_buffer_original;
+ stbi_uc *img_buffer_original, *img_buffer_original_end;
} stbi__context;
@@ -761,8 +826,9 @@ static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
{
s->io.read = NULL;
s->read_from_callbacks = 0;
+ s->callback_already_read = 0;
s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
- s->img_buffer_end = (stbi_uc *) buffer+len;
+ s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
}
// initialize a callback-based context
@@ -772,8 +838,10 @@ static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *
s->io_user_data = user;
s->buflen = sizeof(s->buffer_start);
s->read_from_callbacks = 1;
- s->img_buffer_original = s->buffer_start;
+ s->callback_already_read = 0;
+ s->img_buffer = s->img_buffer_original = s->buffer_start;
stbi__refill_buffer(s);
+ s->img_buffer_original_end = s->img_buffer_end;
}
#ifndef STBI_NO_STDIO
@@ -785,12 +853,17 @@ static int stbi__stdio_read(void *user, char *data, int size)
static void stbi__stdio_skip(void *user, int n)
{
+ int ch;
fseek((FILE*) user, n, SEEK_CUR);
+ ch = fgetc((FILE*) user); /* have to read a byte to reset feof()'s flag */
+ if (ch != EOF) {
+ ungetc(ch, (FILE *) user); /* push byte back onto stream if valid. */
+ }
}
static int stbi__stdio_eof(void *user)
{
- return feof((FILE*) user);
+ return feof((FILE*) user) || ferror((FILE *) user);
}
static stbi_io_callbacks stbi__stdio_callbacks =
@@ -815,81 +888,200 @@ static void stbi__rewind(stbi__context *s)
// but we just rewind to the beginning of the initial buffer, because
// we only use it after doing 'test', which only ever looks at at most 92 bytes
s->img_buffer = s->img_buffer_original;
+ s->img_buffer_end = s->img_buffer_original_end;
}
+enum
+{
+ STBI_ORDER_RGB,
+ STBI_ORDER_BGR
+};
+
+typedef struct
+{
+ int bits_per_channel;
+ int num_channels;
+ int channel_order;
+} stbi__result_info;
+
#ifndef STBI_NO_JPEG
static int stbi__jpeg_test(stbi__context *s);
-static stbi_uc *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp);
#endif
#ifndef STBI_NO_PNG
static int stbi__png_test(stbi__context *s);
-static stbi_uc *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp);
+static int stbi__png_is16(stbi__context *s);
#endif
#ifndef STBI_NO_BMP
static int stbi__bmp_test(stbi__context *s);
-static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp);
#endif
#ifndef STBI_NO_TGA
static int stbi__tga_test(stbi__context *s);
-static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp);
#endif
#ifndef STBI_NO_PSD
static int stbi__psd_test(stbi__context *s);
-static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc);
static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp);
+static int stbi__psd_is16(stbi__context *s);
#endif
#ifndef STBI_NO_HDR
static int stbi__hdr_test(stbi__context *s);
-static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp);
#endif
#ifndef STBI_NO_PIC
static int stbi__pic_test(stbi__context *s);
-static stbi_uc *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp);
#endif
#ifndef STBI_NO_GIF
static int stbi__gif_test(stbi__context *s);
-static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp);
#endif
#ifndef STBI_NO_PNM
static int stbi__pnm_test(stbi__context *s);
-static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp);
+static int stbi__pnm_is16(stbi__context *s);
#endif
-// this is not threadsafe
-static const char *stbi__g_failure_reason;
+static
+#ifdef STBI_THREAD_LOCAL
+STBI_THREAD_LOCAL
+#endif
+const char *stbi__g_failure_reason;
STBIDEF const char *stbi_failure_reason(void)
{
return stbi__g_failure_reason;
}
+#ifndef STBI_NO_FAILURE_STRINGS
static int stbi__err(const char *str)
{
stbi__g_failure_reason = str;
return 0;
}
+#endif
static void *stbi__malloc(size_t size)
{
return STBI_MALLOC(size);
}
+// stb_image uses ints pervasively, including for offset calculations.
+// therefore the largest decoded image size we can support with the
+// current code, even on 64-bit targets, is INT_MAX. this is not a
+// significant limitation for the intended use case.
+//
+// we do, however, need to make sure our size calculations don't
+// overflow. hence a few helper functions for size calculations that
+// multiply integers together, making sure that they're non-negative
+// and no overflow occurs.
+
+// return 1 if the sum is valid, 0 on overflow.
+// negative terms are considered invalid.
+static int stbi__addsizes_valid(int a, int b)
+{
+ if (b < 0) return 0;
+ // now 0 <= b <= INT_MAX, hence also
+ // 0 <= INT_MAX - b <= INTMAX.
+ // And "a + b <= INT_MAX" (which might overflow) is the
+ // same as a <= INT_MAX - b (no overflow)
+ return a <= INT_MAX - b;
+}
+
+// returns 1 if the product is valid, 0 on overflow.
+// negative factors are considered invalid.
+static int stbi__mul2sizes_valid(int a, int b)
+{
+ if (a < 0 || b < 0) return 0;
+ if (b == 0) return 1; // mul-by-0 is always safe
+ // portable way to check for no overflows in a*b
+ return a <= INT_MAX/b;
+}
+
+#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR)
+// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow
+static int stbi__mad2sizes_valid(int a, int b, int add)
+{
+ return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add);
+}
+#endif
+
+// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow
+static int stbi__mad3sizes_valid(int a, int b, int c, int add)
+{
+ return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
+ stbi__addsizes_valid(a*b*c, add);
+}
+
+// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM)
+static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add)
+{
+ return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
+ stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add);
+}
+#endif
+
+#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR)
+// mallocs with size overflow checking
+static void *stbi__malloc_mad2(int a, int b, int add)
+{
+ if (!stbi__mad2sizes_valid(a, b, add)) return NULL;
+ return stbi__malloc(a*b + add);
+}
+#endif
+
+static void *stbi__malloc_mad3(int a, int b, int c, int add)
+{
+ if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL;
+ return stbi__malloc(a*b*c + add);
+}
+
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM)
+static void *stbi__malloc_mad4(int a, int b, int c, int d, int add)
+{
+ if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL;
+ return stbi__malloc(a*b*c*d + add);
+}
+#endif
+
+// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow.
+static int stbi__addints_valid(int a, int b)
+{
+ if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow
+ if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0.
+ return a <= INT_MAX - b;
+}
+
+// returns 1 if the product of two signed shorts is valid, 0 on overflow.
+static int stbi__mul2shorts_valid(short a, short b)
+{
+ if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow
+ if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid
+ if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN
+ return a >= SHRT_MIN / b;
+}
+
// stbi__err - error
// stbi__errpf - error returning pointer to float
// stbi__errpuc - error returning pointer to unsigned char
@@ -902,8 +1094,8 @@ static void *stbi__malloc(size_t size)
#define stbi__err(x,y) stbi__err(x)
#endif
-#define stbi__errpf(x,y) ((float *) (stbi__err(x,y)?NULL:NULL))
-#define stbi__errpuc(x,y) ((unsigned char *) (stbi__err(x,y)?NULL:NULL))
+#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL))
+#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL))
STBIDEF void stbi_image_free(void *retval_from_stbi_load)
{
@@ -918,40 +1110,69 @@ static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp);
#endif
-static int stbi__vertically_flip_on_load = 0;
+static int stbi__vertically_flip_on_load_global = 0;
STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip)
{
- stbi__vertically_flip_on_load = flag_true_if_should_flip;
+ stbi__vertically_flip_on_load_global = flag_true_if_should_flip;
}
-static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+#ifndef STBI_THREAD_LOCAL
+#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global
+#else
+static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set;
+
+STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip)
{
- #ifndef STBI_NO_JPEG
- if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp);
- #endif
+ stbi__vertically_flip_on_load_local = flag_true_if_should_flip;
+ stbi__vertically_flip_on_load_set = 1;
+}
+
+#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \
+ ? stbi__vertically_flip_on_load_local \
+ : stbi__vertically_flip_on_load_global)
+#endif // STBI_THREAD_LOCAL
+
+static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
+{
+ memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields
+ ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed
+ ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order
+ ri->num_channels = 0;
+
+ // test the formats with a very explicit header first (at least a FOURCC
+ // or distinctive magic number first)
#ifndef STBI_NO_PNG
- if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp);
+ if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp, ri);
#endif
#ifndef STBI_NO_BMP
- if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp);
+ if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp, ri);
#endif
#ifndef STBI_NO_GIF
- if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp);
+ if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp, ri);
#endif
#ifndef STBI_NO_PSD
- if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp);
+ if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
+ #else
+ STBI_NOTUSED(bpc);
#endif
#ifndef STBI_NO_PIC
- if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp);
+ if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri);
+ #endif
+
+ // then the formats that can end up attempting to load with just 1 or 2
+ // bytes matching expectations; these are prone to false positives, so
+ // try them later
+ #ifndef STBI_NO_JPEG
+ if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri);
#endif
#ifndef STBI_NO_PNM
- if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp);
+ if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp, ri);
#endif
#ifndef STBI_NO_HDR
if (stbi__hdr_test(s)) {
- float *hdr = stbi__hdr_load(s, x,y,comp,req_comp);
+ float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri);
return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
}
#endif
@@ -959,65 +1180,179 @@ static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *com
#ifndef STBI_NO_TGA
// test tga last because it's a crappy test!
if (stbi__tga_test(s))
- return stbi__tga_load(s,x,y,comp,req_comp);
+ return stbi__tga_load(s,x,y,comp,req_comp, ri);
#endif
return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt");
}
-static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels)
{
- unsigned char *result = stbi__load_main(s, x, y, comp, req_comp);
+ int i;
+ int img_len = w * h * channels;
+ stbi_uc *reduced;
- if (stbi__vertically_flip_on_load && result != NULL) {
- int w = *x, h = *y;
- int depth = req_comp ? req_comp : *comp;
- int row,col,z;
- stbi_uc temp;
-
- // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once
- for (row = 0; row < (h>>1); row++) {
- for (col = 0; col < w; col++) {
- for (z = 0; z < depth; z++) {
- temp = result[(row * w + col) * depth + z];
- result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z];
- result[((h - row - 1) * w + col) * depth + z] = temp;
- }
- }
+ reduced = (stbi_uc *) stbi__malloc(img_len);
+ if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory");
+
+ for (i = 0; i < img_len; ++i)
+ reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling
+
+ STBI_FREE(orig);
+ return reduced;
+}
+
+static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels)
+{
+ int i;
+ int img_len = w * h * channels;
+ stbi__uint16 *enlarged;
+
+ enlarged = (stbi__uint16 *) stbi__malloc(img_len*2);
+ if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
+
+ for (i = 0; i < img_len; ++i)
+ enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff
+
+ STBI_FREE(orig);
+ return enlarged;
+}
+
+static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel)
+{
+ int row;
+ size_t bytes_per_row = (size_t)w * bytes_per_pixel;
+ stbi_uc temp[2048];
+ stbi_uc *bytes = (stbi_uc *)image;
+
+ for (row = 0; row < (h>>1); row++) {
+ stbi_uc *row0 = bytes + row*bytes_per_row;
+ stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row;
+ // swap row0 with row1
+ size_t bytes_left = bytes_per_row;
+ while (bytes_left) {
+ size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp);
+ memcpy(temp, row0, bytes_copy);
+ memcpy(row0, row1, bytes_copy);
+ memcpy(row1, temp, bytes_copy);
+ row0 += bytes_copy;
+ row1 += bytes_copy;
+ bytes_left -= bytes_copy;
}
}
+}
- return result;
+#ifndef STBI_NO_GIF
+static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel)
+{
+ int slice;
+ int slice_size = w * h * bytes_per_pixel;
+
+ stbi_uc *bytes = (stbi_uc *)image;
+ for (slice = 0; slice < z; ++slice) {
+ stbi__vertical_flip(bytes, w, h, bytes_per_pixel);
+ bytes += slice_size;
+ }
}
+#endif
+
+static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+ stbi__result_info ri;
+ void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8);
+
+ if (result == NULL)
+ return NULL;
+
+ // it is the responsibility of the loaders to make sure we get either 8 or 16 bit.
+ STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16);
+
+ if (ri.bits_per_channel != 8) {
+ result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
+ ri.bits_per_channel = 8;
+ }
+ // @TODO: move stbi__convert_format to here
+
+ if (stbi__vertically_flip_on_load) {
+ int channels = req_comp ? req_comp : *comp;
+ stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc));
+ }
+
+ return (unsigned char *) result;
+}
+
+static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+ stbi__result_info ri;
+ void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16);
+
+ if (result == NULL)
+ return NULL;
+
+ // it is the responsibility of the loaders to make sure we get either 8 or 16 bit.
+ STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16);
+
+ if (ri.bits_per_channel != 16) {
+ result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
+ ri.bits_per_channel = 16;
+ }
+
+ // @TODO: move stbi__convert_format16 to here
+ // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision
+
+ if (stbi__vertically_flip_on_load) {
+ int channels = req_comp ? req_comp : *comp;
+ stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16));
+ }
+
+ return (stbi__uint16 *) result;
+}
+
+#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR)
static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
{
if (stbi__vertically_flip_on_load && result != NULL) {
- int w = *x, h = *y;
- int depth = req_comp ? req_comp : *comp;
- int row,col,z;
- float temp;
-
- // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once
- for (row = 0; row < (h>>1); row++) {
- for (col = 0; col < w; col++) {
- for (z = 0; z < depth; z++) {
- temp = result[(row * w + col) * depth + z];
- result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z];
- result[((h - row - 1) * w + col) * depth + z] = temp;
- }
- }
- }
+ int channels = req_comp ? req_comp : *comp;
+ stbi__vertical_flip(result, *x, *y, channels * sizeof(float));
}
}
-
+#endif
#ifndef STBI_NO_STDIO
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
+STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide);
+STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default);
+#endif
+
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
+STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input)
+{
+ return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL);
+}
+#endif
+
static FILE *stbi__fopen(char const *filename, char const *mode)
{
FILE *f;
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
+ wchar_t wMode[64];
+ wchar_t wFilename[1024];
+ if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename)))
+ return 0;
+
+ if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode)))
+ return 0;
+
#if defined(_MSC_VER) && _MSC_VER >= 1400
+ if (0 != _wfopen_s(&f, wFilename, wMode))
+ f = 0;
+#else
+ f = _wfopen(wFilename, wMode);
+#endif
+
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
if (0 != fopen_s(&f, filename, mode))
f=0;
#else
@@ -1042,42 +1377,98 @@ STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req
unsigned char *result;
stbi__context s;
stbi__start_file(&s,f);
- result = stbi__load_flip(&s,x,y,comp,req_comp);
+ result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
if (result) {
// need to 'unget' all the characters in the IO buffer
fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
}
return result;
}
+
+STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+ stbi__uint16 *result;
+ stbi__context s;
+ stbi__start_file(&s,f);
+ result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp);
+ if (result) {
+ // need to 'unget' all the characters in the IO buffer
+ fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
+ }
+ return result;
+}
+
+STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+ FILE *f = stbi__fopen(filename, "rb");
+ stbi__uint16 *result;
+ if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file");
+ result = stbi_load_from_file_16(f,x,y,comp,req_comp);
+ fclose(f);
+ return result;
+}
+
+
#endif //!STBI_NO_STDIO
+STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
+{
+ stbi__context s;
+ stbi__start_mem(&s,buffer,len);
+ return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
+}
+
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
+{
+ stbi__context s;
+ stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
+ return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
+}
+
STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
{
stbi__context s;
stbi__start_mem(&s,buffer,len);
- return stbi__load_flip(&s,x,y,comp,req_comp);
+ return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
}
STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
{
stbi__context s;
stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
- return stbi__load_flip(&s,x,y,comp,req_comp);
+ return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
}
+#ifndef STBI_NO_GIF
+STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
+{
+ unsigned char *result;
+ stbi__context s;
+ stbi__start_mem(&s,buffer,len);
+
+ result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp);
+ if (stbi__vertically_flip_on_load) {
+ stbi__vertical_flip_slices( result, *x, *y, *z, *comp );
+ }
+
+ return result;
+}
+#endif
+
#ifndef STBI_NO_LINEAR
static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
{
unsigned char *data;
#ifndef STBI_NO_HDR
if (stbi__hdr_test(s)) {
- float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp);
+ stbi__result_info ri;
+ float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri);
if (hdr_data)
stbi__float_postprocess(hdr_data,x,y,comp,req_comp);
return hdr_data;
}
#endif
- data = stbi__load_flip(s, x, y, comp, req_comp);
+ data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp);
if (data)
return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
return stbi__errpf("unknown image type", "Image not of any known type, or corrupt");
@@ -1147,13 +1538,18 @@ STBIDEF int stbi_is_hdr (char const *filename)
return result;
}
-STBIDEF int stbi_is_hdr_from_file(FILE *f)
+STBIDEF int stbi_is_hdr_from_file(FILE *f)
{
#ifndef STBI_NO_HDR
+ long pos = ftell(f);
+ int res;
stbi__context s;
stbi__start_file(&s,f);
- return stbi__hdr_test(&s);
+ res = stbi__hdr_test(&s);
+ fseek(f, pos, SEEK_SET);
+ return res;
#else
+ STBI_NOTUSED(f);
return 0;
#endif
}
@@ -1166,18 +1562,21 @@ STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void
stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
return stbi__hdr_test(&s);
#else
+ STBI_NOTUSED(clbk);
+ STBI_NOTUSED(user);
return 0;
#endif
}
-static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
+#ifndef STBI_NO_LINEAR
static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f;
-#ifndef STBI_NO_LINEAR
STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; }
STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; }
#endif
+static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
+
STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; }
STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; }
@@ -1197,6 +1596,7 @@ enum
static void stbi__refill_buffer(stbi__context *s)
{
int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
+ s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original);
if (n == 0) {
// at end of file, treat same as if from memory, but need to handle case
// where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
@@ -1221,6 +1621,9 @@ stbi_inline static stbi_uc stbi__get8(stbi__context *s)
return 0;
}
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
+// nothing
+#else
stbi_inline static int stbi__at_eof(stbi__context *s)
{
if (s->io.read) {
@@ -1232,9 +1635,14 @@ stbi_inline static int stbi__at_eof(stbi__context *s)
return s->img_buffer >= s->img_buffer_end;
}
+#endif
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC)
+// nothing
+#else
static void stbi__skip(stbi__context *s, int n)
{
+ if (n == 0) return; // already there!
if (n < 0) {
s->img_buffer = s->img_buffer_end;
return;
@@ -1249,7 +1657,11 @@ static void stbi__skip(stbi__context *s, int n)
}
s->img_buffer += n;
}
+#endif
+#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM)
+// nothing
+#else
static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
{
if (s->io.read) {
@@ -1273,34 +1685,52 @@ static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
} else
return 0;
}
+#endif
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC)
+// nothing
+#else
static int stbi__get16be(stbi__context *s)
{
int z = stbi__get8(s);
return (z << 8) + stbi__get8(s);
}
+#endif
+#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC)
+// nothing
+#else
static stbi__uint32 stbi__get32be(stbi__context *s)
{
stbi__uint32 z = stbi__get16be(s);
return (z << 16) + stbi__get16be(s);
}
+#endif
+#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF)
+// nothing
+#else
static int stbi__get16le(stbi__context *s)
{
int z = stbi__get8(s);
return z + (stbi__get8(s) << 8);
}
+#endif
+#ifndef STBI_NO_BMP
static stbi__uint32 stbi__get32le(stbi__context *s)
{
stbi__uint32 z = stbi__get16le(s);
- return z + (stbi__get16le(s) << 16);
+ z += (stbi__uint32)stbi__get16le(s) << 16;
+ return z;
}
+#endif
#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings
-
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
+// nothing
+#else
//////////////////////////////////////////////////////////////////////////////
//
// generic converter from built-in img_n to req_comp
@@ -1312,60 +1742,124 @@ static stbi__uint32 stbi__get32le(stbi__context *s)
// assume data buffer is malloced, so malloc a new one and free that one
// only failure mode is malloc failing
-static stbi_uc stbi__compute_y(int r, int g, int b)
+static stbi_uc stbi__compute_y(int r, int g, int b)
+{
+ return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8);
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
+// nothing
+#else
+static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+{
+ int i,j;
+ unsigned char *good;
+
+ if (req_comp == img_n) return data;
+ STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
+
+ good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0);
+ if (good == NULL) {
+ STBI_FREE(data);
+ return stbi__errpuc("outofmem", "Out of memory");
+ }
+
+ for (j=0; j < (int) y; ++j) {
+ unsigned char *src = data + j * x * img_n ;
+ unsigned char *dest = good + j * x * req_comp;
+
+ #define STBI__COMBO(a,b) ((a)*8+(b))
+ #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+ // convert source image with img_n components to one with req_comp components;
+ // avoid switch per pixel, so use switch per scanline and massive macros
+ switch (STBI__COMBO(img_n, req_comp)) {
+ STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255; } break;
+ STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break;
+ STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255; } break;
+ STBI__CASE(2,1) { dest[0]=src[0]; } break;
+ STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break;
+ STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break;
+ STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255; } break;
+ STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break;
+ STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255; } break;
+ STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break;
+ STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break;
+ STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break;
+ default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion");
+ }
+ #undef STBI__CASE
+ }
+
+ STBI_FREE(data);
+ return good;
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD)
+// nothing
+#else
+static stbi__uint16 stbi__compute_y_16(int r, int g, int b)
{
- return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8);
+ return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8);
}
+#endif
-static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD)
+// nothing
+#else
+static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y)
{
int i,j;
- unsigned char *good;
+ stbi__uint16 *good;
if (req_comp == img_n) return data;
STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
- good = (unsigned char *) stbi__malloc(req_comp * x * y);
+ good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2);
if (good == NULL) {
STBI_FREE(data);
- return stbi__errpuc("outofmem", "Out of memory");
+ return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
}
for (j=0; j < (int) y; ++j) {
- unsigned char *src = data + j * x * img_n ;
- unsigned char *dest = good + j * x * req_comp;
+ stbi__uint16 *src = data + j * x * img_n ;
+ stbi__uint16 *dest = good + j * x * req_comp;
- #define COMBO(a,b) ((a)*8+(b))
- #define CASE(a,b) case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+ #define STBI__COMBO(a,b) ((a)*8+(b))
+ #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
// convert source image with img_n components to one with req_comp components;
// avoid switch per pixel, so use switch per scanline and massive macros
- switch (COMBO(img_n, req_comp)) {
- CASE(1,2) dest[0]=src[0], dest[1]=255; break;
- CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break;
- CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break;
- CASE(2,1) dest[0]=src[0]; break;
- CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break;
- CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break;
- CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break;
- CASE(3,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break;
- CASE(3,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255; break;
- CASE(4,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break;
- CASE(4,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break;
- CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break;
- default: STBI_ASSERT(0);
+ switch (STBI__COMBO(img_n, req_comp)) {
+ STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff; } break;
+ STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break;
+ STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff; } break;
+ STBI__CASE(2,1) { dest[0]=src[0]; } break;
+ STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break;
+ STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break;
+ STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff; } break;
+ STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break;
+ STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break;
+ STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break;
+ STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break;
+ STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break;
+ default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion");
}
- #undef CASE
+ #undef STBI__CASE
}
STBI_FREE(data);
return good;
}
+#endif
#ifndef STBI_NO_LINEAR
static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
{
int i,k,n;
- float *output = (float *) stbi__malloc(x * y * comp * sizeof(float));
+ float *output;
+ if (!data) return NULL;
+ output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0);
if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); }
// compute number of non-alpha components
if (comp & 1) n = comp; else n = comp-1;
@@ -1373,7 +1867,11 @@ static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
for (k=0; k < n; ++k) {
output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale);
}
- if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f;
+ }
+ if (n < comp) {
+ for (i=0; i < x*y; ++i) {
+ output[i*comp + n] = data[i*comp + n]/255.0f;
+ }
}
STBI_FREE(data);
return output;
@@ -1385,7 +1883,9 @@ static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp)
{
int i,k,n;
- stbi_uc *output = (stbi_uc *) stbi__malloc(x * y * comp);
+ stbi_uc *output;
+ if (!data) return NULL;
+ output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0);
if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); }
// compute number of non-alpha components
if (comp & 1) n = comp; else n = comp-1;
@@ -1450,7 +1950,7 @@ typedef struct
stbi__context *s;
stbi__huffman huff_dc[4];
stbi__huffman huff_ac[4];
- stbi_uc dequant[4][64];
+ stbi__uint16 dequant[4][64];
stbi__int16 fast_ac[4][1 << FAST_BITS];
// sizes for components, interleaved MCUs
@@ -1486,6 +1986,9 @@ typedef struct
int succ_high;
int succ_low;
int eob_run;
+ int jfif;
+ int app14_color_transform; // Adobe APP14 tag
+ int rgb;
int scan_n, order[4];
int restart_interval, todo;
@@ -1498,11 +2001,15 @@ typedef struct
static int stbi__build_huffman(stbi__huffman *h, int *count)
{
- int i,j,k=0,code;
+ int i,j,k=0;
+ unsigned int code;
// build size list for each symbol (from JPEG spec)
- for (i=0; i < 16; ++i)
- for (j=0; j < count[i]; ++j)
+ for (i=0; i < 16; ++i) {
+ for (j=0; j < count[i]; ++j) {
h->size[k++] = (stbi_uc) (i+1);
+ if(k >= 257) return stbi__err("bad size list","Corrupt JPEG");
+ }
+ }
h->size[k] = 0;
// compute actual symbols (from jpeg spec)
@@ -1514,7 +2021,7 @@ static int stbi__build_huffman(stbi__huffman *h, int *count)
if (h->size[k] == j) {
while (h->size[k] == j)
h->code[k++] = (stbi__uint16) (code++);
- if (code-1 >= (1 << j)) return stbi__err("bad code lengths","Corrupt JPEG");
+ if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG");
}
// compute largest code + 1 for this size, preshifted as needed later
h->maxcode[j] = code << (16-j);
@@ -1555,10 +2062,10 @@ static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
// magnitude code followed by receive_extend code
int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
int m = 1 << (magbits - 1);
- if (k < m) k += (-1 << magbits) + 1;
+ if (k < m) k += (~0U << magbits) + 1;
// if the result is small enough, we can fit it in fast_ac table
if (k >= -128 && k <= 127)
- fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits));
+ fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits));
}
}
}
@@ -1567,9 +2074,10 @@ static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
{
do {
- int b = j->nomore ? 0 : stbi__get8(j->s);
+ unsigned int b = j->nomore ? 0 : stbi__get8(j->s);
if (b == 0xff) {
int c = stbi__get8(j->s);
+ while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes
if (c != 0) {
j->marker = (unsigned char) c;
j->nomore = 1;
@@ -1582,7 +2090,7 @@ static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
}
// (1 << n) - 1
-static stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
+static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
// decode a jpeg huffman value from the bitstream
stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
@@ -1626,6 +2134,8 @@ stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
// convert the huffman code to the symbol id
c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
+ if(c < 0 || c >= 256) // symbol id out of bounds!
+ return -1;
STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
// convert the id to a symbol
@@ -1635,7 +2145,7 @@ stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
}
// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j);
+ if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing
- sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
+ sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative)
k = stbi_lrot(j->code_buffer, n);
- STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
j->code_buffer = k & ~stbi__bmask[n];
k &= stbi__bmask[n];
j->code_bits -= n;
- return k + (stbi__jbias[n] & ~sgn);
+ return k + (stbi__jbias[n] & (sgn - 1));
}
// get some unsigned bits
@@ -1659,6 +2169,7 @@ stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
{
unsigned int k;
if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+ if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing
k = stbi_lrot(j->code_buffer, n);
j->code_buffer = k & ~stbi__bmask[n];
k &= stbi__bmask[n];
@@ -1670,6 +2181,7 @@ stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
{
unsigned int k;
if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
+ if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing
k = j->code_buffer;
j->code_buffer <<= 1;
--j->code_bits;
@@ -1678,7 +2190,7 @@ stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
// given a value that's at position X in the zigzag stream,
// where does it appear in the 8x8 matrix coded as row-major?
-static stbi_uc stbi__jpeg_dezigzag[64+15] =
+static const stbi_uc stbi__jpeg_dezigzag[64+15] =
{
0, 1, 8, 16, 9, 2, 3, 10,
17, 24, 32, 25, 18, 11, 4, 5,
@@ -1694,21 +2206,23 @@ static stbi_uc stbi__jpeg_dezigzag[64+15] =
};
// decode one 64-entry block--
-static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi_uc *dequant)
+static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant)
{
int diff,dc,k;
int t;
if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
t = stbi__jpeg_huff_decode(j, hdc);
- if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+ if (t < 0 || t > 15) return stbi__err("bad huffman code","Corrupt JPEG");
// 0 all the ac values now so we can do it 32-bits at a time
memset(data,0,64*sizeof(data[0]));
diff = t ? stbi__extend_receive(j, t) : 0;
+ if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG");
dc = j->img_comp[b].dc_pred + diff;
j->img_comp[b].dc_pred = dc;
+ if ((dc > SHRT_MAX) || (dequant[0] > SHRT_MAX) || !stbi__mul2shorts_valid((short) dc, (short) dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
data[0] = (short) (dc * dequant[0]);
// decode AC components, see JPEG spec
@@ -1722,6 +2236,7 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman
if (r) { // fast-AC path
k += (r >> 4) & 15; // run
s = r & 15; // combined length
+ if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available");
j->code_buffer <<= s;
j->code_bits -= s;
// decode into unzigzag'd location
@@ -1758,11 +2273,14 @@ static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__
// first scan for DC coefficient, must be first
memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
t = stbi__jpeg_huff_decode(j, hdc);
+ if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
diff = t ? stbi__extend_receive(j, t) : 0;
+ if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG");
dc = j->img_comp[b].dc_pred + diff;
j->img_comp[b].dc_pred = dc;
- data[0] = (short) (dc << j->succ_low);
+ if ((dc > SHRT_MAX) || !stbi__mul2shorts_valid((short) dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+ data[0] = (short) (dc * (1 << j->succ_low));
} else {
// refinement scan for DC coefficient
if (stbi__jpeg_get_bit(j))
@@ -1796,10 +2314,11 @@ static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__
if (r) { // fast-AC path
k += (r >> 4) & 15; // run
s = r & 15; // combined length
+ if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available");
j->code_buffer <<= s;
j->code_bits -= s;
zig = stbi__jpeg_dezigzag[k++];
- data[zig] = (short) ((r >> 8) << shift);
+ data[zig] = (short) ((r >> 8) * (1 << shift));
} else {
int rs = stbi__jpeg_huff_decode(j, hac);
if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
@@ -1817,7 +2336,7 @@ static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__
} else {
k += r;
zig = stbi__jpeg_dezigzag[k++];
- data[zig] = (short) (stbi__extend_receive(j,s) << shift);
+ data[zig] = (short) (stbi__extend_receive(j,s) * (1 << shift));
}
}
} while (k <= j->spec_end);
@@ -1904,7 +2423,7 @@ stbi_inline static stbi_uc stbi__clamp(int x)
}
#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5)))
-#define stbi__fsh(x) ((x) << 12)
+#define stbi__fsh(x) ((x) * 4096)
// derived from jidctint -- DCT_ISLOW
#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
@@ -1959,7 +2478,7 @@ static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64])
// (1|2|3|4|5|6|7)==0 0 seconds
// all separate -0.047 seconds
// 1 && 2|3 && 4|5 && 6|7: -0.047 seconds
- int dcterm = d[0] << 2;
+ int dcterm = d[0]*4;
v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
} else {
STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
@@ -2403,7 +2922,7 @@ static stbi_uc stbi__get_marker(stbi__jpeg *j)
x = stbi__get8(j->s);
if (x != 0xff) return STBI__MARKER_none;
while (x == 0xff)
- x = stbi__get8(j->s);
+ x = stbi__get8(j->s); // consume repeated 0xff fill bytes
return x;
}
@@ -2418,7 +2937,7 @@ static void stbi__jpeg_reset(stbi__jpeg *j)
j->code_bits = 0;
j->code_buffer = 0;
j->nomore = 0;
- j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0;
+ j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0;
j->marker = STBI__MARKER_none;
j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
j->eob_run = 0;
@@ -2550,7 +3069,7 @@ static int stbi__parse_entropy_coded_data(stbi__jpeg *z)
}
}
-static void stbi__jpeg_dequantize(short *data, stbi_uc *dequant)
+static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant)
{
int i;
for (i=0; i < 64; ++i)
@@ -2592,13 +3111,14 @@ static int stbi__process_marker(stbi__jpeg *z, int m)
L = stbi__get16be(z->s)-2;
while (L > 0) {
int q = stbi__get8(z->s);
- int p = q >> 4;
+ int p = q >> 4, sixteen = (p != 0);
int t = q & 15,i;
- if (p != 0) return stbi__err("bad DQT type","Corrupt JPEG");
+ if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG");
if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
+
for (i=0; i < 64; ++i)
- z->dequant[t][stbi__jpeg_dezigzag[i]] = stbi__get8(z->s);
- L -= 65;
+ z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s));
+ L -= (sixteen ? 129 : 65);
}
return L==0;
@@ -2615,6 +3135,7 @@ static int stbi__process_marker(stbi__jpeg *z, int m)
sizes[i] = stbi__get8(z->s);
n += sizes[i];
}
+ if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values!
L -= 17;
if (tc == 0) {
if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
@@ -2631,12 +3152,50 @@ static int stbi__process_marker(stbi__jpeg *z, int m)
}
return L==0;
}
+
// check for comment block or APP blocks
if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
- stbi__skip(z->s, stbi__get16be(z->s)-2);
+ L = stbi__get16be(z->s);
+ if (L < 2) {
+ if (m == 0xFE)
+ return stbi__err("bad COM len","Corrupt JPEG");
+ else
+ return stbi__err("bad APP len","Corrupt JPEG");
+ }
+ L -= 2;
+
+ if (m == 0xE0 && L >= 5) { // JFIF APP0 segment
+ static const unsigned char tag[5] = {'J','F','I','F','\0'};
+ int ok = 1;
+ int i;
+ for (i=0; i < 5; ++i)
+ if (stbi__get8(z->s) != tag[i])
+ ok = 0;
+ L -= 5;
+ if (ok)
+ z->jfif = 1;
+ } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment
+ static const unsigned char tag[6] = {'A','d','o','b','e','\0'};
+ int ok = 1;
+ int i;
+ for (i=0; i < 6; ++i)
+ if (stbi__get8(z->s) != tag[i])
+ ok = 0;
+ L -= 6;
+ if (ok) {
+ stbi__get8(z->s); // version
+ stbi__get16be(z->s); // flags0
+ stbi__get16be(z->s); // flags1
+ z->app14_color_transform = stbi__get8(z->s); // color transform
+ L -= 6;
+ }
+ }
+
+ stbi__skip(z->s, L);
return 1;
}
- return 0;
+
+ return stbi__err("unknown marker","Corrupt JPEG");
}
// after we see SOS
@@ -2679,6 +3238,28 @@ static int stbi__process_scan_header(stbi__jpeg *z)
return 1;
}
+static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why)
+{
+ int i;
+ for (i=0; i < ncomp; ++i) {
+ if (z->img_comp[i].raw_data) {
+ STBI_FREE(z->img_comp[i].raw_data);
+ z->img_comp[i].raw_data = NULL;
+ z->img_comp[i].data = NULL;
+ }
+ if (z->img_comp[i].raw_coeff) {
+ STBI_FREE(z->img_comp[i].raw_coeff);
+ z->img_comp[i].raw_coeff = 0;
+ z->img_comp[i].coeff = 0;
+ }
+ if (z->img_comp[i].linebuf) {
+ STBI_FREE(z->img_comp[i].linebuf);
+ z->img_comp[i].linebuf = NULL;
+ }
+ }
+ return why;
+}
+
static int stbi__process_frame_header(stbi__jpeg *z, int scan)
{
stbi__context *s = z->s;
@@ -2687,8 +3268,10 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
+ if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+ if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
c = stbi__get8(s);
- if (c != 3 && c != 1) return stbi__err("bad component count","Corrupt JPEG"); // JFIF requires
+ if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG");
s->img_n = c;
for (i=0; i < c; ++i) {
z->img_comp[i].data = NULL;
@@ -2697,11 +3280,12 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG");
+ z->rgb = 0;
for (i=0; i < s->img_n; ++i) {
+ static const unsigned char rgb[3] = { 'R', 'G', 'B' };
z->img_comp[i].id = stbi__get8(s);
- if (z->img_comp[i].id != i+1) // JFIF requires
- if (z->img_comp[i].id != i) // some version of jpegtran outputs non-JFIF-compliant files!
- return stbi__err("bad component ID","Corrupt JPEG");
+ if (s->img_n == 3 && z->img_comp[i].id == rgb[i])
+ ++z->rgb;
q = stbi__get8(s);
z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG");
z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG");
@@ -2710,18 +3294,26 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
if (scan != STBI__SCAN_load) return 1;
- if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
+ if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode");
for (i=0; i < s->img_n; ++i) {
if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
}
+ // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios
+ // and I've never seen a non-corrupted JPEG file actually use them
+ for (i=0; i < s->img_n; ++i) {
+ if (h_max % z->img_comp[i].h != 0) return stbi__err("bad H","Corrupt JPEG");
+ if (v_max % z->img_comp[i].v != 0) return stbi__err("bad V","Corrupt JPEG");
+ }
+
// compute interleaved mcu info
z->img_h_max = h_max;
z->img_v_max = v_max;
z->img_mcu_w = h_max * 8;
z->img_mcu_h = v_max * 8;
+ // these sizes can't be more than 17 bits
z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
@@ -2733,28 +3325,27 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
// the bogus oversized data from using interleaved MCUs and their
// big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
// discard the extra data until colorspace conversion
+ //
+ // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier)
+ // so these muls can't overflow with 32-bit ints (which we require)
z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
- z->img_comp[i].raw_data = stbi__malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15);
-
- if (z->img_comp[i].raw_data == NULL) {
- for(--i; i >= 0; --i) {
- STBI_FREE(z->img_comp[i].raw_data);
- z->img_comp[i].data = NULL;
- }
- return stbi__err("outofmem", "Out of memory");
- }
+ z->img_comp[i].coeff = 0;
+ z->img_comp[i].raw_coeff = 0;
+ z->img_comp[i].linebuf = NULL;
+ z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15);
+ if (z->img_comp[i].raw_data == NULL)
+ return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
// align blocks for idct using mmx/sse
z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
- z->img_comp[i].linebuf = NULL;
if (z->progressive) {
- z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3;
- z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3;
- z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15);
+ // w2, h2 are multiples of 8 (see above)
+ z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8;
+ z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8;
+ z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15);
+ if (z->img_comp[i].raw_coeff == NULL)
+ return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
- } else {
- z->img_comp[i].coeff = 0;
- z->img_comp[i].raw_coeff = 0;
}
}
@@ -2773,6 +3364,8 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
{
int m;
+ z->jfif = 0;
+ z->app14_color_transform = -1; // valid values are 0,1,2
z->marker = STBI__MARKER_none; // initialize cached marker to empty
m = stbi__get_marker(z);
if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG");
@@ -2792,6 +3385,28 @@ static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
return 1;
}
+static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j)
+{
+ // some JPEGs have junk at end, skip over it but if we find what looks
+ // like a valid marker, resume there
+ while (!stbi__at_eof(j->s)) {
+ stbi_uc x = stbi__get8(j->s);
+ while (x == 255) { // might be a marker
+ if (stbi__at_eof(j->s)) return STBI__MARKER_none;
+ x = stbi__get8(j->s);
+ if (x != 0x00 && x != 0xff) {
+ // not a stuffed zero or lead-in to another marker, looks
+ // like an actual marker, return it
+ return x;
+ }
+ // stuffed zero has x=0 now which ends the loop, meaning we go
+ // back to regular scan loop.
+ // repeated 0xff keeps trying to read the next byte of the marker.
+ }
+ }
+ return STBI__MARKER_none;
+}
+
// decode image to YCbCr format
static int stbi__decode_jpeg_image(stbi__jpeg *j)
{
@@ -2808,22 +3423,22 @@ static int stbi__decode_jpeg_image(stbi__jpeg *j)
if (!stbi__process_scan_header(j)) return 0;
if (!stbi__parse_entropy_coded_data(j)) return 0;
if (j->marker == STBI__MARKER_none ) {
- // handle 0s at the end of image data from IP Kamera 9060
- while (!stbi__at_eof(j->s)) {
- int x = stbi__get8(j->s);
- if (x == 255) {
- j->marker = stbi__get8(j->s);
- break;
- } else if (x != 0) {
- return stbi__err("junk before marker", "Corrupt JPEG");
- }
- }
+ j->marker = stbi__skip_jpeg_junk_at_end(j);
// if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
}
+ m = stbi__get_marker(j);
+ if (STBI__RESTART(m))
+ m = stbi__get_marker(j);
+ } else if (stbi__DNL(m)) {
+ int Ld = stbi__get16be(j->s);
+ stbi__uint32 NL = stbi__get16be(j->s);
+ if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG");
+ if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
+ m = stbi__get_marker(j);
} else {
- if (!stbi__process_marker(j, m)) return 0;
+ if (!stbi__process_marker(j, m)) return 1;
+ m = stbi__get_marker(j);
}
- m = stbi__get_marker(j);
}
if (j->progressive)
stbi__jpeg_finish(j);
@@ -3038,38 +3653,9 @@ static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_
return out;
}
-#ifdef STBI_JPEG_OLD
-// this is the same YCbCr-to-RGB calculation that stb_image has used
-// historically before the algorithm changes in 1.49
-#define float2fixed(x) ((int) ((x) * 65536 + 0.5))
-static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
-{
- int i;
- for (i=0; i < count; ++i) {
- int y_fixed = (y[i] << 16) + 32768; // rounding
- int r,g,b;
- int cr = pcr[i] - 128;
- int cb = pcb[i] - 128;
- r = y_fixed + cr*float2fixed(1.40200f);
- g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f);
- b = y_fixed + cb*float2fixed(1.77200f);
- r >>= 16;
- g >>= 16;
- b >>= 16;
- if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
- if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
- if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
- out[0] = (stbi_uc)r;
- out[1] = (stbi_uc)g;
- out[2] = (stbi_uc)b;
- out[3] = 255;
- out += step;
- }
-}
-#else
// this is a reduced-precision calculation of YCbCr-to-RGB introduced
// to make sure the code produces the same results in both SIMD and scalar
-#define float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8)
+#define stbi__float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8)
static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
{
int i;
@@ -3078,9 +3664,9 @@ static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc
int r,g,b;
int cr = pcr[i] - 128;
int cb = pcb[i] - 128;
- r = y_fixed + cr* float2fixed(1.40200f);
- g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000);
- b = y_fixed + cb* float2fixed(1.77200f);
+ r = y_fixed + cr* stbi__float2fixed(1.40200f);
+ g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
+ b = y_fixed + cb* stbi__float2fixed(1.77200f);
r >>= 20;
g >>= 20;
b >>= 20;
@@ -3094,7 +3680,6 @@ static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc
out += step;
}
}
-#endif
#if defined(STBI_SSE2) || defined(STBI_NEON)
static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step)
@@ -3213,9 +3798,9 @@ static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc cons
int r,g,b;
int cr = pcr[i] - 128;
int cb = pcb[i] - 128;
- r = y_fixed + cr* float2fixed(1.40200f);
- g = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000);
- b = y_fixed + cb* float2fixed(1.77200f);
+ r = y_fixed + cr* stbi__float2fixed(1.40200f);
+ g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
+ b = y_fixed + cb* stbi__float2fixed(1.77200f);
r >>= 20;
g >>= 20;
b >>= 20;
@@ -3241,18 +3826,14 @@ static void stbi__setup_jpeg(stbi__jpeg *j)
#ifdef STBI_SSE2
if (stbi__sse2_available()) {
j->idct_block_kernel = stbi__idct_simd;
- #ifndef STBI_JPEG_OLD
j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
- #endif
j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
}
#endif
#ifdef STBI_NEON
j->idct_block_kernel = stbi__idct_simd;
- #ifndef STBI_JPEG_OLD
j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
- #endif
j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
#endif
}
@@ -3260,23 +3841,7 @@ static void stbi__setup_jpeg(stbi__jpeg *j)
// clean up the temporary component buffers
static void stbi__cleanup_jpeg(stbi__jpeg *j)
{
- int i;
- for (i=0; i < j->s->img_n; ++i) {
- if (j->img_comp[i].raw_data) {
- STBI_FREE(j->img_comp[i].raw_data);
- j->img_comp[i].raw_data = NULL;
- j->img_comp[i].data = NULL;
- }
- if (j->img_comp[i].raw_coeff) {
- STBI_FREE(j->img_comp[i].raw_coeff);
- j->img_comp[i].raw_coeff = 0;
- j->img_comp[i].coeff = 0;
- }
- if (j->img_comp[i].linebuf) {
- STBI_FREE(j->img_comp[i].linebuf);
- j->img_comp[i].linebuf = NULL;
- }
- }
+ stbi__free_jpeg_components(j, j->s->img_n, 0);
}
typedef struct
@@ -3289,9 +3854,16 @@ typedef struct
int ypos; // which pre-expansion row we're on
} stbi__resample;
+// fast 0..255 * 0..255 => 0..255 rounded multiplication
+static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y)
+{
+ unsigned int t = x*y + 128;
+ return (stbi_uc) ((t + (t >>8)) >> 8);
+}
+
static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
{
- int n, decode_n;
+ int n, decode_n, is_rgb;
z->s->img_n = 0; // make stbi__cleanup_jpeg safe
// validate req_comp
@@ -3301,19 +3873,25 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp
if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; }
// determine actual number of components to generate
- n = req_comp ? req_comp : z->s->img_n;
+ n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1;
- if (z->s->img_n == 3 && n < 3)
+ is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif));
+
+ if (z->s->img_n == 3 && n < 3 && !is_rgb)
decode_n = 1;
else
decode_n = z->s->img_n;
+ // nothing to do if no components requested; check this now to avoid
+ // accessing uninitialized coutput[0] later
+ if (decode_n <= 0) { stbi__cleanup_jpeg(z); return NULL; }
+
// resample and color-convert
{
int k;
unsigned int i,j;
stbi_uc *output;
- stbi_uc *coutput[4];
+ stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL };
stbi__resample res_comp[4];
@@ -3340,7 +3918,7 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp
}
// can't error after this so, this is safe
- output = (stbi_uc *) stbi__malloc(n * z->s->img_x * z->s->img_y + 1);
+ output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1);
if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
// now go ahead and resample
@@ -3363,7 +3941,39 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp
if (n >= 3) {
stbi_uc *y = coutput[0];
if (z->s->img_n == 3) {
- z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+ if (is_rgb) {
+ for (i=0; i < z->s->img_x; ++i) {
+ out[0] = y[i];
+ out[1] = coutput[1][i];
+ out[2] = coutput[2][i];
+ out[3] = 255;
+ out += n;
+ }
+ } else {
+ z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+ }
+ } else if (z->s->img_n == 4) {
+ if (z->app14_color_transform == 0) { // CMYK
+ for (i=0; i < z->s->img_x; ++i) {
+ stbi_uc m = coutput[3][i];
+ out[0] = stbi__blinn_8x8(coutput[0][i], m);
+ out[1] = stbi__blinn_8x8(coutput[1][i], m);
+ out[2] = stbi__blinn_8x8(coutput[2][i], m);
+ out[3] = 255;
+ out += n;
+ }
+ } else if (z->app14_color_transform == 2) { // YCCK
+ z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+ for (i=0; i < z->s->img_x; ++i) {
+ stbi_uc m = coutput[3][i];
+ out[0] = stbi__blinn_8x8(255 - out[0], m);
+ out[1] = stbi__blinn_8x8(255 - out[1], m);
+ out[2] = stbi__blinn_8x8(255 - out[2], m);
+ out += n;
+ }
+ } else { // YCbCr + alpha? Ignore the fourth channel for now
+ z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+ }
} else
for (i=0; i < z->s->img_x; ++i) {
out[0] = out[1] = out[2] = y[i];
@@ -3371,37 +3981,74 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp
out += n;
}
} else {
- stbi_uc *y = coutput[0];
- if (n == 1)
- for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
- else
- for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255;
+ if (is_rgb) {
+ if (n == 1)
+ for (i=0; i < z->s->img_x; ++i)
+ *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
+ else {
+ for (i=0; i < z->s->img_x; ++i, out += 2) {
+ out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
+ out[1] = 255;
+ }
+ }
+ } else if (z->s->img_n == 4 && z->app14_color_transform == 0) {
+ for (i=0; i < z->s->img_x; ++i) {
+ stbi_uc m = coutput[3][i];
+ stbi_uc r = stbi__blinn_8x8(coutput[0][i], m);
+ stbi_uc g = stbi__blinn_8x8(coutput[1][i], m);
+ stbi_uc b = stbi__blinn_8x8(coutput[2][i], m);
+ out[0] = stbi__compute_y(r, g, b);
+ out[1] = 255;
+ out += n;
+ }
+ } else if (z->s->img_n == 4 && z->app14_color_transform == 2) {
+ for (i=0; i < z->s->img_x; ++i) {
+ out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]);
+ out[1] = 255;
+ out += n;
+ }
+ } else {
+ stbi_uc *y = coutput[0];
+ if (n == 1)
+ for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
+ else
+ for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; }
+ }
}
}
stbi__cleanup_jpeg(z);
*out_x = z->s->img_x;
*out_y = z->s->img_y;
- if (comp) *comp = z->s->img_n; // report original components, not output
+ if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output
return output;
}
}
-static unsigned char *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
{
- stbi__jpeg j;
- j.s = s;
- stbi__setup_jpeg(&j);
- return load_jpeg_image(&j, x,y,comp,req_comp);
+ unsigned char* result;
+ stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
+ if (!j) return stbi__errpuc("outofmem", "Out of memory");
+ memset(j, 0, sizeof(stbi__jpeg));
+ STBI_NOTUSED(ri);
+ j->s = s;
+ stbi__setup_jpeg(j);
+ result = load_jpeg_image(j, x,y,comp,req_comp);
+ STBI_FREE(j);
+ return result;
}
static int stbi__jpeg_test(stbi__context *s)
{
int r;
- stbi__jpeg j;
- j.s = s;
- stbi__setup_jpeg(&j);
- r = stbi__decode_jpeg_header(&j, STBI__SCAN_type);
+ stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg));
+ if (!j) return stbi__err("outofmem", "Out of memory");
+ memset(j, 0, sizeof(stbi__jpeg));
+ j->s = s;
+ stbi__setup_jpeg(j);
+ r = stbi__decode_jpeg_header(j, STBI__SCAN_type);
stbi__rewind(s);
+ STBI_FREE(j);
return r;
}
@@ -3413,15 +4060,20 @@ static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp)
}
if (x) *x = j->s->img_x;
if (y) *y = j->s->img_y;
- if (comp) *comp = j->s->img_n;
+ if (comp) *comp = j->s->img_n >= 3 ? 3 : 1;
return 1;
}
static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
{
- stbi__jpeg j;
- j.s = s;
- return stbi__jpeg_info_raw(&j, x, y, comp);
+ int result;
+ stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg)));
+ if (!j) return stbi__err("outofmem", "Out of memory");
+ memset(j, 0, sizeof(stbi__jpeg));
+ j->s = s;
+ result = stbi__jpeg_info_raw(j, x, y, comp);
+ STBI_FREE(j);
+ return result;
}
#endif
@@ -3437,6 +4089,7 @@ static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
// fast-way is faster to check than jpeg huffman, but slow way is slower
#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables
#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1)
+#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet
// zlib-style huffman encoding
// (jpegs packs from left, zlib from right, so can't share code)
@@ -3446,8 +4099,8 @@ typedef struct
stbi__uint16 firstcode[16];
int maxcode[17];
stbi__uint16 firstsymbol[16];
- stbi_uc size[288];
- stbi__uint16 value[288];
+ stbi_uc size[STBI__ZNSYMS];
+ stbi__uint16 value[STBI__ZNSYMS];
} stbi__zhuffman;
stbi_inline static int stbi__bitreverse16(int n)
@@ -3467,7 +4120,7 @@ stbi_inline static int stbi__bit_reverse(int v, int bits)
return stbi__bitreverse16(v) >> (16-bits);
}
-static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num)
+static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num)
{
int i,k=0;
int code, next_code[16], sizes[17];
@@ -3502,10 +4155,10 @@ static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num)
z->size [c] = (stbi_uc ) s;
z->value[c] = (stbi__uint16) i;
if (s <= STBI__ZFAST_BITS) {
- int k = stbi__bit_reverse(next_code[s],s);
- while (k < (1 << STBI__ZFAST_BITS)) {
- z->fast[k] = fastv;
- k += (1 << s);
+ int j = stbi__bit_reverse(next_code[s],s);
+ while (j < (1 << STBI__ZFAST_BITS)) {
+ z->fast[j] = fastv;
+ j += (1 << s);
}
}
++next_code[s];
@@ -3524,6 +4177,7 @@ typedef struct
{
stbi_uc *zbuffer, *zbuffer_end;
int num_bits;
+ int hit_zeof_once;
stbi__uint32 code_buffer;
char *zout;
@@ -3534,16 +4188,23 @@ typedef struct
stbi__zhuffman z_length, z_distance;
} stbi__zbuf;
+stbi_inline static int stbi__zeof(stbi__zbuf *z)
+{
+ return (z->zbuffer >= z->zbuffer_end);
+}
+
stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
{
- if (z->zbuffer >= z->zbuffer_end) return 0;
- return *z->zbuffer++;
+ return stbi__zeof(z) ? 0 : *z->zbuffer++;
}
static void stbi__fill_bits(stbi__zbuf *z)
{
do {
- STBI_ASSERT(z->code_buffer < (1U << z->num_bits));
+ if (z->code_buffer >= (1U << z->num_bits)) {
+ z->zbuffer = z->zbuffer_end; /* treat this as EOF so we fail. */
+ return;
+ }
z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
z->num_bits += 8;
} while (z->num_bits <= 24);
@@ -3568,10 +4229,11 @@ static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
for (s=STBI__ZFAST_BITS+1; ; ++s)
if (k < z->maxcode[s])
break;
- if (s == 16) return -1; // invalid code!
+ if (s >= 16) return -1; // invalid code!
// code size is s, so:
b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
- STBI_ASSERT(z->size[b] == s);
+ if (b >= STBI__ZNSYMS) return -1; // some data was corrupt somewhere!
+ if (z->size[b] != s) return -1; // was originally an assert, but report failure instead.
a->code_buffer >>= s;
a->num_bits -= s;
return z->value[b];
@@ -3580,7 +4242,23 @@ static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
{
int b,s;
- if (a->num_bits < 16) stbi__fill_bits(a);
+ if (a->num_bits < 16) {
+ if (stbi__zeof(a)) {
+ if (!a->hit_zeof_once) {
+ // This is the first time we hit eof, insert 16 extra padding btis
+ // to allow us to keep going; if we actually consume any of them
+ // though, that is invalid data. This is caught later.
+ a->hit_zeof_once = 1;
+ a->num_bits += 16; // add 16 implicit zero bits
+ } else {
+ // We already inserted our extra 16 padding bits and are again
+ // out, this stream is actually prematurely terminated.
+ return -1;
+ }
+ } else {
+ stbi__fill_bits(a);
+ }
+ }
b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
if (b) {
s = b >> 9;
@@ -3594,14 +4272,18 @@ stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes
{
char *q;
- int cur, limit;
+ unsigned int cur, limit, old_limit;
z->zout = zout;
if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
- cur = (int) (z->zout - z->zout_start);
- limit = (int) (z->zout_end - z->zout_start);
- while (cur + n > limit)
+ cur = (unsigned int) (z->zout - z->zout_start);
+ limit = old_limit = (unsigned) (z->zout_end - z->zout_start);
+ if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory");
+ while (cur + n > limit) {
+ if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory");
limit *= 2;
- q = (char *) STBI_REALLOC(z->zout_start, limit);
+ }
+ q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit);
+ STBI_NOTUSED(old_limit);
if (q == NULL) return stbi__err("outofmem", "Out of memory");
z->zout_start = q;
z->zout = q + cur;
@@ -3609,18 +4291,18 @@ static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room
return 1;
}
-static int stbi__zlength_base[31] = {
+static const int stbi__zlength_base[31] = {
3,4,5,6,7,8,9,10,11,13,
15,17,19,23,27,31,35,43,51,59,
67,83,99,115,131,163,195,227,258,0,0 };
-static int stbi__zlength_extra[31]=
+static const int stbi__zlength_extra[31]=
{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
-static int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
+static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
-static int stbi__zdist_extra[32] =
+static const int stbi__zdist_extra[32] =
{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
static int stbi__parse_huffman_block(stbi__zbuf *a)
@@ -3640,17 +4322,25 @@ static int stbi__parse_huffman_block(stbi__zbuf *a)
int len,dist;
if (z == 256) {
a->zout = zout;
+ if (a->hit_zeof_once && a->num_bits < 16) {
+ // The first time we hit zeof, we inserted 16 extra zero bits into our bit
+ // buffer so the decoder can just do its speculative decoding. But if we
+ // actually consumed any of those bits (which is the case when num_bits < 16),
+ // the stream actually read past the end so it is malformed.
+ return stbi__err("unexpected end","Corrupt PNG");
+ }
return 1;
}
+ if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data
z -= 257;
len = stbi__zlength_base[z];
if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
z = stbi__zhuffman_decode(a, &a->z_distance);
- if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
+ if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data
dist = stbi__zdist_base[z];
if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
- if (zout + len > a->zout_end) {
+ if (len > a->zout_end - zout) {
if (!stbi__zexpand(a, zout, len)) return 0;
zout = a->zout;
}
@@ -3667,7 +4357,7 @@ static int stbi__parse_huffman_block(stbi__zbuf *a)
static int stbi__compute_huffman_codes(stbi__zbuf *a)
{
- static stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
+ static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
stbi__zhuffman z_codelength;
stbi_uc lencodes[286+32+137];//padding for maximum single op
stbi_uc codelength_sizes[19];
@@ -3676,6 +4366,7 @@ static int stbi__compute_huffman_codes(stbi__zbuf *a)
int hlit = stbi__zreceive(a,5) + 257;
int hdist = stbi__zreceive(a,5) + 1;
int hclen = stbi__zreceive(a,4) + 4;
+ int ntot = hlit + hdist;
memset(codelength_sizes, 0, sizeof(codelength_sizes));
for (i=0; i < hclen; ++i) {
@@ -3685,33 +4376,36 @@ static int stbi__compute_huffman_codes(stbi__zbuf *a)
if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
n = 0;
- while (n < hlit + hdist) {
+ while (n < ntot) {
int c = stbi__zhuffman_decode(a, &z_codelength);
if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG");
if (c < 16)
lencodes[n++] = (stbi_uc) c;
- else if (c == 16) {
- c = stbi__zreceive(a,2)+3;
- memset(lencodes+n, lencodes[n-1], c);
- n += c;
- } else if (c == 17) {
- c = stbi__zreceive(a,3)+3;
- memset(lencodes+n, 0, c);
- n += c;
- } else {
- STBI_ASSERT(c == 18);
- c = stbi__zreceive(a,7)+11;
- memset(lencodes+n, 0, c);
+ else {
+ stbi_uc fill = 0;
+ if (c == 16) {
+ c = stbi__zreceive(a,2)+3;
+ if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG");
+ fill = lencodes[n-1];
+ } else if (c == 17) {
+ c = stbi__zreceive(a,3)+3;
+ } else if (c == 18) {
+ c = stbi__zreceive(a,7)+11;
+ } else {
+ return stbi__err("bad codelengths", "Corrupt PNG");
+ }
+ if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG");
+ memset(lencodes+n, fill, c);
n += c;
}
}
- if (n != hlit+hdist) return stbi__err("bad codelengths","Corrupt PNG");
+ if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG");
if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
return 1;
}
-static int stbi__parse_uncomperssed_block(stbi__zbuf *a)
+static int stbi__parse_uncompressed_block(stbi__zbuf *a)
{
stbi_uc header[4];
int len,nlen,k;
@@ -3724,7 +4418,7 @@ static int stbi__parse_uncomperssed_block(stbi__zbuf *a)
a->code_buffer >>= 8;
a->num_bits -= 8;
}
- STBI_ASSERT(a->num_bits == 0);
+ if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG");
// now fill header the normal way
while (k < 4)
header[k++] = stbi__zget8(a);
@@ -3746,6 +4440,7 @@ static int stbi__parse_zlib_header(stbi__zbuf *a)
int cm = cmf & 15;
/* int cinfo = cmf >> 4; */
int flg = stbi__zget8(a);
+ if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
@@ -3753,9 +4448,24 @@ static int stbi__parse_zlib_header(stbi__zbuf *a)
return 1;
}
-// @TODO: should statically initialize these for optimal thread safety
-static stbi_uc stbi__zdefault_length[288], stbi__zdefault_distance[32];
-static void stbi__init_zdefaults(void)
+static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] =
+{
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+ 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+ 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+ 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8
+};
+static const stbi_uc stbi__zdefault_distance[32] =
+{
+ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+};
+/*
+Init algorithm:
{
int i; // use <= to match clearly with spec
for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8;
@@ -3765,6 +4475,7 @@ static void stbi__init_zdefaults(void)
for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5;
}
+*/
static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
{
@@ -3773,18 +4484,18 @@ static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
if (!stbi__parse_zlib_header(a)) return 0;
a->num_bits = 0;
a->code_buffer = 0;
+ a->hit_zeof_once = 0;
do {
final = stbi__zreceive(a,1);
type = stbi__zreceive(a,2);
if (type == 0) {
- if (!stbi__parse_uncomperssed_block(a)) return 0;
+ if (!stbi__parse_uncompressed_block(a)) return 0;
} else if (type == 3) {
return 0;
} else {
if (type == 1) {
// use fixed code lengths
- if (!stbi__zdefault_distance[31]) stbi__init_zdefaults();
- if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , 288)) return 0;
+ if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , STBI__ZNSYMS)) return 0;
if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0;
} else {
if (!stbi__compute_huffman_codes(a)) return 0;
@@ -3908,7 +4619,7 @@ static stbi__pngchunk stbi__get_chunk_header(stbi__context *s)
static int stbi__check_png_header(stbi__context *s)
{
- static stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
+ static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
int i;
for (i=0; i < 8; ++i)
if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG");
@@ -3919,6 +4630,7 @@ typedef struct
{
stbi__context *s;
stbi_uc *idata, *expanded, *out;
+ int depth;
} stbi__png;
@@ -3953,44 +4665,50 @@ static int stbi__paeth(int a, int b, int c)
return c;
}
-static stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
+static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
// create the png data from post-deflated data
static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
{
+ int bytes = (depth == 16? 2 : 1);
stbi__context *s = a->s;
- stbi__uint32 i,j,stride = x*out_n;
+ stbi__uint32 i,j,stride = x*out_n*bytes;
stbi__uint32 img_len, img_width_bytes;
int k;
int img_n = s->img_n; // copy it into a local for later
+ int output_bytes = out_n*bytes;
+ int filter_bytes = img_n*bytes;
+ int width = x;
+
STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1);
- a->out = (stbi_uc *) stbi__malloc(x * y * out_n); // extra bytes to write off the end into
+ a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
if (!a->out) return stbi__err("outofmem", "Out of memory");
+ if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
img_width_bytes = (((img_n * x * depth) + 7) >> 3);
img_len = (img_width_bytes + 1) * y;
- if (s->img_x == x && s->img_y == y) {
- if (raw_len != img_len) return stbi__err("not enough pixels","Corrupt PNG");
- } else { // interlaced:
- if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
- }
+
+ // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
+ // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros),
+ // so just check for raw_len < img_len always.
+ if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
for (j=0; j < y; ++j) {
stbi_uc *cur = a->out + stride*j;
- stbi_uc *prior = cur - stride;
+ stbi_uc *prior;
int filter = *raw++;
- int filter_bytes = img_n;
- int width = x;
+
if (filter > 4)
return stbi__err("invalid filter","Corrupt PNG");
if (depth < 8) {
- STBI_ASSERT(img_width_bytes <= x);
+ if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG");
cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
filter_bytes = 1;
width = img_width_bytes;
}
+ prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
// if first row, use special filter that doesn't sample previous row
if (j == 0) filter = first_row_filter[filter];
@@ -4014,6 +4732,14 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
raw += img_n;
cur += out_n;
prior += out_n;
+ } else if (depth == 16) {
+ if (img_n != out_n) {
+ cur[filter_bytes] = 255; // first pixel top byte
+ cur[filter_bytes+1] = 255; // first pixel bottom byte
+ }
+ raw += filter_bytes;
+ cur += output_bytes;
+ prior += output_bytes;
} else {
raw += 1;
cur += 1;
@@ -4022,38 +4748,47 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
// this is a little gross, so that we don't switch per-pixel or per-component
if (depth < 8 || img_n == out_n) {
- int nk = (width - 1)*img_n;
- #define CASE(f) \
+ int nk = (width - 1)*filter_bytes;
+ #define STBI__CASE(f) \
case f: \
for (k=0; k < nk; ++k)
switch (filter) {
// "none" filter turns into a memcpy here; make that explicit.
case STBI__F_none: memcpy(cur, raw, nk); break;
- CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); break;
- CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
- CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); break;
- CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); break;
- CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); break;
- CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); break;
+ STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
+ STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
+ STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
+ STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
+ STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
+ STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
}
- #undef CASE
+ #undef STBI__CASE
raw += nk;
} else {
STBI_ASSERT(img_n+1 == out_n);
- #define CASE(f) \
+ #define STBI__CASE(f) \
case f: \
- for (i=x-1; i >= 1; --i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \
- for (k=0; k < img_n; ++k)
+ for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
+ for (k=0; k < filter_bytes; ++k)
switch (filter) {
- CASE(STBI__F_none) cur[k] = raw[k]; break;
- CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-out_n]); break;
- CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
- CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-out_n])>>1)); break;
- CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],prior[k],prior[k-out_n])); break;
- CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-out_n] >> 1)); break;
- CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],0,0)); break;
+ STBI__CASE(STBI__F_none) { cur[k] = raw[k]; } break;
+ STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
+ STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
+ STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
+ STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
+ STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
+ STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
+ }
+ #undef STBI__CASE
+
+ // the loop above sets the high byte of the pixels' alpha, but for
+ // 16 bit png files we also need the low byte set. we'll do that here.
+ if (depth == 16) {
+ cur = a->out + stride*j; // start at the beginning of the row again
+ for (i=0; i < x; ++i,cur+=output_bytes) {
+ cur[filter_bytes+1] = 255;
+ }
}
- #undef CASE
}
}
@@ -4110,25 +4845,36 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
}
if (img_n != out_n) {
+ int q;
// insert alpha = 255
- stbi_uc *cur = a->out + stride*j;
- int i;
+ cur = a->out + stride*j;
if (img_n == 1) {
- for (i=x-1; i >= 0; --i) {
- cur[i*2+1] = 255;
- cur[i*2+0] = cur[i];
+ for (q=x-1; q >= 0; --q) {
+ cur[q*2+1] = 255;
+ cur[q*2+0] = cur[q];
}
} else {
STBI_ASSERT(img_n == 3);
- for (i=x-1; i >= 0; --i) {
- cur[i*4+3] = 255;
- cur[i*4+2] = cur[i*3+2];
- cur[i*4+1] = cur[i*3+1];
- cur[i*4+0] = cur[i*3+0];
+ for (q=x-1; q >= 0; --q) {
+ cur[q*4+3] = 255;
+ cur[q*4+2] = cur[q*3+2];
+ cur[q*4+1] = cur[q*3+1];
+ cur[q*4+0] = cur[q*3+0];
}
}
}
}
+ } else if (depth == 16) {
+ // force the image data from big-endian to platform-native.
+ // this is done in a separate pass due to the decoding relying
+ // on the data being untouched, but could probably be done
+ // per-line during decode if care is taken.
+ stbi_uc *cur = a->out;
+ stbi__uint16 *cur16 = (stbi__uint16*)cur;
+
+ for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
+ *cur16 = (cur[0] << 8) | cur[1];
+ }
}
return 1;
@@ -4136,13 +4882,16 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced)
{
+ int bytes = (depth == 16 ? 2 : 1);
+ int out_bytes = out_n * bytes;
stbi_uc *final;
int p;
if (!interlaced)
return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color);
// de-interlacing
- final = (stbi_uc *) stbi__malloc(a->s->img_x * a->s->img_y * out_n);
+ final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0);
+ if (!final) return stbi__err("outofmem", "Out of memory");
for (p=0; p < 7; ++p) {
int xorig[] = { 0,4,0,2,0,1,0 };
int yorig[] = { 0,0,4,0,2,0,1 };
@@ -4162,8 +4911,8 @@ static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint3
for (i=0; i < x; ++i) {
int out_y = j*yspc[p]+yorig[p];
int out_x = i*xspc[p]+xorig[p];
- memcpy(final + out_y*a->s->img_x*out_n + out_x*out_n,
- a->out + (j*x+i)*out_n, out_n);
+ memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes,
+ a->out + (j*x+i)*out_bytes, out_bytes);
}
}
STBI_FREE(a->out);
@@ -4201,12 +4950,37 @@ static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n)
return 1;
}
+static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n)
+{
+ stbi__context *s = z->s;
+ stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+ stbi__uint16 *p = (stbi__uint16*) z->out;
+
+ // compute color-based transparency, assuming we've
+ // already got 65535 as the alpha value in the output
+ STBI_ASSERT(out_n == 2 || out_n == 4);
+
+ if (out_n == 2) {
+ for (i = 0; i < pixel_count; ++i) {
+ p[1] = (p[0] == tc[0] ? 0 : 65535);
+ p += 2;
+ }
+ } else {
+ for (i = 0; i < pixel_count; ++i) {
+ if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
+ p[3] = 0;
+ p += 4;
+ }
+ }
+ return 1;
+}
+
static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n)
{
stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y;
stbi_uc *p, *temp_out, *orig = a->out;
- p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n);
+ p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0);
if (p == NULL) return stbi__err("outofmem", "Out of memory");
// between here and free(out) below, exitting would leak
@@ -4238,19 +5012,46 @@ static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int
return 1;
}
-static int stbi__unpremultiply_on_load = 0;
-static int stbi__de_iphone_flag = 0;
+static int stbi__unpremultiply_on_load_global = 0;
+static int stbi__de_iphone_flag_global = 0;
STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply)
{
- stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply;
+ stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply;
}
STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert)
{
- stbi__de_iphone_flag = flag_true_if_should_convert;
+ stbi__de_iphone_flag_global = flag_true_if_should_convert;
+}
+
+#ifndef STBI_THREAD_LOCAL
+#define stbi__unpremultiply_on_load stbi__unpremultiply_on_load_global
+#define stbi__de_iphone_flag stbi__de_iphone_flag_global
+#else
+static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set;
+static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set;
+
+STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply)
+{
+ stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply;
+ stbi__unpremultiply_on_load_set = 1;
+}
+
+STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert)
+{
+ stbi__de_iphone_flag_local = flag_true_if_should_convert;
+ stbi__de_iphone_flag_set = 1;
}
+#define stbi__unpremultiply_on_load (stbi__unpremultiply_on_load_set \
+ ? stbi__unpremultiply_on_load_local \
+ : stbi__unpremultiply_on_load_global)
+#define stbi__de_iphone_flag (stbi__de_iphone_flag_set \
+ ? stbi__de_iphone_flag_local \
+ : stbi__de_iphone_flag_global)
+#endif // STBI_THREAD_LOCAL
+
static void stbi__de_iphone(stbi__png *z)
{
stbi__context *s = z->s;
@@ -4272,9 +5073,10 @@ static void stbi__de_iphone(stbi__png *z)
stbi_uc a = p[3];
stbi_uc t = p[0];
if (a) {
- p[0] = p[2] * 255 / a;
- p[1] = p[1] * 255 / a;
- p[2] = t * 255 / a;
+ stbi_uc half = a / 2;
+ p[0] = (p[2] * 255 + half) / a;
+ p[1] = (p[1] * 255 + half) / a;
+ p[2] = ( t * 255 + half) / a;
} else {
p[0] = p[2];
p[2] = t;
@@ -4293,14 +5095,15 @@ static void stbi__de_iphone(stbi__png *z)
}
}
-#define STBI__PNG_TYPE(a,b,c,d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
+#define STBI__PNG_TYPE(a,b,c,d) (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d))
static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
{
stbi_uc palette[1024], pal_img_n=0;
- stbi_uc has_trans=0, tc[3];
+ stbi_uc has_trans=0, tc[3]={0};
+ stbi__uint16 tc16[3];
stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
- int first=1,k,interlace=0, color=0, depth=0, is_iphone=0;
+ int first=1,k,interlace=0, color=0, is_iphone=0;
stbi__context *s = z->s;
z->expanded = NULL;
@@ -4323,10 +5126,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
first = 0;
if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
- s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
- s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
- depth = stbi__get8(s); if (depth != 1 && depth != 2 && depth != 4 && depth != 8) return stbi__err("1/2/4/8-bit only","PNG not supported: 1/2/4/8-bit only");
+ s->img_x = stbi__get32be(s);
+ s->img_y = stbi__get32be(s);
+ if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+ if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+ z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only");
color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG");
+ if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG");
if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG");
comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG");
filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG");
@@ -4335,14 +5141,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
if (!pal_img_n) {
s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
- if (scan == STBI__SCAN_header) return 1;
} else {
// if paletted, then pal_n is our final components, and
// img_n is # components to decompress/filter.
s->img_n = 1;
if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
- // if SCAN_header, have to scan to see if we have a tRNS
}
+ // even with SCAN_header, have to scan to see if we have a tRNS
break;
}
@@ -4374,8 +5179,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
has_trans = 1;
- for (k=0; k < s->img_n; ++k)
- tc[k] = (stbi_uc) (stbi__get16be(s) & 255) * stbi__depth_scale_table[depth]; // non 8-bit images will be larger
+ // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now.
+ if (scan == STBI__SCAN_header) { ++s->img_n; return 1; }
+ if (z->depth == 16) {
+ for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
+ } else {
+ for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
+ }
}
break;
}
@@ -4383,14 +5193,22 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
case STBI__PNG_TYPE('I','D','A','T'): {
if (first) return stbi__err("first not IHDR", "Corrupt PNG");
if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
- if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
+ if (scan == STBI__SCAN_header) {
+ // header scan definitely stops at first IDAT
+ if (pal_img_n)
+ s->img_n = pal_img_n;
+ return 1;
+ }
+ if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes");
if ((int)(ioff + c.length) < (int)ioff) return 0;
if (ioff + c.length > idata_limit) {
+ stbi__uint32 idata_limit_old = idata_limit;
stbi_uc *p;
if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
while (ioff + c.length > idata_limit)
idata_limit *= 2;
- p = (stbi_uc *) STBI_REALLOC(z->idata, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
+ STBI_NOTUSED(idata_limit_old);
+ p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
z->idata = p;
}
if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG");
@@ -4404,7 +5222,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
if (scan != STBI__SCAN_load) return 1;
if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
// initial guess for decoded data size to avoid unnecessary reallocs
- bpl = (s->img_x * depth + 7) / 8; // bytes per line, per component
+ bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component
raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone);
if (z->expanded == NULL) return 0; // zlib should set error
@@ -4413,9 +5231,14 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
s->img_out_n = s->img_n+1;
else
s->img_out_n = s->img_n;
- if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, depth, color, interlace)) return 0;
- if (has_trans)
- if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
+ if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
+ if (has_trans) {
+ if (z->depth == 16) {
+ if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
+ } else {
+ if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
+ }
+ }
if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
stbi__de_iphone(z);
if (pal_img_n) {
@@ -4425,8 +5248,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
if (req_comp >= 3) s->img_out_n = req_comp;
if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
return 0;
+ } else if (has_trans) {
+ // non-paletted image with tRNS -> source image has (constant) alpha
+ ++s->img_n;
}
STBI_FREE(z->expanded); z->expanded = NULL;
+ // end of PNG chunk, read and skip CRC
+ stbi__get32be(s);
return 1;
}
@@ -4452,21 +5280,30 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
}
}
-static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp)
+static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri)
{
- unsigned char *result=NULL;
+ void *result=NULL;
if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
+ if (p->depth <= 8)
+ ri->bits_per_channel = 8;
+ else if (p->depth == 16)
+ ri->bits_per_channel = 16;
+ else
+ return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth");
result = p->out;
p->out = NULL;
if (req_comp && req_comp != p->s->img_out_n) {
- result = stbi__convert_format(result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+ if (ri->bits_per_channel == 8)
+ result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+ else
+ result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
p->s->img_out_n = req_comp;
if (result == NULL) return result;
}
*x = p->s->img_x;
*y = p->s->img_y;
- if (n) *n = p->s->img_out_n;
+ if (n) *n = p->s->img_n;
}
STBI_FREE(p->out); p->out = NULL;
STBI_FREE(p->expanded); p->expanded = NULL;
@@ -4475,11 +5312,11 @@ static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req
return result;
}
-static unsigned char *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
{
stbi__png p;
p.s = s;
- return stbi__do_png(&p, x,y,comp,req_comp);
+ return stbi__do_png(&p, x,y,comp,req_comp, ri);
}
static int stbi__png_test(stbi__context *s)
@@ -4508,6 +5345,19 @@ static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp)
p.s = s;
return stbi__png_info_raw(&p, x, y, comp);
}
+
+static int stbi__png_is16(stbi__context *s)
+{
+ stbi__png p;
+ p.s = s;
+ if (!stbi__png_info_raw(&p, NULL, NULL, NULL))
+ return 0;
+ if (p.depth != 16) {
+ stbi__rewind(p.s);
+ return 0;
+ }
+ return 1;
+}
#endif
// Microsoft/Windows BMP image
@@ -4541,11 +5391,11 @@ static int stbi__high_bit(unsigned int z)
{
int n=0;
if (z == 0) return -1;
- if (z >= 0x10000) n += 16, z >>= 16;
- if (z >= 0x00100) n += 8, z >>= 8;
- if (z >= 0x00010) n += 4, z >>= 4;
- if (z >= 0x00004) n += 2, z >>= 2;
- if (z >= 0x00002) n += 1, z >>= 1;
+ if (z >= 0x10000) { n += 16; z >>= 16; }
+ if (z >= 0x00100) { n += 8; z >>= 8; }
+ if (z >= 0x00010) { n += 4; z >>= 4; }
+ if (z >= 0x00004) { n += 2; z >>= 2; }
+ if (z >= 0x00002) { n += 1;/* >>= 1;*/ }
return n;
}
@@ -4559,36 +5409,76 @@ static int stbi__bitcount(unsigned int a)
return a & 0xff;
}
-static int stbi__shiftsigned(int v, int shift, int bits)
+// extract an arbitrarily-aligned N-bit value (N=bits)
+// from v, and then make it 8-bits long and fractionally
+// extend it to full full range.
+static int stbi__shiftsigned(unsigned int v, int shift, int bits)
+{
+ static unsigned int mul_table[9] = {
+ 0,
+ 0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/,
+ 0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/,
+ };
+ static unsigned int shift_table[9] = {
+ 0, 0,0,1,0,2,4,6,0,
+ };
+ if (shift < 0)
+ v <<= -shift;
+ else
+ v >>= shift;
+ STBI_ASSERT(v < 256);
+ v >>= (8-bits);
+ STBI_ASSERT(bits >= 0 && bits <= 8);
+ return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits];
+}
+
+typedef struct
{
- int result;
- int z=0;
+ int bpp, offset, hsz;
+ unsigned int mr,mg,mb,ma, all_a;
+ int extra_read;
+} stbi__bmp_data;
- if (shift < 0) v <<= -shift;
- else v >>= shift;
- result = v;
+static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress)
+{
+ // BI_BITFIELDS specifies masks explicitly, don't override
+ if (compress == 3)
+ return 1;
- z = bits;
- while (z < 8) {
- result += v >> z;
- z += bits;
+ if (compress == 0) {
+ if (info->bpp == 16) {
+ info->mr = 31u << 10;
+ info->mg = 31u << 5;
+ info->mb = 31u << 0;
+ } else if (info->bpp == 32) {
+ info->mr = 0xffu << 16;
+ info->mg = 0xffu << 8;
+ info->mb = 0xffu << 0;
+ info->ma = 0xffu << 24;
+ info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0
+ } else {
+ // otherwise, use defaults, which is all-0
+ info->mr = info->mg = info->mb = info->ma = 0;
+ }
+ return 1;
}
- return result;
+ return 0; // error
}
-static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
{
- stbi_uc *out;
- unsigned int mr=0,mg=0,mb=0,ma=0, fake_a=0;
- stbi_uc pal[256][4];
- int psize=0,i,j,compress=0,width;
- int bpp, flip_vertically, pad, target, offset, hsz;
+ int hsz;
if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP");
stbi__get32le(s); // discard filesize
stbi__get16le(s); // discard reserved
stbi__get16le(s); // discard reserved
- offset = stbi__get32le(s);
- hsz = stbi__get32le(s);
+ info->offset = stbi__get32le(s);
+ info->hsz = hsz = stbi__get32le(s);
+ info->mr = info->mg = info->mb = info->ma = 0;
+ info->extra_read = 14;
+
+ if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP");
+
if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
if (hsz == 12) {
s->img_x = stbi__get16le(s);
@@ -4598,16 +5488,12 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
s->img_y = stbi__get32le(s);
}
if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP");
- bpp = stbi__get16le(s);
- if (bpp == 1) return stbi__errpuc("monochrome", "BMP type not supported: 1-bit");
- flip_vertically = ((int) s->img_y) > 0;
- s->img_y = abs((int) s->img_y);
- if (hsz == 12) {
- if (bpp < 24)
- psize = (offset - 14 - 24) / 3;
- } else {
- compress = stbi__get32le(s);
+ info->bpp = stbi__get16le(s);
+ if (hsz != 12) {
+ int compress = stbi__get32le(s);
if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE");
+ if (compress >= 4) return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes
+ if (compress == 3 && info->bpp != 16 && info->bpp != 32) return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel
stbi__get32le(s); // discard sizeof
stbi__get32le(s); // discard hres
stbi__get32le(s); // discard vres
@@ -4620,27 +5506,16 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
stbi__get32le(s);
stbi__get32le(s);
}
- if (bpp == 16 || bpp == 32) {
- mr = mg = mb = 0;
+ if (info->bpp == 16 || info->bpp == 32) {
if (compress == 0) {
- if (bpp == 32) {
- mr = 0xffu << 16;
- mg = 0xffu << 8;
- mb = 0xffu << 0;
- ma = 0xffu << 24;
- fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255
- STBI_NOTUSED(fake_a);
- } else {
- mr = 31u << 10;
- mg = 31u << 5;
- mb = 31u << 0;
- }
+ stbi__bmp_set_mask_defaults(info, compress);
} else if (compress == 3) {
- mr = stbi__get32le(s);
- mg = stbi__get32le(s);
- mb = stbi__get32le(s);
+ info->mr = stbi__get32le(s);
+ info->mg = stbi__get32le(s);
+ info->mb = stbi__get32le(s);
+ info->extra_read += 12;
// not documented, but generated by photoshop and handled by mspaint
- if (mr == mg && mg == mb) {
+ if (info->mr == info->mg && info->mg == info->mb) {
// ?!?!?
return stbi__errpuc("bad BMP", "bad BMP");
}
@@ -4648,11 +5523,16 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
return stbi__errpuc("bad BMP", "bad BMP");
}
} else {
- STBI_ASSERT(hsz == 108 || hsz == 124);
- mr = stbi__get32le(s);
- mg = stbi__get32le(s);
- mb = stbi__get32le(s);
- ma = stbi__get32le(s);
+ // V4/V5 header
+ int i;
+ if (hsz != 108 && hsz != 124)
+ return stbi__errpuc("bad BMP", "bad BMP");
+ info->mr = stbi__get32le(s);
+ info->mg = stbi__get32le(s);
+ info->mb = stbi__get32le(s);
+ info->ma = stbi__get32le(s);
+ if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs
+ stbi__bmp_set_mask_defaults(info, compress);
stbi__get32le(s); // discard color space
for (i=0; i < 12; ++i)
stbi__get32le(s); // discard color space parameters
@@ -4663,63 +5543,146 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
stbi__get32le(s); // discard reserved
}
}
- if (bpp < 16)
- psize = (offset - 14 - hsz) >> 2;
}
- s->img_n = ma ? 4 : 3;
+ return (void *) 1;
+}
+
+
+static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+ stbi_uc *out;
+ unsigned int mr=0,mg=0,mb=0,ma=0, all_a;
+ stbi_uc pal[256][4];
+ int psize=0,i,j,width;
+ int flip_vertically, pad, target;
+ stbi__bmp_data info;
+ STBI_NOTUSED(ri);
+
+ info.all_a = 255;
+ if (stbi__bmp_parse_header(s, &info) == NULL)
+ return NULL; // error code already set
+
+ flip_vertically = ((int) s->img_y) > 0;
+ s->img_y = abs((int) s->img_y);
+
+ if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+ if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
+ mr = info.mr;
+ mg = info.mg;
+ mb = info.mb;
+ ma = info.ma;
+ all_a = info.all_a;
+
+ if (info.hsz == 12) {
+ if (info.bpp < 24)
+ psize = (info.offset - info.extra_read - 24) / 3;
+ } else {
+ if (info.bpp < 16)
+ psize = (info.offset - info.extra_read - info.hsz) >> 2;
+ }
+ if (psize == 0) {
+ // accept some number of extra bytes after the header, but if the offset points either to before
+ // the header ends or implies a large amount of extra data, reject the file as malformed
+ int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original);
+ int header_limit = 1024; // max we actually read is below 256 bytes currently.
+ int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size.
+ if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) {
+ return stbi__errpuc("bad header", "Corrupt BMP");
+ }
+ // we established that bytes_read_so_far is positive and sensible.
+ // the first half of this test rejects offsets that are either too small positives, or
+ // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn
+ // ensures the number computed in the second half of the test can't overflow.
+ if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) {
+ return stbi__errpuc("bad offset", "Corrupt BMP");
+ } else {
+ stbi__skip(s, info.offset - bytes_read_so_far);
+ }
+ }
+
+ if (info.bpp == 24 && ma == 0xff000000)
+ s->img_n = 3;
+ else
+ s->img_n = ma ? 4 : 3;
if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
target = req_comp;
else
target = s->img_n; // if they want monochrome, we'll post-convert
- out = (stbi_uc *) stbi__malloc(target * s->img_x * s->img_y);
+
+ // sanity-check size
+ if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0))
+ return stbi__errpuc("too large", "Corrupt BMP");
+
+ out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0);
if (!out) return stbi__errpuc("outofmem", "Out of memory");
- if (bpp < 16) {
+ if (info.bpp < 16) {
int z=0;
if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); }
for (i=0; i < psize; ++i) {
pal[i][2] = stbi__get8(s);
pal[i][1] = stbi__get8(s);
pal[i][0] = stbi__get8(s);
- if (hsz != 12) stbi__get8(s);
+ if (info.hsz != 12) stbi__get8(s);
pal[i][3] = 255;
}
- stbi__skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4));
- if (bpp == 4) width = (s->img_x + 1) >> 1;
- else if (bpp == 8) width = s->img_x;
+ stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4));
+ if (info.bpp == 1) width = (s->img_x + 7) >> 3;
+ else if (info.bpp == 4) width = (s->img_x + 1) >> 1;
+ else if (info.bpp == 8) width = s->img_x;
else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); }
pad = (-width)&3;
- for (j=0; j < (int) s->img_y; ++j) {
- for (i=0; i < (int) s->img_x; i += 2) {
- int v=stbi__get8(s),v2=0;
- if (bpp == 4) {
- v2 = v & 15;
- v >>= 4;
+ if (info.bpp == 1) {
+ for (j=0; j < (int) s->img_y; ++j) {
+ int bit_offset = 7, v = stbi__get8(s);
+ for (i=0; i < (int) s->img_x; ++i) {
+ int color = (v>>bit_offset)&0x1;
+ out[z++] = pal[color][0];
+ out[z++] = pal[color][1];
+ out[z++] = pal[color][2];
+ if (target == 4) out[z++] = 255;
+ if (i+1 == (int) s->img_x) break;
+ if((--bit_offset) < 0) {
+ bit_offset = 7;
+ v = stbi__get8(s);
+ }
}
- out[z++] = pal[v][0];
- out[z++] = pal[v][1];
- out[z++] = pal[v][2];
- if (target == 4) out[z++] = 255;
- if (i+1 == (int) s->img_x) break;
- v = (bpp == 8) ? stbi__get8(s) : v2;
- out[z++] = pal[v][0];
- out[z++] = pal[v][1];
- out[z++] = pal[v][2];
- if (target == 4) out[z++] = 255;
+ stbi__skip(s, pad);
+ }
+ } else {
+ for (j=0; j < (int) s->img_y; ++j) {
+ for (i=0; i < (int) s->img_x; i += 2) {
+ int v=stbi__get8(s),v2=0;
+ if (info.bpp == 4) {
+ v2 = v & 15;
+ v >>= 4;
+ }
+ out[z++] = pal[v][0];
+ out[z++] = pal[v][1];
+ out[z++] = pal[v][2];
+ if (target == 4) out[z++] = 255;
+ if (i+1 == (int) s->img_x) break;
+ v = (info.bpp == 8) ? stbi__get8(s) : v2;
+ out[z++] = pal[v][0];
+ out[z++] = pal[v][1];
+ out[z++] = pal[v][2];
+ if (target == 4) out[z++] = 255;
+ }
+ stbi__skip(s, pad);
}
- stbi__skip(s, pad);
}
} else {
int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
int z = 0;
int easy=0;
- stbi__skip(s, offset - 14 - hsz);
- if (bpp == 24) width = 3 * s->img_x;
- else if (bpp == 16) width = 2*s->img_x;
+ stbi__skip(s, info.offset - info.extra_read - info.hsz);
+ if (info.bpp == 24) width = 3 * s->img_x;
+ else if (info.bpp == 16) width = 2*s->img_x;
else /* bpp = 32 and pad = 0 */ width=0;
pad = (-width) & 3;
- if (bpp == 24) {
+ if (info.bpp == 24) {
easy = 1;
- } else if (bpp == 32) {
+ } else if (info.bpp == 32) {
if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
easy = 2;
}
@@ -4730,6 +5693,7 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
+ if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
}
for (j=0; j < (int) s->img_y; ++j) {
if (easy) {
@@ -4740,29 +5704,38 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
out[z+0] = stbi__get8(s);
z += 3;
a = (easy == 2 ? stbi__get8(s) : 255);
+ all_a |= a;
if (target == 4) out[z++] = a;
}
} else {
+ int bpp = info.bpp;
for (i=0; i < (int) s->img_x; ++i) {
stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
- int a;
+ unsigned int a;
out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount));
a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255);
+ all_a |= a;
if (target == 4) out[z++] = STBI__BYTECAST(a);
}
}
stbi__skip(s, pad);
}
}
+
+ // if alpha channel is all 0s, replace with all 255s
+ if (target == 4 && all_a == 0)
+ for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4)
+ out[i] = 255;
+
if (flip_vertically) {
stbi_uc t;
for (j=0; j < (int) s->img_y>>1; ++j) {
stbi_uc *p1 = out + j *s->img_x*target;
stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
for (i=0; i < (int) s->img_x*target; ++i) {
- t = p1[i], p1[i] = p2[i], p2[i] = t;
+ t = p1[i]; p1[i] = p2[i]; p2[i] = t;
}
}
}
@@ -4782,20 +5755,55 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
// Targa Truevision - TGA
// by Jonathan Dummer
#ifndef STBI_NO_TGA
+// returns STBI_rgb or whatever, 0 on error
+static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16)
+{
+ // only RGB or RGBA (incl. 16bit) or grey allowed
+ if (is_rgb16) *is_rgb16 = 0;
+ switch(bits_per_pixel) {
+ case 8: return STBI_grey;
+ case 16: if(is_grey) return STBI_grey_alpha;
+ // fallthrough
+ case 15: if(is_rgb16) *is_rgb16 = 1;
+ return STBI_rgb;
+ case 24: // fallthrough
+ case 32: return bits_per_pixel/8;
+ default: return 0;
+ }
+}
+
static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
{
- int tga_w, tga_h, tga_comp;
- int sz;
+ int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp;
+ int sz, tga_colormap_type;
stbi__get8(s); // discard Offset
- sz = stbi__get8(s); // color type
- if( sz > 1 ) {
+ tga_colormap_type = stbi__get8(s); // colormap type
+ if( tga_colormap_type > 1 ) {
stbi__rewind(s);
return 0; // only RGB or indexed allowed
}
- sz = stbi__get8(s); // image type
- // only RGB or grey allowed, +/- RLE
- if ((sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11)) return 0;
- stbi__skip(s,9);
+ tga_image_type = stbi__get8(s); // image type
+ if ( tga_colormap_type == 1 ) { // colormapped (paletted) image
+ if (tga_image_type != 1 && tga_image_type != 9) {
+ stbi__rewind(s);
+ return 0;
+ }
+ stbi__skip(s,4); // skip index of first colormap entry and number of entries
+ sz = stbi__get8(s); // check bits per palette color entry
+ if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) {
+ stbi__rewind(s);
+ return 0;
+ }
+ stbi__skip(s,4); // skip image x and y origin
+ tga_colormap_bpp = sz;
+ } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE
+ if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) {
+ stbi__rewind(s);
+ return 0; // only RGB or grey allowed, +/- RLE
+ }
+ stbi__skip(s,9); // skip colormap specification and image x/y origin
+ tga_colormap_bpp = 0;
+ }
tga_w = stbi__get16le(s);
if( tga_w < 1 ) {
stbi__rewind(s);
@@ -4806,45 +5814,81 @@ static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
stbi__rewind(s);
return 0; // test height
}
- sz = stbi__get8(s); // bits per pixel
- // only RGB or RGBA or grey allowed
- if ((sz != 8) && (sz != 16) && (sz != 24) && (sz != 32)) {
- stbi__rewind(s);
- return 0;
+ tga_bits_per_pixel = stbi__get8(s); // bits per pixel
+ stbi__get8(s); // ignore alpha bits
+ if (tga_colormap_bpp != 0) {
+ if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) {
+ // when using a colormap, tga_bits_per_pixel is the size of the indexes
+ // I don't think anything but 8 or 16bit indexes makes sense
+ stbi__rewind(s);
+ return 0;
+ }
+ tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL);
+ } else {
+ tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL);
+ }
+ if(!tga_comp) {
+ stbi__rewind(s);
+ return 0;
}
- tga_comp = sz;
if (x) *x = tga_w;
if (y) *y = tga_h;
- if (comp) *comp = tga_comp / 8;
+ if (comp) *comp = tga_comp;
return 1; // seems to have passed everything
}
static int stbi__tga_test(stbi__context *s)
{
- int res;
- int sz;
+ int res = 0;
+ int sz, tga_color_type;
stbi__get8(s); // discard Offset
- sz = stbi__get8(s); // color type
- if ( sz > 1 ) return 0; // only RGB or indexed allowed
+ tga_color_type = stbi__get8(s); // color type
+ if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed
sz = stbi__get8(s); // image type
- if ( (sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11) ) return 0; // only RGB or grey allowed, +/- RLE
- stbi__get16be(s); // discard palette start
- stbi__get16be(s); // discard palette length
- stbi__get8(s); // discard bits per palette color entry
- stbi__get16be(s); // discard x origin
- stbi__get16be(s); // discard y origin
- if ( stbi__get16be(s) < 1 ) return 0; // test width
- if ( stbi__get16be(s) < 1 ) return 0; // test height
+ if ( tga_color_type == 1 ) { // colormapped (paletted) image
+ if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9
+ stbi__skip(s,4); // skip index of first colormap entry and number of entries
+ sz = stbi__get8(s); // check bits per palette color entry
+ if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
+ stbi__skip(s,4); // skip image x and y origin
+ } else { // "normal" image w/o colormap
+ if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE
+ stbi__skip(s,9); // skip colormap specification and image x/y origin
+ }
+ if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width
+ if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height
sz = stbi__get8(s); // bits per pixel
- if ( (sz != 8) && (sz != 16) && (sz != 24) && (sz != 32) )
- res = 0;
- else
- res = 1;
+ if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index
+ if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
+
+ res = 1; // if we got this far, everything's good and we can return 1 instead of 0
+
+errorEnd:
stbi__rewind(s);
return res;
}
-static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+// read 16bit value and convert to 24bit RGB
+static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out)
+{
+ stbi__uint16 px = (stbi__uint16)stbi__get16le(s);
+ stbi__uint16 fiveBitMask = 31;
+ // we have 3 channels with 5bits each
+ int r = (px >> 10) & fiveBitMask;
+ int g = (px >> 5) & fiveBitMask;
+ int b = px & fiveBitMask;
+ // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later
+ out[0] = (stbi_uc)((r * 255)/31);
+ out[1] = (stbi_uc)((g * 255)/31);
+ out[2] = (stbi_uc)((b * 255)/31);
+
+ // some people claim that the most significant bit might be used for alpha
+ // (possibly if an alpha-bit is set in the "image descriptor byte")
+ // but that only made 16bit test images completely translucent..
+ // so let's treat all 15 and 16bit TGAs as RGB with no alpha.
+}
+
+static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
{
// read in the TGA header stuff
int tga_offset = stbi__get8(s);
@@ -4859,16 +5903,23 @@ static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int
int tga_width = stbi__get16le(s);
int tga_height = stbi__get16le(s);
int tga_bits_per_pixel = stbi__get8(s);
- int tga_comp = tga_bits_per_pixel / 8;
+ int tga_comp, tga_rgb16=0;
int tga_inverted = stbi__get8(s);
+ // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?)
// image data
unsigned char *tga_data;
unsigned char *tga_palette = NULL;
int i, j;
- unsigned char raw_data[4];
+ unsigned char raw_data[4] = {0};
int RLE_count = 0;
int RLE_repeating = 0;
int read_next_pixel = 1;
+ STBI_NOTUSED(ri);
+ STBI_NOTUSED(tga_x_origin); // @TODO
+ STBI_NOTUSED(tga_y_origin); // @TODO
+
+ if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+ if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
// do a tiny bit of precessing
if ( tga_image_type >= 8 )
@@ -4876,59 +5927,63 @@ static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int
tga_image_type -= 8;
tga_is_RLE = 1;
}
- /* int tga_alpha_bits = tga_inverted & 15; */
tga_inverted = 1 - ((tga_inverted >> 5) & 1);
- // error check
- if ( //(tga_indexed) ||
- (tga_width < 1) || (tga_height < 1) ||
- (tga_image_type < 1) || (tga_image_type > 3) ||
- ((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16) &&
- (tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32))
- )
- {
- return NULL; // we don't report this as a bad TGA because we don't even know if it's TGA
- }
-
// If I'm paletted, then I'll use the number of bits from the palette
- if ( tga_indexed )
- {
- tga_comp = tga_palette_bits / 8;
- }
+ if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16);
+ else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16);
+
+ if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency
+ return stbi__errpuc("bad format", "Can't find out TGA pixelformat");
// tga info
*x = tga_width;
*y = tga_height;
if (comp) *comp = tga_comp;
- tga_data = (unsigned char*)stbi__malloc( (size_t)tga_width * tga_height * tga_comp );
+ if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0))
+ return stbi__errpuc("too large", "Corrupt TGA");
+
+ tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0);
if (!tga_data) return stbi__errpuc("outofmem", "Out of memory");
// skip to the data's starting position (offset usually = 0)
stbi__skip(s, tga_offset );
- if ( !tga_indexed && !tga_is_RLE) {
+ if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) {
for (i=0; i < tga_height; ++i) {
- int y = tga_inverted ? tga_height -i - 1 : i;
- stbi_uc *tga_row = tga_data + y*tga_width*tga_comp;
+ int row = tga_inverted ? tga_height -i - 1 : i;
+ stbi_uc *tga_row = tga_data + row*tga_width*tga_comp;
stbi__getn(s, tga_row, tga_width * tga_comp);
}
} else {
// do I need to load a palette?
if ( tga_indexed)
{
+ if (tga_palette_len == 0) { /* you have to have at least one entry! */
+ STBI_FREE(tga_data);
+ return stbi__errpuc("bad palette", "Corrupt TGA");
+ }
+
// any data to skip? (offset usually = 0)
stbi__skip(s, tga_palette_start );
// load the palette
- tga_palette = (unsigned char*)stbi__malloc( tga_palette_len * tga_palette_bits / 8 );
+ tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0);
if (!tga_palette) {
STBI_FREE(tga_data);
return stbi__errpuc("outofmem", "Out of memory");
}
- if (!stbi__getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 )) {
- STBI_FREE(tga_data);
- STBI_FREE(tga_palette);
- return stbi__errpuc("bad palette", "Corrupt TGA");
+ if (tga_rgb16) {
+ stbi_uc *pal_entry = tga_palette;
+ STBI_ASSERT(tga_comp == STBI_rgb);
+ for (i=0; i < tga_palette_len; ++i) {
+ stbi__tga_read_rgb16(s, pal_entry);
+ pal_entry += tga_comp;
+ }
+ } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) {
+ STBI_FREE(tga_data);
+ STBI_FREE(tga_palette);
+ return stbi__errpuc("bad palette", "Corrupt TGA");
}
}
// load the data
@@ -4958,23 +6013,22 @@ static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int
// load however much data we did have
if ( tga_indexed )
{
- // read in 1 byte, then perform the lookup
- int pal_idx = stbi__get8(s);
- if ( pal_idx >= tga_palette_len )
- {
- // invalid index
+ // read in index, then perform the lookup
+ int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s);
+ if ( pal_idx >= tga_palette_len ) {
+ // invalid index
pal_idx = 0;
}
- pal_idx *= tga_bits_per_pixel / 8;
- for (j = 0; j*8 < tga_bits_per_pixel; ++j)
- {
+ pal_idx *= tga_comp;
+ for (j = 0; j < tga_comp; ++j) {
raw_data[j] = tga_palette[pal_idx+j];
}
- } else
- {
+ } else if(tga_rgb16) {
+ STBI_ASSERT(tga_comp == STBI_rgb);
+ stbi__tga_read_rgb16(s, raw_data);
+ } else {
// read in the data raw
- for (j = 0; j*8 < tga_bits_per_pixel; ++j)
- {
+ for (j = 0; j < tga_comp; ++j) {
raw_data[j] = stbi__get8(s);
}
}
@@ -5013,8 +6067,8 @@ static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int
}
}
- // swap RGB
- if (tga_comp >= 3)
+ // swap RGB - if the source data was RGB16, it already is in the right order
+ if (tga_comp >= 3 && !tga_rgb16)
{
unsigned char* tga_pixel = tga_data;
for (i=0; i < tga_width * tga_height; ++i)
@@ -5034,6 +6088,7 @@ static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int
// Microsoft's C compilers happy... [8^(
tga_palette_start = tga_palette_len = tga_palette_bits =
tga_x_origin = tga_y_origin = 0;
+ STBI_NOTUSED(tga_palette_start);
// OK, done
return tga_data;
}
@@ -5050,13 +6105,53 @@ static int stbi__psd_test(stbi__context *s)
return r;
}
-static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount)
+{
+ int count, nleft, len;
+
+ count = 0;
+ while ((nleft = pixelCount - count) > 0) {
+ len = stbi__get8(s);
+ if (len == 128) {
+ // No-op.
+ } else if (len < 128) {
+ // Copy next len+1 bytes literally.
+ len++;
+ if (len > nleft) return 0; // corrupt data
+ count += len;
+ while (len) {
+ *p = stbi__get8(s);
+ p += 4;
+ len--;
+ }
+ } else if (len > 128) {
+ stbi_uc val;
+ // Next -len+1 bytes in the dest are replicated from next source byte.
+ // (Interpret len as a negative 8-bit int.)
+ len = 257 - len;
+ if (len > nleft) return 0; // corrupt data
+ val = stbi__get8(s);
+ count += len;
+ while (len) {
+ *p = val;
+ p += 4;
+ len--;
+ }
+ }
+ }
+
+ return 1;
+}
+
+static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
{
- int pixelCount;
+ int pixelCount;
int channelCount, compression;
- int channel, i, count, len;
+ int channel, i;
+ int bitdepth;
int w,h;
stbi_uc *out;
+ STBI_NOTUSED(ri);
// Check identifier
if (stbi__get32be(s) != 0x38425053) // "8BPS"
@@ -5078,9 +6173,13 @@ static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int
h = stbi__get32be(s);
w = stbi__get32be(s);
+ if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+ if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
// Make sure the depth is 8 bits.
- if (stbi__get16be(s) != 8)
- return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 bit");
+ bitdepth = stbi__get16be(s);
+ if (bitdepth != 8 && bitdepth != 16)
+ return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit");
// Make sure the color mode is RGB.
// Valid options are:
@@ -5112,8 +6211,18 @@ static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int
if (compression > 1)
return stbi__errpuc("bad compression", "PSD has an unknown compression format");
+ // Check size
+ if (!stbi__mad3sizes_valid(4, w, h, 0))
+ return stbi__errpuc("too large", "Corrupt PSD");
+
// Create the destination image.
- out = (stbi_uc *) stbi__malloc(4 * w*h);
+
+ if (!compression && bitdepth == 16 && bpc == 16) {
+ out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0);
+ ri->bits_per_channel = 16;
+ } else
+ out = (stbi_uc *) stbi__malloc(4 * w*h);
+
if (!out) return stbi__errpuc("outofmem", "Out of memory");
pixelCount = w*h;
@@ -5130,7 +6239,7 @@ static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int
// Else if n is 128, noop.
// Endloop
- // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
+ // The RLE-compressed data is preceded by a 2-byte data count for each row in the data,
// which we're going to just skip.
stbi__skip(s, h * channelCount * 2 );
@@ -5145,61 +6254,86 @@ static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int
*p = (channel == 3 ? 255 : 0);
} else {
// Read the RLE data.
- count = 0;
- while (count < pixelCount) {
- len = stbi__get8(s);
- if (len == 128) {
- // No-op.
- } else if (len < 128) {
- // Copy next len+1 bytes literally.
- len++;
- count += len;
- while (len) {
- *p = stbi__get8(s);
- p += 4;
- len--;
- }
- } else if (len > 128) {
- stbi_uc val;
- // Next -len+1 bytes in the dest are replicated from next source byte.
- // (Interpret len as a negative 8-bit int.)
- len ^= 0x0FF;
- len += 2;
- val = stbi__get8(s);
- count += len;
- while (len) {
- *p = val;
- p += 4;
- len--;
- }
- }
+ if (!stbi__psd_decode_rle(s, p, pixelCount)) {
+ STBI_FREE(out);
+ return stbi__errpuc("corrupt", "bad RLE data");
}
}
}
} else {
// We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...)
- // where each channel consists of an 8-bit value for each pixel in the image.
+ // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image.
// Read the data by channel.
for (channel = 0; channel < 4; channel++) {
- stbi_uc *p;
-
- p = out + channel;
- if (channel > channelCount) {
+ if (channel >= channelCount) {
// Fill this channel with default data.
- for (i = 0; i < pixelCount; i++, p += 4)
- *p = channel == 3 ? 255 : 0;
+ if (bitdepth == 16 && bpc == 16) {
+ stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
+ stbi__uint16 val = channel == 3 ? 65535 : 0;
+ for (i = 0; i < pixelCount; i++, q += 4)
+ *q = val;
+ } else {
+ stbi_uc *p = out+channel;
+ stbi_uc val = channel == 3 ? 255 : 0;
+ for (i = 0; i < pixelCount; i++, p += 4)
+ *p = val;
+ }
} else {
- // Read the data.
- for (i = 0; i < pixelCount; i++, p += 4)
- *p = stbi__get8(s);
+ if (ri->bits_per_channel == 16) { // output bpc
+ stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
+ for (i = 0; i < pixelCount; i++, q += 4)
+ *q = (stbi__uint16) stbi__get16be(s);
+ } else {
+ stbi_uc *p = out+channel;
+ if (bitdepth == 16) { // input bpc
+ for (i = 0; i < pixelCount; i++, p += 4)
+ *p = (stbi_uc) (stbi__get16be(s) >> 8);
+ } else {
+ for (i = 0; i < pixelCount; i++, p += 4)
+ *p = stbi__get8(s);
+ }
+ }
+ }
+ }
+ }
+
+ // remove weird white matte from PSD
+ if (channelCount >= 4) {
+ if (ri->bits_per_channel == 16) {
+ for (i=0; i < w*h; ++i) {
+ stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i;
+ if (pixel[3] != 0 && pixel[3] != 65535) {
+ float a = pixel[3] / 65535.0f;
+ float ra = 1.0f / a;
+ float inv_a = 65535.0f * (1 - ra);
+ pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a);
+ pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a);
+ pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a);
+ }
+ }
+ } else {
+ for (i=0; i < w*h; ++i) {
+ unsigned char *pixel = out + 4*i;
+ if (pixel[3] != 0 && pixel[3] != 255) {
+ float a = pixel[3] / 255.0f;
+ float ra = 1.0f / a;
+ float inv_a = 255.0f * (1 - ra);
+ pixel[0] = (unsigned char) (pixel[0]*ra + inv_a);
+ pixel[1] = (unsigned char) (pixel[1]*ra + inv_a);
+ pixel[2] = (unsigned char) (pixel[2]*ra + inv_a);
+ }
}
}
}
+ // convert to desired output format
if (req_comp && req_comp != 4) {
- out = stbi__convert_format(out, 4, req_comp, w, h);
+ if (ri->bits_per_channel == 16)
+ out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h);
+ else
+ out = stbi__convert_format(out, 4, req_comp, w, h);
if (out == NULL) return out; // stbi__convert_format frees input on failure
}
@@ -5351,7 +6485,6 @@ static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *c
if (count >= 128) { // Repeated
stbi_uc value[4];
- int i;
if (count==128)
count = stbi__get16be(s);
@@ -5384,30 +6517,38 @@ static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *c
return result;
}
-static stbi_uc *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp)
+static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri)
{
stbi_uc *result;
- int i, x,y;
+ int i, x,y, internal_comp;
+ STBI_NOTUSED(ri);
+
+ if (!comp) comp = &internal_comp;
for (i=0; i<92; ++i)
stbi__get8(s);
x = stbi__get16be(s);
y = stbi__get16be(s);
+
+ if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+ if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)");
- if ((1 << 28) / x < y) return stbi__errpuc("too large", "Image too large to decode");
+ if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode");
stbi__get32be(s); //skip `ratio'
stbi__get16be(s); //skip `fields'
stbi__get16be(s); //skip `pad'
// intermediate buffer is RGBA
- result = (stbi_uc *) stbi__malloc(x*y*4);
+ result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0);
+ if (!result) return stbi__errpuc("outofmem", "Out of memory");
memset(result, 0xff, x*y*4);
if (!stbi__pic_load_core(s,x,y,comp, result)) {
STBI_FREE(result);
- result=0;
+ return 0;
}
*px = x;
*py = y;
@@ -5440,10 +6581,12 @@ typedef struct
{
int w,h;
stbi_uc *out; // output buffer (always 4 components)
+ stbi_uc *background; // The current "background" as far as a gif is concerned
+ stbi_uc *history;
int flags, bgindex, ratio, transparent, eflags;
stbi_uc pal[256][4];
stbi_uc lpal[256][4];
- stbi__gif_lzw codes[4096];
+ stbi__gif_lzw codes[8192];
stbi_uc *color_table;
int parse, step;
int lflags;
@@ -5451,6 +6594,7 @@ typedef struct
int max_x, max_y;
int cur_x, cur_y;
int line_size;
+ int delay;
} stbi__gif;
static int stbi__gif_test_raw(stbi__context *s)
@@ -5499,6 +6643,9 @@ static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_in
g->ratio = stbi__get8(s);
g->transparent = -1;
+ if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+ if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+
if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments
if (is_info) return 1;
@@ -5511,19 +6658,23 @@ static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_in
static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp)
{
- stbi__gif g;
- if (!stbi__gif_header(s, &g, comp, 1)) {
+ stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif));
+ if (!g) return stbi__err("outofmem", "Out of memory");
+ if (!stbi__gif_header(s, g, comp, 1)) {
+ STBI_FREE(g);
stbi__rewind( s );
return 0;
}
- if (x) *x = g.w;
- if (y) *y = g.h;
+ if (x) *x = g->w;
+ if (y) *y = g->h;
+ STBI_FREE(g);
return 1;
}
static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
{
stbi_uc *p, *c;
+ int idx;
// recurse to decode the prefixes, since the linked-list is backwards,
// and working backwards through an interleaved image would be nasty
@@ -5532,10 +6683,12 @@ static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
if (g->cur_y >= g->max_y) return;
- p = &g->out[g->cur_x + g->cur_y];
- c = &g->color_table[g->codes[code].suffix * 4];
+ idx = g->cur_x + g->cur_y;
+ p = &g->out[idx];
+ g->history[idx / 4] = 1;
- if (c[3] >= 128) {
+ c = &g->color_table[g->codes[code].suffix * 4];
+ if (c[3] > 128) { // don't render transparent pixels;
p[0] = c[2];
p[1] = c[1];
p[2] = c[0];
@@ -5558,7 +6711,7 @@ static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
{
stbi_uc lzw_cs;
- stbi__int32 len, code;
+ stbi__int32 len, init_code;
stbi__uint32 first;
stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear;
stbi__gif_lzw *p;
@@ -5571,10 +6724,10 @@ static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
codemask = (1 << codesize) - 1;
bits = 0;
valid_bits = 0;
- for (code = 0; code < clear; code++) {
- g->codes[code].prefix = -1;
- g->codes[code].first = (stbi_uc) code;
- g->codes[code].suffix = (stbi_uc) code;
+ for (init_code = 0; init_code < clear; init_code++) {
+ g->codes[init_code].prefix = -1;
+ g->codes[init_code].first = (stbi_uc) init_code;
+ g->codes[init_code].suffix = (stbi_uc) init_code;
}
// support no starting clear code
@@ -5609,11 +6762,16 @@ static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
stbi__skip(s,len);
return g->out;
} else if (code <= avail) {
- if (first) return stbi__errpuc("no clear code", "Corrupt GIF");
+ if (first) {
+ return stbi__errpuc("no clear code", "Corrupt GIF");
+ }
if (oldcode >= 0) {
p = &g->codes[avail++];
- if (avail > 4096) return stbi__errpuc("too many codes", "Corrupt GIF");
+ if (avail > 8192) {
+ return stbi__errpuc("too many codes", "Corrupt GIF");
+ }
+
p->prefix = (stbi__int16) oldcode;
p->first = g->codes[oldcode].first;
p->suffix = (code == avail) ? p->first : g->codes[code].first;
@@ -5635,43 +6793,75 @@ static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
}
}
-static void stbi__fill_gif_background(stbi__gif *g)
-{
- int i;
- stbi_uc *c = g->pal[g->bgindex];
- // @OPTIMIZE: write a dword at a time
- for (i = 0; i < g->w * g->h * 4; i += 4) {
- stbi_uc *p = &g->out[i];
- p[0] = c[2];
- p[1] = c[1];
- p[2] = c[0];
- p[3] = c[3];
- }
-}
-
// this function is designed to support animated gifs, although stb_image doesn't support it
-static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp)
+// two back is the image from two frames ago, used for a very specific disposal format
+static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back)
{
- int i;
- stbi_uc *old_out = 0;
+ int dispose;
+ int first_frame;
+ int pi;
+ int pcount;
+ STBI_NOTUSED(req_comp);
+ // on first frame, any non-written pixels get the background colour (non-transparent)
+ first_frame = 0;
if (g->out == 0) {
- if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header
- g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h);
- if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory");
- stbi__fill_gif_background(g);
+ if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header
+ if (!stbi__mad3sizes_valid(4, g->w, g->h, 0))
+ return stbi__errpuc("too large", "GIF image is too large");
+ pcount = g->w * g->h;
+ g->out = (stbi_uc *) stbi__malloc(4 * pcount);
+ g->background = (stbi_uc *) stbi__malloc(4 * pcount);
+ g->history = (stbi_uc *) stbi__malloc(pcount);
+ if (!g->out || !g->background || !g->history)
+ return stbi__errpuc("outofmem", "Out of memory");
+
+ // image is treated as "transparent" at the start - ie, nothing overwrites the current background;
+ // background colour is only used for pixels that are not rendered first frame, after that "background"
+ // color refers to the color that was there the previous frame.
+ memset(g->out, 0x00, 4 * pcount);
+ memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent)
+ memset(g->history, 0x00, pcount); // pixels that were affected previous frame
+ first_frame = 1;
} else {
- // animated-gif-only path
- if (((g->eflags & 0x1C) >> 2) == 3) {
- old_out = g->out;
- g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h);
- if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory");
- memcpy(g->out, old_out, g->w*g->h*4);
+ // second frame - how do we dispose of the previous one?
+ dispose = (g->eflags & 0x1C) >> 2;
+ pcount = g->w * g->h;
+
+ if ((dispose == 3) && (two_back == 0)) {
+ dispose = 2; // if I don't have an image to revert back to, default to the old background
+ }
+
+ if (dispose == 3) { // use previous graphic
+ for (pi = 0; pi < pcount; ++pi) {
+ if (g->history[pi]) {
+ memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 );
+ }
+ }
+ } else if (dispose == 2) {
+ // restore what was changed last frame to background before that frame;
+ for (pi = 0; pi < pcount; ++pi) {
+ if (g->history[pi]) {
+ memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 );
+ }
+ }
+ } else {
+ // This is a non-disposal case eithe way, so just
+ // leave the pixels as is, and they will become the new background
+ // 1: do not dispose
+ // 0: not specified.
}
+
+ // background is what out is after the undoing of the previou frame;
+ memcpy( g->background, g->out, 4 * g->w * g->h );
}
+ // clear my history;
+ memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame
+
for (;;) {
- switch (stbi__get8(s)) {
+ int tag = stbi__get8(s);
+ switch (tag) {
case 0x2C: /* Image Descriptor */
{
stbi__int32 x, y, w, h;
@@ -5692,6 +6882,13 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
g->cur_x = g->start_x;
g->cur_y = g->start_y;
+ // if the width of the specified rectangle is 0, that means
+ // we may not see *any* pixels or the image is malformed;
+ // to make sure this is caught, move the current y down to
+ // max_y (which is what out_gif_code checks).
+ if (w == 0)
+ g->cur_y = g->max_y;
+
g->lflags = stbi__get8(s);
if (g->lflags & 0x40) {
@@ -5706,38 +6903,60 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1);
g->color_table = (stbi_uc *) g->lpal;
} else if (g->flags & 0x80) {
- for (i=0; i < 256; ++i) // @OPTIMIZE: stbi__jpeg_reset only the previous transparent
- g->pal[i][3] = 255;
- if (g->transparent >= 0 && (g->eflags & 0x01))
- g->pal[g->transparent][3] = 0;
g->color_table = (stbi_uc *) g->pal;
} else
return stbi__errpuc("missing color table", "Corrupt GIF");
o = stbi__process_gif_raster(s, g);
- if (o == NULL) return NULL;
+ if (!o) return NULL;
+
+ // if this was the first frame,
+ pcount = g->w * g->h;
+ if (first_frame && (g->bgindex > 0)) {
+ // if first frame, any pixel not drawn to gets the background color
+ for (pi = 0; pi < pcount; ++pi) {
+ if (g->history[pi] == 0) {
+ g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be;
+ memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 );
+ }
+ }
+ }
- if (req_comp && req_comp != 4)
- o = stbi__convert_format(o, 4, req_comp, g->w, g->h);
return o;
}
case 0x21: // Comment Extension.
{
int len;
- if (stbi__get8(s) == 0xF9) { // Graphic Control Extension.
+ int ext = stbi__get8(s);
+ if (ext == 0xF9) { // Graphic Control Extension.
len = stbi__get8(s);
if (len == 4) {
g->eflags = stbi__get8(s);
- stbi__get16le(s); // delay
- g->transparent = stbi__get8(s);
+ g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths.
+
+ // unset old transparent
+ if (g->transparent >= 0) {
+ g->pal[g->transparent][3] = 255;
+ }
+ if (g->eflags & 0x01) {
+ g->transparent = stbi__get8(s);
+ if (g->transparent >= 0) {
+ g->pal[g->transparent][3] = 0;
+ }
+ } else {
+ // don't need transparent
+ stbi__skip(s, 1);
+ g->transparent = -1;
+ }
} else {
stbi__skip(s, len);
break;
}
}
- while ((len = stbi__get8(s)) != 0)
+ while ((len = stbi__get8(s)) != 0) {
stbi__skip(s, len);
+ }
break;
}
@@ -5750,19 +6969,128 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
}
}
-static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays)
+{
+ STBI_FREE(g->out);
+ STBI_FREE(g->history);
+ STBI_FREE(g->background);
+
+ if (out) STBI_FREE(out);
+ if (delays && *delays) STBI_FREE(*delays);
+ return stbi__errpuc("outofmem", "Out of memory");
+}
+
+static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
+{
+ if (stbi__gif_test(s)) {
+ int layers = 0;
+ stbi_uc *u = 0;
+ stbi_uc *out = 0;
+ stbi_uc *two_back = 0;
+ stbi__gif g;
+ int stride;
+ int out_size = 0;
+ int delays_size = 0;
+
+ STBI_NOTUSED(out_size);
+ STBI_NOTUSED(delays_size);
+
+ memset(&g, 0, sizeof(g));
+ if (delays) {
+ *delays = 0;
+ }
+
+ do {
+ u = stbi__gif_load_next(s, &g, comp, req_comp, two_back);
+ if (u == (stbi_uc *) s) u = 0; // end of animated gif marker
+
+ if (u) {
+ *x = g.w;
+ *y = g.h;
+ ++layers;
+ stride = g.w * g.h * 4;
+
+ if (out) {
+ void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride );
+ if (!tmp)
+ return stbi__load_gif_main_outofmem(&g, out, delays);
+ else {
+ out = (stbi_uc*) tmp;
+ out_size = layers * stride;
+ }
+
+ if (delays) {
+ int *new_delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers );
+ if (!new_delays)
+ return stbi__load_gif_main_outofmem(&g, out, delays);
+ *delays = new_delays;
+ delays_size = layers * sizeof(int);
+ }
+ } else {
+ out = (stbi_uc*)stbi__malloc( layers * stride );
+ if (!out)
+ return stbi__load_gif_main_outofmem(&g, out, delays);
+ out_size = layers * stride;
+ if (delays) {
+ *delays = (int*) stbi__malloc( layers * sizeof(int) );
+ if (!*delays)
+ return stbi__load_gif_main_outofmem(&g, out, delays);
+ delays_size = layers * sizeof(int);
+ }
+ }
+ memcpy( out + ((layers - 1) * stride), u, stride );
+ if (layers >= 2) {
+ two_back = out - 2 * stride;
+ }
+
+ if (delays) {
+ (*delays)[layers - 1U] = g.delay;
+ }
+ }
+ } while (u != 0);
+
+ // free temp buffer;
+ STBI_FREE(g.out);
+ STBI_FREE(g.history);
+ STBI_FREE(g.background);
+
+ // do the final conversion after loading everything;
+ if (req_comp && req_comp != 4)
+ out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h);
+
+ *z = layers;
+ return out;
+ } else {
+ return stbi__errpuc("not GIF", "Image was not as a gif type.");
+ }
+}
+
+static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
{
stbi_uc *u = 0;
stbi__gif g;
memset(&g, 0, sizeof(g));
+ STBI_NOTUSED(ri);
- u = stbi__gif_load_next(s, &g, comp, req_comp);
+ u = stbi__gif_load_next(s, &g, comp, req_comp, 0);
if (u == (stbi_uc *) s) u = 0; // end of animated gif marker
if (u) {
*x = g.w;
*y = g.h;
+
+ // moved conversion to after successful load so that the same
+ // can be done for multiple frames.
+ if (req_comp && req_comp != 4)
+ u = stbi__convert_format(u, 4, req_comp, g.w, g.h);
+ } else if (g.out) {
+ // if there was an error and we allocated an image buffer, free it!
+ STBI_FREE(g.out);
}
+ // free buffers needed for multiple frame loading;
+ STBI_FREE(g.history);
+ STBI_FREE(g.background);
+
return u;
}
@@ -5776,20 +7104,24 @@ static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
// Radiance RGBE HDR loader
// originally by Nicolas Schulz
#ifndef STBI_NO_HDR
-static int stbi__hdr_test_core(stbi__context *s)
+static int stbi__hdr_test_core(stbi__context *s, const char *signature)
{
- const char *signature = "#?RADIANCE\n";
int i;
for (i=0; signature[i]; ++i)
if (stbi__get8(s) != signature[i])
- return 0;
+ return 0;
+ stbi__rewind(s);
return 1;
}
static int stbi__hdr_test(stbi__context* s)
{
- int r = stbi__hdr_test_core(s);
+ int r = stbi__hdr_test_core(s, "#?RADIANCE\n");
stbi__rewind(s);
+ if(!r) {
+ r = stbi__hdr_test_core(s, "#?RGBE\n");
+ stbi__rewind(s);
+ }
return r;
}
@@ -5843,7 +7175,7 @@ static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp)
}
}
-static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
{
char buffer[STBI__HDR_BUFLEN];
char *token;
@@ -5854,10 +7186,12 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
int len;
unsigned char count, value;
int i, j, k, c1,c2, z;
-
+ const char *headerToken;
+ STBI_NOTUSED(ri);
// Check identifier
- if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0)
+ headerToken = stbi__hdr_gettoken(s,buffer);
+ if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0)
return stbi__errpf("not HDR", "Corrupt HDR image");
// Parse header
@@ -5880,14 +7214,22 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
token += 3;
width = (int) strtol(token, NULL, 10);
+ if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)");
+ if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)");
+
*x = width;
*y = height;
if (comp) *comp = 3;
if (req_comp == 0) req_comp = 3;
+ if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0))
+ return stbi__errpf("too large", "HDR image is too large");
+
// Read data
- hdr_data = (float *) stbi__malloc(height * width * req_comp * sizeof(float));
+ hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0);
+ if (!hdr_data)
+ return stbi__errpf("outofmem", "Out of memory");
// Load image data
// image data is stored as some number of sca
@@ -5926,20 +7268,29 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
len <<= 8;
len |= stbi__get8(s);
if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); }
- if (scanline == NULL) scanline = (stbi_uc *) stbi__malloc(width * 4);
+ if (scanline == NULL) {
+ scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0);
+ if (!scanline) {
+ STBI_FREE(hdr_data);
+ return stbi__errpf("outofmem", "Out of memory");
+ }
+ }
for (k = 0; k < 4; ++k) {
+ int nleft;
i = 0;
- while (i < width) {
+ while ((nleft = width - i) > 0) {
count = stbi__get8(s);
if (count > 128) {
// Run
value = stbi__get8(s);
count -= 128;
+ if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
for (z = 0; z < count; ++z)
scanline[i++ * 4 + k] = value;
} else {
// Dump
+ if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
for (z = 0; z < count; ++z)
scanline[i++ * 4 + k] = stbi__get8(s);
}
@@ -5948,7 +7299,8 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
for (i=0; i < width; ++i)
stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
}
- STBI_FREE(scanline);
+ if (scanline)
+ STBI_FREE(scanline);
}
return hdr_data;
@@ -5959,8 +7311,13 @@ static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
char buffer[STBI__HDR_BUFLEN];
char *token;
int valid = 0;
+ int dummy;
- if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) {
+ if (!x) x = &dummy;
+ if (!y) y = &dummy;
+ if (!comp) comp = &dummy;
+
+ if (stbi__hdr_test(s) == 0) {
stbi__rewind( s );
return 0;
}
@@ -5997,29 +7354,23 @@ static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
#ifndef STBI_NO_BMP
static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
{
- int hsz;
- if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') {
- stbi__rewind( s );
- return 0;
- }
- stbi__skip(s,12);
- hsz = stbi__get32le(s);
- if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) {
- stbi__rewind( s );
- return 0;
- }
- if (hsz == 12) {
- *x = stbi__get16le(s);
- *y = stbi__get16le(s);
- } else {
- *x = stbi__get32le(s);
- *y = stbi__get32le(s);
+ void *p;
+ stbi__bmp_data info;
+
+ info.all_a = 255;
+ p = stbi__bmp_parse_header(s, &info);
+ if (p == NULL) {
+ stbi__rewind( s );
+ return 0;
}
- if (stbi__get16le(s) != 1) {
- stbi__rewind( s );
- return 0;
+ if (x) *x = s->img_x;
+ if (y) *y = s->img_y;
+ if (comp) {
+ if (info.bpp == 24 && info.ma == 0xff000000)
+ *comp = 3;
+ else
+ *comp = info.ma ? 4 : 3;
}
- *comp = stbi__get16le(s) / 8;
return 1;
}
#endif
@@ -6027,7 +7378,10 @@ static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
#ifndef STBI_NO_PSD
static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
{
- int channelCount;
+ int channelCount, dummy, depth;
+ if (!x) x = &dummy;
+ if (!y) y = &dummy;
+ if (!comp) comp = &dummy;
if (stbi__get32be(s) != 0x38425053) {
stbi__rewind( s );
return 0;
@@ -6044,7 +7398,8 @@ static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
}
*y = stbi__get32be(s);
*x = stbi__get32be(s);
- if (stbi__get16be(s) != 8) {
+ depth = stbi__get16be(s);
+ if (depth != 8 && depth != 16) {
stbi__rewind( s );
return 0;
}
@@ -6055,22 +7410,61 @@ static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
*comp = 4;
return 1;
}
+
+static int stbi__psd_is16(stbi__context *s)
+{
+ int channelCount, depth;
+ if (stbi__get32be(s) != 0x38425053) {
+ stbi__rewind( s );
+ return 0;
+ }
+ if (stbi__get16be(s) != 1) {
+ stbi__rewind( s );
+ return 0;
+ }
+ stbi__skip(s, 6);
+ channelCount = stbi__get16be(s);
+ if (channelCount < 0 || channelCount > 16) {
+ stbi__rewind( s );
+ return 0;
+ }
+ STBI_NOTUSED(stbi__get32be(s));
+ STBI_NOTUSED(stbi__get32be(s));
+ depth = stbi__get16be(s);
+ if (depth != 16) {
+ stbi__rewind( s );
+ return 0;
+ }
+ return 1;
+}
#endif
#ifndef STBI_NO_PIC
static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
{
- int act_comp=0,num_packets=0,chained;
+ int act_comp=0,num_packets=0,chained,dummy;
stbi__pic_packet packets[10];
- stbi__skip(s, 92);
+ if (!x) x = &dummy;
+ if (!y) y = &dummy;
+ if (!comp) comp = &dummy;
+
+ if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) {
+ stbi__rewind(s);
+ return 0;
+ }
+
+ stbi__skip(s, 88);
*x = stbi__get16be(s);
*y = stbi__get16be(s);
- if (stbi__at_eof(s)) return 0;
+ if (stbi__at_eof(s)) {
+ stbi__rewind( s);
+ return 0;
+ }
if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) {
- stbi__rewind( s );
- return 0;
+ stbi__rewind( s );
+ return 0;
}
stbi__skip(s, 8);
@@ -6114,7 +7508,6 @@ static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
// Known limitations:
// Does not support comments in the header section
// Does not support ASCII image data (formats P2 and P3)
-// Does not support 16-bit-per-channel
#ifndef STBI_NO_PNM
@@ -6130,21 +7523,38 @@ static int stbi__pnm_test(stbi__context *s)
return 1;
}
-static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
{
stbi_uc *out;
- if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n))
+ STBI_NOTUSED(ri);
+
+ ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n);
+ if (ri->bits_per_channel == 0)
return 0;
+
+ if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+ if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
*x = s->img_x;
*y = s->img_y;
- *comp = s->img_n;
+ if (comp) *comp = s->img_n;
- out = (stbi_uc *) stbi__malloc(s->img_n * s->img_x * s->img_y);
+ if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0))
+ return stbi__errpuc("too large", "PNM too large");
+
+ out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0);
if (!out) return stbi__errpuc("outofmem", "Out of memory");
- stbi__getn(s, out, s->img_n * s->img_x * s->img_y);
+ if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) {
+ STBI_FREE(out);
+ return stbi__errpuc("bad PNM", "PNM file truncated");
+ }
if (req_comp && req_comp != s->img_n) {
- out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+ if (ri->bits_per_channel == 16) {
+ out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y);
+ } else {
+ out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+ }
if (out == NULL) return out; // stbi__convert_format frees input on failure
}
return out;
@@ -6157,8 +7567,16 @@ static int stbi__pnm_isspace(char c)
static void stbi__pnm_skip_whitespace(stbi__context *s, char *c)
{
- while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
- *c = (char) stbi__get8(s);
+ for (;;) {
+ while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
+ *c = (char) stbi__get8(s);
+
+ if (stbi__at_eof(s) || *c != '#')
+ break;
+
+ while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' )
+ *c = (char) stbi__get8(s);
+ }
}
static int stbi__pnm_isdigit(char c)
@@ -6173,6 +7591,8 @@ static int stbi__pnm_getinteger(stbi__context *s, char *c)
while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
value = value*10 + (*c - '0');
*c = (char) stbi__get8(s);
+ if((value > 214748364) || (value == 214748364 && *c > '7'))
+ return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int");
}
return value;
@@ -6180,16 +7600,20 @@ static int stbi__pnm_getinteger(stbi__context *s, char *c)
static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
{
- int maxv;
+ int maxv, dummy;
char c, p, t;
- stbi__rewind( s );
+ if (!x) x = &dummy;
+ if (!y) y = &dummy;
+ if (!comp) comp = &dummy;
+
+ stbi__rewind(s);
// Get identifier
p = (char) stbi__get8(s);
t = (char) stbi__get8(s);
if (p != 'P' || (t != '5' && t != '6')) {
- stbi__rewind( s );
+ stbi__rewind(s);
return 0;
}
@@ -6199,17 +7623,29 @@ static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
stbi__pnm_skip_whitespace(s, &c);
*x = stbi__pnm_getinteger(s, &c); // read width
+ if(*x == 0)
+ return stbi__err("invalid width", "PPM image header had zero or overflowing width");
stbi__pnm_skip_whitespace(s, &c);
*y = stbi__pnm_getinteger(s, &c); // read height
+ if (*y == 0)
+ return stbi__err("invalid width", "PPM image header had zero or overflowing width");
stbi__pnm_skip_whitespace(s, &c);
maxv = stbi__pnm_getinteger(s, &c); // read max value
-
- if (maxv > 255)
- return stbi__err("max value > 255", "PPM image not 8-bit");
+ if (maxv > 65535)
+ return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images");
+ else if (maxv > 255)
+ return 16;
else
- return 1;
+ return 8;
+}
+
+static int stbi__pnm_is16(stbi__context *s)
+{
+ if (stbi__pnm_info(s, NULL, NULL, NULL) == 16)
+ return 1;
+ return 0;
}
#endif
@@ -6255,6 +7691,22 @@ static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
return stbi__err("unknown image type", "Image not of any known type, or corrupt");
}
+static int stbi__is_16_main(stbi__context *s)
+{
+ #ifndef STBI_NO_PNG
+ if (stbi__png_is16(s)) return 1;
+ #endif
+
+ #ifndef STBI_NO_PSD
+ if (stbi__psd_is16(s)) return 1;
+ #endif
+
+ #ifndef STBI_NO_PNM
+ if (stbi__pnm_is16(s)) return 1;
+ #endif
+ return 0;
+}
+
#ifndef STBI_NO_STDIO
STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp)
{
@@ -6276,6 +7728,27 @@ STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp)
fseek(f,pos,SEEK_SET);
return r;
}
+
+STBIDEF int stbi_is_16_bit(char const *filename)
+{
+ FILE *f = stbi__fopen(filename, "rb");
+ int result;
+ if (!f) return stbi__err("can't fopen", "Unable to open file");
+ result = stbi_is_16_bit_from_file(f);
+ fclose(f);
+ return result;
+}
+
+STBIDEF int stbi_is_16_bit_from_file(FILE *f)
+{
+ int r;
+ stbi__context s;
+ long pos = ftell(f);
+ stbi__start_file(&s, f);
+ r = stbi__is_16_main(&s);
+ fseek(f,pos,SEEK_SET);
+ return r;
+}
#endif // !STBI_NO_STDIO
STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp)
@@ -6292,10 +7765,64 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
return stbi__info_main(&s,x,y,comp);
}
+STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len)
+{
+ stbi__context s;
+ stbi__start_mem(&s,buffer,len);
+ return stbi__is_16_main(&s);
+}
+
+STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user)
+{
+ stbi__context s;
+ stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
+ return stbi__is_16_main(&s);
+}
+
#endif // STB_IMAGE_IMPLEMENTATION
/*
revision history:
+ 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs
+ 2.19 (2018-02-11) fix warning
+ 2.18 (2018-01-30) fix warnings
+ 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug
+ 1-bit BMP
+ *_is_16_bit api
+ avoid warnings
+ 2.16 (2017-07-23) all functions have 16-bit variants;
+ STBI_NO_STDIO works again;
+ compilation fixes;
+ fix rounding in unpremultiply;
+ optimize vertical flip;
+ disable raw_len validation;
+ documentation fixes
+ 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode;
+ warning fixes; disable run-time SSE detection on gcc;
+ uniform handling of optional "return" values;
+ thread-safe initialization of zlib tables
+ 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
+ 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now
+ 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
+ 2.11 (2016-04-02) allocate large structures on the stack
+ remove white matting for transparent PSD
+ fix reported channel count for PNG & BMP
+ re-enable SSE2 in non-gcc 64-bit
+ support RGB-formatted JPEG
+ read 16-bit PNGs (only as 8-bit)
+ 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED
+ 2.09 (2016-01-16) allow comments in PNM files
+ 16-bit-per-pixel TGA (not bit-per-component)
+ info() for TGA could break due to .hdr handling
+ info() for BMP to shares code instead of sloppy parse
+ can use STBI_REALLOC_SIZED if allocator doesn't support realloc
+ code cleanup
+ 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
+ 2.07 (2015-09-13) fix compiler warnings
+ partial animated GIF support
+ limited 16-bpc PSD support
+ #ifdef unused functions
+ bug with < 92 byte PIC,PNM,HDR,TGA
2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value
2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning
2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit
@@ -6436,3 +7963,46 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
0.50 (2006-11-19)
first released version
*/
+
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+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.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+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 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/external/include/stb_image_write.h b/external/include/stb_image_write.h
index 59052f9c4..28704c1bc 100644
--- a/external/include/stb_image_write.h
+++ b/external/include/stb_image_write.h
@@ -1,5 +1,6 @@
-/* stb_image_write - v0.98 - public domain - http://nothings.org/stb/stb_image_write.h
- writes out PNG/BMP/TGA images to C stdio - Sean Barrett 2010
+#pragma once
+/* stb_image_write - v1.16 - public domain - http://nothings.org/stb
+ writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015
no warranty implied; use at your own risk
Before #including,
@@ -12,29 +13,67 @@
ABOUT:
- This header file is a library for writing images to C stdio. It could be
- adapted to write to memory or a general streaming interface; let me know.
+ This header file is a library for writing images to C stdio or a callback.
The PNG output is not optimal; it is 20-50% larger than the file
- written by a decent optimizing implementation. This library is designed
- for source code compactness and simplicitly, not optimal image file size
- or run-time performance.
+ written by a decent optimizing implementation; though providing a custom
+ zlib compress function (see STBIW_ZLIB_COMPRESS) can mitigate that.
+ This library is designed for source code compactness and simplicity,
+ not optimal image file size or run-time performance.
BUILDING:
You can #define STBIW_ASSERT(x) before the #include to avoid using assert.h.
You can #define STBIW_MALLOC(), STBIW_REALLOC(), and STBIW_FREE() to replace
malloc,realloc,free.
- You can define STBIW_MEMMOVE() to replace memmove()
+ You can #define STBIW_MEMMOVE() to replace memmove()
+ You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress function
+ for PNG compression (instead of the builtin one), it must have the following signature:
+ unsigned char * my_compress(unsigned char *data, int data_len, int *out_len, int quality);
+ The returned data will be freed with STBIW_FREE() (free() by default),
+ so it must be heap allocated with STBIW_MALLOC() (malloc() by default),
+
+UNICODE:
+
+ If compiling for Windows and you wish to use Unicode filenames, compile
+ with
+ #define STBIW_WINDOWS_UTF8
+ and pass utf8-encoded filenames. Call stbiw_convert_wchar_to_utf8 to convert
+ Windows wchar_t filenames to utf8.
USAGE:
- There are four functions, one for each image file format:
+ There are five functions, one for each image file format:
int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
- int stbi_write_hdr(char const *filename, int w, int h, int comp, const void *data);
+ int stbi_write_jpg(char const *filename, int w, int h, int comp, const void *data, int quality);
+ int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data);
+
+ void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip data vertically
+
+ There are also five equivalent functions that use an arbitrary write function. You are
+ expected to open/close your file-equivalent before and after calling these:
+
+ int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes);
+ int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
+ int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
+ int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data);
+ int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality);
+
+ where the callback is:
+ void stbi_write_func(void *context, void *data, int size);
+
+ You can configure it with these global variables:
+ int stbi_write_tga_with_rle; // defaults to true; set to 0 to disable RLE
+ int stbi_write_png_compression_level; // defaults to 8; set to higher for more compression
+ int stbi_write_force_png_filter; // defaults to -1; set to 0..5 to force a filter mode
+
+
+ You can define STBI_WRITE_NO_STDIO to disable the file variant of these
+ functions, so the library will not use stdio.h at all. However, this will
+ also disable HDR writing, because it requires stdio for formatted output.
Each function returns 0 on failure and non-0 on success.
@@ -58,69 +97,145 @@
writer, both because it is in BGR order and because it may have padding
at the end of the line.)
+ PNG allows you to set the deflate compression level by setting the global
+ variable 'stbi_write_png_compression_level' (it defaults to 8).
+
HDR expects linear float data. Since the format is always 32-bit rgb(e)
data, alpha (if provided) is discarded, and for monochrome data it is
replicated across all three channels.
+ TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed
+ data, set the global variable 'stbi_write_tga_with_rle' to 0.
+
+ JPEG does ignore alpha channels in input data; quality is between 1 and 100.
+ Higher quality looks better but results in a bigger image.
+ JPEG baseline (no JPEG progressive).
+
CREDITS:
- PNG/BMP/TGA
- Sean Barrett
- HDR
- Baldur Karlsson
- TGA monochrome:
- Jean-Sebastien Guay
- misc enhancements:
- Tim Kelsey
+
+ Sean Barrett - PNG/BMP/TGA
+ Baldur Karlsson - HDR
+ Jean-Sebastien Guay - TGA monochrome
+ Tim Kelsey - misc enhancements
+ Alan Hickman - TGA RLE
+ Emmanuel Julien - initial file IO callback implementation
+ Jon Olick - original jo_jpeg.cpp code
+ Daniel Gibson - integrate JPEG, allow external zlib
+ Aarni Koskela - allow choosing PNG filter
+
bugfixes:
github:Chribba
-
+ Guillaume Chereau
+ github:jry2
+ github:romigrou
+ Sergio Gonzalez
+ Jonas Karlsson
+ Filip Wasil
+ Thatcher Ulrich
+ github:poppolopoppo
+ Patrick Boettcher
+ github:xeekworx
+ Cap Petschulat
+ Simon Rodriguez
+ Ivan Tikhonov
+ github:ignotion
+ Adam Schackart
+ Andrew Kensler
+
LICENSE
-This software is in the public domain. Where that dedication is not
-recognized, you are granted a perpetual, irrevocable license to copy,
-distribute, and modify this file as you see fit.
+ See end of file for license information.
+
*/
#ifndef INCLUDE_STB_IMAGE_WRITE_H
#define INCLUDE_STB_IMAGE_WRITE_H
+#include
+
+// if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline' or 'static inline'
+#ifndef STBIWDEF
+#ifdef STB_IMAGE_WRITE_STATIC
+#define STBIWDEF static
+#else
#ifdef __cplusplus
-extern "C" {
+#define STBIWDEF extern "C"
+#else
+#define STBIWDEF extern
+#endif
+#endif
#endif
-extern int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
-extern int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
-extern int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
-extern int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data);
+#ifndef STB_IMAGE_WRITE_STATIC // C++ forbids static forward declarations
+STBIWDEF int stbi_write_tga_with_rle;
+STBIWDEF int stbi_write_png_compression_level;
+STBIWDEF int stbi_write_force_png_filter;
+#endif
-#ifdef __cplusplus
-}
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
+STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
+STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
+STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data);
+STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality);
+
+#ifdef STBIW_WINDOWS_UTF8
+STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input);
+#endif
#endif
+typedef void stbi_write_func(void *context, void *data, int size);
+
+STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes);
+STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
+STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
+STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data);
+STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality);
+
+STBIWDEF void stbi_flip_vertically_on_write(int flip_boolean);
+
#endif//INCLUDE_STB_IMAGE_WRITE_H
#ifdef STB_IMAGE_WRITE_IMPLEMENTATION
+#ifdef _WIN32
+ #ifndef _CRT_SECURE_NO_WARNINGS
+ #define _CRT_SECURE_NO_WARNINGS
+ #endif
+ #ifndef _CRT_NONSTDC_NO_DEPRECATE
+ #define _CRT_NONSTDC_NO_DEPRECATE
+ #endif
+#endif
+
+#ifndef STBI_WRITE_NO_STDIO
+#include
+#endif // STBI_WRITE_NO_STDIO
+
#include
#include
-#include
#include
#include
-#if defined(STBIW_MALLOC) && defined(STBIW_FREE) && defined(STBIW_REALLOC)
+#if defined(STBIW_MALLOC) && defined(STBIW_FREE) && (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED))
// ok
-#elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && !defined(STBIW_REALLOC)
+#elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED)
// ok
#else
-#error "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC."
+#error "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)."
#endif
#ifndef STBIW_MALLOC
-#define STBIW_MALLOC(sz) malloc(sz)
-#define STBIW_REALLOC(p,sz) realloc(p,sz)
-#define STBIW_FREE(p) free(p)
+#define STBIW_MALLOC(sz) malloc(sz)
+#define STBIW_REALLOC(p,newsz) realloc(p,newsz)
+#define STBIW_FREE(p) free(p)
+#endif
+
+#ifndef STBIW_REALLOC_SIZED
+#define STBIW_REALLOC_SIZED(p,oldsz,newsz) STBIW_REALLOC(p,newsz)
#endif
+
+
#ifndef STBIW_MEMMOVE
#define STBIW_MEMMOVE(a,b,sz) memmove(a,b,sz)
#endif
@@ -131,22 +246,129 @@ extern int stbi_write_hdr(char const *filename, int w, int h, int comp, const fl
#define STBIW_ASSERT(x) assert(x)
#endif
+#define STBIW_UCHAR(x) (unsigned char) ((x) & 0xff)
+
+#ifdef STB_IMAGE_WRITE_STATIC
+static int stbi_write_png_compression_level = 8;
+static int stbi_write_tga_with_rle = 1;
+static int stbi_write_force_png_filter = -1;
+#else
+int stbi_write_png_compression_level = 8;
+int stbi_write_tga_with_rle = 1;
+int stbi_write_force_png_filter = -1;
+#endif
+
+static int stbi__flip_vertically_on_write = 0;
+
+STBIWDEF void stbi_flip_vertically_on_write(int flag)
+{
+ stbi__flip_vertically_on_write = flag;
+}
+
+typedef struct
+{
+ stbi_write_func *func;
+ void *context;
+ unsigned char buffer[64];
+ int buf_used;
+} stbi__write_context;
+
+// initialize a callback-based context
+static void stbi__start_write_callbacks(stbi__write_context *s, stbi_write_func *c, void *context)
+{
+ s->func = c;
+ s->context = context;
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+
+static void stbi__stdio_write(void *context, void *data, int size)
+{
+ fwrite(data,1,size,(FILE*) context);
+}
+
+#if defined(_WIN32) && defined(STBIW_WINDOWS_UTF8)
+#ifdef __cplusplus
+#define STBIW_EXTERN extern "C"
+#else
+#define STBIW_EXTERN extern
+#endif
+STBIW_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide);
+STBIW_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default);
+
+STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input)
+{
+ return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL);
+}
+#endif
+
+static FILE *stbiw__fopen(char const *filename, char const *mode)
+{
+ FILE *f;
+#if defined(_WIN32) && defined(STBIW_WINDOWS_UTF8)
+ wchar_t wMode[64];
+ wchar_t wFilename[1024];
+ if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename)))
+ return 0;
+
+ if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode)))
+ return 0;
+
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+ if (0 != _wfopen_s(&f, wFilename, wMode))
+ f = 0;
+#else
+ f = _wfopen(wFilename, wMode);
+#endif
+
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
+ if (0 != fopen_s(&f, filename, mode))
+ f=0;
+#else
+ f = fopen(filename, mode);
+#endif
+ return f;
+}
+
+static int stbi__start_write_file(stbi__write_context *s, const char *filename)
+{
+ FILE *f = stbiw__fopen(filename, "wb");
+ stbi__start_write_callbacks(s, stbi__stdio_write, (void *) f);
+ return f != NULL;
+}
+
+static void stbi__end_write_file(stbi__write_context *s)
+{
+ fclose((FILE *)s->context);
+}
+
+#endif // !STBI_WRITE_NO_STDIO
+
typedef unsigned int stbiw_uint32;
typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1];
-static void writefv(FILE *f, const char *fmt, va_list v)
+static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v)
{
while (*fmt) {
switch (*fmt++) {
case ' ': break;
- case '1': { unsigned char x = (unsigned char) va_arg(v, int); fputc(x,f); break; }
- case '2': { int x = va_arg(v,int); unsigned char b[2];
- b[0] = (unsigned char) x; b[1] = (unsigned char) (x>>8);
- fwrite(b,2,1,f); break; }
- case '4': { stbiw_uint32 x = va_arg(v,int); unsigned char b[4];
- b[0]=(unsigned char)x; b[1]=(unsigned char)(x>>8);
- b[2]=(unsigned char)(x>>16); b[3]=(unsigned char)(x>>24);
- fwrite(b,4,1,f); break; }
+ case '1': { unsigned char x = STBIW_UCHAR(va_arg(v, int));
+ s->func(s->context,&x,1);
+ break; }
+ case '2': { int x = va_arg(v,int);
+ unsigned char b[2];
+ b[0] = STBIW_UCHAR(x);
+ b[1] = STBIW_UCHAR(x>>8);
+ s->func(s->context,b,2);
+ break; }
+ case '4': { stbiw_uint32 x = va_arg(v,int);
+ unsigned char b[4];
+ b[0]=STBIW_UCHAR(x);
+ b[1]=STBIW_UCHAR(x>>8);
+ b[2]=STBIW_UCHAR(x>>16);
+ b[3]=STBIW_UCHAR(x>>24);
+ s->func(s->context,b,4);
+ break; }
default:
STBIW_ASSERT(0);
return;
@@ -154,105 +376,273 @@ static void writefv(FILE *f, const char *fmt, va_list v)
}
}
-static void write3(FILE *f, unsigned char a, unsigned char b, unsigned char c)
+static void stbiw__writef(stbi__write_context *s, const char *fmt, ...)
+{
+ va_list v;
+ va_start(v, fmt);
+ stbiw__writefv(s, fmt, v);
+ va_end(v);
+}
+
+static void stbiw__write_flush(stbi__write_context *s)
+{
+ if (s->buf_used) {
+ s->func(s->context, &s->buffer, s->buf_used);
+ s->buf_used = 0;
+ }
+}
+
+static void stbiw__putc(stbi__write_context *s, unsigned char c)
+{
+ s->func(s->context, &c, 1);
+}
+
+static void stbiw__write1(stbi__write_context *s, unsigned char a)
+{
+ if ((size_t)s->buf_used + 1 > sizeof(s->buffer))
+ stbiw__write_flush(s);
+ s->buffer[s->buf_used++] = a;
+}
+
+static void stbiw__write3(stbi__write_context *s, unsigned char a, unsigned char b, unsigned char c)
{
- unsigned char arr[3];
- arr[0] = a, arr[1] = b, arr[2] = c;
- fwrite(arr, 3, 1, f);
+ int n;
+ if ((size_t)s->buf_used + 3 > sizeof(s->buffer))
+ stbiw__write_flush(s);
+ n = s->buf_used;
+ s->buf_used = n+3;
+ s->buffer[n+0] = a;
+ s->buffer[n+1] = b;
+ s->buffer[n+2] = c;
}
-static void write_pixels(FILE *f, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad, int expand_mono)
+static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp, int write_alpha, int expand_mono, unsigned char *d)
{
unsigned char bg[3] = { 255, 0, 255}, px[3];
+ int k;
+
+ if (write_alpha < 0)
+ stbiw__write1(s, d[comp - 1]);
+
+ switch (comp) {
+ case 2: // 2 pixels = mono + alpha, alpha is written separately, so same as 1-channel case
+ case 1:
+ if (expand_mono)
+ stbiw__write3(s, d[0], d[0], d[0]); // monochrome bmp
+ else
+ stbiw__write1(s, d[0]); // monochrome TGA
+ break;
+ case 4:
+ if (!write_alpha) {
+ // composite against pink background
+ for (k = 0; k < 3; ++k)
+ px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255;
+ stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]);
+ break;
+ }
+ /* FALLTHROUGH */
+ case 3:
+ stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]);
+ break;
+ }
+ if (write_alpha > 0)
+ stbiw__write1(s, d[comp - 1]);
+}
+
+static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad, int expand_mono)
+{
stbiw_uint32 zero = 0;
- int i,j,k, j_end;
+ int i,j, j_end;
if (y <= 0)
return;
- if (vdir < 0)
- j_end = -1, j = y-1;
- else
- j_end = y, j = 0;
+ if (stbi__flip_vertically_on_write)
+ vdir *= -1;
+
+ if (vdir < 0) {
+ j_end = -1; j = y-1;
+ } else {
+ j_end = y; j = 0;
+ }
for (; j != j_end; j += vdir) {
for (i=0; i < x; ++i) {
unsigned char *d = (unsigned char *) data + (j*x+i)*comp;
- if (write_alpha < 0)
- fwrite(&d[comp-1], 1, 1, f);
- switch (comp) {
- case 1: fwrite(d, 1, 1, f);
- break;
- case 2: if (expand_mono)
- write3(f, d[0],d[0],d[0]); // monochrome bmp
- else
- fwrite(d, 1, 1, f); // monochrome TGA
- break;
- case 4:
- if (!write_alpha) {
- // composite against pink background
- for (k=0; k < 3; ++k)
- px[k] = bg[k] + ((d[k] - bg[k]) * d[3])/255;
- write3(f, px[1-rgb_dir],px[1],px[1+rgb_dir]);
- break;
- }
- /* FALLTHROUGH */
- case 3:
- write3(f, d[1-rgb_dir],d[1],d[1+rgb_dir]);
- break;
- }
- if (write_alpha > 0)
- fwrite(&d[comp-1], 1, 1, f);
+ stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d);
}
- fwrite(&zero,scanline_pad,1,f);
+ stbiw__write_flush(s);
+ s->func(s->context, &zero, scanline_pad);
}
}
-static int outfile(char const *filename, int rgb_dir, int vdir, int x, int y, int comp, int expand_mono, void *data, int alpha, int pad, const char *fmt, ...)
+static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, int expand_mono, void *data, int alpha, int pad, const char *fmt, ...)
{
- FILE *f;
- if (y < 0 || x < 0) return 0;
- f = fopen(filename, "wb");
- if (f) {
+ if (y < 0 || x < 0) {
+ return 0;
+ } else {
va_list v;
va_start(v, fmt);
- writefv(f, fmt, v);
+ stbiw__writefv(s, fmt, v);
va_end(v);
- write_pixels(f,rgb_dir,vdir,x,y,comp,data,alpha,pad,expand_mono);
- fclose(f);
+ stbiw__write_pixels(s,rgb_dir,vdir,x,y,comp,data,alpha,pad, expand_mono);
+ return 1;
}
- return f != NULL;
}
-int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data)
+static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp, const void *data)
+{
+ if (comp != 4) {
+ // write RGB bitmap
+ int pad = (-x*3) & 3;
+ return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *) data,0,pad,
+ "11 4 22 4" "4 44 22 444444",
+ 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header
+ 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header
+ } else {
+ // RGBA bitmaps need a v4 header
+ // use BI_BITFIELDS mode with 32bpp and alpha mask
+ // (straight BI_RGB with alpha mask doesn't work in most readers)
+ return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *)data,1,0,
+ "11 4 22 4" "4 44 22 444444 4444 4 444 444 444 444",
+ 'B', 'M', 14+108+x*y*4, 0, 0, 14+108, // file header
+ 108, x,y, 1,32, 3,0,0,0,0,0, 0xff0000,0xff00,0xff,0xff000000u, 0, 0,0,0, 0,0,0, 0,0,0, 0,0,0); // bitmap V4 header
+ }
+}
+
+STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data)
+{
+ stbi__write_context s = { 0 };
+ stbi__start_write_callbacks(&s, func, context);
+ return stbi_write_bmp_core(&s, x, y, comp, data);
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data)
{
- int pad = (-x*3) & 3;
- return outfile(filename,-1,-1,x,y,comp,1,(void *) data,0,pad,
- "11 4 22 4" "4 44 22 444444",
- 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header
- 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header
+ stbi__write_context s = { 0 };
+ if (stbi__start_write_file(&s,filename)) {
+ int r = stbi_write_bmp_core(&s, x, y, comp, data);
+ stbi__end_write_file(&s);
+ return r;
+ } else
+ return 0;
}
+#endif //!STBI_WRITE_NO_STDIO
-int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data)
+static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp, void *data)
{
int has_alpha = (comp == 2 || comp == 4);
int colorbytes = has_alpha ? comp-1 : comp;
int format = colorbytes < 2 ? 3 : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3
- return outfile(filename, -1,-1, x, y, comp, 0, (void *) data, has_alpha, 0,
- "111 221 2222 11", 0,0,format, 0,0,0, 0,0,x,y, (colorbytes+has_alpha)*8, has_alpha*8);
+
+ if (y < 0 || x < 0)
+ return 0;
+
+ if (!stbi_write_tga_with_rle) {
+ return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *) data, has_alpha, 0,
+ "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y, (colorbytes + has_alpha) * 8, has_alpha * 8);
+ } else {
+ int i,j,k;
+ int jend, jdir;
+
+ stbiw__writef(s, "111 221 2222 11", 0,0,format+8, 0,0,0, 0,0,x,y, (colorbytes + has_alpha) * 8, has_alpha * 8);
+
+ if (stbi__flip_vertically_on_write) {
+ j = 0;
+ jend = y;
+ jdir = 1;
+ } else {
+ j = y-1;
+ jend = -1;
+ jdir = -1;
+ }
+ for (; j != jend; j += jdir) {
+ unsigned char *row = (unsigned char *) data + j * x * comp;
+ int len;
+
+ for (i = 0; i < x; i += len) {
+ unsigned char *begin = row + i * comp;
+ int diff = 1;
+ len = 1;
+
+ if (i < x - 1) {
+ ++len;
+ diff = memcmp(begin, row + (i + 1) * comp, comp);
+ if (diff) {
+ const unsigned char *prev = begin;
+ for (k = i + 2; k < x && len < 128; ++k) {
+ if (memcmp(prev, row + k * comp, comp)) {
+ prev += comp;
+ ++len;
+ } else {
+ --len;
+ break;
+ }
+ }
+ } else {
+ for (k = i + 2; k < x && len < 128; ++k) {
+ if (!memcmp(begin, row + k * comp, comp)) {
+ ++len;
+ } else {
+ break;
+ }
+ }
+ }
+ }
+
+ if (diff) {
+ unsigned char header = STBIW_UCHAR(len - 1);
+ stbiw__write1(s, header);
+ for (k = 0; k < len; ++k) {
+ stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp);
+ }
+ } else {
+ unsigned char header = STBIW_UCHAR(len - 129);
+ stbiw__write1(s, header);
+ stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin);
+ }
+ }
+ }
+ stbiw__write_flush(s);
+ }
+ return 1;
}
+STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data)
+{
+ stbi__write_context s = { 0 };
+ stbi__start_write_callbacks(&s, func, context);
+ return stbi_write_tga_core(&s, x, y, comp, (void *) data);
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data)
+{
+ stbi__write_context s = { 0 };
+ if (stbi__start_write_file(&s,filename)) {
+ int r = stbi_write_tga_core(&s, x, y, comp, (void *) data);
+ stbi__end_write_file(&s);
+ return r;
+ } else
+ return 0;
+}
+#endif
+
// *************************************************************************************************
// Radiance RGBE HDR writer
// by Baldur Karlsson
+
#define stbiw__max(a, b) ((a) > (b) ? (a) : (b))
-void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear)
+#ifndef STBI_WRITE_NO_STDIO
+
+static void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear)
{
int exponent;
float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2]));
- if (maxcomp < 1e-32) {
+ if (maxcomp < 1e-32f) {
rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0;
} else {
float normalize = (float) frexp(maxcomp, &exponent) * 256.0f/maxcomp;
@@ -264,23 +654,23 @@ void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear)
}
}
-void stbiw__write_run_data(FILE *f, int length, unsigned char databyte)
+static void stbiw__write_run_data(stbi__write_context *s, int length, unsigned char databyte)
{
- unsigned char lengthbyte = (unsigned char) (length+128);
+ unsigned char lengthbyte = STBIW_UCHAR(length+128);
STBIW_ASSERT(length+128 <= 255);
- fwrite(&lengthbyte, 1, 1, f);
- fwrite(&databyte, 1, 1, f);
+ s->func(s->context, &lengthbyte, 1);
+ s->func(s->context, &databyte, 1);
}
-void stbiw__write_dump_data(FILE *f, int length, unsigned char *data)
+static void stbiw__write_dump_data(stbi__write_context *s, int length, unsigned char *data)
{
- unsigned char lengthbyte = (unsigned char )(length & 0xff);
+ unsigned char lengthbyte = STBIW_UCHAR(length);
STBIW_ASSERT(length <= 128); // inconsistent with spec but consistent with official code
- fwrite(&lengthbyte, 1, 1, f);
- fwrite(data, length, 1, f);
+ s->func(s->context, &lengthbyte, 1);
+ s->func(s->context, data, length);
}
-void stbiw__write_hdr_scanline(FILE *f, int width, int comp, unsigned char *scratch, const float *scanline)
+static void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp, unsigned char *scratch, float *scanline)
{
unsigned char scanlineheader[4] = { 2, 2, 0, 0 };
unsigned char rgbe[4];
@@ -293,31 +683,31 @@ void stbiw__write_hdr_scanline(FILE *f, int width, int comp, unsigned char *scra
/* skip RLE for images too small or large */
if (width < 8 || width >= 32768) {
for (x=0; x < width; x++) {
- switch (comp) {
+ switch (ncomp) {
case 4: /* fallthrough */
- case 3: linear[2] = scanline[x*comp + 2];
- linear[1] = scanline[x*comp + 1];
- linear[0] = scanline[x*comp + 0];
+ case 3: linear[2] = scanline[x*ncomp + 2];
+ linear[1] = scanline[x*ncomp + 1];
+ linear[0] = scanline[x*ncomp + 0];
break;
- case 2: /* fallthrough */
- case 1: linear[0] = linear[1] = linear[2] = scanline[x*comp + 0];
+ default:
+ linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0];
break;
}
stbiw__linear_to_rgbe(rgbe, linear);
- fwrite(rgbe, 4, 1, f);
+ s->func(s->context, rgbe, 4);
}
} else {
int c,r;
/* encode into scratch buffer */
for (x=0; x < width; x++) {
- switch(comp) {
+ switch(ncomp) {
case 4: /* fallthrough */
- case 3: linear[2] = scanline[x*comp + 2];
- linear[1] = scanline[x*comp + 1];
- linear[0] = scanline[x*comp + 0];
+ case 3: linear[2] = scanline[x*ncomp + 2];
+ linear[1] = scanline[x*ncomp + 1];
+ linear[0] = scanline[x*ncomp + 0];
break;
- case 2: /* fallthrough */
- case 1: linear[0] = linear[1] = linear[2] = scanline[x*comp + 0];
+ default:
+ linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0];
break;
}
stbiw__linear_to_rgbe(rgbe, linear);
@@ -327,7 +717,7 @@ void stbiw__write_hdr_scanline(FILE *f, int width, int comp, unsigned char *scra
scratch[x + width*3] = rgbe[3];
}
- fwrite(scanlineheader, 4, 1, f);
+ s->func(s->context, scanlineheader, 4);
/* RLE each component separately */
for (c=0; c < 4; c++) {
@@ -348,7 +738,7 @@ void stbiw__write_hdr_scanline(FILE *f, int width, int comp, unsigned char *scra
while (x < r) {
int len = r-x;
if (len > 128) len = 128;
- stbiw__write_dump_data(f, len, &comp[x]);
+ stbiw__write_dump_data(s, len, &comp[x]);
x += len;
}
// if there's a run, output it
@@ -360,7 +750,7 @@ void stbiw__write_hdr_scanline(FILE *f, int width, int comp, unsigned char *scra
while (x < r) {
int len = r-x;
if (len > 127) len = 127;
- stbiw__write_run_data(f, len, comp[x]);
+ stbiw__write_run_data(s, len, comp[x]);
x += len;
}
}
@@ -369,30 +759,60 @@ void stbiw__write_hdr_scanline(FILE *f, int width, int comp, unsigned char *scra
}
}
-int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data)
+static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, float *data)
{
- int i;
- FILE *f;
- if (y <= 0 || x <= 0 || data == NULL) return 0;
- f = fopen(filename, "wb");
- if (f) {
- /* Each component is stored separately. Allocate scratch space for full output scanline. */
+ if (y <= 0 || x <= 0 || data == NULL)
+ return 0;
+ else {
+ // Each component is stored separately. Allocate scratch space for full output scanline.
unsigned char *scratch = (unsigned char *) STBIW_MALLOC(x*4);
- fprintf(f, "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n" );
- fprintf(f, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n" , y, x);
+ int i, len;
+ char buffer[128];
+ char header[] = "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n";
+ s->func(s->context, header, sizeof(header)-1);
+
+#ifdef __STDC_LIB_EXT1__
+ len = sprintf_s(buffer, sizeof(buffer), "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x);
+#else
+ len = snprintf(buffer, sizeof(buffer), "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x);
+#endif
+ s->func(s->context, buffer, len);
+
for(i=0; i < y; i++)
- stbiw__write_hdr_scanline(f, x, comp, scratch, data + comp*i*x);
+ stbiw__write_hdr_scanline(s, x, comp, scratch, data + comp*x*(stbi__flip_vertically_on_write ? y-1-i : i));
STBIW_FREE(scratch);
- fclose(f);
+ return 1;
}
- return f != NULL;
}
-/////////////////////////////////////////////////////////
-// PNG
+STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const float *data)
+{
+ stbi__write_context s = { 0 };
+ stbi__start_write_callbacks(&s, func, context);
+ return stbi_write_hdr_core(&s, x, y, comp, (float *) data);
+}
+
+STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data)
+{
+ stbi__write_context s = { 0 };
+ if (stbi__start_write_file(&s,filename)) {
+ int r = stbi_write_hdr_core(&s, x, y, comp, (float *) data);
+ stbi__end_write_file(&s);
+ return r;
+ } else
+ return 0;
+}
+#endif // STBI_WRITE_NO_STDIO
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// PNG writer
+//
+#ifndef STBIW_ZLIB_COMPRESS
// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size()
-#define stbiw__sbraw(a) ((int *) (a) - 2)
+#define stbiw__sbraw(a) ((int *) (void *) (a) - 2)
#define stbiw__sbm(a) stbiw__sbraw(a)[0]
#define stbiw__sbn(a) stbiw__sbraw(a)[1]
@@ -407,7 +827,7 @@ int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *da
static void *stbiw__sbgrowf(void **arr, int increment, int itemsize)
{
int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1;
- void *p = STBIW_REALLOC(*arr ? stbiw__sbraw(*arr) : 0, itemsize * m + sizeof(int)*2);
+ void *p = STBIW_REALLOC_SIZED(*arr ? stbiw__sbraw(*arr) : 0, *arr ? (stbiw__sbm(*arr)*itemsize + sizeof(int)*2) : 0, itemsize * m + sizeof(int)*2);
STBIW_ASSERT(p);
if (p) {
if (!*arr) ((int *) p)[1] = 0;
@@ -420,7 +840,7 @@ static void *stbiw__sbgrowf(void **arr, int increment, int itemsize)
static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount)
{
while (*bitcount >= 8) {
- stbiw__sbpush(data, (unsigned char) *bitbuffer);
+ stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer));
*bitbuffer >>= 8;
*bitcount -= 8;
}
@@ -471,8 +891,14 @@ static unsigned int stbiw__zhash(unsigned char *data)
#define stbiw__ZHASH 16384
-unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality)
+#endif // STBIW_ZLIB_COMPRESS
+
+STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality)
{
+#ifdef STBIW_ZLIB_COMPRESS
+ // user provided a zlib compress implementation, use that
+ return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality);
+#else // use builtin
static unsigned short lengthc[] = { 3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258, 259 };
static unsigned char lengtheb[]= { 0,0,0,0,0,0,0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 };
static unsigned short distc[] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577, 32768 };
@@ -480,7 +906,9 @@ unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_l
unsigned int bitbuf=0;
int i,j, bitcount=0;
unsigned char *out = NULL;
- unsigned char **hash_table[stbiw__ZHASH]; // 64KB on the stack!
+ unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(unsigned char**));
+ if (hash_table == NULL)
+ return NULL;
if (quality < 5) quality = 5;
stbiw__sbpush(out, 0x78); // DEFLATE 32K window
@@ -501,7 +929,7 @@ unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_l
for (j=0; j < n; ++j) {
if (hlist[j]-data > i-32768) { // if entry lies within window
int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i);
- if (d >= best) best=d,bestloc=hlist[j];
+ if (d >= best) { best=d; bestloc=hlist[j]; }
}
}
// when hash table entry is too long, delete half the entries
@@ -552,43 +980,98 @@ unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_l
for (i=0; i < stbiw__ZHASH; ++i)
(void) stbiw__sbfree(hash_table[i]);
+ STBIW_FREE(hash_table);
+
+ // store uncompressed instead if compression was worse
+ if (stbiw__sbn(out) > data_len + 2 + ((data_len+32766)/32767)*5) {
+ stbiw__sbn(out) = 2; // truncate to DEFLATE 32K window and FLEVEL = 1
+ for (j = 0; j < data_len;) {
+ int blocklen = data_len - j;
+ if (blocklen > 32767) blocklen = 32767;
+ stbiw__sbpush(out, data_len - j == blocklen); // BFINAL = ?, BTYPE = 0 -- no compression
+ stbiw__sbpush(out, STBIW_UCHAR(blocklen)); // LEN
+ stbiw__sbpush(out, STBIW_UCHAR(blocklen >> 8));
+ stbiw__sbpush(out, STBIW_UCHAR(~blocklen)); // NLEN
+ stbiw__sbpush(out, STBIW_UCHAR(~blocklen >> 8));
+ memcpy(out+stbiw__sbn(out), data+j, blocklen);
+ stbiw__sbn(out) += blocklen;
+ j += blocklen;
+ }
+ }
{
// compute adler32 on input
- unsigned int i=0, s1=1, s2=0, blocklen = data_len % 5552;
- int j=0;
+ unsigned int s1=1, s2=0;
+ int blocklen = (int) (data_len % 5552);
+ j=0;
while (j < data_len) {
- for (i=0; i < blocklen; ++i) s1 += data[j+i], s2 += s1;
- s1 %= 65521, s2 %= 65521;
+ for (i=0; i < blocklen; ++i) { s1 += data[j+i]; s2 += s1; }
+ s1 %= 65521; s2 %= 65521;
j += blocklen;
blocklen = 5552;
}
- stbiw__sbpush(out, (unsigned char) (s2 >> 8));
- stbiw__sbpush(out, (unsigned char) s2);
- stbiw__sbpush(out, (unsigned char) (s1 >> 8));
- stbiw__sbpush(out, (unsigned char) s1);
+ stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8));
+ stbiw__sbpush(out, STBIW_UCHAR(s2));
+ stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8));
+ stbiw__sbpush(out, STBIW_UCHAR(s1));
}
*out_len = stbiw__sbn(out);
// make returned pointer freeable
STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len);
return (unsigned char *) stbiw__sbraw(out);
+#endif // STBIW_ZLIB_COMPRESS
}
-unsigned int stbiw__crc32(unsigned char *buffer, int len)
+static unsigned int stbiw__crc32(unsigned char *buffer, int len)
{
- static unsigned int crc_table[256];
+#ifdef STBIW_CRC32
+ return STBIW_CRC32(buffer, len);
+#else
+ static unsigned int crc_table[256] =
+ {
+ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+ 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+ 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+ 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+ 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+ 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+ 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+ 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+ 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+ 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+ 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+ 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+ 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+ 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+ 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+ 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+ 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+ 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+ 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+ 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+ 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+ 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+ 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+ 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+ 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+ 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+ 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+ 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+ 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+ 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+ 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+ 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+ };
+
unsigned int crc = ~0u;
- int i,j;
- if (crc_table[1] == 0)
- for(i=0; i < 256; i++)
- for (crc_table[i]=i, j=0; j < 8; ++j)
- crc_table[i] = (crc_table[i] >> 1) ^ (crc_table[i] & 1 ? 0xedb88320 : 0);
+ int i;
for (i=0; i < len; ++i)
crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)];
return ~crc;
+#endif
}
-#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=(unsigned char)(a),(o)[1]=(unsigned char)(b),(o)[2]=(unsigned char)(c),(o)[3]=(unsigned char)(d),(o)+=4)
+#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=STBIW_UCHAR(a),(o)[1]=STBIW_UCHAR(b),(o)[2]=STBIW_UCHAR(c),(o)[3]=STBIW_UCHAR(d),(o)+=4)
#define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v));
#define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3])
@@ -601,66 +1084,97 @@ static void stbiw__wpcrc(unsigned char **data, int len)
static unsigned char stbiw__paeth(int a, int b, int c)
{
int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c);
- if (pa <= pb && pa <= pc) return (unsigned char) a;
- if (pb <= pc) return (unsigned char) b;
- return (unsigned char) c;
+ if (pa <= pb && pa <= pc) return STBIW_UCHAR(a);
+ if (pb <= pc) return STBIW_UCHAR(b);
+ return STBIW_UCHAR(c);
+}
+
+// @OPTIMIZE: provide an option that always forces left-predict or paeth predict
+static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes, int width, int height, int y, int n, int filter_type, signed char *line_buffer)
+{
+ static int mapping[] = { 0,1,2,3,4 };
+ static int firstmap[] = { 0,1,0,5,6 };
+ int *mymap = (y != 0) ? mapping : firstmap;
+ int i;
+ int type = mymap[filter_type];
+ unsigned char *z = pixels + stride_bytes * (stbi__flip_vertically_on_write ? height-1-y : y);
+ int signed_stride = stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes;
+
+ if (type==0) {
+ memcpy(line_buffer, z, width*n);
+ return;
+ }
+
+ // first loop isn't optimized since it's just one pixel
+ for (i = 0; i < n; ++i) {
+ switch (type) {
+ case 1: line_buffer[i] = z[i]; break;
+ case 2: line_buffer[i] = z[i] - z[i-signed_stride]; break;
+ case 3: line_buffer[i] = z[i] - (z[i-signed_stride]>>1); break;
+ case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-signed_stride],0)); break;
+ case 5: line_buffer[i] = z[i]; break;
+ case 6: line_buffer[i] = z[i]; break;
+ }
+ }
+ switch (type) {
+ case 1: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-n]; break;
+ case 2: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-signed_stride]; break;
+ case 3: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - ((z[i-n] + z[i-signed_stride])>>1); break;
+ case 4: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-signed_stride], z[i-signed_stride-n]); break;
+ case 5: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - (z[i-n]>>1); break;
+ case 6: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break;
+ }
}
-unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len)
+STBIWDEF unsigned char *stbi_write_png_to_mem(const unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len)
{
+ int force_filter = stbi_write_force_png_filter;
int ctype[5] = { -1, 0, 4, 2, 6 };
unsigned char sig[8] = { 137,80,78,71,13,10,26,10 };
unsigned char *out,*o, *filt, *zlib;
signed char *line_buffer;
- int i,j,k,p,zlen;
+ int j,zlen;
if (stride_bytes == 0)
stride_bytes = x * n;
+ if (force_filter >= 5) {
+ force_filter = -1;
+ }
+
filt = (unsigned char *) STBIW_MALLOC((x*n+1) * y); if (!filt) return 0;
line_buffer = (signed char *) STBIW_MALLOC(x * n); if (!line_buffer) { STBIW_FREE(filt); return 0; }
for (j=0; j < y; ++j) {
- static int mapping[] = { 0,1,2,3,4 };
- static int firstmap[] = { 0,1,0,5,6 };
- int *mymap = j ? mapping : firstmap;
- int best = 0, bestval = 0x7fffffff;
- for (p=0; p < 2; ++p) {
- for (k= p?best:0; k < 5; ++k) {
- int type = mymap[k],est=0;
- unsigned char *z = pixels + stride_bytes*j;
- for (i=0; i < n; ++i)
- switch (type) {
- case 0: line_buffer[i] = z[i]; break;
- case 1: line_buffer[i] = z[i]; break;
- case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
- case 3: line_buffer[i] = z[i] - (z[i-stride_bytes]>>1); break;
- case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-stride_bytes],0)); break;
- case 5: line_buffer[i] = z[i]; break;
- case 6: line_buffer[i] = z[i]; break;
- }
- for (i=n; i < x*n; ++i) {
- switch (type) {
- case 0: line_buffer[i] = z[i]; break;
- case 1: line_buffer[i] = z[i] - z[i-n]; break;
- case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
- case 3: line_buffer[i] = z[i] - ((z[i-n] + z[i-stride_bytes])>>1); break;
- case 4: line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-stride_bytes], z[i-stride_bytes-n]); break;
- case 5: line_buffer[i] = z[i] - (z[i-n]>>1); break;
- case 6: line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break;
- }
- }
- if (p) break;
- for (i=0; i < x*n; ++i)
+ int filter_type;
+ if (force_filter > -1) {
+ filter_type = force_filter;
+ stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, force_filter, line_buffer);
+ } else { // Estimate the best filter by running through all of them:
+ int best_filter = 0, best_filter_val = 0x7fffffff, est, i;
+ for (filter_type = 0; filter_type < 5; filter_type++) {
+ stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, filter_type, line_buffer);
+
+ // Estimate the entropy of the line using this filter; the less, the better.
+ est = 0;
+ for (i = 0; i < x*n; ++i) {
est += abs((signed char) line_buffer[i]);
- if (est < bestval) { bestval = est; best = k; }
+ }
+ if (est < best_filter_val) {
+ best_filter_val = est;
+ best_filter = filter_type;
+ }
+ }
+ if (filter_type != best_filter) { // If the last iteration already got us the best filter, don't redo it
+ stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, best_filter, line_buffer);
+ filter_type = best_filter;
}
}
- // when we get here, best contains the filter type, and line_buffer contains the data
- filt[j*(x*n+1)] = (unsigned char) best;
+ // when we get here, filter_type contains the filter type, and line_buffer contains the data
+ filt[j*(x*n+1)] = (unsigned char) filter_type;
STBIW_MEMMOVE(filt+j*(x*n+1)+1, line_buffer, x*n);
}
STBIW_FREE(line_buffer);
- zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, 8); // increase 8 to get smaller but use more memory
+ zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, stbi_write_png_compression_level);
STBIW_FREE(filt);
if (!zlib) return 0;
@@ -676,7 +1190,7 @@ unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, in
stbiw__wp32(o, x);
stbiw__wp32(o, y);
*o++ = 8;
- *o++ = (unsigned char) ctype[n];
+ *o++ = STBIW_UCHAR(ctype[n]);
*o++ = 0;
*o++ = 0;
*o++ = 0;
@@ -698,22 +1212,456 @@ unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, in
return out;
}
-int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes)
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes)
{
FILE *f;
int len;
- unsigned char *png = stbi_write_png_to_mem((unsigned char *) data, stride_bytes, x, y, comp, &len);
- if (!png) return 0;
- f = fopen(filename, "wb");
+ unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len);
+ if (png == NULL) return 0;
+
+ f = stbiw__fopen(filename, "wb");
if (!f) { STBIW_FREE(png); return 0; }
fwrite(png, 1, len, f);
fclose(f);
STBIW_FREE(png);
return 1;
}
+#endif
+
+STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int stride_bytes)
+{
+ int len;
+ unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len);
+ if (png == NULL) return 0;
+ func(context, png, len);
+ STBIW_FREE(png);
+ return 1;
+}
+
+
+/* ***************************************************************************
+ *
+ * JPEG writer
+ *
+ * This is based on Jon Olick's jo_jpeg.cpp:
+ * public domain Simple, Minimalistic JPEG writer - http://www.jonolick.com/code.html
+ */
+
+static const unsigned char stbiw__jpg_ZigZag[] = { 0,1,5,6,14,15,27,28,2,4,7,13,16,26,29,42,3,8,12,17,25,30,41,43,9,11,18,
+ 24,31,40,44,53,10,19,23,32,39,45,52,54,20,22,33,38,46,51,55,60,21,34,37,47,50,56,59,61,35,36,48,49,57,58,62,63 };
+
+static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP, int *bitCntP, const unsigned short *bs) {
+ int bitBuf = *bitBufP, bitCnt = *bitCntP;
+ bitCnt += bs[1];
+ bitBuf |= bs[0] << (24 - bitCnt);
+ while(bitCnt >= 8) {
+ unsigned char c = (bitBuf >> 16) & 255;
+ stbiw__putc(s, c);
+ if(c == 255) {
+ stbiw__putc(s, 0);
+ }
+ bitBuf <<= 8;
+ bitCnt -= 8;
+ }
+ *bitBufP = bitBuf;
+ *bitCntP = bitCnt;
+}
+
+static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p, float *d4p, float *d5p, float *d6p, float *d7p) {
+ float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p, d6 = *d6p, d7 = *d7p;
+ float z1, z2, z3, z4, z5, z11, z13;
+
+ float tmp0 = d0 + d7;
+ float tmp7 = d0 - d7;
+ float tmp1 = d1 + d6;
+ float tmp6 = d1 - d6;
+ float tmp2 = d2 + d5;
+ float tmp5 = d2 - d5;
+ float tmp3 = d3 + d4;
+ float tmp4 = d3 - d4;
+
+ // Even part
+ float tmp10 = tmp0 + tmp3; // phase 2
+ float tmp13 = tmp0 - tmp3;
+ float tmp11 = tmp1 + tmp2;
+ float tmp12 = tmp1 - tmp2;
+
+ d0 = tmp10 + tmp11; // phase 3
+ d4 = tmp10 - tmp11;
+
+ z1 = (tmp12 + tmp13) * 0.707106781f; // c4
+ d2 = tmp13 + z1; // phase 5
+ d6 = tmp13 - z1;
+
+ // Odd part
+ tmp10 = tmp4 + tmp5; // phase 2
+ tmp11 = tmp5 + tmp6;
+ tmp12 = tmp6 + tmp7;
+
+ // The rotator is modified from fig 4-8 to avoid extra negations.
+ z5 = (tmp10 - tmp12) * 0.382683433f; // c6
+ z2 = tmp10 * 0.541196100f + z5; // c2-c6
+ z4 = tmp12 * 1.306562965f + z5; // c2+c6
+ z3 = tmp11 * 0.707106781f; // c4
+
+ z11 = tmp7 + z3; // phase 5
+ z13 = tmp7 - z3;
+
+ *d5p = z13 + z2; // phase 6
+ *d3p = z13 - z2;
+ *d1p = z11 + z4;
+ *d7p = z11 - z4;
+
+ *d0p = d0; *d2p = d2; *d4p = d4; *d6p = d6;
+}
+
+static void stbiw__jpg_calcBits(int val, unsigned short bits[2]) {
+ int tmp1 = val < 0 ? -val : val;
+ val = val < 0 ? val-1 : val;
+ bits[1] = 1;
+ while(tmp1 >>= 1) {
+ ++bits[1];
+ }
+ bits[0] = val & ((1<0)&&(DU[end0pos]==0); --end0pos) {
+ }
+ // end0pos = first element in reverse order !=0
+ if(end0pos == 0) {
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
+ return DU[0];
+ }
+ for(i = 1; i <= end0pos; ++i) {
+ int startpos = i;
+ int nrzeroes;
+ unsigned short bits[2];
+ for (; DU[i]==0 && i<=end0pos; ++i) {
+ }
+ nrzeroes = i-startpos;
+ if ( nrzeroes >= 16 ) {
+ int lng = nrzeroes>>4;
+ int nrmarker;
+ for (nrmarker=1; nrmarker <= lng; ++nrmarker)
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes);
+ nrzeroes &= 15;
+ }
+ stbiw__jpg_calcBits(DU[i], bits);
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes<<4)+bits[1]]);
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
+ }
+ if(end0pos != 63) {
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
+ }
+ return DU[0];
+}
+
+static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, int comp, const void* data, int quality) {
+ // Constants that don't pollute global namespace
+ static const unsigned char std_dc_luminance_nrcodes[] = {0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0};
+ static const unsigned char std_dc_luminance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11};
+ static const unsigned char std_ac_luminance_nrcodes[] = {0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d};
+ static const unsigned char std_ac_luminance_values[] = {
+ 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,
+ 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,
+ 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,
+ 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89,
+ 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,
+ 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,
+ 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa
+ };
+ static const unsigned char std_dc_chrominance_nrcodes[] = {0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0};
+ static const unsigned char std_dc_chrominance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11};
+ static const unsigned char std_ac_chrominance_nrcodes[] = {0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77};
+ static const unsigned char std_ac_chrominance_values[] = {
+ 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,
+ 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,
+ 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,
+ 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87,
+ 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,
+ 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,
+ 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa
+ };
+ // Huffman tables
+ static const unsigned short YDC_HT[256][2] = { {0,2},{2,3},{3,3},{4,3},{5,3},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9}};
+ static const unsigned short UVDC_HT[256][2] = { {0,2},{1,2},{2,2},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9},{1022,10},{2046,11}};
+ static const unsigned short YAC_HT[256][2] = {
+ {10,4},{0,2},{1,2},{4,3},{11,4},{26,5},{120,7},{248,8},{1014,10},{65410,16},{65411,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {12,4},{27,5},{121,7},{502,9},{2038,11},{65412,16},{65413,16},{65414,16},{65415,16},{65416,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {28,5},{249,8},{1015,10},{4084,12},{65417,16},{65418,16},{65419,16},{65420,16},{65421,16},{65422,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {58,6},{503,9},{4085,12},{65423,16},{65424,16},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {59,6},{1016,10},{65430,16},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {122,7},{2039,11},{65438,16},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {123,7},{4086,12},{65446,16},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {250,8},{4087,12},{65454,16},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {504,9},{32704,15},{65462,16},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {505,9},{65470,16},{65471,16},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {506,9},{65479,16},{65480,16},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {1017,10},{65488,16},{65489,16},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {1018,10},{65497,16},{65498,16},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {2040,11},{65506,16},{65507,16},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {65515,16},{65516,16},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {2041,11},{65525,16},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0}
+ };
+ static const unsigned short UVAC_HT[256][2] = {
+ {0,2},{1,2},{4,3},{10,4},{24,5},{25,5},{56,6},{120,7},{500,9},{1014,10},{4084,12},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {11,4},{57,6},{246,8},{501,9},{2038,11},{4085,12},{65416,16},{65417,16},{65418,16},{65419,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {26,5},{247,8},{1015,10},{4086,12},{32706,15},{65420,16},{65421,16},{65422,16},{65423,16},{65424,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {27,5},{248,8},{1016,10},{4087,12},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{65430,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {58,6},{502,9},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{65438,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {59,6},{1017,10},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{65446,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {121,7},{2039,11},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{65454,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {122,7},{2040,11},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{65462,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {249,8},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{65470,16},{65471,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {503,9},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{65479,16},{65480,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {504,9},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{65488,16},{65489,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {505,9},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{65497,16},{65498,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {506,9},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{65506,16},{65507,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {2041,11},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{65515,16},{65516,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {16352,14},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{65525,16},{0,0},{0,0},{0,0},{0,0},{0,0},
+ {1018,10},{32707,15},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0}
+ };
+ static const int YQT[] = {16,11,10,16,24,40,51,61,12,12,14,19,26,58,60,55,14,13,16,24,40,57,69,56,14,17,22,29,51,87,80,62,18,22,
+ 37,56,68,109,103,77,24,35,55,64,81,104,113,92,49,64,78,87,103,121,120,101,72,92,95,98,112,100,103,99};
+ static const int UVQT[] = {17,18,24,47,99,99,99,99,18,21,26,66,99,99,99,99,24,26,56,99,99,99,99,99,47,66,99,99,99,99,99,99,
+ 99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99};
+ static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f,
+ 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f };
+
+ int row, col, i, k, subsample;
+ float fdtbl_Y[64], fdtbl_UV[64];
+ unsigned char YTable[64], UVTable[64];
+
+ if(!data || !width || !height || comp > 4 || comp < 1) {
+ return 0;
+ }
+
+ quality = quality ? quality : 90;
+ subsample = quality <= 90 ? 1 : 0;
+ quality = quality < 1 ? 1 : quality > 100 ? 100 : quality;
+ quality = quality < 50 ? 5000 / quality : 200 - quality * 2;
+
+ for(i = 0; i < 64; ++i) {
+ int uvti, yti = (YQT[i]*quality+50)/100;
+ YTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (yti < 1 ? 1 : yti > 255 ? 255 : yti);
+ uvti = (UVQT[i]*quality+50)/100;
+ UVTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (uvti < 1 ? 1 : uvti > 255 ? 255 : uvti);
+ }
+
+ for(row = 0, k = 0; row < 8; ++row) {
+ for(col = 0; col < 8; ++col, ++k) {
+ fdtbl_Y[k] = 1 / (YTable [stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
+ fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
+ }
+ }
+
+ // Write Headers
+ {
+ static const unsigned char head0[] = { 0xFF,0xD8,0xFF,0xE0,0,0x10,'J','F','I','F',0,1,1,0,0,1,0,1,0,0,0xFF,0xDB,0,0x84,0 };
+ static const unsigned char head2[] = { 0xFF,0xDA,0,0xC,3,1,0,2,0x11,3,0x11,0,0x3F,0 };
+ const unsigned char head1[] = { 0xFF,0xC0,0,0x11,8,(unsigned char)(height>>8),STBIW_UCHAR(height),(unsigned char)(width>>8),STBIW_UCHAR(width),
+ 3,1,(unsigned char)(subsample?0x22:0x11),0,2,0x11,1,3,0x11,1,0xFF,0xC4,0x01,0xA2,0 };
+ s->func(s->context, (void*)head0, sizeof(head0));
+ s->func(s->context, (void*)YTable, sizeof(YTable));
+ stbiw__putc(s, 1);
+ s->func(s->context, UVTable, sizeof(UVTable));
+ s->func(s->context, (void*)head1, sizeof(head1));
+ s->func(s->context, (void*)(std_dc_luminance_nrcodes+1), sizeof(std_dc_luminance_nrcodes)-1);
+ s->func(s->context, (void*)std_dc_luminance_values, sizeof(std_dc_luminance_values));
+ stbiw__putc(s, 0x10); // HTYACinfo
+ s->func(s->context, (void*)(std_ac_luminance_nrcodes+1), sizeof(std_ac_luminance_nrcodes)-1);
+ s->func(s->context, (void*)std_ac_luminance_values, sizeof(std_ac_luminance_values));
+ stbiw__putc(s, 1); // HTUDCinfo
+ s->func(s->context, (void*)(std_dc_chrominance_nrcodes+1), sizeof(std_dc_chrominance_nrcodes)-1);
+ s->func(s->context, (void*)std_dc_chrominance_values, sizeof(std_dc_chrominance_values));
+ stbiw__putc(s, 0x11); // HTUACinfo
+ s->func(s->context, (void*)(std_ac_chrominance_nrcodes+1), sizeof(std_ac_chrominance_nrcodes)-1);
+ s->func(s->context, (void*)std_ac_chrominance_values, sizeof(std_ac_chrominance_values));
+ s->func(s->context, (void*)head2, sizeof(head2));
+ }
+
+ // Encode 8x8 macroblocks
+ {
+ static const unsigned short fillBits[] = {0x7F, 7};
+ int DCY=0, DCU=0, DCV=0;
+ int bitBuf=0, bitCnt=0;
+ // comp == 2 is grey+alpha (alpha is ignored)
+ int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0;
+ const unsigned char *dataR = (const unsigned char *)data;
+ const unsigned char *dataG = dataR + ofsG;
+ const unsigned char *dataB = dataR + ofsB;
+ int x, y, pos;
+ if(subsample) {
+ for(y = 0; y < height; y += 16) {
+ for(x = 0; x < width; x += 16) {
+ float Y[256], U[256], V[256];
+ for(row = y, pos = 0; row < y+16; ++row) {
+ // row >= height => use last input row
+ int clamped_row = (row < height) ? row : height - 1;
+ int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp;
+ for(col = x; col < x+16; ++col, ++pos) {
+ // if col >= width => use pixel from last input column
+ int p = base_p + ((col < width) ? col : (width-1))*comp;
+ float r = dataR[p], g = dataG[p], b = dataB[p];
+ Y[pos]= +0.29900f*r + 0.58700f*g + 0.11400f*b - 128;
+ U[pos]= -0.16874f*r - 0.33126f*g + 0.50000f*b;
+ V[pos]= +0.50000f*r - 0.41869f*g - 0.08131f*b;
+ }
+ }
+ DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+0, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT);
+ DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+8, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT);
+ DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+128, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT);
+ DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+136, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT);
+
+ // subsample U,V
+ {
+ float subU[64], subV[64];
+ int yy, xx;
+ for(yy = 0, pos = 0; yy < 8; ++yy) {
+ for(xx = 0; xx < 8; ++xx, ++pos) {
+ int j = yy*32+xx*2;
+ subU[pos] = (U[j+0] + U[j+1] + U[j+16] + U[j+17]) * 0.25f;
+ subV[pos] = (V[j+0] + V[j+1] + V[j+16] + V[j+17]) * 0.25f;
+ }
+ }
+ DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, subU, 8, fdtbl_UV, DCU, UVDC_HT, UVAC_HT);
+ DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, subV, 8, fdtbl_UV, DCV, UVDC_HT, UVAC_HT);
+ }
+ }
+ }
+ } else {
+ for(y = 0; y < height; y += 8) {
+ for(x = 0; x < width; x += 8) {
+ float Y[64], U[64], V[64];
+ for(row = y, pos = 0; row < y+8; ++row) {
+ // row >= height => use last input row
+ int clamped_row = (row < height) ? row : height - 1;
+ int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp;
+ for(col = x; col < x+8; ++col, ++pos) {
+ // if col >= width => use pixel from last input column
+ int p = base_p + ((col < width) ? col : (width-1))*comp;
+ float r = dataR[p], g = dataG[p], b = dataB[p];
+ Y[pos]= +0.29900f*r + 0.58700f*g + 0.11400f*b - 128;
+ U[pos]= -0.16874f*r - 0.33126f*g + 0.50000f*b;
+ V[pos]= +0.50000f*r - 0.41869f*g - 0.08131f*b;
+ }
+ }
+
+ DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y, 8, fdtbl_Y, DCY, YDC_HT, YAC_HT);
+ DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, U, 8, fdtbl_UV, DCU, UVDC_HT, UVAC_HT);
+ DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, V, 8, fdtbl_UV, DCV, UVDC_HT, UVAC_HT);
+ }
+ }
+ }
+
+ // Do the bit alignment of the EOI marker
+ stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits);
+ }
+
+ // EOI
+ stbiw__putc(s, 0xFF);
+ stbiw__putc(s, 0xD9);
+
+ return 1;
+}
+
+STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality)
+{
+ stbi__write_context s = { 0 };
+ stbi__start_write_callbacks(&s, func, context);
+ return stbi_write_jpg_core(&s, x, y, comp, (void *) data, quality);
+}
+
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality)
+{
+ stbi__write_context s = { 0 };
+ if (stbi__start_write_file(&s,filename)) {
+ int r = stbi_write_jpg_core(&s, x, y, comp, data, quality);
+ stbi__end_write_file(&s);
+ return r;
+ } else
+ return 0;
+}
+#endif
+
#endif // STB_IMAGE_WRITE_IMPLEMENTATION
/* Revision history
+ 1.16 (2021-07-11)
+ make Deflate code emit uncompressed blocks when it would otherwise expand
+ support writing BMPs with alpha channel
+ 1.15 (2020-07-13) unknown
+ 1.14 (2020-02-02) updated JPEG writer to downsample chroma channels
+ 1.13
+ 1.12
+ 1.11 (2019-08-11)
+
+ 1.10 (2019-02-07)
+ support utf8 filenames in Windows; fix warnings and platform ifdefs
+ 1.09 (2018-02-11)
+ fix typo in zlib quality API, improve STB_I_W_STATIC in C++
+ 1.08 (2018-01-29)
+ add stbi__flip_vertically_on_write, external zlib, zlib quality, choose PNG filter
+ 1.07 (2017-07-24)
+ doc fix
+ 1.06 (2017-07-23)
+ writing JPEG (using Jon Olick's code)
+ 1.05 ???
+ 1.04 (2017-03-03)
+ monochrome BMP expansion
+ 1.03 ???
+ 1.02 (2016-04-02)
+ avoid allocating large structures on the stack
+ 1.01 (2016-01-16)
+ STBIW_REALLOC_SIZED: support allocators with no realloc support
+ avoid race-condition in crc initialization
+ minor compile issues
+ 1.00 (2015-09-14)
+ installable file IO function
+ 0.99 (2015-09-13)
+ warning fixes; TGA rle support
0.98 (2015-04-08)
added STBIW_MALLOC, STBIW_ASSERT etc
0.97 (2015-01-18)
@@ -722,7 +1670,7 @@ int stbi_write_png(char const *filename, int x, int y, int comp, const void *dat
add HDR output
fix monochrome BMP
0.95 (2014-08-17)
- add monochrome TGA output
+ add monochrome TGA output
0.94 (2014-05-31)
rename private functions to avoid conflicts with stb_image.h
0.93 (2014-05-27)
@@ -733,3 +1681,45 @@ int stbi_write_png(char const *filename, int x, int y, int comp, const void *dat
first public release
0.90 first internal release
*/
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+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.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+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 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/img/bespokeScene.2025-10-07_22-53-27z.3271samp.png b/img/bespokeScene.2025-10-07_22-53-27z.3271samp.png
new file mode 100644
index 000000000..a8d06283f
Binary files /dev/null and b/img/bespokeScene.2025-10-07_22-53-27z.3271samp.png differ
diff --git a/img/bespokeScene.2025-10-07_22-53-27z.5000samp.png b/img/bespokeScene.2025-10-07_22-53-27z.5000samp.png
new file mode 100644
index 000000000..a9e08363a
Binary files /dev/null and b/img/bespokeScene.2025-10-07_22-53-27z.5000samp.png differ
diff --git a/img/bespokeScene.2025-10-07_23-56-20z.2178samp.png b/img/bespokeScene.2025-10-07_23-56-20z.2178samp.png
new file mode 100644
index 000000000..0a77d0b26
Binary files /dev/null and b/img/bespokeScene.2025-10-07_23-56-20z.2178samp.png differ
diff --git a/img/bespokeScene.2025-10-07_23-56-20z.3040samp.png b/img/bespokeScene.2025-10-07_23-56-20z.3040samp.png
new file mode 100644
index 000000000..b1f133abc
Binary files /dev/null and b/img/bespokeScene.2025-10-07_23-56-20z.3040samp.png differ
diff --git a/img/bespokeScene.2025-10-07_23-56-20z.3718samp.png b/img/bespokeScene.2025-10-07_23-56-20z.3718samp.png
new file mode 100644
index 000000000..e57ca7c73
Binary files /dev/null and b/img/bespokeScene.2025-10-07_23-56-20z.3718samp.png differ
diff --git a/img/bespokeScene.2025-10-07_23-56-20z.425samp.png b/img/bespokeScene.2025-10-07_23-56-20z.425samp.png
new file mode 100644
index 000000000..40133b4fd
Binary files /dev/null and b/img/bespokeScene.2025-10-07_23-56-20z.425samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-32-47z.246samp.png b/img/bespokeScene.2025-10-08_00-32-47z.246samp.png
new file mode 100644
index 000000000..13e8cad02
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-32-47z.246samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-37-54z.184samp.png b/img/bespokeScene.2025-10-08_00-37-54z.184samp.png
new file mode 100644
index 000000000..e277bed2e
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-37-54z.184samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-42-54z.34samp.png b/img/bespokeScene.2025-10-08_00-42-54z.34samp.png
new file mode 100644
index 000000000..92e1ca483
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-42-54z.34samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-43-02z.26samp.png b/img/bespokeScene.2025-10-08_00-43-02z.26samp.png
new file mode 100644
index 000000000..6eb139e30
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-43-02z.26samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-43-09z.13samp.png b/img/bespokeScene.2025-10-08_00-43-09z.13samp.png
new file mode 100644
index 000000000..23cb9896e
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-43-09z.13samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-45-20z.16samp.png b/img/bespokeScene.2025-10-08_00-45-20z.16samp.png
new file mode 100644
index 000000000..020e415cd
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-45-20z.16samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-49-12z.14samp.png b/img/bespokeScene.2025-10-08_00-49-12z.14samp.png
new file mode 100644
index 000000000..c45727d31
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-49-12z.14samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-49-28z.13samp.png b/img/bespokeScene.2025-10-08_00-49-28z.13samp.png
new file mode 100644
index 000000000..62dc263b5
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-49-28z.13samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-49-42z.2samp.png b/img/bespokeScene.2025-10-08_00-49-42z.2samp.png
new file mode 100644
index 000000000..620783077
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-49-42z.2samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-50-38z.36samp.png b/img/bespokeScene.2025-10-08_00-50-38z.36samp.png
new file mode 100644
index 000000000..5528d03b1
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-50-38z.36samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-51-29z.31samp.png b/img/bespokeScene.2025-10-08_00-51-29z.31samp.png
new file mode 100644
index 000000000..2e0a5b5c8
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-51-29z.31samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-52-48z.146samp.png b/img/bespokeScene.2025-10-08_00-52-48z.146samp.png
new file mode 100644
index 000000000..19e8cbd12
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-52-48z.146samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-53-51z.34samp.png b/img/bespokeScene.2025-10-08_00-53-51z.34samp.png
new file mode 100644
index 000000000..ffefb658e
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-53-51z.34samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-54-20z.1103samp.png b/img/bespokeScene.2025-10-08_00-54-20z.1103samp.png
new file mode 100644
index 000000000..358b58baf
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-54-20z.1103samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-54-20z.1339samp.png b/img/bespokeScene.2025-10-08_00-54-20z.1339samp.png
new file mode 100644
index 000000000..81ea16dc3
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-54-20z.1339samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-54-20z.29samp.png b/img/bespokeScene.2025-10-08_00-54-20z.29samp.png
new file mode 100644
index 000000000..e2ec1e63f
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-54-20z.29samp.png differ
diff --git a/img/bespokeScene.2025-10-08_00-54-20z.5000samp.png b/img/bespokeScene.2025-10-08_00-54-20z.5000samp.png
new file mode 100644
index 000000000..594243bea
Binary files /dev/null and b/img/bespokeScene.2025-10-08_00-54-20z.5000samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-21-23z.6samp.png b/img/bespokeScene.2025-10-08_19-21-23z.6samp.png
new file mode 100644
index 000000000..59b32a7bd
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-21-23z.6samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-22-47z.377samp.png b/img/bespokeScene.2025-10-08_19-22-47z.377samp.png
new file mode 100644
index 000000000..9deca8a8a
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-22-47z.377samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-26-15z.19samp.png b/img/bespokeScene.2025-10-08_19-26-15z.19samp.png
new file mode 100644
index 000000000..aa77a18e0
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-26-15z.19samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-26-54z.43samp.png b/img/bespokeScene.2025-10-08_19-26-54z.43samp.png
new file mode 100644
index 000000000..bacfc6c3a
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-26-54z.43samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-28-05z.47samp.png b/img/bespokeScene.2025-10-08_19-28-05z.47samp.png
new file mode 100644
index 000000000..e33040467
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-28-05z.47samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-29-13z.58samp.png b/img/bespokeScene.2025-10-08_19-29-13z.58samp.png
new file mode 100644
index 000000000..32f1db33b
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-29-13z.58samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-36-54z.16samp.png b/img/bespokeScene.2025-10-08_19-36-54z.16samp.png
new file mode 100644
index 000000000..d8bfa621f
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-36-54z.16samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-37-11z.29samp.png b/img/bespokeScene.2025-10-08_19-37-11z.29samp.png
new file mode 100644
index 000000000..64dd91056
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-37-11z.29samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-38-36z.51samp.png b/img/bespokeScene.2025-10-08_19-38-36z.51samp.png
new file mode 100644
index 000000000..7db69af4f
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-38-36z.51samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-39-17z.193samp.png b/img/bespokeScene.2025-10-08_19-39-17z.193samp.png
new file mode 100644
index 000000000..50e1b7850
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-39-17z.193samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-40-18z.14samp.png b/img/bespokeScene.2025-10-08_19-40-18z.14samp.png
new file mode 100644
index 000000000..ec93461c1
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-40-18z.14samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-41-53z.17samp.png b/img/bespokeScene.2025-10-08_19-41-53z.17samp.png
new file mode 100644
index 000000000..d89f444f6
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-41-53z.17samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-47-17z.46samp.png b/img/bespokeScene.2025-10-08_19-47-17z.46samp.png
new file mode 100644
index 000000000..b2d77a5aa
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-47-17z.46samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-48-07z.34samp.png b/img/bespokeScene.2025-10-08_19-48-07z.34samp.png
new file mode 100644
index 000000000..6af789f12
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-48-07z.34samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-50-40z.55samp.png b/img/bespokeScene.2025-10-08_19-50-40z.55samp.png
new file mode 100644
index 000000000..15a894510
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-50-40z.55samp.png differ
diff --git a/img/bespokeScene.2025-10-08_19-51-46z.38samp.png b/img/bespokeScene.2025-10-08_19-51-46z.38samp.png
new file mode 100644
index 000000000..eda98f424
Binary files /dev/null and b/img/bespokeScene.2025-10-08_19-51-46z.38samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-03-54z.122samp.png b/img/bespokeScene.2025-10-08_20-03-54z.122samp.png
new file mode 100644
index 000000000..6c7de6f81
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-03-54z.122samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-03-54z.31samp.png b/img/bespokeScene.2025-10-08_20-03-54z.31samp.png
new file mode 100644
index 000000000..6ce488c73
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-03-54z.31samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-11-27z.83samp.png b/img/bespokeScene.2025-10-08_20-11-27z.83samp.png
new file mode 100644
index 000000000..0793d32eb
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-11-27z.83samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-13-38z.4samp.png b/img/bespokeScene.2025-10-08_20-13-38z.4samp.png
new file mode 100644
index 000000000..205224c4d
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-13-38z.4samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-13-57z.2samp.png b/img/bespokeScene.2025-10-08_20-13-57z.2samp.png
new file mode 100644
index 000000000..804d3ead6
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-13-57z.2samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-14-14z.1samp.png b/img/bespokeScene.2025-10-08_20-14-14z.1samp.png
new file mode 100644
index 000000000..fb233bf17
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-14-14z.1samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-14-38z.39samp.png b/img/bespokeScene.2025-10-08_20-14-38z.39samp.png
new file mode 100644
index 000000000..e8ddd036f
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-14-38z.39samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-14-38z.40samp.png b/img/bespokeScene.2025-10-08_20-14-38z.40samp.png
new file mode 100644
index 000000000..ce81757d7
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-14-38z.40samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-16-17z.26samp.png b/img/bespokeScene.2025-10-08_20-16-17z.26samp.png
new file mode 100644
index 000000000..091e39691
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-16-17z.26samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-22-42z.38samp.png b/img/bespokeScene.2025-10-08_20-22-42z.38samp.png
new file mode 100644
index 000000000..cbc3bb296
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-22-42z.38samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-26-40z.106samp.png b/img/bespokeScene.2025-10-08_20-26-40z.106samp.png
new file mode 100644
index 000000000..28de2880b
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-26-40z.106samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-26-40z.71samp.png b/img/bespokeScene.2025-10-08_20-26-40z.71samp.png
new file mode 100644
index 000000000..4019c9e10
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-26-40z.71samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-28-06z.36samp.png b/img/bespokeScene.2025-10-08_20-28-06z.36samp.png
new file mode 100644
index 000000000..e22323529
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-28-06z.36samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-28-06z.73samp.png b/img/bespokeScene.2025-10-08_20-28-06z.73samp.png
new file mode 100644
index 000000000..ac549c805
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-28-06z.73samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-28-53z.51samp.png b/img/bespokeScene.2025-10-08_20-28-53z.51samp.png
new file mode 100644
index 000000000..c3421562c
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-28-53z.51samp.png differ
diff --git a/img/bespokeScene.2025-10-08_20-28-53z.58samp.png b/img/bespokeScene.2025-10-08_20-28-53z.58samp.png
new file mode 100644
index 000000000..debbe3f59
Binary files /dev/null and b/img/bespokeScene.2025-10-08_20-28-53z.58samp.png differ
diff --git a/img/chessDuck.2025-10-05_22-31-26z.1006samp.png b/img/chessDuck.2025-10-05_22-31-26z.1006samp.png
new file mode 100644
index 000000000..fcb385774
Binary files /dev/null and b/img/chessDuck.2025-10-05_22-31-26z.1006samp.png differ
diff --git a/img/chessDuck.2025-10-05_22-31-26z.357samp.png b/img/chessDuck.2025-10-05_22-31-26z.357samp.png
new file mode 100644
index 000000000..cd7537af3
Binary files /dev/null and b/img/chessDuck.2025-10-05_22-31-26z.357samp.png differ
diff --git a/img/chessDuck.2025-10-05_22-52-03z.28samp.png b/img/chessDuck.2025-10-05_22-52-03z.28samp.png
new file mode 100644
index 000000000..04495d978
Binary files /dev/null and b/img/chessDuck.2025-10-05_22-52-03z.28samp.png differ
diff --git a/img/chessDuck.2025-10-05_22-57-58z.37samp.png b/img/chessDuck.2025-10-05_22-57-58z.37samp.png
new file mode 100644
index 000000000..41d815f59
Binary files /dev/null and b/img/chessDuck.2025-10-05_22-57-58z.37samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-01-36z.66samp.png b/img/chessDuck.2025-10-05_23-01-36z.66samp.png
new file mode 100644
index 000000000..96622cc00
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-01-36z.66samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.1361samp.png b/img/chessDuck.2025-10-05_23-06-26z.1361samp.png
new file mode 100644
index 000000000..6cc80c4e8
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.1361samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.1639samp.png b/img/chessDuck.2025-10-05_23-06-26z.1639samp.png
new file mode 100644
index 000000000..3f1fb52cb
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.1639samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.223samp.png b/img/chessDuck.2025-10-05_23-06-26z.223samp.png
new file mode 100644
index 000000000..9682da1d7
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.223samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.42samp.png b/img/chessDuck.2025-10-05_23-06-26z.42samp.png
new file mode 100644
index 000000000..727c015ab
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.42samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.46samp.png b/img/chessDuck.2025-10-05_23-06-26z.46samp.png
new file mode 100644
index 000000000..f4cedf0ec
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.46samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.47samp.png b/img/chessDuck.2025-10-05_23-06-26z.47samp.png
new file mode 100644
index 000000000..1a013cf89
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.47samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.508samp.png b/img/chessDuck.2025-10-05_23-06-26z.508samp.png
new file mode 100644
index 000000000..7f13d8b9b
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.508samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-06-26z.70samp.png b/img/chessDuck.2025-10-05_23-06-26z.70samp.png
new file mode 100644
index 000000000..70ed9e85e
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-06-26z.70samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-39-40z.2528samp.png b/img/chessDuck.2025-10-05_23-39-40z.2528samp.png
new file mode 100644
index 000000000..de820c6fd
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-39-40z.2528samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-39-40z.2671samp.png b/img/chessDuck.2025-10-05_23-39-40z.2671samp.png
new file mode 100644
index 000000000..dbd5ce0fd
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-39-40z.2671samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-39-40z.3040samp.png b/img/chessDuck.2025-10-05_23-39-40z.3040samp.png
new file mode 100644
index 000000000..0e3f4ab4f
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-39-40z.3040samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-43-57z.2681samp.png b/img/chessDuck.2025-10-05_23-43-57z.2681samp.png
new file mode 100644
index 000000000..4e80947d0
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-43-57z.2681samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-46-18z.260samp.png b/img/chessDuck.2025-10-05_23-46-18z.260samp.png
new file mode 100644
index 000000000..f01e1d5f6
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-46-18z.260samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-46-18z.397samp.png b/img/chessDuck.2025-10-05_23-46-18z.397samp.png
new file mode 100644
index 000000000..09ace19bb
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-46-18z.397samp.png differ
diff --git a/img/chessDuck.2025-10-05_23-46-18z.597samp.png b/img/chessDuck.2025-10-05_23-46-18z.597samp.png
new file mode 100644
index 000000000..f45e40227
Binary files /dev/null and b/img/chessDuck.2025-10-05_23-46-18z.597samp.png differ
diff --git a/img/cornell.2025-10-08_18-31-32z.730samp.png b/img/cornell.2025-10-08_18-31-32z.730samp.png
new file mode 100644
index 000000000..15fd8dbe0
Binary files /dev/null and b/img/cornell.2025-10-08_18-31-32z.730samp.png differ
diff --git a/img/cornell.2025-10-08_18-33-05z.736samp.png b/img/cornell.2025-10-08_18-33-05z.736samp.png
new file mode 100644
index 000000000..85f2cbcf2
Binary files /dev/null and b/img/cornell.2025-10-08_18-33-05z.736samp.png differ
diff --git a/img/cornell.2025-10-08_18-33-51z.138samp.png b/img/cornell.2025-10-08_18-33-51z.138samp.png
new file mode 100644
index 000000000..468250549
Binary files /dev/null and b/img/cornell.2025-10-08_18-33-51z.138samp.png differ
diff --git a/img/cornell.2025-10-08_18-33-51z.323samp.png b/img/cornell.2025-10-08_18-33-51z.323samp.png
new file mode 100644
index 000000000..d155cd9fa
Binary files /dev/null and b/img/cornell.2025-10-08_18-33-51z.323samp.png differ
diff --git a/img/cornell.2025-10-08_18-33-51z.353samp.png b/img/cornell.2025-10-08_18-33-51z.353samp.png
new file mode 100644
index 000000000..0956b40b6
Binary files /dev/null and b/img/cornell.2025-10-08_18-33-51z.353samp.png differ
diff --git a/img/cornell.2025-10-08_18-33-51z.512samp.png b/img/cornell.2025-10-08_18-33-51z.512samp.png
new file mode 100644
index 000000000..a8868320a
Binary files /dev/null and b/img/cornell.2025-10-08_18-33-51z.512samp.png differ
diff --git a/img/cornell.2025-10-08_18-33-51z.516samp.png b/img/cornell.2025-10-08_18-33-51z.516samp.png
new file mode 100644
index 000000000..2b8c3d841
Binary files /dev/null and b/img/cornell.2025-10-08_18-33-51z.516samp.png differ
diff --git a/img/cornell.2025-10-08_18-36-11z.127samp.png b/img/cornell.2025-10-08_18-36-11z.127samp.png
new file mode 100644
index 000000000..c8b128010
Binary files /dev/null and b/img/cornell.2025-10-08_18-36-11z.127samp.png differ
diff --git a/img/cornell.2025-10-08_18-36-11z.187samp.png b/img/cornell.2025-10-08_18-36-11z.187samp.png
new file mode 100644
index 000000000..c46f88efd
Binary files /dev/null and b/img/cornell.2025-10-08_18-36-11z.187samp.png differ
diff --git a/img/cornell.2025-10-08_18-36-11z.290samp.png b/img/cornell.2025-10-08_18-36-11z.290samp.png
new file mode 100644
index 000000000..35bc15490
Binary files /dev/null and b/img/cornell.2025-10-08_18-36-11z.290samp.png differ
diff --git a/img/cornell.2025-10-08_18-36-11z.88samp.png b/img/cornell.2025-10-08_18-36-11z.88samp.png
new file mode 100644
index 000000000..92310efb2
Binary files /dev/null and b/img/cornell.2025-10-08_18-36-11z.88samp.png differ
diff --git a/img/cornell.2025-10-08_18-36-11z.95samp.png b/img/cornell.2025-10-08_18-36-11z.95samp.png
new file mode 100644
index 000000000..fb8478bbe
Binary files /dev/null and b/img/cornell.2025-10-08_18-36-11z.95samp.png differ
diff --git a/img/cornell.2025-10-08_18-38-10z.2224samp.png b/img/cornell.2025-10-08_18-38-10z.2224samp.png
new file mode 100644
index 000000000..e8dd0c366
Binary files /dev/null and b/img/cornell.2025-10-08_18-38-10z.2224samp.png differ
diff --git a/img/cornell.2025-10-08_18-38-10z.5000samp.png b/img/cornell.2025-10-08_18-38-10z.5000samp.png
new file mode 100644
index 000000000..ee94c05ac
Binary files /dev/null and b/img/cornell.2025-10-08_18-38-10z.5000samp.png differ
diff --git a/img/cornell.2025-10-08_18-40-25z.1250samp.png b/img/cornell.2025-10-08_18-40-25z.1250samp.png
new file mode 100644
index 000000000..a4b532d6c
Binary files /dev/null and b/img/cornell.2025-10-08_18-40-25z.1250samp.png differ
diff --git a/img/cornell.2025-10-08_18-41-13z.1576samp.png b/img/cornell.2025-10-08_18-41-13z.1576samp.png
new file mode 100644
index 000000000..b70352296
Binary files /dev/null and b/img/cornell.2025-10-08_18-41-13z.1576samp.png differ
diff --git a/img/cornell.2025-10-08_18-41-13z.5000samp.png b/img/cornell.2025-10-08_18-41-13z.5000samp.png
new file mode 100644
index 000000000..e7befc96f
Binary files /dev/null and b/img/cornell.2025-10-08_18-41-13z.5000samp.png differ
diff --git a/img/cornell.2025-10-08_18-43-29z.5000samp.png b/img/cornell.2025-10-08_18-43-29z.5000samp.png
new file mode 100644
index 000000000..3bc04bf6c
Binary files /dev/null and b/img/cornell.2025-10-08_18-43-29z.5000samp.png differ
diff --git a/img/cornell.2025-10-08_19-01-07z.4218samp.png b/img/cornell.2025-10-08_19-01-07z.4218samp.png
new file mode 100644
index 000000000..2e479bf75
Binary files /dev/null and b/img/cornell.2025-10-08_19-01-07z.4218samp.png differ
diff --git a/img/cornell.2025-10-08_19-01-07z.5000samp.png b/img/cornell.2025-10-08_19-01-07z.5000samp.png
new file mode 100644
index 000000000..dcc2e552f
Binary files /dev/null and b/img/cornell.2025-10-08_19-01-07z.5000samp.png differ
diff --git a/img/cornell.2025-10-08_19-04-34z.1703samp.png b/img/cornell.2025-10-08_19-04-34z.1703samp.png
new file mode 100644
index 000000000..56ac1722a
Binary files /dev/null and b/img/cornell.2025-10-08_19-04-34z.1703samp.png differ
diff --git a/img/cornell.2025-10-08_19-08-18z.2330samp.png b/img/cornell.2025-10-08_19-08-18z.2330samp.png
new file mode 100644
index 000000000..5e78367bb
Binary files /dev/null and b/img/cornell.2025-10-08_19-08-18z.2330samp.png differ
diff --git a/img/cornell.2025-10-08_19-15-35z.3677samp.png b/img/cornell.2025-10-08_19-15-35z.3677samp.png
new file mode 100644
index 000000000..b35cb459a
Binary files /dev/null and b/img/cornell.2025-10-08_19-15-35z.3677samp.png differ
diff --git a/img/cornell.2025-10-08_19-17-02z.1160samp.png b/img/cornell.2025-10-08_19-17-02z.1160samp.png
new file mode 100644
index 000000000..7fe97aa66
Binary files /dev/null and b/img/cornell.2025-10-08_19-17-02z.1160samp.png differ
diff --git a/img/cornell.2025-10-08_20-30-05z.1035samp.png b/img/cornell.2025-10-08_20-30-05z.1035samp.png
new file mode 100644
index 000000000..2d09b8068
Binary files /dev/null and b/img/cornell.2025-10-08_20-30-05z.1035samp.png differ
diff --git a/img/cornell.2025-10-08_20-30-35z.287samp.png b/img/cornell.2025-10-08_20-30-35z.287samp.png
new file mode 100644
index 000000000..bbedb97b3
Binary files /dev/null and b/img/cornell.2025-10-08_20-30-35z.287samp.png differ
diff --git a/img/cornell.2025-10-08_20-30-35z.797samp.png b/img/cornell.2025-10-08_20-30-35z.797samp.png
new file mode 100644
index 000000000..a63199f8b
Binary files /dev/null and b/img/cornell.2025-10-08_20-30-35z.797samp.png differ
diff --git a/img/cornell.2025-10-08_20-31-43z.80samp.png b/img/cornell.2025-10-08_20-31-43z.80samp.png
new file mode 100644
index 000000000..1969719b2
Binary files /dev/null and b/img/cornell.2025-10-08_20-31-43z.80samp.png differ
diff --git a/img/cornell.2025-10-08_20-32-57z.2403samp.png b/img/cornell.2025-10-08_20-32-57z.2403samp.png
new file mode 100644
index 000000000..36643ae5a
Binary files /dev/null and b/img/cornell.2025-10-08_20-32-57z.2403samp.png differ
diff --git a/img/cornell.2025-10-08_20-33-57z.389samp.png b/img/cornell.2025-10-08_20-33-57z.389samp.png
new file mode 100644
index 000000000..b4e008b74
Binary files /dev/null and b/img/cornell.2025-10-08_20-33-57z.389samp.png differ
diff --git a/img/cornell.2025-10-08_20-33-57z.6samp.png b/img/cornell.2025-10-08_20-33-57z.6samp.png
new file mode 100644
index 000000000..84091e6b5
Binary files /dev/null and b/img/cornell.2025-10-08_20-33-57z.6samp.png differ
diff --git a/img/cornell.2025-10-08_20-35-04z.2307samp.png b/img/cornell.2025-10-08_20-35-04z.2307samp.png
new file mode 100644
index 000000000..48ec765ba
Binary files /dev/null and b/img/cornell.2025-10-08_20-35-04z.2307samp.png differ
diff --git a/img/cornell.2025-10-08_20-35-47z.3842samp.png b/img/cornell.2025-10-08_20-35-47z.3842samp.png
new file mode 100644
index 000000000..f05d94a49
Binary files /dev/null and b/img/cornell.2025-10-08_20-35-47z.3842samp.png differ
diff --git a/img/cornell.2025-10-08_20-35-47z.949samp.png b/img/cornell.2025-10-08_20-35-47z.949samp.png
new file mode 100644
index 000000000..84503f755
Binary files /dev/null and b/img/cornell.2025-10-08_20-35-47z.949samp.png differ
diff --git a/img/cornell.2025-10-08_20-37-38z.840samp.png b/img/cornell.2025-10-08_20-37-38z.840samp.png
new file mode 100644
index 000000000..b40e4ecb9
Binary files /dev/null and b/img/cornell.2025-10-08_20-37-38z.840samp.png differ
diff --git a/img/cornell.2025-10-08_20-38-01z.979samp.png b/img/cornell.2025-10-08_20-38-01z.979samp.png
new file mode 100644
index 000000000..390001e3d
Binary files /dev/null and b/img/cornell.2025-10-08_20-38-01z.979samp.png differ
diff --git a/img/cornell.2025-10-08_20-50-28z.792samp.png b/img/cornell.2025-10-08_20-50-28z.792samp.png
new file mode 100644
index 000000000..d800a7e8e
Binary files /dev/null and b/img/cornell.2025-10-08_20-50-28z.792samp.png differ
diff --git a/img/cornell.2025-10-08_20-51-13z.812samp.png b/img/cornell.2025-10-08_20-51-13z.812samp.png
new file mode 100644
index 000000000..46eea560f
Binary files /dev/null and b/img/cornell.2025-10-08_20-51-13z.812samp.png differ
diff --git a/img/cornell.2025-10-08_20-51-37z.841samp.png b/img/cornell.2025-10-08_20-51-37z.841samp.png
new file mode 100644
index 000000000..94ea8d774
Binary files /dev/null and b/img/cornell.2025-10-08_20-51-37z.841samp.png differ
diff --git a/img/cornell.2025-10-08_20-51-37z.982samp.png b/img/cornell.2025-10-08_20-51-37z.982samp.png
new file mode 100644
index 000000000..46d2a1bd0
Binary files /dev/null and b/img/cornell.2025-10-08_20-51-37z.982samp.png differ
diff --git a/img/duckMotion.2025-10-07_21-40-03z.7samp.png b/img/duckMotion.2025-10-07_21-40-03z.7samp.png
new file mode 100644
index 000000000..9e7d03167
Binary files /dev/null and b/img/duckMotion.2025-10-07_21-40-03z.7samp.png differ
diff --git a/img/duckMotion.2025-10-07_21-40-30z.3samp.png b/img/duckMotion.2025-10-07_21-40-30z.3samp.png
new file mode 100644
index 000000000..69b3b16db
Binary files /dev/null and b/img/duckMotion.2025-10-07_21-40-30z.3samp.png differ
diff --git a/img/duckMotion.2025-10-08_18-45-46z.5000samp.png b/img/duckMotion.2025-10-08_18-45-46z.5000samp.png
new file mode 100644
index 000000000..702256469
Binary files /dev/null and b/img/duckMotion.2025-10-08_18-45-46z.5000samp.png differ
diff --git a/img/duckMotion.2025-10-08_18-48-03z.5000samp.png b/img/duckMotion.2025-10-08_18-48-03z.5000samp.png
new file mode 100644
index 000000000..3ff80f799
Binary files /dev/null and b/img/duckMotion.2025-10-08_18-48-03z.5000samp.png differ
diff --git a/img/screenshots/Screenshot 2025-09-25 173659.png b/img/screenshots/Screenshot 2025-09-25 173659.png
new file mode 100644
index 000000000..7206700b9
Binary files /dev/null and b/img/screenshots/Screenshot 2025-09-25 173659.png differ
diff --git a/img/screenshots/Screenshot 2025-09-25 182650.png b/img/screenshots/Screenshot 2025-09-25 182650.png
new file mode 100644
index 000000000..0f9cd6f4e
Binary files /dev/null and b/img/screenshots/Screenshot 2025-09-25 182650.png differ
diff --git a/img/screenshots/Screenshot 2025-09-25 200858.png b/img/screenshots/Screenshot 2025-09-25 200858.png
new file mode 100644
index 000000000..3bfcb6172
Binary files /dev/null and b/img/screenshots/Screenshot 2025-09-25 200858.png differ
diff --git a/img/screenshots/Screenshot 2025-09-26 180308.png b/img/screenshots/Screenshot 2025-09-26 180308.png
new file mode 100644
index 000000000..719f92e9b
Binary files /dev/null and b/img/screenshots/Screenshot 2025-09-26 180308.png differ
diff --git a/img/screenshots/Screenshot 2025-10-03 171907.png b/img/screenshots/Screenshot 2025-10-03 171907.png
new file mode 100644
index 000000000..7f0c6217f
Binary files /dev/null and b/img/screenshots/Screenshot 2025-10-03 171907.png differ
diff --git a/img/screenshots/Screenshot 2025-10-03 172051.png b/img/screenshots/Screenshot 2025-10-03 172051.png
new file mode 100644
index 000000000..34dedb4bb
Binary files /dev/null and b/img/screenshots/Screenshot 2025-10-03 172051.png differ
diff --git a/scenes/bespoke_gltf.json b/scenes/bespoke_gltf.json
new file mode 100644
index 000000000..5fa150c25
--- /dev/null
+++ b/scenes/bespoke_gltf.json
@@ -0,0 +1,131 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_yellow":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.95, 0.95, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "specular_gray":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.9, 0.9, 0.9],
+ "ROUGHNESS":0.0
+ },
+ "specular_greenish":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.35, 0.5, 0.35],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_gray":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.8, 0.8, 0.8]
+ },
+ "diffuse_brown":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.3, 0.2, 0.1]
+ },
+ "diffuse_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.85]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"bespokeScene",
+ "EYE":[7.5,2.0,7.5],
+ "LOOKAT":[0.0,8.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ { "TYPE":"gltf",
+ "MATERIAL":"glass_white",
+ "FILE": "../scenes/glTF/chandelier1a.glb",
+ "TRANS":[0.0,12.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[1,1,1]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"light",
+ "FILE": "../scenes/glTF/chandelier1b2.glb",
+ "TRANS":[0.0,12.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[1,1,1]
+ },
+ {
+
+ "TYPE":"gltf",
+ "MATERIAL":"specular_gray",
+ "FILE": "../scenes/glTF/bellA1.glb",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.15,0.15,0.15]
+ },
+ {
+
+ "TYPE":"gltf",
+ "MATERIAL":"specular_greenish",
+ "FILE": "../scenes/glTF/bellA2.glb",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.15,0.15,0.15]
+ },
+ {
+
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_brown",
+ "FILE": "../scenes/glTF/bellA3.glb",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.15,0.15,0.15]
+ }
+
+ ],
+ "Environment": {
+ "HDR": "../scenes/hdr/dam_wall_4k.hdr"
+ }
+}
\ No newline at end of file
diff --git a/scenes/bespoke_gltf_2.json b/scenes/bespoke_gltf_2.json
new file mode 100644
index 000000000..39e7e86da
--- /dev/null
+++ b/scenes/bespoke_gltf_2.json
@@ -0,0 +1,158 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_yellow":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.95, 0.95, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "specular_gray":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.9, 0.9, 0.9],
+ "ROUGHNESS":0.0
+ },
+ "specular_greenish":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.35, 0.5, 0.35],
+ "ROUGHNESS":0.0
+ },
+ "specular_blue":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.35, 0.35, 0.85],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_gray":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.8, 0.8, 0.8]
+ },
+ "diffuse_brown":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.3, 0.2, 0.1]
+ },
+ "diffuse_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.85]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"bespokeScene",
+ "EYE":[7.5,4.0,-7.5],
+ "LOOKAT":[0.0,10.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ { "TYPE":"gltf",
+ "MATERIAL":"diffuse_gray",
+ "FILE": "../scenes/glTF/mug.glb",
+ "TRANS":[0.0,7.5,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[1,1,1]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_brown",
+ "FILE": "../scenes/glTF/mersonClimbingA1.glb",
+ "TRANS":[1.0,13.0,-5.7],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[2,2,2]
+ },
+ {
+
+ "TYPE":"gltf",
+ "MATERIAL":"specular_blue",
+ "FILE": "../scenes/glTF/mersonClimbingA2.glb",
+ "TRANS":[1.0,13.0,-5.7],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[2,2,2]
+ },
+ {
+
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_blue",
+ "FILE": "../scenes/glTF/sideBookA.glb",
+ "TRANS":[0.0,-1.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[1,1,1]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_yellow",
+ "FILE": "../scenes/glTF/pencilA1.glb",
+ "TRANS":[0.0,8.0,0.76],
+ "ROTAT":[30.0,0.0,180.0],
+ "SCALE":[1,1,1]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"specular_greenish",
+ "FILE": "../scenes/glTF/pencilA2.glb",
+ "TRANS":[0.0,15.0,4.81],
+ "ROTAT":[30.0,0.0,180.0],
+ "SCALE":[1,1,1]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_yellow",
+ "FILE": "../scenes/glTF/pencilA1.glb",
+ "TRANS":[0.75,10.0,1.21],
+ "ROTAT":[30.0,0.0,-15.0],
+ "SCALE":[1,1,1]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,-4.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[50.0,0.01,50.0]
+ }
+ ],
+ "Environment": {
+ "HDR": "../scenes/hdr/industrial_sunset_02_puresky_4k.hdr"
+ }
+}
\ No newline at end of file
diff --git a/scenes/bespoke_gltf_closed.json b/scenes/bespoke_gltf_closed.json
new file mode 100644
index 000000000..375c70578
--- /dev/null
+++ b/scenes/bespoke_gltf_closed.json
@@ -0,0 +1,175 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_yellow":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.95, 0.95, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "specular_gray":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.9, 0.9, 0.9],
+ "ROUGHNESS":0.0
+ },
+ "specular_greenish":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.35, 0.5, 0.35],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_gray":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.8, 0.8, 0.8]
+ },
+ "diffuse_brown":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.3, 0.2, 0.1]
+ },
+ "diffuse_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.85]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"bespokeScene",
+ "EYE":[7.5,2.0,7.5],
+ "LOOKAT":[0.0,8.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects": [
+ {
+ "TYPE": "gltf",
+ "MATERIAL": "glass_white",
+ "FILE": "../scenes/glTF/chandelier1a.glb",
+ "TRANS": [ 0.0, 12.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 1, 1, 1 ]
+ },
+ {
+ "TYPE": "gltf",
+ "MATERIAL": "light",
+ "FILE": "../scenes/glTF/chandelier1b2.glb",
+ "TRANS": [ 0.0, 12.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 1, 1, 1 ]
+ },
+ {
+
+ "TYPE": "gltf",
+ "MATERIAL": "specular_gray",
+ "FILE": "../scenes/glTF/bellA1.glb",
+ "TRANS": [ 0.0, 0.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 0.15, 0.15, 0.15 ]
+ },
+ {
+
+ "TYPE": "gltf",
+ "MATERIAL": "specular_greenish",
+ "FILE": "../scenes/glTF/bellA2.glb",
+ "TRANS": [ 0.0, 0.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 0.15, 0.15, 0.15 ]
+ },
+ {
+
+ "TYPE": "gltf",
+ "MATERIAL": "diffuse_brown",
+ "FILE": "../scenes/glTF/bellA3.glb",
+ "TRANS": [ 0.0, 0.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 0.15, 0.15, 0.15 ]
+ },
+
+
+ {
+ "TYPE": "cube",
+ "MATERIAL": "diffuse_white",
+ "TRANS": [ 0.0, -10.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 30.0, 0.01, 30.0 ]
+ },
+ {
+ "TYPE": "cube",
+ "MATERIAL": "diffuse_white",
+ "TRANS": [ 0.0, 20.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 90.0 ],
+ "SCALE": [ 0.01, 30.0, 30.0 ]
+ },
+ {
+ "TYPE": "cube",
+ "MATERIAL": "diffuse_white",
+ "TRANS": [ 0.0, 5.0, -15.0 ],
+ "ROTAT": [ 0.0, 90.0, 0.0 ],
+ "SCALE": [ 0.01, 30.0, 30.0 ]
+ },
+ {
+ "TYPE": "cube",
+ "MATERIAL": "diffuse_white",
+ "TRANS": [ 0.0, 5.0, 15.0 ],
+ "ROTAT": [ 0.0, 90.0, 0.0 ],
+ "SCALE": [ 0.01, 30.0, 30.0 ]
+ },
+ {
+ "TYPE": "cube",
+ "MATERIAL": "diffuse_white",
+ "TRANS": [ -15.0, 5.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 0.01, 30.0, 30.0 ]
+ },
+ {
+ "TYPE": "cube",
+ "MATERIAL": "diffuse_white",
+ "TRANS": [ 15.0, 5.0, 0.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 0.01, 30.0, 30.0 ]
+ }
+
+ ],
+ "Environment": {
+ "HDR": "../scenes/hdr/dam_wall_4k.hdr"
+ }
+}
\ No newline at end of file
diff --git a/scenes/cornell_diffuse.json b/scenes/cornell_diffuse.json
new file mode 100644
index 000000000..81c5e1d15
--- /dev/null
+++ b/scenes/cornell_diffuse.json
@@ -0,0 +1,93 @@
+{
+ "Materials": {
+ "light": {
+ "TYPE": "Emitting",
+ "RGB": [ 1.0, 1.0, 1.0 ],
+ "EMITTANCE": 5.0
+ },
+ "diffuse_white": {
+ "TYPE": "Diffuse",
+ "RGB": [ 0.98, 0.98, 0.98 ]
+ },
+ "diffuse_red": {
+ "TYPE": "Diffuse",
+ "RGB": [ 0.85, 0.35, 0.35 ]
+ },
+ "diffuse_green": {
+ "TYPE": "Diffuse",
+ "RGB": [ 0.35, 0.85, 0.35 ]
+ },
+ "diffuse_bright_blue": {
+ "TYPE": "Diffuse",
+ "RGB": [ 0.35, 0.35, 0.98 ]
+ },
+ "specular_white": {
+ "TYPE": "Specular",
+ "RGB": [ 0.98, 0.98, 0.98 ],
+ "ROUGHNESS": 0.0
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"sphere",
+ "MATERIAL":"diffuse_bright_blue",
+ "TRANS":[-1.0,4.0,-1.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,3.0,3.0]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/cornell_doftest.json b/scenes/cornell_doftest.json
new file mode 100644
index 000000000..150c4fa23
--- /dev/null
+++ b/scenes/cornell_doftest.json
@@ -0,0 +1,107 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_bright_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.98]
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_bright_blue",
+ "TRANS":[-1.0,4.0,-1.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,3.0,3.0]
+ },
+ {
+ "TYPE":"sphere",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[2.0,5.0,2.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,3.0,3.0]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/cornell_glass.json b/scenes/cornell_glass.json
new file mode 100644
index 000000000..4aa73fa87
--- /dev/null
+++ b/scenes/cornell_glass.json
@@ -0,0 +1,96 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.5
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"sphere",
+ "MATERIAL":"glass_white",
+ "TRANS":[-1.0,4.0,-1.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,3.0,3.0]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/cornell_gltf.json b/scenes/cornell_gltf.json
new file mode 100644
index 000000000..4b45a40e5
--- /dev/null
+++ b/scenes/cornell_gltf.json
@@ -0,0 +1,113 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_bright_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.98]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"glass_white",
+ "TRANS":[0.0,3.0,0.0],
+ "ROTAT":[0.0,-45.0,0.0],
+ "SCALE":[0.03,0.03,0.03],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ }
+ ],
+ "Environment": {
+ "COLOR": [ 0.1, 0.2, 0.45 ],
+ "HDR": "../scenes/hdr/dam_wall_4k.hdr"
+ }
+}
\ No newline at end of file
diff --git a/scenes/cornell_motion.json b/scenes/cornell_motion.json
new file mode 100644
index 000000000..8a4e90969
--- /dev/null
+++ b/scenes/cornell_motion.json
@@ -0,0 +1,118 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_bright_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.98]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"sphere",
+ "MATERIAL":"diffuse_bright_blue",
+ "FRAMES": [
+ {
+ "T": 0.0,
+ "TRANS": [ -1.0, 4.0, -1.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 3.0, 3.0, 3.0 ]
+ },
+ {
+ "T": 1.0,
+ "TRANS": [ 1.0, 7.0, 1.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 3.0, 3.0, 3.0 ]
+ },
+ {
+ "T": 1.5,
+ "TRANS": [ 1.0, 7.0, 1.0 ],
+ "ROTAT": [ 0.0, 0.0, 0.0 ],
+ "SCALE": [ 3.0, 3.0, 3.0 ]
+ }
+
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/cornell_reflective.json b/scenes/cornell_reflective.json
new file mode 100644
index 000000000..7ac2ec5c6
--- /dev/null
+++ b/scenes/cornell_reflective.json
@@ -0,0 +1,96 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.5
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"sphere",
+ "MATERIAL":"specular_white",
+ "TRANS":[-1.0,4.0,-1.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,3.0,3.0]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/cornell_transmissive.json b/scenes/cornell_transmissive.json
new file mode 100644
index 000000000..ddba72823
--- /dev/null
+++ b/scenes/cornell_transmissive.json
@@ -0,0 +1,96 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular Transmissive",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.5
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_red",
+ "TRANS":[-5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[5.0,5.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"sphere",
+ "MATERIAL":"specular_white",
+ "TRANS":[-1.0,4.0,-1.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,3.0,3.0]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/duck_motion.json b/scenes/duck_motion.json
new file mode 100644
index 000000000..d190f30fe
--- /dev/null
+++ b/scenes/duck_motion.json
@@ -0,0 +1,133 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_yellow":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.95, 0.95, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_gray":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.8, 0.8, 0.8]
+ },
+ "diffuse_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.85]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"duckMotion",
+ "EYE":[5.5,4.0,5.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[20.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,20.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_gray",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,20.0]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_yellow",
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf",
+ "FRAMES": [
+
+ {
+ "T": 0.0,
+ "TRANS": [ -4.0, 2.0, -0.5 ],
+ "ROTAT": [ 0.0, 45.0, 0.0 ],
+ "SCALE": [ 0.02, 0.02, 0.02 ]
+ },
+ {
+ "T": 1.0,
+ "TRANS": [ 1.0, 4.5, -0.5 ],
+ "ROTAT": [ 0.0, 45.0, 0.0 ],
+ "SCALE": [ 0.02, 0.02, 0.02 ]
+ },
+ {
+ "T": 2.0,
+ "TRANS": [ 2.0, 4.75, -0.5 ],
+ "ROTAT": [ 0.0, 45.0, 0.0 ],
+ "SCALE": [ 0.02, 0.02, 0.02 ]
+ },
+ {
+ "T": 2.5,
+ "TRANS": [ 2.1, 4.752, -0.5 ],
+ "ROTAT": [ 0.0, 45.0, 0.0 ],
+ "SCALE": [ 0.02, 0.02, 0.02 ]
+ }
+
+ ]
+ }
+
+ ],
+ "Environment": {
+
+ }
+}
\ No newline at end of file
diff --git a/scenes/duck_still.json b/scenes/duck_still.json
new file mode 100644
index 000000000..b133ca593
--- /dev/null
+++ b/scenes/duck_still.json
@@ -0,0 +1,108 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_yellow":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.95, 0.95, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_gray":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.8, 0.8, 0.8]
+ },
+ "diffuse_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.85]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"duckMotion",
+ "EYE":[5.5,4.0,5.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[20.0,0.01,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,20.0,10.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_gray",
+ "TRANS":[0.0,5.0,-5.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[0.01,10.0,20.0]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_yellow",
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf",
+ "TRANS": [ -4.0, 2.0, -0.5 ],
+ "ROTAT": [ 0.0, 45.0, 0.0 ],
+ "SCALE": [ 0.02, 0.02, 0.02 ]
+ }
+
+ ],
+ "Environment": {
+
+ }
+}
\ No newline at end of file
diff --git a/scenes/glTF-Samples/Avocado.bin b/scenes/glTF-Samples/Avocado.bin
new file mode 100644
index 000000000..b98140c9d
Binary files /dev/null and b/scenes/glTF-Samples/Avocado.bin differ
diff --git a/scenes/glTF-Samples/Avocado.glb b/scenes/glTF-Samples/Avocado.glb
new file mode 100644
index 000000000..dd79cb804
Binary files /dev/null and b/scenes/glTF-Samples/Avocado.glb differ
diff --git a/scenes/glTF-Samples/Avocado.gltf b/scenes/glTF-Samples/Avocado.gltf
new file mode 100644
index 000000000..55fcd9551
--- /dev/null
+++ b/scenes/glTF-Samples/Avocado.gltf
@@ -0,0 +1,155 @@
+{
+ "accessors": [
+ {
+ "bufferView": 0,
+ "componentType": 5126,
+ "count": 406,
+ "type": "VEC2"
+ },
+ {
+ "bufferView": 1,
+ "componentType": 5126,
+ "count": 406,
+ "type": "VEC3"
+ },
+ {
+ "bufferView": 2,
+ "componentType": 5126,
+ "count": 406,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 3,
+ "componentType": 5126,
+ "count": 406,
+ "type": "VEC3",
+ "max": [
+ 0.02128091,
+ 0.06284806,
+ 0.0138090011
+ ],
+ "min": [
+ -0.02128091,
+ -4.773855E-05,
+ -0.013809
+ ]
+ },
+ {
+ "bufferView": 4,
+ "componentType": 5123,
+ "count": 2046,
+ "type": "SCALAR"
+ }
+ ],
+ "asset": {
+ "generator": "glTF Tools for Unity",
+ "version": "2.0"
+ },
+ "bufferViews": [
+ {
+ "buffer": 0,
+ "byteLength": 3248
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 3248,
+ "byteLength": 4872
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 8120,
+ "byteLength": 6496
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 14616,
+ "byteLength": 4872
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 19488,
+ "byteLength": 4092
+ }
+ ],
+ "buffers": [
+ {
+ "uri": "Avocado.bin",
+ "byteLength": 23580
+ }
+ ],
+ "images": [
+ {
+ "uri": "Avocado_baseColor.png"
+ },
+ {
+ "uri": "Avocado_roughnessMetallic.png"
+ },
+ {
+ "uri": "Avocado_normal.png"
+ }
+ ],
+ "meshes": [
+ {
+ "primitives": [
+ {
+ "attributes": {
+ "TEXCOORD_0": 0,
+ "NORMAL": 1,
+ "TANGENT": 2,
+ "POSITION": 3
+ },
+ "indices": 4,
+ "material": 0
+ }
+ ],
+ "name": "Avocado"
+ }
+ ],
+ "materials": [
+ {
+ "pbrMetallicRoughness": {
+ "baseColorTexture": {
+ "index": 0
+ },
+ "metallicRoughnessTexture": {
+ "index": 1
+ }
+ },
+ "normalTexture": {
+ "index": 2
+ },
+ "name": "2256_Avocado_d"
+ }
+ ],
+ "nodes": [
+ {
+ "mesh": 0,
+ "rotation": [
+ 0.0,
+ 1.0,
+ 0.0,
+ 0.0
+ ],
+ "name": "Avocado"
+ }
+ ],
+ "scene": 0,
+ "scenes": [
+ {
+ "nodes": [
+ 0
+ ]
+ }
+ ],
+ "textures": [
+ {
+ "source": 0
+ },
+ {
+ "source": 1
+ },
+ {
+ "source": 2
+ }
+ ]
+}
\ No newline at end of file
diff --git a/scenes/glTF-Samples/Avocado_baseColor.png b/scenes/glTF-Samples/Avocado_baseColor.png
new file mode 100644
index 000000000..38630edf8
Binary files /dev/null and b/scenes/glTF-Samples/Avocado_baseColor.png differ
diff --git a/scenes/glTF-Samples/Avocado_normal.png b/scenes/glTF-Samples/Avocado_normal.png
new file mode 100644
index 000000000..268387b9c
Binary files /dev/null and b/scenes/glTF-Samples/Avocado_normal.png differ
diff --git a/scenes/glTF-Samples/Avocado_roughnessMetallic.png b/scenes/glTF-Samples/Avocado_roughnessMetallic.png
new file mode 100644
index 000000000..97c7f7353
Binary files /dev/null and b/scenes/glTF-Samples/Avocado_roughnessMetallic.png differ
diff --git a/scenes/glTF-Samples/Box.glb b/scenes/glTF-Samples/Box.glb
new file mode 100644
index 000000000..95ec886b6
Binary files /dev/null and b/scenes/glTF-Samples/Box.glb differ
diff --git a/scenes/glTF-Samples/Triangle.gltf b/scenes/glTF-Samples/Triangle.gltf
new file mode 100644
index 000000000..0faabea53
--- /dev/null
+++ b/scenes/glTF-Samples/Triangle.gltf
@@ -0,0 +1,70 @@
+{
+ "scene" : 0,
+ "scenes" : [
+ {
+ "nodes" : [ 0 ]
+ }
+ ],
+
+ "nodes" : [
+ {
+ "mesh" : 0
+ }
+ ],
+
+ "meshes" : [
+ {
+ "primitives" : [ {
+ "attributes" : {
+ "POSITION" : 1
+ },
+ "indices" : 0
+ } ]
+ }
+ ],
+
+ "buffers" : [
+ {
+ "uri" : "simpleTriangle.bin",
+ "byteLength" : 44
+ }
+ ],
+ "bufferViews" : [
+ {
+ "buffer" : 0,
+ "byteOffset" : 0,
+ "byteLength" : 6,
+ "target" : 34963
+ },
+ {
+ "buffer" : 0,
+ "byteOffset" : 8,
+ "byteLength" : 36,
+ "target" : 34962
+ }
+ ],
+ "accessors" : [
+ {
+ "bufferView" : 0,
+ "byteOffset" : 0,
+ "componentType" : 5123,
+ "count" : 3,
+ "type" : "SCALAR",
+ "max" : [ 2 ],
+ "min" : [ 0 ]
+ },
+ {
+ "bufferView" : 1,
+ "byteOffset" : 0,
+ "componentType" : 5126,
+ "count" : 3,
+ "type" : "VEC3",
+ "max" : [ 1.0, 1.0, 0.0 ],
+ "min" : [ 0.0, 0.0, 0.0 ]
+ }
+ ],
+
+ "asset" : {
+ "version" : "2.0"
+ }
+}
diff --git a/scenes/glTF-Samples/abeautifulgame/ABeautifulGame.bin b/scenes/glTF-Samples/abeautifulgame/ABeautifulGame.bin
new file mode 100644
index 000000000..8308f62c8
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/ABeautifulGame.bin differ
diff --git a/scenes/glTF-Samples/abeautifulgame/ABeautifulGame.gltf b/scenes/glTF-Samples/abeautifulgame/ABeautifulGame.gltf
new file mode 100644
index 000000000..0e8b4f998
--- /dev/null
+++ b/scenes/glTF-Samples/abeautifulgame/ABeautifulGame.gltf
@@ -0,0 +1,1834 @@
+{
+ "asset" : {
+ "copyright" : "Original assets by Moeen Sayed and Mujtaba Sayed for SideFX.",
+ "generator" : "Khronos glTF Blender I/O v3.3.17",
+ "version" : "2.0"
+ },
+ "extensionsUsed" : [
+ "KHR_materials_transmission",
+ "KHR_materials_volume"
+ ],
+ "scene" : 0,
+ "scenes" : [
+ {
+ "name" : "Scene",
+ "nodes" : [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 6,
+ 8,
+ 10,
+ 12,
+ 14,
+ 16,
+ 18,
+ 20,
+ 22,
+ 24,
+ 26,
+ 28,
+ 30,
+ 32,
+ 34,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48
+ ]
+ }
+ ],
+ "nodes" : [
+ {
+ "mesh" : 0,
+ "name" : "King_B",
+ "translation" : [
+ -0.03142297640442848,
+ 0.0174538753926754,
+ 0.22009074687957764
+ ]
+ },
+ {
+ "mesh" : 1,
+ "name" : "King_W",
+ "translation" : [
+ -0.03176186978816986,
+ 0.01745394617319107,
+ -0.22027580440044403
+ ]
+ },
+ {
+ "mesh" : 2,
+ "name" : "Queen_B",
+ "translation" : [
+ 0.030731208622455597,
+ 0.01762339472770691,
+ 0.21983970701694489
+ ]
+ },
+ {
+ "mesh" : 3,
+ "name" : "Queen_W",
+ "translation" : [
+ 0.03090556710958481,
+ 0.01686232164502144,
+ -0.22027580440044403
+ ]
+ },
+ {
+ "mesh" : 4,
+ "name" : "Chessboard"
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W1",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 5
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W1",
+ "translation" : [
+ 0.21845926344394684,
+ 0.014926999807357788,
+ -0.15599016845226288
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W2",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 7
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W2",
+ "translation" : [
+ 0.15633293986320496,
+ 0.014926999807357788,
+ -0.15608981251716614
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W3",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 9
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W3",
+ "translation" : [
+ 0.09358328580856323,
+ 0.014926999807357788,
+ -0.09414908289909363
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W4",
+ "translation" : [
+ -0.03124999813735485,
+ -0.014926999807357788,
+ 0.03124999813735485
+ ]
+ },
+ {
+ "children" : [
+ 11
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W4",
+ "translation" : [
+ 0.03124999813735485,
+ 0.014926999807357788,
+ -0.03124999813735485
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W5",
+ "translation" : [
+ -0.03124999813735485,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 13
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W5",
+ "translation" : [
+ -0.031169699504971504,
+ 0.014926999807357788,
+ -0.1564261019229889
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W6",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 15
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W6",
+ "translation" : [
+ -0.09379050135612488,
+ 0.014926999807357788,
+ -0.1562434285879135
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W7",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 17
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W7",
+ "translation" : [
+ -0.1564229130744934,
+ 0.014927003532648087,
+ -0.1564216911792755
+ ]
+ },
+ {
+ "mesh" : 5,
+ "name" : "Pawn_Top_W8",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 19
+ ],
+ "mesh" : 6,
+ "name" : "Pawn_Body_W8",
+ "translation" : [
+ -0.21923202276229858,
+ 0.014927007257938385,
+ -0.15629565715789795
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B1",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 21
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B1",
+ "translation" : [
+ -0.21923202276229858,
+ 0.014927007257938385,
+ 0.15638446807861328
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B2",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 23
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B2",
+ "translation" : [
+ -0.15673714876174927,
+ 0.014927007257938385,
+ 0.15617261826992035
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B3",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 25
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B3",
+ "translation" : [
+ -0.09381857514381409,
+ 0.014927007257938385,
+ 0.1562785506248474
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B4",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 27
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B4",
+ "translation" : [
+ -0.03132370114326477,
+ 0.014927007257938385,
+ 0.09357181191444397
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B5",
+ "translation" : [
+ -0.03124999813735485,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 29
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B5",
+ "translation" : [
+ 0.031245321035385132,
+ 0.014927007257938385,
+ 0.15634210407733917
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B6",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 31
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B6",
+ "translation" : [
+ 0.09381434321403503,
+ 0.014927007257938385,
+ 0.15609847009181976
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B7",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 33
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B7",
+ "translation" : [
+ 0.15611860156059265,
+ 0.014927007257938385,
+ 0.15625736117362976
+ ]
+ },
+ {
+ "mesh" : 7,
+ "name" : "Pawn_Top_B8",
+ "translation" : [
+ -0.03125,
+ -0.014926999807357788,
+ 0.03125
+ ]
+ },
+ {
+ "children" : [
+ 35
+ ],
+ "mesh" : 8,
+ "name" : "Pawn_Body_B8",
+ "translation" : [
+ 0.21876174211502075,
+ 0.014927007257938385,
+ 0.15628913044929504
+ ]
+ },
+ {
+ "mesh" : 9,
+ "name" : "Castle_B1",
+ "translation" : [
+ -0.21881157159805298,
+ 0.01800301857292652,
+ 0.21959251165390015
+ ]
+ },
+ {
+ "mesh" : 9,
+ "name" : "Castle_B2",
+ "translation" : [
+ 0.22001203894615173,
+ 0.01800301857292652,
+ 0.2196142077445984
+ ]
+ },
+ {
+ "mesh" : 10,
+ "name" : "Castle_W1",
+ "translation" : [
+ 0.21969175338745117,
+ 0.016820574179291725,
+ -0.21970760822296143
+ ]
+ },
+ {
+ "mesh" : 10,
+ "name" : "Castle_W2",
+ "translation" : [
+ -0.21860846877098083,
+ 0.01710103079676628,
+ -0.22002007067203522
+ ]
+ },
+ {
+ "mesh" : 11,
+ "name" : "Knight_B1",
+ "translation" : [
+ -0.15675804018974304,
+ 0.01697981357574463,
+ 0.22001084685325623
+ ]
+ },
+ {
+ "mesh" : 11,
+ "name" : "Knight_B2",
+ "translation" : [
+ 0.1584867238998413,
+ 0.01697981357574463,
+ 0.2197423279285431
+ ]
+ },
+ {
+ "mesh" : 12,
+ "name" : "Knight_W1",
+ "rotation" : [
+ 0,
+ -1,
+ 0,
+ 4.371138828673793e-08
+ ],
+ "translation" : [
+ 0.15809699892997742,
+ 0.016979999840259552,
+ -0.22098299860954285
+ ]
+ },
+ {
+ "mesh" : 12,
+ "name" : "Knight_W2",
+ "rotation" : [
+ 0,
+ -1,
+ 0,
+ 4.371138828673793e-08
+ ],
+ "translation" : [
+ -0.15665100514888763,
+ 0.016979999840259552,
+ -0.22008299827575684
+ ]
+ },
+ {
+ "mesh" : 13,
+ "name" : "Bishop_B1",
+ "translation" : [
+ -0.09403245151042938,
+ 0.01697981357574463,
+ 0.21908524632453918
+ ]
+ },
+ {
+ "mesh" : 13,
+ "name" : "Bishop_B2",
+ "translation" : [
+ 0.08951026201248169,
+ 0.01697981357574463,
+ 0.21954728662967682
+ ]
+ },
+ {
+ "mesh" : 14,
+ "name" : "Bishop_W1",
+ "translation" : [
+ 0.090296670794487,
+ 0.01697981357574463,
+ -0.2176361083984375
+ ]
+ },
+ {
+ "mesh" : 14,
+ "name" : "Bishop_W2",
+ "translation" : [
+ -0.09416553378105164,
+ 0.01697981357574463,
+ -0.22063007950782776
+ ]
+ }
+ ],
+ "materials" : [
+ {
+ "name" : "King_Black",
+ "normalTexture" : {
+ "index" : 0
+ },
+ "occlusionTexture" : {
+ "index" : 1
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 2
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 1
+ }
+ }
+ },
+ {
+ "name" : "King_White",
+ "normalTexture" : {
+ "index" : 3
+ },
+ "occlusionTexture" : {
+ "index" : 4
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 5
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 4
+ }
+ }
+ },
+ {
+ "name" : "Queen_Black",
+ "normalTexture" : {
+ "index" : 6
+ },
+ "occlusionTexture" : {
+ "index" : 7
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 8
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 7
+ }
+ }
+ },
+ {
+ "name" : "Queen_White",
+ "normalTexture" : {
+ "index" : 9
+ },
+ "occlusionTexture" : {
+ "index" : 10
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 11
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 10
+ }
+ }
+ },
+ {
+ "name" : "Chessboard",
+ "normalTexture" : {
+ "index" : 12
+ },
+ "occlusionTexture" : {
+ "index" : 13
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 14
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 13
+ }
+ }
+ },
+ {
+ "extensions" : {
+ "KHR_materials_transmission" : {
+ "transmissionFactor" : 1
+ },
+ "KHR_materials_volume" : {
+ "attenuationColor" : [
+ 0.800000011920929,
+ 0.800000011920929,
+ 0.800000011920929
+ ],
+ "thicknessFactor" : 0.2199999988079071
+ }
+ },
+ "name" : "Pawn_Top_White",
+ "normalTexture" : {
+ "index" : 15
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorFactor" : [
+ 1,
+ 1,
+ 0.828000009059906,
+ 1
+ ],
+ "metallicRoughnessTexture" : {
+ "index" : 16
+ }
+ }
+ },
+ {
+ "name" : "Pawn_Body_White",
+ "normalTexture" : {
+ "index" : 17
+ },
+ "occlusionTexture" : {
+ "index" : 18
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 19
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 18
+ }
+ }
+ },
+ {
+ "extensions" : {
+ "KHR_materials_transmission" : {
+ "transmissionFactor" : 1
+ },
+ "KHR_materials_volume" : {
+ "attenuationColor" : [
+ 0.800000011920929,
+ 0.800000011920929,
+ 0.800000011920929
+ ],
+ "thicknessFactor" : 0.2199999988079071
+ }
+ },
+ "name" : "Pawn_Top_Black",
+ "normalTexture" : {
+ "index" : 20
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorFactor" : [
+ 0.2994999885559082,
+ 0.5,
+ 0.44999998807907104,
+ 1
+ ],
+ "metallicRoughnessTexture" : {
+ "index" : 21
+ }
+ }
+ },
+ {
+ "name" : "Pawn_Body_Black",
+ "normalTexture" : {
+ "index" : 22
+ },
+ "occlusionTexture" : {
+ "index" : 23
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 24
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 23
+ }
+ }
+ },
+ {
+ "name" : "Castle_Black",
+ "normalTexture" : {
+ "index" : 25
+ },
+ "occlusionTexture" : {
+ "index" : 26
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 27
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 26
+ }
+ }
+ },
+ {
+ "name" : "Castle_White",
+ "normalTexture" : {
+ "index" : 28
+ },
+ "occlusionTexture" : {
+ "index" : 29
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 30
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 29
+ }
+ }
+ },
+ {
+ "name" : "Knight_Black",
+ "normalTexture" : {
+ "index" : 31
+ },
+ "occlusionTexture" : {
+ "index" : 32
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 33
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 32
+ }
+ }
+ },
+ {
+ "name" : "Knight_White",
+ "normalTexture" : {
+ "index" : 34
+ },
+ "occlusionTexture" : {
+ "index" : 35
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 36
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 35
+ }
+ }
+ },
+ {
+ "name" : "Bishop_Black",
+ "normalTexture" : {
+ "index" : 37
+ },
+ "occlusionTexture" : {
+ "index" : 38
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 39
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 38
+ }
+ }
+ },
+ {
+ "name" : "Bishop_White",
+ "normalTexture" : {
+ "index" : 40
+ },
+ "occlusionTexture" : {
+ "index" : 41
+ },
+ "pbrMetallicRoughness" : {
+ "baseColorTexture" : {
+ "index" : 42
+ },
+ "metallicRoughnessTexture" : {
+ "index" : 41
+ }
+ }
+ }
+ ],
+ "meshes" : [
+ {
+ "name" : "King_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 0,
+ "NORMAL" : 1,
+ "TEXCOORD_0" : 2
+ },
+ "indices" : 3,
+ "material" : 0
+ }
+ ]
+ },
+ {
+ "name" : "King_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 0,
+ "NORMAL" : 1,
+ "TEXCOORD_0" : 2
+ },
+ "indices" : 3,
+ "material" : 1
+ }
+ ]
+ },
+ {
+ "name" : "Queen_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 4,
+ "NORMAL" : 5,
+ "TEXCOORD_0" : 6
+ },
+ "indices" : 7,
+ "material" : 2
+ }
+ ]
+ },
+ {
+ "name" : "Queen_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 4,
+ "NORMAL" : 5,
+ "TEXCOORD_0" : 6
+ },
+ "indices" : 7,
+ "material" : 3
+ }
+ ]
+ },
+ {
+ "name" : "Chessboard",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 8,
+ "NORMAL" : 9,
+ "TEXCOORD_0" : 10
+ },
+ "indices" : 11,
+ "material" : 4
+ }
+ ]
+ },
+ {
+ "name" : "Pawn_Top_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 12,
+ "NORMAL" : 13,
+ "TEXCOORD_0" : 14
+ },
+ "indices" : 15,
+ "material" : 5
+ }
+ ]
+ },
+ {
+ "name" : "Pawn_Body_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 16,
+ "NORMAL" : 17,
+ "TEXCOORD_0" : 18
+ },
+ "indices" : 19,
+ "material" : 6
+ }
+ ]
+ },
+ {
+ "name" : "Pawn_Top_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 12,
+ "NORMAL" : 13,
+ "TEXCOORD_0" : 14
+ },
+ "indices" : 15,
+ "material" : 7
+ }
+ ]
+ },
+ {
+ "name" : "Pawn_Body_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 16,
+ "NORMAL" : 17,
+ "TEXCOORD_0" : 18
+ },
+ "indices" : 19,
+ "material" : 8
+ }
+ ]
+ },
+ {
+ "name" : "Castle_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 20,
+ "NORMAL" : 21,
+ "TEXCOORD_0" : 22
+ },
+ "indices" : 23,
+ "material" : 9
+ }
+ ]
+ },
+ {
+ "name" : "Castle_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 20,
+ "NORMAL" : 21,
+ "TEXCOORD_0" : 22
+ },
+ "indices" : 23,
+ "material" : 10
+ }
+ ]
+ },
+ {
+ "name" : "Knight_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 24,
+ "NORMAL" : 25,
+ "TEXCOORD_0" : 26
+ },
+ "indices" : 27,
+ "material" : 11
+ }
+ ]
+ },
+ {
+ "name" : "Knight_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 24,
+ "NORMAL" : 25,
+ "TEXCOORD_0" : 26
+ },
+ "indices" : 27,
+ "material" : 12
+ }
+ ]
+ },
+ {
+ "name" : "Bishop_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 28,
+ "NORMAL" : 29,
+ "TEXCOORD_0" : 30
+ },
+ "indices" : 31,
+ "material" : 13
+ }
+ ]
+ },
+ {
+ "name" : "Bishop_Shared",
+ "primitives" : [
+ {
+ "attributes" : {
+ "POSITION" : 28,
+ "NORMAL" : 29,
+ "TEXCOORD_0" : 30
+ },
+ "indices" : 31,
+ "material" : 14
+ }
+ ]
+ }
+ ],
+ "textures" : [
+ {
+ "sampler" : 0,
+ "source" : 0
+ },
+ {
+ "sampler" : 0,
+ "source" : 1
+ },
+ {
+ "sampler" : 0,
+ "source" : 2
+ },
+ {
+ "sampler" : 0,
+ "source" : 3
+ },
+ {
+ "sampler" : 0,
+ "source" : 4
+ },
+ {
+ "sampler" : 0,
+ "source" : 5
+ },
+ {
+ "sampler" : 0,
+ "source" : 6
+ },
+ {
+ "sampler" : 0,
+ "source" : 7
+ },
+ {
+ "sampler" : 0,
+ "source" : 8
+ },
+ {
+ "sampler" : 0,
+ "source" : 9
+ },
+ {
+ "sampler" : 0,
+ "source" : 10
+ },
+ {
+ "sampler" : 0,
+ "source" : 11
+ },
+ {
+ "sampler" : 0,
+ "source" : 12
+ },
+ {
+ "sampler" : 0,
+ "source" : 13
+ },
+ {
+ "sampler" : 0,
+ "source" : 14
+ },
+ {
+ "sampler" : 0,
+ "source" : 15
+ },
+ {
+ "sampler" : 0,
+ "source" : 16
+ },
+ {
+ "sampler" : 0,
+ "source" : 15
+ },
+ {
+ "sampler" : 0,
+ "source" : 16
+ },
+ {
+ "sampler" : 0,
+ "source" : 17
+ },
+ {
+ "sampler" : 0,
+ "source" : 15
+ },
+ {
+ "sampler" : 0,
+ "source" : 16
+ },
+ {
+ "sampler" : 0,
+ "source" : 15
+ },
+ {
+ "sampler" : 0,
+ "source" : 16
+ },
+ {
+ "sampler" : 0,
+ "source" : 18
+ },
+ {
+ "sampler" : 0,
+ "source" : 19
+ },
+ {
+ "sampler" : 0,
+ "source" : 20
+ },
+ {
+ "sampler" : 0,
+ "source" : 21
+ },
+ {
+ "sampler" : 0,
+ "source" : 19
+ },
+ {
+ "sampler" : 0,
+ "source" : 20
+ },
+ {
+ "sampler" : 0,
+ "source" : 22
+ },
+ {
+ "sampler" : 0,
+ "source" : 23
+ },
+ {
+ "sampler" : 0,
+ "source" : 24
+ },
+ {
+ "sampler" : 0,
+ "source" : 25
+ },
+ {
+ "sampler" : 0,
+ "source" : 23
+ },
+ {
+ "sampler" : 0,
+ "source" : 24
+ },
+ {
+ "sampler" : 0,
+ "source" : 26
+ },
+ {
+ "sampler" : 0,
+ "source" : 27
+ },
+ {
+ "sampler" : 0,
+ "source" : 28
+ },
+ {
+ "sampler" : 0,
+ "source" : 29
+ },
+ {
+ "sampler" : 0,
+ "source" : 30
+ },
+ {
+ "sampler" : 0,
+ "source" : 31
+ },
+ {
+ "sampler" : 0,
+ "source" : 32
+ }
+ ],
+ "images" : [
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "King_black_normal",
+ "uri" : "King_black_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "King_black_ORM",
+ "uri" : "King_black_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "King_black_base_color",
+ "uri" : "King_black_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "King_white_normal",
+ "uri" : "King_white_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "King_white_ORM",
+ "uri" : "King_white_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "King_white_base_color",
+ "uri" : "King_white_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Queen_black_normal",
+ "uri" : "Queen_black_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Queen_black_ORM",
+ "uri" : "Queen_black_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Queen_black_base_color",
+ "uri" : "Queen_black_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Queen_white_normal",
+ "uri" : "Queen_white_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Queen_white_ORM",
+ "uri" : "Queen_white_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Queen_white_base_color",
+ "uri" : "Queen_white_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Chessboard_normal",
+ "uri" : "Chessboard_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Chessboard_ORM",
+ "uri" : "Chessboard_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Chessboard_base_color",
+ "uri" : "Chessboard_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Pawn_normal",
+ "uri" : "Pawn_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Pawn_ORM",
+ "uri" : "Pawn_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Pawn_white_base_color",
+ "uri" : "Pawn_white_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Pawn_black_base_color",
+ "uri" : "Pawn_black_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Castle_normal",
+ "uri" : "Castle_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Castle_ORM",
+ "uri" : "Castle_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Castle_black_base_color",
+ "uri" : "Castle_black_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Castle_white_base_color",
+ "uri" : "Castle_white_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Knight_normal",
+ "uri" : "Knight_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Knight_ORM",
+ "uri" : "Knight_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Knight_black_base_color",
+ "uri" : "Knight_black_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Knight_white_base_color",
+ "uri" : "Knight_white_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Bishop_black_normal",
+ "uri" : "Bishop_black_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Bishop_black_ORM",
+ "uri" : "Bishop_black_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Bishop_black_base_color",
+ "uri" : "Bishop_black_base_color.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Bishop_white_normal",
+ "uri" : "Bishop_white_normal.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Bishop_white_ORM",
+ "uri" : "Bishop_white_ORM.jpg"
+ },
+ {
+ "mimeType" : "image/jpeg",
+ "name" : "Bishop_white_base_color",
+ "uri" : "Bishop_white_base_color.jpg"
+ }
+ ],
+ "accessors" : [
+ {
+ "bufferView" : 0,
+ "componentType" : 5126,
+ "count" : 28901,
+ "max" : [
+ 0.028035586699843407,
+ 0.15154190361499786,
+ 0.02803558111190796
+ ],
+ "min" : [
+ -0.028035584837198257,
+ -3.725290298461914e-09,
+ -0.02803558111190796
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 1,
+ "componentType" : 5126,
+ "count" : 28901,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 2,
+ "componentType" : 5126,
+ "count" : 28901,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 3,
+ "componentType" : 5123,
+ "count" : 121440,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 4,
+ "componentType" : 5126,
+ "count" : 20907,
+ "max" : [
+ 0.026661992073059082,
+ 0.1361335813999176,
+ 0.026661992073059082
+ ],
+ "min" : [
+ -0.026661990210413933,
+ 0,
+ -0.026661992073059082
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 5,
+ "componentType" : 5126,
+ "count" : 20907,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 6,
+ "componentType" : 5126,
+ "count" : 20907,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 7,
+ "componentType" : 5123,
+ "count" : 103104,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 8,
+ "componentType" : 5126,
+ "count" : 108441,
+ "max" : [
+ 0.3527080714702606,
+ 0.01851509138941765,
+ 0.3527080714702606
+ ],
+ "min" : [
+ -0.3527080714702606,
+ -5.566945304735782e-08,
+ -0.3527080714702606
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 9,
+ "componentType" : 5126,
+ "count" : 108441,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 10,
+ "componentType" : 5126,
+ "count" : 108441,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 11,
+ "componentType" : 5125,
+ "count" : 277248,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 12,
+ "componentType" : 5126,
+ "count" : 1131,
+ "max" : [
+ 0.04213219881057739,
+ 0.08137139678001404,
+ -0.020367786288261414
+ ],
+ "min" : [
+ 0.02036779560148716,
+ 0.0592837817966938,
+ -0.042132191359996796
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 13,
+ "componentType" : 5126,
+ "count" : 1131,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 14,
+ "componentType" : 5126,
+ "count" : 1131,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 15,
+ "componentType" : 5123,
+ "count" : 6624,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 16,
+ "componentType" : 5126,
+ "count" : 25951,
+ "max" : [
+ 0.021040337160229683,
+ 0.04976364225149155,
+ 0.021040335297584534
+ ],
+ "min" : [
+ -0.021040331572294235,
+ 0,
+ -0.021040333434939384
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 17,
+ "componentType" : 5126,
+ "count" : 25951,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 18,
+ "componentType" : 5126,
+ "count" : 25951,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 19,
+ "componentType" : 5123,
+ "count" : 141696,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 20,
+ "componentType" : 5126,
+ "count" : 23969,
+ "max" : [
+ 0.0268431156873703,
+ 0.09708680957555771,
+ 0.0268431156873703
+ ],
+ "min" : [
+ -0.0268431156873703,
+ -3.725290298461914e-09,
+ -0.0268431156873703
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 21,
+ "componentType" : 5126,
+ "count" : 23969,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 22,
+ "componentType" : 5126,
+ "count" : 23969,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 23,
+ "componentType" : 5123,
+ "count" : 91584,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 24,
+ "componentType" : 5126,
+ "count" : 6432,
+ "max" : [
+ 0.024992674589157104,
+ 0.09972551465034485,
+ 0.028097912669181824
+ ],
+ "min" : [
+ -0.024992674589157104,
+ -0.00039299391210079193,
+ -0.032059311866760254
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 25,
+ "componentType" : 5126,
+ "count" : 6432,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 26,
+ "componentType" : 5126,
+ "count" : 6432,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 27,
+ "componentType" : 5123,
+ "count" : 33552,
+ "type" : "SCALAR"
+ },
+ {
+ "bufferView" : 28,
+ "componentType" : 5126,
+ "count" : 42834,
+ "max" : [
+ 0.024297118186950684,
+ 0.12363776564598083,
+ 0.024310514330863953
+ ],
+ "min" : [
+ -0.024297118186950684,
+ -0.00039617158472537994,
+ -0.024283722043037415
+ ],
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 29,
+ "componentType" : 5126,
+ "count" : 42834,
+ "type" : "VEC3"
+ },
+ {
+ "bufferView" : 30,
+ "componentType" : 5126,
+ "count" : 42834,
+ "type" : "VEC2"
+ },
+ {
+ "bufferView" : 31,
+ "componentType" : 5123,
+ "count" : 225168,
+ "type" : "SCALAR"
+ }
+ ],
+ "bufferViews" : [
+ {
+ "buffer" : 0,
+ "byteLength" : 346812,
+ "byteOffset" : 0
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 346812,
+ "byteOffset" : 346812
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 231208,
+ "byteOffset" : 693624
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 242880,
+ "byteOffset" : 924832
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 250884,
+ "byteOffset" : 1167712
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 250884,
+ "byteOffset" : 1418596
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 167256,
+ "byteOffset" : 1669480
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 206208,
+ "byteOffset" : 1836736
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 1301292,
+ "byteOffset" : 2042944
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 1301292,
+ "byteOffset" : 3344236
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 867528,
+ "byteOffset" : 4645528
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 1108992,
+ "byteOffset" : 5513056
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 13572,
+ "byteOffset" : 6622048
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 13572,
+ "byteOffset" : 6635620
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 9048,
+ "byteOffset" : 6649192
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 13248,
+ "byteOffset" : 6658240
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 311412,
+ "byteOffset" : 6671488
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 311412,
+ "byteOffset" : 6982900
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 207608,
+ "byteOffset" : 7294312
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 283392,
+ "byteOffset" : 7501920
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 287628,
+ "byteOffset" : 7785312
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 287628,
+ "byteOffset" : 8072940
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 191752,
+ "byteOffset" : 8360568
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 183168,
+ "byteOffset" : 8552320
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 77184,
+ "byteOffset" : 8735488
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 77184,
+ "byteOffset" : 8812672
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 51456,
+ "byteOffset" : 8889856
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 67104,
+ "byteOffset" : 8941312
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 514008,
+ "byteOffset" : 9008416
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 514008,
+ "byteOffset" : 9522424
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 342672,
+ "byteOffset" : 10036432
+ },
+ {
+ "buffer" : 0,
+ "byteLength" : 450336,
+ "byteOffset" : 10379104
+ }
+ ],
+ "samplers" : [
+ {
+ "magFilter" : 9729,
+ "minFilter" : 9987
+ }
+ ],
+ "buffers" : [
+ {
+ "byteLength" : 10829440,
+ "uri" : "ABeautifulGame.bin"
+ }
+ ]
+}
diff --git a/scenes/glTF-Samples/abeautifulgame/Bishop_black_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Bishop_black_ORM.jpg
new file mode 100644
index 000000000..b06e49885
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Bishop_black_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Bishop_black_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Bishop_black_base_color.jpg
new file mode 100644
index 000000000..4011467f5
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Bishop_black_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Bishop_black_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Bishop_black_normal.jpg
new file mode 100644
index 000000000..76e45c056
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Bishop_black_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Bishop_white_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Bishop_white_ORM.jpg
new file mode 100644
index 000000000..512d7ac10
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Bishop_white_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Bishop_white_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Bishop_white_base_color.jpg
new file mode 100644
index 000000000..907e057a1
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Bishop_white_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Bishop_white_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Bishop_white_normal.jpg
new file mode 100644
index 000000000..d73a833d1
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Bishop_white_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Castle_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Castle_ORM.jpg
new file mode 100644
index 000000000..5c02b1ddf
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Castle_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Castle_black_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Castle_black_base_color.jpg
new file mode 100644
index 000000000..f7b98a944
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Castle_black_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Castle_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Castle_normal.jpg
new file mode 100644
index 000000000..c3e22d047
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Castle_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Castle_white_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Castle_white_base_color.jpg
new file mode 100644
index 000000000..3548e2034
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Castle_white_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Chessboard_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Chessboard_ORM.jpg
new file mode 100644
index 000000000..a7a05c31c
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Chessboard_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Chessboard_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Chessboard_base_color.jpg
new file mode 100644
index 000000000..b85306f07
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Chessboard_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Chessboard_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Chessboard_normal.jpg
new file mode 100644
index 000000000..a58826c6f
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Chessboard_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/King_black_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/King_black_ORM.jpg
new file mode 100644
index 000000000..210da263d
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/King_black_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/King_black_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/King_black_base_color.jpg
new file mode 100644
index 000000000..1ac5fa792
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/King_black_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/King_black_normal.jpg b/scenes/glTF-Samples/abeautifulgame/King_black_normal.jpg
new file mode 100644
index 000000000..c605ae26d
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/King_black_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/King_white_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/King_white_ORM.jpg
new file mode 100644
index 000000000..7f26fc05c
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/King_white_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/King_white_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/King_white_base_color.jpg
new file mode 100644
index 000000000..224cba350
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/King_white_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/King_white_normal.jpg b/scenes/glTF-Samples/abeautifulgame/King_white_normal.jpg
new file mode 100644
index 000000000..8a8dcf7a3
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/King_white_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Knight_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Knight_ORM.jpg
new file mode 100644
index 000000000..1fa040eee
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Knight_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Knight_black_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Knight_black_base_color.jpg
new file mode 100644
index 000000000..5be5b9aa2
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Knight_black_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Knight_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Knight_normal.jpg
new file mode 100644
index 000000000..a88f0a7c7
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Knight_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Knight_white_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Knight_white_base_color.jpg
new file mode 100644
index 000000000..e590e3961
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Knight_white_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Pawn_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Pawn_ORM.jpg
new file mode 100644
index 000000000..47faf7dfd
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Pawn_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Pawn_black_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Pawn_black_base_color.jpg
new file mode 100644
index 000000000..5078a2ce4
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Pawn_black_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Pawn_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Pawn_normal.jpg
new file mode 100644
index 000000000..4cdc45070
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Pawn_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Pawn_white_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Pawn_white_base_color.jpg
new file mode 100644
index 000000000..576de84a0
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Pawn_white_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Queen_black_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Queen_black_ORM.jpg
new file mode 100644
index 000000000..c130d53b2
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Queen_black_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Queen_black_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Queen_black_base_color.jpg
new file mode 100644
index 000000000..bbd230fc4
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Queen_black_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Queen_black_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Queen_black_normal.jpg
new file mode 100644
index 000000000..ffbc75342
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Queen_black_normal.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Queen_white_ORM.jpg b/scenes/glTF-Samples/abeautifulgame/Queen_white_ORM.jpg
new file mode 100644
index 000000000..0a1203df7
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Queen_white_ORM.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Queen_white_base_color.jpg b/scenes/glTF-Samples/abeautifulgame/Queen_white_base_color.jpg
new file mode 100644
index 000000000..d04ff2f6f
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Queen_white_base_color.jpg differ
diff --git a/scenes/glTF-Samples/abeautifulgame/Queen_white_normal.jpg b/scenes/glTF-Samples/abeautifulgame/Queen_white_normal.jpg
new file mode 100644
index 000000000..4bb1b5216
Binary files /dev/null and b/scenes/glTF-Samples/abeautifulgame/Queen_white_normal.jpg differ
diff --git a/scenes/glTF-Samples/duck/Duck.gltf b/scenes/glTF-Samples/duck/Duck.gltf
new file mode 100644
index 000000000..b80c842ce
--- /dev/null
+++ b/scenes/glTF-Samples/duck/Duck.gltf
@@ -0,0 +1,219 @@
+{
+ "asset": {
+ "generator": "COLLADA2GLTF",
+ "version": "2.0"
+ },
+ "scene": 0,
+ "scenes": [
+ {
+ "nodes": [
+ 0
+ ]
+ }
+ ],
+ "nodes": [
+ {
+ "children": [
+ 2,
+ 1
+ ],
+ "matrix": [
+ 0.009999999776482582,
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.009999999776482582,
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.009999999776482582,
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.0,
+ 1.0
+ ]
+ },
+ {
+ "matrix": [
+ -0.7289686799049377,
+ 0.0,
+ -0.6845470666885376,
+ 0.0,
+ -0.4252049028873444,
+ 0.7836934328079224,
+ 0.4527972936630249,
+ 0.0,
+ 0.5364750623703003,
+ 0.6211478114128113,
+ -0.571287989616394,
+ 0.0,
+ 400.1130065917969,
+ 463.2640075683594,
+ -431.0780334472656,
+ 1.0
+ ],
+ "camera": 0
+ },
+ {
+ "mesh": 0
+ }
+ ],
+ "cameras": [
+ {
+ "perspective": {
+ "aspectRatio": 1.5,
+ "yfov": 0.6605925559997559,
+ "zfar": 10000.0,
+ "znear": 1.0
+ },
+ "type": "perspective"
+ }
+ ],
+ "meshes": [
+ {
+ "primitives": [
+ {
+ "attributes": {
+ "NORMAL": 1,
+ "POSITION": 2,
+ "TEXCOORD_0": 3
+ },
+ "indices": 0,
+ "mode": 4,
+ "material": 0
+ }
+ ],
+ "name": "LOD3spShape"
+ }
+ ],
+ "accessors": [
+ {
+ "bufferView": 0,
+ "byteOffset": 0,
+ "componentType": 5123,
+ "count": 12636,
+ "max": [
+ 2398
+ ],
+ "min": [
+ 0
+ ],
+ "type": "SCALAR"
+ },
+ {
+ "bufferView": 1,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 2399,
+ "max": [
+ 0.9995989799499512,
+ 0.999580979347229,
+ 0.9984359741210938
+ ],
+ "min": [
+ -0.9990839958190918,
+ -1.0,
+ -0.9998319745063782
+ ],
+ "type": "VEC3"
+ },
+ {
+ "bufferView": 1,
+ "byteOffset": 28788,
+ "componentType": 5126,
+ "count": 2399,
+ "max": [
+ 96.17990112304688,
+ 163.97000122070313,
+ 53.92519760131836
+ ],
+ "min": [
+ -69.29850006103516,
+ 9.929369926452637,
+ -61.32819747924805
+ ],
+ "type": "VEC3"
+ },
+ {
+ "bufferView": 2,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 2399,
+ "max": [
+ 0.9833459854125976,
+ 0.9800369739532472
+ ],
+ "min": [
+ 0.026409000158309938,
+ 0.01996302604675293
+ ],
+ "type": "VEC2"
+ }
+ ],
+ "materials": [
+ {
+ "pbrMetallicRoughness": {
+ "baseColorTexture": {
+ "index": 0
+ },
+ "metallicFactor": 0.0
+ },
+ "emissiveFactor": [
+ 0.0,
+ 0.0,
+ 0.0
+ ],
+ "name": "blinn3-fx"
+ }
+ ],
+ "textures": [
+ {
+ "sampler": 0,
+ "source": 0
+ }
+ ],
+ "images": [
+ {
+ "uri": "DuckCM.png"
+ }
+ ],
+ "samplers": [
+ {
+ "magFilter": 9729,
+ "minFilter": 9986,
+ "wrapS": 10497,
+ "wrapT": 10497
+ }
+ ],
+ "bufferViews": [
+ {
+ "buffer": 0,
+ "byteOffset": 76768,
+ "byteLength": 25272,
+ "target": 34963
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 0,
+ "byteLength": 57576,
+ "byteStride": 12,
+ "target": 34962
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 57576,
+ "byteLength": 19192,
+ "byteStride": 8,
+ "target": 34962
+ }
+ ],
+ "buffers": [
+ {
+ "byteLength": 102040,
+ "uri": "Duck0.bin"
+ }
+ ]
+}
diff --git a/scenes/glTF-Samples/duck/Duck0.bin b/scenes/glTF-Samples/duck/Duck0.bin
new file mode 100644
index 000000000..5f01f88ac
Binary files /dev/null and b/scenes/glTF-Samples/duck/Duck0.bin differ
diff --git a/scenes/glTF-Samples/duck/DuckCM.png b/scenes/glTF-Samples/duck/DuckCM.png
new file mode 100644
index 000000000..9fa2dd4cc
Binary files /dev/null and b/scenes/glTF-Samples/duck/DuckCM.png differ
diff --git a/scenes/glTF-Samples/fox/Fox.bin b/scenes/glTF-Samples/fox/Fox.bin
new file mode 100644
index 000000000..41e41dc2f
Binary files /dev/null and b/scenes/glTF-Samples/fox/Fox.bin differ
diff --git a/scenes/glTF-Samples/fox/Fox.gltf b/scenes/glTF-Samples/fox/Fox.gltf
new file mode 100644
index 000000000..e35b7d741
--- /dev/null
+++ b/scenes/glTF-Samples/fox/Fox.gltf
@@ -0,0 +1,1777 @@
+{
+ "asset": {
+ "copyright": "CC-BY 4.0 Model by PixelMannen https://opengameart.org/content/fox-and-shiba and @tomkranis https://sketchfab.com/3d-models/low-poly-fox-by-pixelmannen-animated-371dea88d7e04a76af5763f2a36866bc and @AsoboStudio with @scurest https://github.com/KhronosGroup/glTF-Sample-Models/pull/150#issuecomment-406300118",
+ "version": "2.0"
+ },
+ "accessors": [
+ {
+ "bufferView": 0,
+ "componentType": 5126,
+ "count": 1728,
+ "type": "VEC3",
+ "byteOffset": 0,
+ "min": [
+ -12.592718124389648,
+ -0.12174476683139801,
+ -88.09500122070312
+ ],
+ "max": [
+ 12.592718124389648,
+ 78.90718841552734,
+ 66.62486267089844
+ ]
+ },
+ {
+ "bufferView": 1,
+ "componentType": 5126,
+ "count": 1728,
+ "type": "VEC2",
+ "byteOffset": 0
+ },
+ {
+ "bufferView": 1,
+ "componentType": 5123,
+ "count": 1728,
+ "type": "VEC4",
+ "byteOffset": 13824
+ },
+ {
+ "bufferView": 2,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 1728,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 3,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 24,
+ "type": "MAT4"
+ },
+ {
+ "bufferView": 4,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 83,
+ "type": "SCALAR",
+ "min": [
+ 0.0
+ ],
+ "max": [
+ 3.4166667461395264
+ ]
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 1328,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 2656,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 3984,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 5312,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 6640,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 7968,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 9296,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 10624,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 11952,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 13280,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 14608,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 15936,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 17264,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 18592,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 19920,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 21248,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 22576,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 23904,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 6,
+ "byteOffset": 0,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC3"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 25232,
+ "componentType": 5126,
+ "count": 83,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 4,
+ "byteOffset": 332,
+ "componentType": 5126,
+ "count": 18,
+ "type": "SCALAR",
+ "min": [
+ 0.0
+ ],
+ "max": [
+ 0.7083333134651184
+ ]
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 26560,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 26848,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 27136,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 27424,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 27712,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 28000,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 28288,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 28576,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 28864,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 29152,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 29440,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 29728,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 30016,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 30304,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 30592,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 30880,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 31168,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 31456,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 31744,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 6,
+ "byteOffset": 996,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC3"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 32032,
+ "componentType": 5126,
+ "count": 18,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 4,
+ "byteOffset": 404,
+ "componentType": 5126,
+ "count": 25,
+ "type": "SCALAR",
+ "min": [
+ 0.0
+ ],
+ "max": [
+ 1.1583333015441895
+ ]
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 32320,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 32720,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 33120,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 33520,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 33920,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 34320,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 34720,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 35120,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 35520,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 35920,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 36320,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 36720,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 37120,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 37520,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 37920,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 38320,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 38720,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 39120,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 39520,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ },
+ {
+ "bufferView": 6,
+ "byteOffset": 1212,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC3"
+ },
+ {
+ "bufferView": 5,
+ "byteOffset": 39920,
+ "componentType": 5126,
+ "count": 25,
+ "type": "VEC4"
+ }
+ ],
+ "animations": [
+ {
+ "channels": [
+ {
+ "sampler": 0,
+ "target": {
+ "node": 8,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 1,
+ "target": {
+ "node": 7,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 2,
+ "target": {
+ "node": 11,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 3,
+ "target": {
+ "node": 10,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 4,
+ "target": {
+ "node": 9,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 5,
+ "target": {
+ "node": 14,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 6,
+ "target": {
+ "node": 13,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 7,
+ "target": {
+ "node": 12,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 8,
+ "target": {
+ "node": 6,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 9,
+ "target": {
+ "node": 5,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 10,
+ "target": {
+ "node": 17,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 11,
+ "target": {
+ "node": 16,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 12,
+ "target": {
+ "node": 15,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 13,
+ "target": {
+ "node": 20,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 14,
+ "target": {
+ "node": 19,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 15,
+ "target": {
+ "node": 18,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 16,
+ "target": {
+ "node": 24,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 17,
+ "target": {
+ "node": 23,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 18,
+ "target": {
+ "node": 22,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 19,
+ "target": {
+ "node": 4,
+ "path": "translation"
+ }
+ },
+ {
+ "sampler": 20,
+ "target": {
+ "node": 4,
+ "path": "rotation"
+ }
+ }
+ ],
+ "samplers": [
+ {
+ "input": 5,
+ "output": 6
+ },
+ {
+ "input": 5,
+ "output": 7
+ },
+ {
+ "input": 5,
+ "output": 8
+ },
+ {
+ "input": 5,
+ "output": 9
+ },
+ {
+ "input": 5,
+ "output": 10
+ },
+ {
+ "input": 5,
+ "output": 11
+ },
+ {
+ "input": 5,
+ "output": 12
+ },
+ {
+ "input": 5,
+ "output": 13
+ },
+ {
+ "input": 5,
+ "output": 14
+ },
+ {
+ "input": 5,
+ "output": 15
+ },
+ {
+ "input": 5,
+ "output": 16
+ },
+ {
+ "input": 5,
+ "output": 17
+ },
+ {
+ "input": 5,
+ "output": 18
+ },
+ {
+ "input": 5,
+ "output": 19
+ },
+ {
+ "input": 5,
+ "output": 20
+ },
+ {
+ "input": 5,
+ "output": 21
+ },
+ {
+ "input": 5,
+ "output": 22
+ },
+ {
+ "input": 5,
+ "output": 23
+ },
+ {
+ "input": 5,
+ "output": 24
+ },
+ {
+ "input": 5,
+ "output": 25
+ },
+ {
+ "input": 5,
+ "output": 26
+ }
+ ],
+ "name": "Survey"
+ },
+ {
+ "channels": [
+ {
+ "sampler": 0,
+ "target": {
+ "node": 8,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 1,
+ "target": {
+ "node": 7,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 2,
+ "target": {
+ "node": 11,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 3,
+ "target": {
+ "node": 10,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 4,
+ "target": {
+ "node": 9,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 5,
+ "target": {
+ "node": 14,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 6,
+ "target": {
+ "node": 13,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 7,
+ "target": {
+ "node": 12,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 8,
+ "target": {
+ "node": 6,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 9,
+ "target": {
+ "node": 5,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 10,
+ "target": {
+ "node": 17,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 11,
+ "target": {
+ "node": 16,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 12,
+ "target": {
+ "node": 15,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 13,
+ "target": {
+ "node": 20,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 14,
+ "target": {
+ "node": 19,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 15,
+ "target": {
+ "node": 18,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 16,
+ "target": {
+ "node": 24,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 17,
+ "target": {
+ "node": 23,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 18,
+ "target": {
+ "node": 22,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 19,
+ "target": {
+ "node": 4,
+ "path": "translation"
+ }
+ },
+ {
+ "sampler": 20,
+ "target": {
+ "node": 4,
+ "path": "rotation"
+ }
+ }
+ ],
+ "samplers": [
+ {
+ "input": 27,
+ "output": 28
+ },
+ {
+ "input": 27,
+ "output": 29
+ },
+ {
+ "input": 27,
+ "output": 30
+ },
+ {
+ "input": 27,
+ "output": 31
+ },
+ {
+ "input": 27,
+ "output": 32
+ },
+ {
+ "input": 27,
+ "output": 33
+ },
+ {
+ "input": 27,
+ "output": 34
+ },
+ {
+ "input": 27,
+ "output": 35
+ },
+ {
+ "input": 27,
+ "output": 36
+ },
+ {
+ "input": 27,
+ "output": 37
+ },
+ {
+ "input": 27,
+ "output": 38
+ },
+ {
+ "input": 27,
+ "output": 39
+ },
+ {
+ "input": 27,
+ "output": 40
+ },
+ {
+ "input": 27,
+ "output": 41
+ },
+ {
+ "input": 27,
+ "output": 42
+ },
+ {
+ "input": 27,
+ "output": 43
+ },
+ {
+ "input": 27,
+ "output": 44
+ },
+ {
+ "input": 27,
+ "output": 45
+ },
+ {
+ "input": 27,
+ "output": 46
+ },
+ {
+ "input": 27,
+ "output": 47
+ },
+ {
+ "input": 27,
+ "output": 48
+ }
+ ],
+ "name": "Walk"
+ },
+ {
+ "channels": [
+ {
+ "sampler": 0,
+ "target": {
+ "node": 8,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 1,
+ "target": {
+ "node": 7,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 2,
+ "target": {
+ "node": 11,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 3,
+ "target": {
+ "node": 10,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 4,
+ "target": {
+ "node": 9,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 5,
+ "target": {
+ "node": 14,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 6,
+ "target": {
+ "node": 13,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 7,
+ "target": {
+ "node": 12,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 8,
+ "target": {
+ "node": 6,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 9,
+ "target": {
+ "node": 5,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 10,
+ "target": {
+ "node": 17,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 11,
+ "target": {
+ "node": 16,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 12,
+ "target": {
+ "node": 15,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 13,
+ "target": {
+ "node": 20,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 14,
+ "target": {
+ "node": 19,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 15,
+ "target": {
+ "node": 18,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 16,
+ "target": {
+ "node": 24,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 17,
+ "target": {
+ "node": 23,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 18,
+ "target": {
+ "node": 22,
+ "path": "rotation"
+ }
+ },
+ {
+ "sampler": 19,
+ "target": {
+ "node": 4,
+ "path": "translation"
+ }
+ },
+ {
+ "sampler": 20,
+ "target": {
+ "node": 4,
+ "path": "rotation"
+ }
+ }
+ ],
+ "samplers": [
+ {
+ "input": 49,
+ "output": 50
+ },
+ {
+ "input": 49,
+ "output": 51
+ },
+ {
+ "input": 49,
+ "output": 52
+ },
+ {
+ "input": 49,
+ "output": 53
+ },
+ {
+ "input": 49,
+ "output": 54
+ },
+ {
+ "input": 49,
+ "output": 55
+ },
+ {
+ "input": 49,
+ "output": 56
+ },
+ {
+ "input": 49,
+ "output": 57
+ },
+ {
+ "input": 49,
+ "output": 58
+ },
+ {
+ "input": 49,
+ "output": 59
+ },
+ {
+ "input": 49,
+ "output": 60
+ },
+ {
+ "input": 49,
+ "output": 61
+ },
+ {
+ "input": 49,
+ "output": 62
+ },
+ {
+ "input": 49,
+ "output": 63
+ },
+ {
+ "input": 49,
+ "output": 64
+ },
+ {
+ "input": 49,
+ "output": 65
+ },
+ {
+ "input": 49,
+ "output": 66
+ },
+ {
+ "input": 49,
+ "output": 67
+ },
+ {
+ "input": 49,
+ "output": 68
+ },
+ {
+ "input": 49,
+ "output": 69
+ },
+ {
+ "input": 49,
+ "output": 70
+ }
+ ],
+ "name": "Run"
+ }
+ ],
+ "bufferViews": [
+ {
+ "buffer": 0,
+ "byteOffset": 0,
+ "byteLength": 20736,
+ "byteStride": 12,
+ "target": 34962
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 20736,
+ "byteLength": 27648,
+ "byteStride": 8,
+ "target": 34962
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 48384,
+ "byteLength": 27648,
+ "byteStride": 16,
+ "target": 34962
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 76032,
+ "byteLength": 1536
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 77568,
+ "byteLength": 504
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 78072,
+ "byteLength": 40320
+ },
+ {
+ "buffer": 0,
+ "byteOffset": 118392,
+ "byteLength": 1512
+ }
+ ],
+ "buffers": [
+ {
+ "uri": "Fox.bin",
+ "byteLength": 119904
+ }
+ ],
+ "images": [
+ {
+ "uri": "Texture.png",
+ "mimeType": "image/png"
+ }
+ ],
+ "materials": [
+ {
+ "name": "fox_material",
+ "pbrMetallicRoughness": {
+ "baseColorTexture": {
+ "index": 0
+ },
+ "metallicFactor": 0,
+ "roughnessFactor": 0.58
+ }
+ }
+ ],
+ "meshes": [
+ {
+ "name": "fox1",
+ "primitives": [
+ {
+ "attributes": {
+ "POSITION": 0,
+ "TEXCOORD_0": 1,
+ "JOINTS_0": 2,
+ "WEIGHTS_0": 3
+ },
+ "material": 0
+ }
+ ]
+ }
+ ],
+ "nodes": [
+ {
+ "children": [
+ 2
+ ],
+ "name": "root"
+ },
+ {
+ "name": "fox",
+ "mesh": 0,
+ "skin": 0
+ },
+ {
+ "children": [
+ 3
+ ],
+ "name": "_rootJoint"
+ },
+ {
+ "children": [
+ 4
+ ],
+ "name": "b_Root_00",
+ "rotation": [
+ -0.7071080924875391,
+ 0.0,
+ 0.0,
+ 0.7071054698831242
+ ]
+ },
+ {
+ "children": [
+ 5,
+ 15,
+ 18,
+ 22
+ ],
+ "name": "b_Hip_01",
+ "rotation": [
+ 0.12769094176175547,
+ -0.6954820192393762,
+ -0.12769022650601444,
+ 0.695481840425441
+ ],
+ "translation": [
+ 0,
+ 26.748403549194336,
+ 42.93817138671875
+ ]
+ },
+ {
+ "children": [
+ 6
+ ],
+ "name": "b_Spine01_02",
+ "rotation": [
+ 0.0,
+ 0.0,
+ -0.5904157638238317,
+ 0.8070992664030376
+ ],
+ "translation": [
+ 12.850601196289062,
+ 0,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 7,
+ 9,
+ 12
+ ],
+ "name": "b_Spine02_03",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.017411952404281082,
+ 0.9998484004655261
+ ],
+ "translation": [
+ 21.65575408935547,
+ -0.000118255615234375,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 8
+ ],
+ "name": "b_Neck_04",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.30337914028264346,
+ 0.9528699267168443
+ ],
+ "translation": [
+ 25.64914321899414,
+ 0,
+ 0
+ ]
+ },
+ {
+ "name": "b_Head_05",
+ "rotation": [
+ 0.0,
+ 0.0,
+ -0.4002854151487349,
+ 0.9163905206947555
+ ],
+ "translation": [
+ 13.376960754394531,
+ 0,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 10
+ ],
+ "name": "b_RightUpperArm_06",
+ "rotation": [
+ 0.0004673273262011562,
+ -0.0004461484692255928,
+ -0.7121792881110691,
+ 0.7019973248825985
+ ],
+ "translation": [
+ 18.677913665771484,
+ -4.297340393066406,
+ 6.9675750732421875
+ ]
+ },
+ {
+ "children": [
+ 11
+ ],
+ "name": "b_RightForeArm_07",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.03712589977348744,
+ 0.9993105961441663
+ ],
+ "translation": [
+ 23.04512596130371,
+ 0,
+ 0
+ ]
+ },
+ {
+ "name": "b_RightHand_08",
+ "rotation": [
+ -0.012037406914797018,
+ -0.00782221012465276,
+ 0.4605623277185148,
+ 0.8875112709988741
+ ],
+ "translation": [
+ 19.350055694580078,
+ -0.14598655700683594,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 13
+ ],
+ "name": "b_LeftUpperArm_09",
+ "rotation": [
+ 0.0004972619220940174,
+ -0.0008821923166442875,
+ -0.7120874929914663,
+ 0.7020900061903927
+ ],
+ "translation": [
+ 18.67791748046875,
+ -4.297344207763672,
+ -6.967987060546875
+ ]
+ },
+ {
+ "children": [
+ 14
+ ],
+ "name": "b_LeftForeArm_010",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.03712589977348744,
+ 0.9993105961441663
+ ],
+ "translation": [
+ 23.045124053955078,
+ 0,
+ 0
+ ]
+ },
+ {
+ "name": "b_LeftHand_011",
+ "rotation": [
+ 0.01651791440721507,
+ 0.014013739873997781,
+ 0.46007557521271,
+ 0.8876154790736099
+ ],
+ "translation": [
+ 19.350051879882812,
+ -0.14599037170410156,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 16
+ ],
+ "name": "b_Tail01_012",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.9818928940656295,
+ 0.1894369145214904
+ ],
+ "translation": [
+ 4.2603759765625,
+ 15.958770751953125,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 17
+ ],
+ "name": "b_Tail02_013",
+ "rotation": [
+ 0.0,
+ 0.0,
+ -0.0696171663387466,
+ 0.9975737818081244
+ ],
+ "translation": [
+ 12.411918640136719,
+ 0,
+ 0
+ ]
+ },
+ {
+ "name": "b_Tail03_014",
+ "rotation": [
+ 0.0,
+ 0.0,
+ -0.05383274484207684,
+ 0.9985499664927979
+ ],
+ "translation": [
+ 24.24032211303711,
+ 0,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 19
+ ],
+ "name": "b_LeftLeg01_015",
+ "rotation": [
+ 0.0,
+ -0.0001717522536559936,
+ 0.9700158834020681,
+ -0.2430414706359161
+ ],
+ "translation": [
+ 4.813770294189453,
+ 5.154018402099609,
+ -6.968006134033203
+ ]
+ },
+ {
+ "children": [
+ 20
+ ],
+ "name": "b_LeftLeg02_016",
+ "rotation": [
+ 0.0,
+ 0.0,
+ -0.36804378855511655,
+ 0.9298084586117706
+ ],
+ "translation": [
+ 18.944175720214844,
+ 0,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 21
+ ],
+ "name": "b_LeftFoot01_017",
+ "rotation": [
+ 0.0002484105929664666,
+ 0.0,
+ 0.4584841122585099,
+ 0.888702569535333
+ ],
+ "translation": [
+ 17.942811965942383,
+ 0,
+ 0
+ ]
+ },
+ {
+ "name": "b_LeftFoot02_018",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.5472882949090243,
+ 0.8369441571906533
+ ],
+ "translation": [
+ 15.779938697814941,
+ 0,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 23
+ ],
+ "name": "b_RightLeg01_019",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.9699585942054535,
+ -0.24327006705918533
+ ],
+ "translation": [
+ 4.813777923583984,
+ 5.154026031494141,
+ 6.967563629150391
+ ]
+ },
+ {
+ "children": [
+ 24
+ ],
+ "name": "b_RightLeg02_020",
+ "rotation": [
+ 0.0,
+ 0.0,
+ -0.36804381432052885,
+ 0.9298084484131106
+ ],
+ "translation": [
+ 18.944183349609375,
+ 0,
+ 0
+ ]
+ },
+ {
+ "children": [
+ 25
+ ],
+ "name": "b_RightFoot01_021",
+ "rotation": [
+ -0.00015345455876803163,
+ 0.0,
+ 0.4579093746168346,
+ 0.888998864504178
+ ],
+ "translation": [
+ 17.94281005859375,
+ 0,
+ 0
+ ]
+ },
+ {
+ "name": "b_RightFoot02_022",
+ "rotation": [
+ 0.0,
+ 0.0,
+ 0.5472882949090243,
+ 0.8369441571906533
+ ],
+ "translation": [
+ 15.779935836791992,
+ 0,
+ 0
+ ]
+ }
+ ],
+ "samplers": [
+ {
+ "magFilter": 9729,
+ "minFilter": 9987
+ }
+ ],
+ "scene": 0,
+ "scenes": [
+ {
+ "nodes": [
+ 0,
+ 1
+ ]
+ }
+ ],
+ "skins": [
+ {
+ "inverseBindMatrices": 4,
+ "joints": [
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25
+ ],
+ "skeleton": 2
+ }
+ ],
+ "textures": [
+ {
+ "sampler": 0,
+ "source": 0
+ }
+ ]
+}
diff --git a/scenes/glTF-Samples/fox/Texture.png b/scenes/glTF-Samples/fox/Texture.png
new file mode 100644
index 000000000..796324656
Binary files /dev/null and b/scenes/glTF-Samples/fox/Texture.png differ
diff --git a/scenes/glTF-Samples/simpleTriangle.bin b/scenes/glTF-Samples/simpleTriangle.bin
new file mode 100644
index 000000000..d642500b9
Binary files /dev/null and b/scenes/glTF-Samples/simpleTriangle.bin differ
diff --git a/scenes/glTF/bellA1.glb b/scenes/glTF/bellA1.glb
new file mode 100644
index 000000000..61437dae7
Binary files /dev/null and b/scenes/glTF/bellA1.glb differ
diff --git a/scenes/glTF/bellA2.glb b/scenes/glTF/bellA2.glb
new file mode 100644
index 000000000..f22066dfd
Binary files /dev/null and b/scenes/glTF/bellA2.glb differ
diff --git a/scenes/glTF/bellA3.glb b/scenes/glTF/bellA3.glb
new file mode 100644
index 000000000..88ed24607
Binary files /dev/null and b/scenes/glTF/bellA3.glb differ
diff --git a/scenes/glTF/bookA.glb b/scenes/glTF/bookA.glb
new file mode 100644
index 000000000..0aef229e4
Binary files /dev/null and b/scenes/glTF/bookA.glb differ
diff --git a/scenes/glTF/chandelier1a.glb b/scenes/glTF/chandelier1a.glb
new file mode 100644
index 000000000..aa4d1aa66
Binary files /dev/null and b/scenes/glTF/chandelier1a.glb differ
diff --git a/scenes/glTF/chandelier1b2.glb b/scenes/glTF/chandelier1b2.glb
new file mode 100644
index 000000000..92b3dbf1c
Binary files /dev/null and b/scenes/glTF/chandelier1b2.glb differ
diff --git a/scenes/glTF/desk_0055.glb b/scenes/glTF/desk_0055.glb
new file mode 100644
index 000000000..ee2c20ae3
Binary files /dev/null and b/scenes/glTF/desk_0055.glb differ
diff --git a/scenes/glTF/extra/bell.glb b/scenes/glTF/extra/bell.glb
new file mode 100644
index 000000000..a45a99671
Binary files /dev/null and b/scenes/glTF/extra/bell.glb differ
diff --git a/scenes/glTF/extra/book.glb b/scenes/glTF/extra/book.glb
new file mode 100644
index 000000000..ffbb69137
Binary files /dev/null and b/scenes/glTF/extra/book.glb differ
diff --git a/scenes/glTF/extra/chandelier.glb b/scenes/glTF/extra/chandelier.glb
new file mode 100644
index 000000000..fe0e7cb23
Binary files /dev/null and b/scenes/glTF/extra/chandelier.glb differ
diff --git a/scenes/glTF/extra/chandelier1b.glb b/scenes/glTF/extra/chandelier1b.glb
new file mode 100644
index 000000000..a526c21db
Binary files /dev/null and b/scenes/glTF/extra/chandelier1b.glb differ
diff --git a/scenes/glTF/extra/merson.glb b/scenes/glTF/extra/merson.glb
new file mode 100644
index 000000000..833f90d53
Binary files /dev/null and b/scenes/glTF/extra/merson.glb differ
diff --git a/scenes/glTF/extra/mersonClimbing.glb b/scenes/glTF/extra/mersonClimbing.glb
new file mode 100644
index 000000000..1bd5a170b
Binary files /dev/null and b/scenes/glTF/extra/mersonClimbing.glb differ
diff --git a/scenes/glTF/extra/mersonLying.glb b/scenes/glTF/extra/mersonLying.glb
new file mode 100644
index 000000000..168acc61c
Binary files /dev/null and b/scenes/glTF/extra/mersonLying.glb differ
diff --git a/scenes/glTF/extra/mersonStanding.glb b/scenes/glTF/extra/mersonStanding.glb
new file mode 100644
index 000000000..2ce9ecfb5
Binary files /dev/null and b/scenes/glTF/extra/mersonStanding.glb differ
diff --git a/scenes/glTF/extra/pencil.glb b/scenes/glTF/extra/pencil.glb
new file mode 100644
index 000000000..72668f08e
Binary files /dev/null and b/scenes/glTF/extra/pencil.glb differ
diff --git a/scenes/glTF/mersonA1.glb b/scenes/glTF/mersonA1.glb
new file mode 100644
index 000000000..ae19594a3
Binary files /dev/null and b/scenes/glTF/mersonA1.glb differ
diff --git a/scenes/glTF/mersonA2.glb b/scenes/glTF/mersonA2.glb
new file mode 100644
index 000000000..e3b848290
Binary files /dev/null and b/scenes/glTF/mersonA2.glb differ
diff --git a/scenes/glTF/mersonClimbingA1.glb b/scenes/glTF/mersonClimbingA1.glb
new file mode 100644
index 000000000..4b05085cd
Binary files /dev/null and b/scenes/glTF/mersonClimbingA1.glb differ
diff --git a/scenes/glTF/mersonClimbingA2.glb b/scenes/glTF/mersonClimbingA2.glb
new file mode 100644
index 000000000..a93a5a1a0
Binary files /dev/null and b/scenes/glTF/mersonClimbingA2.glb differ
diff --git a/scenes/glTF/mersonLyingA1.glb b/scenes/glTF/mersonLyingA1.glb
new file mode 100644
index 000000000..5695698c1
Binary files /dev/null and b/scenes/glTF/mersonLyingA1.glb differ
diff --git a/scenes/glTF/mersonLyingA2.glb b/scenes/glTF/mersonLyingA2.glb
new file mode 100644
index 000000000..981011dce
Binary files /dev/null and b/scenes/glTF/mersonLyingA2.glb differ
diff --git a/scenes/glTF/mersonPushingA1.glb b/scenes/glTF/mersonPushingA1.glb
new file mode 100644
index 000000000..0285470f1
Binary files /dev/null and b/scenes/glTF/mersonPushingA1.glb differ
diff --git a/scenes/glTF/mersonPushingA2.glb b/scenes/glTF/mersonPushingA2.glb
new file mode 100644
index 000000000..70450953e
Binary files /dev/null and b/scenes/glTF/mersonPushingA2.glb differ
diff --git a/scenes/glTF/mersonStandingA1.glb b/scenes/glTF/mersonStandingA1.glb
new file mode 100644
index 000000000..3958d6634
Binary files /dev/null and b/scenes/glTF/mersonStandingA1.glb differ
diff --git a/scenes/glTF/mersonStandingA2.glb b/scenes/glTF/mersonStandingA2.glb
new file mode 100644
index 000000000..77fbe54e6
Binary files /dev/null and b/scenes/glTF/mersonStandingA2.glb differ
diff --git a/scenes/glTF/mug.glb b/scenes/glTF/mug.glb
new file mode 100644
index 000000000..306ff4f09
Binary files /dev/null and b/scenes/glTF/mug.glb differ
diff --git a/scenes/glTF/pencilA1.glb b/scenes/glTF/pencilA1.glb
new file mode 100644
index 000000000..fffa2cd79
Binary files /dev/null and b/scenes/glTF/pencilA1.glb differ
diff --git a/scenes/glTF/pencilA2.glb b/scenes/glTF/pencilA2.glb
new file mode 100644
index 000000000..596ab1c2f
Binary files /dev/null and b/scenes/glTF/pencilA2.glb differ
diff --git a/scenes/glTF/sideBookA.glb b/scenes/glTF/sideBookA.glb
new file mode 100644
index 000000000..98ea516ac
Binary files /dev/null and b/scenes/glTF/sideBookA.glb differ
diff --git a/scenes/gltf_open.json b/scenes/gltf_open.json
new file mode 100644
index 000000000..26e40a6c2
--- /dev/null
+++ b/scenes/gltf_open.json
@@ -0,0 +1,92 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_bright_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.98]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"cornell",
+ "EYE":[0.0,5.0,10.5],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"light",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[3.0,0.3,3.0]
+ },
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,0.0,0.0],
+ "ROTAT":[0.0,0.0,0.0],
+ "SCALE":[10.0,0.01,10.0]
+ },
+
+ {
+ "TYPE":"cube",
+ "MATERIAL":"diffuse_white",
+ "TRANS":[0.0,10.0,0.0],
+ "ROTAT":[0.0,0.0,90.0],
+ "SCALE":[0.01,10.0,10.0]
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"glass_white",
+ "TRANS":[0.0,4.0,0.0],
+ "ROTAT":[0.0,-45.0,0.0],
+ "SCALE":[0.02,0.02,0.02],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ }
+ ],
+ "Environment": {
+ "COLOR": [ 0.1, 0.2, 0.45 ],
+ "HDR": "../scenes/hdr/dam_wall_4k.hdr"
+ }
+}
\ No newline at end of file
diff --git a/scenes/hdr/dam_wall_4k.hdr b/scenes/hdr/dam_wall_4k.hdr
new file mode 100644
index 000000000..743f59f06
Binary files /dev/null and b/scenes/hdr/dam_wall_4k.hdr differ
diff --git a/scenes/hdr/industrial_sunset_02_puresky_4k.hdr b/scenes/hdr/industrial_sunset_02_puresky_4k.hdr
new file mode 100644
index 000000000..bc15b9a0c
Binary files /dev/null and b/scenes/hdr/industrial_sunset_02_puresky_4k.hdr differ
diff --git a/scenes/multi_gltf.json b/scenes/multi_gltf.json
new file mode 100644
index 000000000..1d83554bd
--- /dev/null
+++ b/scenes/multi_gltf.json
@@ -0,0 +1,128 @@
+{
+ "Materials":
+ {
+ "light":
+ {
+ "TYPE":"Emitting",
+ "RGB":[1.0, 1.0, 1.0],
+ "EMITTANCE":5.0
+ },
+ "diffuse_white":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.98, 0.98, 0.98]
+ },
+ "diffuse_red":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.85, 0.35, 0.35]
+ },
+ "diffuse_green":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.85, 0.35]
+ },
+ "diffuse_yellow":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.95, 0.95, 0.35]
+ },
+ "specular_white":
+ {
+ "TYPE":"Specular",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS":0.0
+ },
+ "diffuse_gray":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.8, 0.8, 0.8]
+ },
+ "diffuse_blue":
+ {
+ "TYPE":"Diffuse",
+ "RGB":[0.35, 0.35, 0.85]
+ },
+ "glass_white":
+ {
+ "TYPE":"Glass",
+ "RGB":[0.98, 0.98, 0.98],
+ "ROUGHNESS": 0.0,
+ "ETA":1.55
+ }
+ },
+ "Camera":
+ {
+ "RES":[800,800],
+ "FOVY":45.0,
+ "ITERATIONS":5000,
+ "DEPTH":8,
+ "FILE":"chessDuck",
+ "EYE":[6.35,6.7,7.7],
+ "LOOKAT":[0.0,5.0,0.0],
+ "UP":[0.0,1.0,0.0]
+ },
+ "Objects":
+ [
+ {
+ "TYPE":"cube",
+ "MATERIAL":"specular_white",
+ "TRANS":[0.0,6.5,0.0],
+ "ROTAT":[5.0,0.0,0.0],
+ "SCALE":[15.0,0.3,15.0]
+ },
+
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"glass_white",
+ "TRANS":[0.0,2.0,0.0],
+ "ROTAT":[0.0,-45.0,0.0],
+ "SCALE":[0.02,0.02,0.02],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"glass_white",
+ "TRANS":[2.5,1.5,6.5],
+ "ROTAT":[0.0,23.0,0.0],
+ "SCALE":[0.02,0.02,0.02],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_blue",
+ "TRANS":[1.0,5.0,4.0],
+ "ROTAT":[130.0,73.0,87.0],
+ "SCALE":[0.015,0.015,0.015],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_green",
+ "TRANS":[-1.0,5.5,-4.0],
+ "ROTAT":[49.0,41.0,253.0],
+ "SCALE":[0.015,0.015,0.015],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_yellow",
+ "TRANS":[6.4,3.8,-0.5],
+ "ROTAT":[41.0,253.0,49.0],
+ "SCALE":[0.015,0.015,0.015],
+ "FILE": "../scenes/glTF-Samples/duck/Duck.gltf"
+ },
+ {
+ "TYPE":"gltf",
+ "MATERIAL":"diffuse_gray",
+ "TRANS":[0.0,1.0,0.0],
+ "ROTAT":[0.0,90.0,0.0],
+ "SCALE":[20.0,20.0,20.0],
+ "FILE": "../scenes/glTF-Samples/abeautifulgame/ABeautifulGame.gltf"
+ }
+ ],
+ "Environment": {
+ "COLOR": [ 0.1, 0.2, 0.45 ],
+ "HDR": "../scenes/hdr/dam_wall_4k.hdr"
+ }
+}
\ No newline at end of file
diff --git a/src/TinyGLTF/tiny_gltf.cc b/src/TinyGLTF/tiny_gltf.cc
new file mode 100644
index 000000000..9aa08d800
--- /dev/null
+++ b/src/TinyGLTF/tiny_gltf.cc
@@ -0,0 +1,4 @@
+#define TINYGLTF_IMPLEMENTATION
+//#define STB_IMAGE_IMPLEMENTATION
+//#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "tiny_gltf.h"
diff --git a/src/TinyGLTF/tiny_gltf.h b/src/TinyGLTF/tiny_gltf.h
new file mode 100644
index 000000000..f4bab1fac
--- /dev/null
+++ b/src/TinyGLTF/tiny_gltf.h
@@ -0,0 +1,8744 @@
+//
+// Header-only tiny glTF 2.0 loader and serializer.
+//
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 - Present 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.
+
+// Version: - v2.9.*
+// See https://github.com/syoyo/tinygltf/releases for release history.
+//
+// Tiny glTF loader is using following third party libraries:
+//
+// - jsonhpp: C++ JSON library.
+// - base64: base64 decode/encode library.
+// - stb_image: Image loading library.
+//
+#ifndef TINY_GLTF_H_
+#define TINY_GLTF_H_
+
+#include
+#include
+#include // std::fabs
+#include
+#include
+#include
+#include
+#include
+#include