Commit Graph

395 Commits

Author SHA1 Message Date
Janine Liu fb602ca425 Merge branch 'khr_texture_transform-for-extensions' into texture-transform-in-views 2024-02-13 17:03:28 -05:00
Janine Liu 49b04e0816 Merge branch 'main' into texture-transform-in-views 2024-02-13 16:44:18 -05:00
Sean Lilley 70507353af Regenerate files 2024-02-13 13:54:25 -05:00
Sean Lilley 8b65c8dc44 Merge branch 'main' into khr_texture_transform-for-extensions 2024-02-13 13:47:20 -05:00
Janine Liu 6c4f31053a Add validation statements, other tweaks 2024-02-13 13:08:30 -05:00
Sean Lilley 4ac60b45ea Remove support for EXT_feature_metadata in CesiumGltf, CesiumGltfReader, and CesiumGltfWriter 2024-02-13 12:21:02 -05:00
Janine Liu cad3f95c27 Add unit tests, use KhrTextureTransform in GltfReader 2024-02-13 11:47:06 -05:00
Janine Liu 544f318806 Fix compilation errors 2024-02-13 10:50:53 -05:00
Janine Liu 9d7c2a5dea Create KhrTextureTransform class 2024-02-13 10:45:33 -05:00
Bradley Austin Davis e20c154c55 Migrating dependencies to vcpkg 2024-02-02 10:40:59 -08:00
Sean Lilley 59a950ab0e Attach KHR_texture_transform to EXT_mesh_features and EXT_structural_metadata objects 2024-02-01 15:16:46 -05:00
Kevin Ring d0eb4c31a5 Support texture transform on occlusion and normal textures. 2024-01-31 19:51:29 +11:00
Kevin Ring 260c0f307d Update for latest main, add a test. 2023-12-19 22:57:09 +11:00
Kevin Ring b1e29de6b0 Merge remote-tracking branch 'origin/main' into load-gltf-uri 2023-12-19 21:28:00 +11:00
Kevin Ring a900fa6489 Move TestImageManipulation.cpp to the right library. 2023-11-29 09:40:36 +11:00
Kevin Ring eb0805545e Merge remote-tracking branch 'origin/raster-overlay-refactoring' into bake-overlays-to-gltf 2023-11-29 09:32:36 +11:00
Sean Lilley 7aba4a6fa3 Added test 2023-11-20 11:00:31 -05:00
Kevin Ring 761630d45a Add CesiumGltfContent library. 2023-11-15 17:20:08 +11:00
Sean Lilley c20713c1d4 Fixed crash when loading glTFs with data uri images 2023-11-08 10:05:13 -05:00
Kevin Ring c7a5c70e37 Fix case of filename. 2023-09-08 22:57:38 +10:00
Kevin Ring 2002f0d313 Add missing generated file. 2023-09-08 15:41:52 +10:00
Kevin Ring 3c05ac98b1 Merge remote-tracking branch 'origin/main' into upgrade-feature-metadata 2023-09-08 15:34:49 +10:00
Kevin Ring 710c47e8b8 Merge remote-tracking branch 'origin/upgrade-feature-metadata' into final-metadata-changes 2023-09-08 12:02:39 +10:00
Kevin Ring 309c1817fa Merge remote-tracking branch 'origin/json-read-tweaks' into generated-readers 2023-08-31 09:08:54 +10:00
Kevin Ring 77a256cc0b Merge remote-tracking branch 'origin/main' into json-read-tweaks 2023-08-31 08:59:46 +10:00
Janine Liu c7f01d437c Warn about EXT_feature_metadata 2023-08-30 15:28:06 -04:00
Kevin Ring 2babed53b1 Add tests of unknown properties in glTF. 2023-08-25 15:13:05 +10:00
Brian Langevin f442bb4268
Merge branch 'main' into unknown-properties 2023-08-24 11:17:47 -06:00
Kevin Ring b1f2650f55 Add *Reader classes to CesiumGltfReader and Cesium3DTilesReader. 2023-08-23 18:52:44 +10:00
Kevin Ring 25944b78d4 Read from radidjson::Value. 2023-08-23 15:37:02 +10:00
Joseph Kaile 410312ff32 formatting 2023-08-17 15:49:31 -04:00
Joseph Kaile e4852cdf7b fully decompress ktx texture if unable to transcode 2023-08-17 15:47:31 -04:00
Kevin Ring 07d64139a2 Rename ExtensionReaderContext to JsonReaderOptions. 2023-08-16 15:31:57 +10:00
Janine Liu ecd215bddc Merge branch 'main' into upgrade-feature-metadata 2023-08-10 15:27:24 -04:00
Joseph Kaile a2cebe04f1 add test to verify compressed vertex attributes are within range 2023-07-31 17:41:45 -04:00
Kevin Ring 5c89b3c7d3 Tiny tweaks, mostly to formatting. 2023-07-31 19:08:08 +10:00
Joseph Kaile 40d22b1b14 fix doc comments 2023-07-28 12:45:18 -04:00
Joseph Kaile 6e1c17c9a5 reorg meshopt decode 2023-07-27 22:21:26 -04:00
Joseph Kaile 65090a7327 decode filter 2023-07-26 13:50:08 -04:00
Joseph Kaile d9857303e0 fix linux compile error 2023-07-26 12:32:13 -04:00
Joseph Kaile 5cc8dff015 apply pull request comments 2023-07-25 20:32:31 -04:00
Joseph Kaile 6049f72a3f apply pull request review code changes 2023-07-25 14:26:19 -04:00
Joseph Kaile 87980fdb04 fix compile warnings 2023-07-24 17:37:56 -04:00
Joseph Kaile 7965f5d50b add more error checking 2023-07-24 15:12:50 -04:00
Joseph Kaile e0642b6f6b fix linux compile errors 2023-07-24 13:36:29 -04:00
Joseph Kaile 053846489b fix rename error 2023-07-24 11:52:37 -04:00
Joseph Kaile 643b2f1831 fix testing failure and add some performance benefits 2023-07-24 11:34:16 -04:00
Joseph Kaile 030c5462b4 add testing data and test 2023-07-21 21:52:15 -04:00
Joseph Kaile 1779ca87f3 add warning messages when meshopt fails 2023-07-21 19:04:04 -04:00
Joseph Kaile 4802c6a813 use 32 bit indices when numVertices > 65535 2023-07-21 17:27:51 -04:00
Joseph Kaile 4f4901c717 address pull request comments 2023-07-21 14:43:51 -04:00
Joseph Kaile 39b5cc79f8 fix linux compile errors 2023-07-21 12:39:14 -04:00
Kevin Ring 1c36c0e09a Merge remote-tracking branch 'origin/main' into meshopt-compression 2023-07-21 14:11:10 +10:00
Joseph Kaile 35b23187d7 transform texture coordinates on cpu 2023-07-20 15:32:43 -04:00
Janine Liu b41f6da1fc
Fix typos 2023-07-19 11:22:41 -04:00
Joseph Kaile 311489838a initial commit for meshopt-compression 2023-07-18 21:22:00 -04:00
Kevin Ring a31fe8fcd8 Fix GCC/Clang compile errors. 2023-07-07 16:54:53 +10:00
Kevin Ring 72075c3a57 Fix handling of KTX2 images without mipmaps. 2023-07-07 15:39:42 +10:00
Kevin Ring 355111dcf5 Revert "Fix handling of KTX2 images without mipmaps."
This reverts commit 930760ea95.
2023-07-07 15:37:53 +10:00
Kevin Ring 930760ea95 Fix handling of KTX2 images without mipmaps. 2023-07-07 15:37:01 +10:00
Janine Liu 55ed63a945 Regenerate EXT_structural_metadata classes without prefix 2023-06-16 16:08:35 -04:00
Janine Liu f82528cc3f Formatting, changelog entry, cleanup 2023-06-16 15:43:02 -04:00
Janine Liu e0f49321c5 Prefix EXT_feature_metadata files, rename EXT_mesh_features files 2023-06-16 15:16:05 -04:00
Tim Moore b240bd875f Make clang-format enforced change 2023-05-23 18:33:18 +02:00
Tim Moore 6129026255 Generalize loadGltf() to do all postprocessing
CesiumGltfReader::loadGltf() now mimics the actions of readGltf()
and resolves external references before calling postprocess(). It's
therefore more general, not just addressing Draco compression.
2023-05-23 17:54:07 +02:00
Tim Moore 15df61d833 return result via std::move
Suggestion from clang-format
2023-05-23 16:07:21 +02:00
Tim Moore 066de1614b run clang-format on GltfReader.h 2023-05-23 16:07:21 +02:00
Tim Moore 9e63800169 Add a function to load a glTF file
The new function GltfReader::loadGltf() loads a glTF file, resolves
external data, and does draco decompression if necessary.
2023-05-23 16:07:21 +02:00
Marco Hutter 8ffbbbab46 Update class names for materials variants extension 2023-05-02 02:05:04 +02:00
Marco Hutter 18dbbfde54 Add generated classes for `KHR_materials_variants` 2023-05-01 21:45:28 +02:00
Janine Liu 8509878a0c
Merge branch 'main' into texture-support 2023-03-23 10:57:07 -04:00
Joseph Kaile d103bb813a Revert "switch to add_subdirectory"
This reverts commit d7d3048f4f.
2023-03-15 16:09:00 -04:00
Joseph Kaile d7d3048f4f switch to add_subdirectory 2023-03-14 15:44:11 -04:00
Kevin Ring d18875641d Improve support for KTX2 and WebP textures. 2023-03-14 11:28:04 +11:00
Joseph Kaile 06a193d4a9 fix cmake syntax error, address pr comments 2023-03-05 01:55:46 -05:00
Joseph Kaile bb89c16b03 fix a mac/linux compile error 2023-02-21 14:50:09 -05:00
Joseph Kaile dae5cf4b65 skip externalproject install, use build-in-source header/lib path 2023-02-21 13:40:17 -05:00
Joseph Kaile d2662a6d48 fix turbojpeg.h not found error 2023-02-21 00:27:21 -05:00
Joseph Kaile 2079d796a4 use turbojpg for jpg decoding 2023-02-20 21:16:49 -05:00
Joseph Kaile 573025e6e0 add libjpegturbo as external project and create imported target 2023-02-20 13:47:53 -05:00
Nithin Pranesh ad429153f4 gcc/clang fix? (round 2) 2022-10-11 18:19:39 -04:00
Nithin Pranesh 8aecc718bc fix gcc / clang errors (maybe) 2022-10-11 14:39:33 -04:00
Nithin Pranesh 0fb2a43324 move mipmap generation out of readImage, integrate with gltf textures + raster imagery 2022-09-05 22:33:34 -04:00
Nithin Pranesh b72007722a Merge branch 'main' into mipmaps 2022-09-05 10:06:29 -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
Nithin Pranesh 7c1f3ee45d
Merge branch 'main' into webp-support 2022-08-30 23:21:30 -04:00
Sean Lilley 5ba6cb6535 Add KHR_texture_transform extension 2022-08-28 13:32:20 -04:00
Joseph Kaile f404003e68 only decode with alpha channel 2022-08-18 15:42:34 -04:00
Joseph Kaile 1f49447a96 use decodeInto instead of decode 2022-08-18 15:25:57 -04:00
Joseph Kaile 0939ef9130 redo isWebP function 2022-08-18 13:10:29 -04:00
Joseph Kaile fe5588ddf7 addng webp parsing to gltf image reader 2022-08-17 17:52:34 -04:00
Joseph Kaile e79136ad4f Add libwebp to cmake 2022-08-17 16:57:36 -04:00
Nithin Pranesh 0be3d30444 mipmap generation on native side 2022-05-19 14:14:01 -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 705f1d642a Fix tests 2022-02-27 18:02:12 -05:00
Sean Lilley 7235ce8f69 Rerun with different names 2022-02-27 17:17:43 -05:00
Sean Lilley b76468a278 Remove old files 2022-02-27 17:12:41 -05:00