Commit Graph

142 Commits

Author SHA1 Message Date
Sean Lilley a85266300c Fix tests 2022-09-04 13:36:21 -04:00
Sean Lilley b56796076f Don't write byteOffset if value is 0. Fixes Draco output 2022-09-04 09:40:27 -04:00
Nithin Pranesh 30a16320e7 regenerate webp extension 2022-08-31 12:34:43 -04:00
Nithin Pranesh 320ffa91d9 add webp extension 2022-08-31 12:06:11 -04:00
Sean Lilley 5ba6cb6535 Add KHR_texture_transform extension 2022-08-28 13:32:20 -04:00
Sean Lilley 67462c0eaa Merge branch 'main' into 3dtiles-1.1 2022-03-22 08:19:34 -04:00
Sean Lilley 00eab5bed7 Update 3D Tiles and glTF extensions 2022-03-16 09:15:02 -04:00
Nithin Pranesh 027fb29bc5 Merge branch 'main' into node-variants 2022-03-02 11:24:32 -05:00
Sean Lilley be3f18cf9b Support optional JsonValue properties 2022-02-27 17:58:43 -05:00
Sean Lilley 7235ce8f69 Rerun with different names 2022-02-27 17:17:43 -05:00
Sean Lilley 4416777e73 Re-rerun generator 2022-02-27 12:49:25 -05:00
Sean Lilley 3ee7e19399 Merge branch 'main' into 3dtiles-1.1 2022-02-27 11:21:29 -05:00
IanLilleyT 21904215dd updated generator for 3d tiles 1.1 schemas 2022-02-18 18:06:14 -05:00
Nithin Pranesh 847e0009ce
Merge branch 'main' into ktx2-nithin 2022-02-18 14:33:07 -05:00
Kevin Ring 966aba6089 Fix code generation for MAXAR_mesh_variants. 2022-02-17 19:30:51 +11:00
Nithin Pranesh c720dbbfbe add MAXAR_mesh_variants, fix generator trying to generate manually-defined classes (like glTF Property) 2022-02-16 09:40:55 -05:00
Nithin Pranesh a312bf42d6 Revert "add MAXAR_mesh_variants, fix generator trying to generate manually-defined classes (like glTF Property)"
This reverts commit 26ad9be905.
2022-02-16 09:34:12 -05:00
Nithin Pranesh 26ad9be905 add MAXAR_mesh_variants, fix generator trying to generate manually-defined classes (like glTF Property) 2022-02-16 09:32:18 -05:00
Nithin Pranesh 1a08065023 fix khr_texture_basisu extension generation 2022-02-01 14:35:47 -05:00
Nithin Pranesh ca963694e6 regenerate gltf files 2022-02-01 12:45:28 -05:00
Nithin Pranesh 56ffcd56ca format 2022-02-01 12:36:09 -05:00
Nithin Pranesh e0b6344933 Merge branch 'main' into ktx2-nithin 2022-02-01 12:19:55 -05:00
Joseph Kaile 62fc7905b7 generate Cesium RTC extension using generate-tools 2022-01-31 14:18:51 -05:00
Sean Lilley 5e78d1d72a Added more gltf and 3d tiles extensions 2022-01-21 14:25:35 -05:00
Sean Lilley d5862b07cf Use gsl::span to match GltfReader API 2022-01-10 18:53:38 -05:00
Sean Lilley 684d8d8085 Use cctype 2021-12-27 16:01:51 -05:00
Sean Lilley 4616f70a56 Cleanup 2021-12-27 14:07:49 -05:00
Sean Lilley 15c2146134 Rename conflicting enum instead of undef 2021-12-20 09:44:32 -05:00
Nithin Pranesh 1906b68bc6 fix ext_feature_metadata schema url + regenerate 2021-12-19 18:34:30 -05:00
Sean Lilley d2b0cd0ad5 Added tests 2021-12-17 10:45:07 -05:00
Sean Lilley d74cac32ba Name changes for GltfReader 2021-12-17 10:33:40 -05:00
Sean Lilley e9523aec60 New CesiumGltfWriter 2021-12-17 10:33:40 -05:00
Sean Lilley 21c65ddac8 Change folder structure for src folders 2021-12-03 11:11:41 -05:00
Sean Lilley 2cdcb92e20 Namespace cleanup 2021-12-02 18:34:22 -05:00
Sean Lilley 52283f3359 Fix includes 2021-10-11 17:28:44 -04:00
Kevin Ring c1b9096abc Merge remote-tracking branch 'origin/main' into gltf-generator-enum-fixes 2021-10-02 01:10:06 +10:00
Marco Hutter 9855400417 Use proper relative paths in all public headers 2021-09-28 17:23:07 +02:00
Marco Hutter 27fdd26e27 Merge remote-tracking branch 'origin/main' into include-style-fixes
# Conflicts:
#	Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfContent.h
#	Cesium3DTilesSelection/src/Batched3DModelContent.cpp
#	Cesium3DTilesSelection/src/CompositeContent.cpp
#	Cesium3DTilesSelection/src/ExternalTilesetContent.cpp
#	Cesium3DTilesSelection/src/GltfContent.cpp
#	Cesium3DTilesSelection/src/QuantizedMeshContent.cpp
#	Cesium3DTilesSelection/src/Tile.cpp
#	Cesium3DTilesSelection/src/TileContentFactory.cpp
#	Cesium3DTilesSelection/src/calcQuadtreeMaxGeometricError.h
2021-09-28 14:38:33 +02:00
Kevin Ring 62ff744d4f Treat `<something.h>` as third-party include. 2021-09-27 10:46:26 +10:00
Sean Lilley ae7d9e70a8 Merge branch 'main' into gltf-generator-enum-fixes 2021-09-26 13:24:10 -04:00
Marco Hutter 175b7eec9a Also format the auto-generated code
This will sort itself out at some point...
2021-09-26 17:57:48 +02:00
Marco Hutter 0e827f7afd Updated includes based on clang-format with Regroup
This MAINLY inserted some blank lines between
the blocks.
2021-09-26 17:46:27 +02:00
Marco Hutter c73ec558eb Removed magic_enum dependency
It was only used in CesiumGltfWriter, and is no longer
required after the glTF enum updates
2021-09-26 15:11:57 +02:00
Marco Hutter 486eb57a93 Update for glTF enums in other classes - WIP
This updates the non-auto-generated classes based on
the changes of the auto-generated ones.
2021-09-26 15:06:10 +02:00
Marco Hutter 97a2757e39 Added missing noexcept specifiers
Reported as "C26440 Function ... can be declared noexcept"
2021-09-14 16:12:50 +02:00
Marco Hutter 9a81477fb1 Fixed property name of normal texture info 2021-08-17 18:21:45 +02:00
Daniel Krupka f47aaaa5dc Extract JSON writing to non-glTF library 2021-07-23 13:59:50 -04:00
Kevin Ring 4e45bab460 Use angle brackets to #include catch2. 2021-07-04 22:57:11 +10:00
Samuel Vargas 34dd3b4082
Remove redundant `hasRootObject` from writeJsonValue
This parmaeter is ultimately unnecessary. The caller should be responsible
for ensuring that the CesiumGltf::JsonWriter state is balanced before calling
writeJsonValue. This should simplify our internal API.
2021-05-03 15:35:38 -04:00
Marco Hutter 51e43bbd49 Comment fixes for clang formatting 2021-04-29 17:06:34 +02:00
Kevin Ring 33951541b7 magic_enum via cmake, tiny optimization, some cleanup. 2021-04-22 10:15:24 +10:00
Samuel Vargas 091b4a3232
Improve error messages for Animation / Buffer / Image writer
Primarily fixes spacing issues, we also write the index of the
image in the images array that triggered the error now.
2021-04-21 16:20:47 -04:00
Samuel Vargas 03f4694420
Remove extraneous iostream input 2021-04-21 16:06:25 -04:00
Samuel Vargas 33db5cc76e
Fix @link doxygen command that clang-format busted 2021-04-21 15:46:22 -04:00
Samuel Vargas 91c7b7f663
Rewrite encodeAsBase64String to avoid extra copy
Also add additional unittests for the class.
2021-04-21 15:18:42 -04:00
Samuel Vargas 10dfa6823c
Replace thrown exceptions with `WriteModelResult`
The API should now mimic the reading api, where errors encountered
during the serialization process don't cause crashes. The caller receives
two vectors of strings detailing all errors and warnings that were
generated, and the json serialization functions stop gracefully.
2021-04-20 13:58:20 -04:00
Samuel Vargas 6abd456a0b
Replace std::transform + std::back_inserter with reinterpret_cast 2021-04-19 17:25:17 -04:00
Samuel Vargas 29f3f9f07e
Add noexcept back to encodeAsBase64String 2021-04-19 17:18:11 -04:00
Samuel Vargas dbd8f67402
WriteOptions -> WriteModelOptions
Renamed it for better consistency with ReadModelOptions
2021-04-19 17:09:38 -04:00
Samuel Vargas cb595c1b55
Replace base64_encode.hpp with modp_b64 2021-04-19 16:57:03 -04:00
Samuel Vargas 37f826ead7
Log to stderr on non standard animation channel count.
We can change this logging to be configurable later, or use spdlog
2021-04-19 16:54:44 -04:00
Samuel Vargas 2fbc6f4e1a
Improve doxygen for callback function, fix wrapping 2021-04-19 15:37:30 -04:00
Samuel Vargas ca6c119632
Swap \link syntax with {@link} 2021-04-19 15:25:58 -04:00
Samuel Vargas 3412704062
Replace bitmask options with dedicated struct 2021-04-19 14:28:43 -04:00
Kevin Ring bc3a1951c7 Add another missing include. 2021-04-17 18:57:57 +10:00
Kevin Ring 52eaf76af1 Add missing includes. 2021-04-17 00:23:20 +10:00
Kevin Ring d64d3bf882 Add missing include. 2021-04-16 23:37:20 +10:00
Kevin Ring 6c0a55c090 Fix formatting. 2021-04-16 16:23:08 +10:00
Kevin Ring 999c382cc1 Merge remote-tracking branch 'origin/main' into gltf-extensions 2021-04-16 16:07:23 +10:00
Samuel Vargas b03dac82af
Add trailing newline to misc files [ skip ci ] 2021-04-06 13:07:48 -04:00
Samuel Vargas 94c77dd89e
Merge tag 'post-clang-format' into gltf-writer-clang-format
The commit that ran clang-format on the entire codebase and made no other changes.
2021-03-09 16:36:39 -05:00
Samuel Vargas a65dac301b
Implement basic triangle serialization test 2021-03-05 14:29:48 -05:00
Samuel Vargas 0d803ba646
Add detailed doxygen for the serialization functions [ skip ci ] 2021-03-05 13:18:27 -05:00
Samuel Vargas 7de726a364
Add trailing newlines [skip ci] 2021-03-05 11:38:53 -05:00
Samuel Vargas 6babc551a0
Replace std::uint8_t with std::byte for data containers 2021-03-05 10:16:12 -05:00
Samuel Vargas 477576d1a6
Fix extras writing for other glTF objects
They need a object created on their behalf.
2021-03-05 07:41:23 -05:00
Samuel Vargas 510f5a6d8c
Add missing camera orthographic extensions serialzier 2021-03-05 07:41:23 -05:00
Samuel Vargas 53801b27e7
Only serialize JsonValue::Objects as extensions 2021-03-05 07:41:23 -05:00
Samuel Vargas fefc4c3b8f
Update ImageWriter to work like BufferWriter
- Now supports writing images to the user lambda
- Now supports auto converting pixelData to base64
2021-03-05 07:41:22 -05:00
Samuel Vargas e0463a54dc
Update base64 include path, update comment 2021-03-05 07:41:22 -05:00
Samuel Vargas 37b0d11c1a
Move Base64 encoding to dedicated .cpp 2021-03-05 07:41:21 -05:00
Samuel Vargas 5e55a3a7f3
Remove extraneous space in WriteFlags.h 2021-03-05 07:41:21 -05:00
Samuel Vargas 1000fe2e15
Throw exception if GLB or GLTF not passed to writeModel 2021-03-05 07:41:21 -05:00
Samuel Vargas 98480a4c02
Increase BufferWriter coverage to 100% 2021-03-05 07:41:20 -05:00
Samuel Vargas adc0317b60
Add toString() / toStringView() methods for CesiumGltf::JsonWriter 2021-03-05 07:41:20 -05:00
Samuel Vargas 6601266f7d
Add mutual exclusion test 2021-03-05 07:41:19 -05:00
Samuel Vargas 7337177771
Add test for root array / single primitive value 2021-03-05 07:41:19 -05:00
Samuel Vargas 080a4bdd85
Remove FindMinMax / PrimitiveVectorToLittleEndian 2021-03-05 07:41:19 -05:00
Samuel Vargas 865388c0dc
Add additional smoketests for glTF / GLB generation 2021-03-05 07:41:18 -05:00
Samuel Vargas d636270d37
Rename GLTF_VERSION to GLB_CONTAINER_VERSION 2021-03-05 07:41:18 -05:00
Samuel Vargas 7bfb800ab9
Rework the Writer / BufferWriter API
- Removed unused EmbedImages / EmbedBuffers / ExternalBuffers parameters
- Split the writing function into two separate functions.
2021-03-05 07:41:17 -05:00
Samuel Vargas f643405726
Add CesiumGltfWriter 2021-03-05 07:41:16 -05:00