Commit Graph

321 Commits

Author SHA1 Message Date
Nithin Pranesh ddde548e0f fix test 2022-02-01 11:54:55 -05:00
Joseph Kaile 62fc7905b7 generate Cesium RTC extension using generate-tools 2022-01-31 14:18:51 -05:00
Joseph Kaile acca54fd79 add test to parse non-fractional doubles as ints 2022-01-31 12:25:10 -05:00
Nithin Pranesh c07417e0ef Merge branch 'main' into asset-accessor-verb 2022-01-24 10:02:52 -05:00
Sean Lilley 5e78d1d72a Added more gltf and 3d tiles extensions 2022-01-21 14:25:35 -05:00
Kevin Ring 518b7cbaf0 Rename IAssetAccessor methods, allow use of any verb. 2022-01-20 11:00:29 +11:00
Nithin Pranesh 213c986377 fix namespace of ImageCesium reference 2022-01-13 15:11:46 -05:00
Sean Lilley 924845a0b5 Revert padding change in GltfReader 2021-12-27 13:44:57 -05:00
Sean Lilley f14c6709e1 Misc generator improvements 2021-12-27 13:31:29 -05:00
Nithin Pranesh 1906b68bc6 fix ext_feature_metadata schema url + regenerate 2021-12-19 18:34:30 -05:00
Nithin Pranesh 6e4b4b9faa regenerate gltf classes 2021-12-19 17:49:39 -05:00
Nithin Pranesh d439523dcf fixed generated extension accidentally moved 2021-12-19 17:25:12 -05:00
Nithin Pranesh 53b828a9ca Merge remote-tracking branch 'origin/main' into ktx2-nithin 2021-12-19 17:23:39 -05:00
Sean Lilley 3d035e5926 Remove bad semicolon 2021-12-03 13:30:58 -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
Kevin Ring 962aaddffb Use CesiumGS fork of KTX-Software, fix clang compiler error. 2021-11-30 11:56:01 +11:00
Nithin Pranesh 55c12d0861 add support for transcoding to more formats 2021-11-27 17:53:27 -05:00
Nithin Pranesh 14c4ab148b parse ktx extension 2021-11-26 23:23:44 -05:00
Nithin Pranesh 5f424295f1 running into strange deletion problem 2021-11-24 19:45:21 -05:00
lyhkop 1bb719ae22
Merge branch 'CesiumGS:main' into main 2021-11-23 07:10:56 +08:00
Nithin Pranesh 976d2d4d05 cleaner ImageCesium api 2021-11-22 18:03:34 -05:00
Nithin Pranesh fb9f1daa1a gcc/clang warnings 2021-11-22 10:15:02 -05:00
Nithin Pranesh 7db19c5ff7 delete accidentally added "generated" file 2021-11-22 05:07:42 -05:00
Nithin Pranesh 57f9c69e9b add KHR_texture_basisu extension support 2021-11-22 04:49:44 -05:00
lyhkop c1b11a1d29 set indices accessor offset value to 0 after decode draco mesh 2021-11-22 17:34:47 +08:00
Nithin Pranesh 042221aac6 oof forgot to format after generate-gltfs 2021-11-22 03:52:54 -05:00
Nithin Pranesh a2efbf8e8d rerun generate-gltf 2021-11-22 03:51:54 -05:00
Nithin Pranesh bc019173eb format 2021-11-22 03:47:19 -05:00
Sean Lilley a9110dbb74 Initial KTX2
(cherry picked from Sean's hackathon project)
2021-11-22 03:45:23 -05:00
Nithin Pranesh b42320ec01 Add KTX-Software as cmake dependency
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-22 03:10:23 -05:00
Kevin Ring f3b2dc7d54 Formatting. 2021-11-22 09:02:22 +11:00
Kevin Ring 83d1329bc3
Update decodeDraco.cpp 2021-11-22 08:51:39 +11:00
lyh 6356e5494a draco mesh vertices number maybe greater than attribute accessor count 2021-11-21 14:43:06 +08:00
Nithin Pranesh de378a04a0 format 2021-11-11 18:58:09 -05:00
Nithin Pranesh 4b6f706453 add some logging for failed external buffer loads 2021-11-11 18:47:44 -05:00
Nithin Pranesh 12133c8b7a remove slightly incorrect test
The mime type need not be checked during embedded buffer decoding, if the image
is an external uri. Maybe we should add tests and error reporting for the
asynchronous resolveExternalBuffers, but this test no longer makes sense now after
external images are explicitly supported (i.e., external uris should be ignored
initially during postProcess).
2021-11-11 18:47:44 -05:00
Nithin Pranesh 7f2f556a52 ignore images with uris when looking for embedded images 2021-11-11 18:47:44 -05:00
Nithin Pranesh 04131d31cd explicitly exclude data uris when resolving external buffers 2021-11-11 18:47:44 -05:00
Nithin Pranesh 549c3b344f explicitly track lifetime of ModelReaderResult with unique_ptr 2021-11-11 18:47:44 -05:00
Nithin Pranesh 4e531c4be4 format 2021-11-11 18:47:23 -05:00
Nithin Pranesh 990c432c77 WIP external textures/buffers 2021-11-11 16:47:09 -05:00
Kevin Ring 4dac37ceb0
Merge pull request #377 from CesiumGS/extension-class-rename
Rename generated extension classes (targeting `main`)
2021-11-01 11:02:01 +11:00
Sean Lilley 9acc5ac71a Rename Primitive back to MeshPrimitive 2021-10-30 14:56:43 -04:00
Sean Lilley 6fd48d8735 Use different naming convention for extension classes 2021-10-30 14:55:40 -04:00
Nithin Pranesh 95051aa2b5 fixed handling of reserved c++ keywords in gltf reader generator 2021-10-29 17:37:57 -04:00
Sean Lilley f9b48fbe0e Renegerate glTF classes 2021-10-18 18:46:58 -04:00
Sean Lilley 8453d760e7 Rename generate-gltf-classes to generate-classes 2021-10-12 12:51:55 -04:00
Kevin Ring fd1fabd685 Merge remote-tracking branch 'origin/fix-includes' into add-cesium3dtilesreader 2021-10-12 22:28:36 +11:00
Kevin Ring 76ab57830b Merge remote-tracking branch 'origin/add-cesium3dtiles' into fix-includes 2021-10-12 22:28:12 +11:00
Kevin Ring 179ef660f0 Forward declare ExtensionReaderContext in the right namespace. 2021-10-12 22:25:58 +11:00
Kevin Ring 58cd5d8645 Merge remote-tracking branch 'origin/fix-includes' into add-cesium3dtilesreader 2021-10-12 22:04:03 +11:00
Kevin Ring 439e37afda Merge remote-tracking branch 'origin/add-cesium3dtiles' into fix-includes 2021-10-12 21:45:12 +11:00
Kevin Ring 3443bbf130 Remove using in header, remove redundant code. 2021-10-12 17:47:35 +11:00
Sean Lilley 254d3bfa6a Merge branch 'fix-includes' into add-cesium3dtilesreader 2021-10-11 17:51:50 -04:00
Sean Lilley 52283f3359 Fix includes 2021-10-11 17:28:44 -04:00
Sean Lilley 7dad7003bb One ExtensibleObject 2021-10-11 16:47:49 -04:00
Sean Lilley 471bc06c24 Add Cesium3DTilesReader 2021-10-10 22:11:26 -04:00
Marco Hutter 5d626c719d Add test case for WebP images 2021-10-01 20:33:02 +02:00
Marco Hutter 3c62216aaa Forward warnings and errors from images to model 2021-10-01 20:32:26 +02: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 c81b55b9ae Merge branch 'gltf-generator-enum-fixes' of https://github.com/CesiumGS/cesium-native into gltf-generator-enum-fixes 2021-09-30 17:35:10 +02:00
Marco Hutter 2f10a900ac Added basic (but not sufficient) unit test 2021-09-30 17:34:24 +02:00
Marco Hutter e42e3ca6db Use relative paths in auto-generated classes 2021-09-28 17:43:20 +02: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 0f6645f34b Removed the classes from GeneratedJsonHandlers.
Apparently, all implementations are in one file. Not
sure where the individual files came from...
2021-09-26 16:53:51 +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 f63c0e5265 Update of auto-generated classes - WIP
This does not compile. It is only the update of the
auto-generated classes, without the corresponding
updates in the non-auto-generated classes.
2021-09-26 14:44:29 +02:00
Marco Hutter 6a5e0d3d48 Added missing const for reference parameters
C26460: The reference argument ... for function ... can be marked as const
2021-09-15 17:43:42 +02:00
Marco Hutter 46c9c7ec7d Formatting after adding const 2021-09-15 15:38:06 +02:00
Marco Hutter de8145ab9e Added missing const keyword
C26496: The variable ... is assigned only once, mark it as const
2021-09-15 15:37:29 +02:00
Marco Hutter a84b09c238 Added further noexcept specifiers 2021-09-15 02:35:40 +02:00
Marco Hutter 588c5a1ab9 Add noexcept for default constructors
C26455: Default constructor may not throw.
2021-09-15 01:35:34 +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
Kevin Ring 7f012b2506 Clearer verifySuccessfulCopy. 2021-08-25 10:23:32 +10:00
Kevin Ring f8b8f9bcb0 Fix clang warnings. 2021-08-23 22:56:56 +10:00
Kevin Ring 4704366a94 Better doc, extra test. 2021-08-23 22:46:21 +10:00
Kevin Ring 004b4839ad Fix typo. 2021-08-23 22:28:30 +10:00
Kevin Ring 215b3e3d32 Add ImageManipulation class. 2021-08-23 22:26:37 +10:00
Bao Tran 1c608a9dd4 attempt to unify draco target 2021-07-26 17:03:13 -04:00
Bao Tran 3dc4c2da40 suppress draco warning on MSVC and define draco alias target 2021-07-26 16:43:36 -04:00
Sean Lilley 46c5a41827 Update draco version so that cesium-native builds in gcc 11 2021-07-26 16:17:57 -04:00
Kevin Ring 449068c3d6
Merge pull request #281 from CesiumGS/feature-metadata-extension
Upgrade batch table to EXT_feature_metadata extension
2021-07-24 21:32:14 +10:00
Kevin Ring 33b40b6dad Generate JSON handlers into a single source file.
To speed up compilation.
2021-07-06 22:34:18 +10:00
Kevin Ring 4e45bab460 Use angle brackets to #include catch2. 2021-07-04 22:57:11 +10:00
Bao Tran e1eb2d1f84 Merge branch 'main' into feature-metadata-extension 2021-07-02 10:50:43 -04:00
Kevin Ring 09b4e393de More cleanup of tracing macros. 2021-06-22 12:26:07 +10:00
Kevin Ring 44a69d4cda Clean up tracing API. 2021-06-21 17:33:59 +10:00
Kevin Ring 0648cb07d2 Allocate unique IDs for tileset loading slots. 2021-06-08 15:23:36 +10:00
Kevin Ring 491531147d Merge remote-tracking branch 'origin/profiler' into load-tracing 2021-06-07 16:35:19 +10:00
Kevin Ring 30f22898b1 Feature metadata working well for simple case. 2021-05-17 12:30:09 +10:00
Kevin Ring 8f85fd8bbe WIP conversion of b3dm batch table to EXT_feature_metadata. 2021-05-14 22:28:31 +10:00
Kevin Ring 15be10ed1b Merge remote-tracking branch 'origin/main' into feature-metadata-extension 2021-05-13 21:22:28 +10:00
Kevin Ring a21938c371 Use stbi_image_free instead of free, update CHANGES. 2021-05-12 23:03:26 +10:00
Bao Tran ed01f94552 format 2021-05-07 17:31:30 -04:00
Bao Tran 17348ff432 Merge branch 'main' into match-draco-indices 2021-05-07 17:19:04 -04:00
Bao Tran 1dc58c95e2 match indices accessor count with decoded draco indices 2021-05-07 17:12:34 -04:00
Kevin Ring ed42e46d5f Add support for EXT_feature_metadata on Primitives. 2021-05-07 16:18:13 +10:00
Kevin Ring 0d6295168f Use 3d-tiles-next branch of glTF instead of my fork. 2021-05-07 15:40:53 +10:00
Kevin Ring b29b8c64ad EXT_feature_metadata progress. 2021-05-07 15:34:16 +10:00
Samuel Vargas fbcc458681
Fix a leak where pImage isn't freed after being copied into ImageReaderResult 2021-05-06 11:53:39 -04:00
Kevin Ring 527e6051c1 Fix more code gen problems. 2021-05-06 17:30:39 +10:00
Marco Hutter 51e43bbd49 Comment fixes for clang formatting 2021-04-29 17:06:34 +02:00
Samuel Vargas 3412704062
Replace bitmask options with dedicated struct 2021-04-19 14:28:43 -04:00
Samuel Vargas 5deb2861f2
Replace back_inserter / transform with std::copy and reinterpret_cast 2021-04-19 13:41:10 -04: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
Kevin Ring e5c5408804 More constier. 2021-04-16 13:18:25 +10:00
Kevin Ring 8aab8bbec2 Don't construct so many GltfReaders.
Also switch to constexpr char* for extension and type names to avoid
static initializer ordering problems.
2021-04-16 12:52:29 +10:00
Samuel Vargas 8070d85023
Merge remote-tracking branch 'origin/main' into gltf-writer 2021-04-15 13:49:04 -04:00
Kevin Ring 02e3be9b03 Merge remote-tracking branch 'origin/main' into gltf-extensions 2021-04-15 21:54:03 +10:00
Kevin Ring ea97130b0e Formatting. 2021-04-15 10:54:49 +10:00
Kevin Ring aab3fcbf40 Fix another clang error. 2021-04-15 10:40:58 +10:00
Kevin Ring bf00407f90 Add missing include. 2021-04-15 10:22:56 +10:00
Kevin Ring 0c7c949ce8 Remove unused code. 2021-04-15 09:47:33 +10:00
Kevin Ring 45f44fa034 Reader -> GltfReader. 2021-04-15 00:37:37 +10:00
Kevin Ring e414544b50 Implement glTF reader using JSON reader. 2021-04-14 23:53:26 +10:00
Kevin Ring fc4f25515f JSON reader. 2021-04-14 23:31:40 +10:00
Kevin Ring 15f799429a More renames. 2021-04-14 21:38:36 +10:00
Kevin Ring cb91ccf8a6 JsonReader -> JsonHandler ♻ 2021-04-14 18:31:12 +10:00
Kevin Ring 94ea03847c Move CesiumJsonReader stuff to the right namespace. 2021-04-14 14:22:22 +10:00
Kevin Ring 88795c0045 Move JsonValue to CesiumUtility. 2021-04-13 23:24:53 +10:00
Kevin Ring 222692b590 Separate CesiumJsonReader library. 2021-04-13 22:05:36 +10:00
Jordi Torres 6333b1cb0a First pass of clang tidy
Mainly caching else after return, not using empty() instead of size() == 0, missing const references to avoid copies and removing redundant initializations
2021-04-12 13:22:03 +02:00
Kevin Ring f0b06a826d Make IgnoreValueJsonHandler public. 2021-04-09 12:37:53 +10:00
Kevin Ring 673e9884a1 Renames. 2021-04-09 12:30:27 +10:00
Kevin Ring cfff453f8c Rename protected key methods. 2021-04-08 22:34:12 +10:00
Kevin Ring 2ab38cd0fb Don't qualify reader methods in extensions. 2021-04-08 22:26:22 +10:00
Kevin Ring ebfb30554a Fix linux build. 2021-04-08 22:20:24 +10:00
Kevin Ring 48f2d3b5c2 Remove unused files, other cleanup. 2021-04-08 21:59:42 +10:00
Kevin Ring 7279f4cabf Improve tests. 2021-04-08 17:59:45 +10:00
Kevin Ring e3148aedc6 Reactivate Draco extension. 2021-04-08 14:44:39 +10:00
Kevin Ring f33f7b1dd5 Make CesiumGltf::Reader a proper class, mange its own extensions. 2021-04-07 23:41:37 +10:00
Kevin Ring 3566ba5b29 Clean up JsonReader function signatures. 2021-04-07 14:35:19 +10:00
Samuel Vargas f9e489f67f
Merge remote-tracking branch 'origin/main' into gltf-writer
Accidentally merged with antiquated `master` branch before
2021-04-06 14:16:55 -04:00
Samuel Vargas 6516b2dcb3
Add clarifying comment for std::transform usage 2021-04-06 13:44:34 -04:00
Samuel Vargas b03dac82af
Add trailing newline to misc files [ skip ci ] 2021-04-06 13:07:48 -04:00
Kevin Ring d6d9de643d Rename JsonReader methods. 2021-04-06 22:26:16 +10:00
Kevin Ring 04f4cc12db JsonHandler -> JsonReader. 2021-04-06 21:59:20 +10:00
Kevin Ring c8c9ca0f3a Make IJsonHandler.h and JsonHandler.h public. 2021-04-06 21:55:50 +10:00
Kevin Ring 987ca69614 Support for external glTF extensions. 2021-04-06 21:49:12 +10:00
Kevin Ring 692a3bf16b Merge remote-tracking branch 'origin/main' into support-deserializing-arbitrary-extensions 2021-04-05 11:57:45 +10:00
Marco Hutter 0ba6f38be5 Fixed typo. 2021-04-02 21:43:45 +02:00
Marco Hutter aeeb44e804 Added cast.
Expected that. GCC this time.
2021-04-02 21:42:23 +02:00
Marco Hutter 7425d5a89a Updated and extended error messages 2021-04-02 21:14:43 +02:00