Commit Graph

161 Commits

Author SHA1 Message Date
Ashley Rogers cca8871eef Include both catch2 headers 2024-11-22 11:30:45 -05:00
Ashley Rogers f82d65bead Change Catch2 header 2024-11-22 11:17:21 -05:00
Ashley Rogers 35bf88745e Revert unnecessary cast changes 2024-11-22 11:04:17 -05:00
Ashley Rogers acc9e81d12 Merge from main 2024-11-20 17:12:43 -05:00
Ashley Rogers f573e49ad5 Fix remaining non-CesiumGltf warnings 2024-11-20 16:51:44 -05:00
Ashley Rogers 52633c67f4 Non-PropertyTable changes 2024-11-20 16:20:04 -05:00
Kevin Ring fb24a2efe1 Merge remote-tracking branch 'origin/cpp20' into remove-gsl 2024-11-19 09:15:21 +11:00
Kevin Ring 89dfc44bdc Remove use of GSL.
Change gsl::span to std::span, and replace the few uses of gsl::narrow
with an alternative.
2024-11-06 15:16:03 +11:00
Ashley Rogers 714aa28c28 SharedAsset support in gltf generated code 2024-10-22 11:42:09 -04:00
Tim Moore a86948dadb Change variable name to folow coding conventions 2024-08-28 18:44:14 +02:00
Tim Moore f377ecb164 Fix a bug with instances that have multiple nodes
The i3dm converter was repeatedly overwriting the beginning of the new
glTF buffer that holds instance transformations.
2024-08-28 18:34:45 +02:00
Kevin Ring 88dd05cf8a Formatting. 2024-08-15 08:40:37 +10:00
Kevin Ring 1fcdeadfd9 Merge remote-tracking branch 'origin/main' into vcpkg-swl 2024-08-02 19:45:58 +10:00
Brian L d03181a97a Revert changes to ForEachPrimitiveInSceneXXX callbacks 2024-07-24 13:17:22 -06:00
Kevin Ring 8b9b001b8b
Merge branch 'main' into gltf-ray-intersect 2024-07-23 13:38:37 -04:00
Janine Liu 707dd8b770 Add missing includes 2024-07-11 10:25:23 -04:00
Brian L 7cda07f420 Remove occurrences of including <glm/mat4x4.hpp> in header files 2024-07-09 09:25:27 -06:00
Brian L ca25ad4840 Change int to int32_t when specifying an ID 2024-07-08 15:15:44 -06:00
Brian L 728668a873 Merge branch 'main' into gltf-ray-intersect 2024-07-08 09:15:30 -06:00
Kevin Ring 7c9ea84178 Merge remote-tracking branch 'origin/main' into vcpkg-swl 2024-07-02 17:39:20 +10:00
Kevin Ring 0d68e3a672 Small tweaks from review. 2024-06-29 10:54:47 +10:00
Tim Moore 38b727a674 Cast iterator distance to size_t 2024-06-28 11:10:09 +02:00
Tim Moore c6de588e14 Strip trailing whitespace from i3dm external content URL
This whitespace may be added to keep the size of an i3dm file 8 byte
aligned.
2024-06-27 19:16:49 +02:00
Tim Moore ef1438fa25 Modify comment 2024-06-27 19:14:59 +02:00
Tim Moore e6ec85d078 run format 2024-06-26 10:47:10 +02:00
Tim Moore 9aaeb639e7 AssetFetcher: keep a copy of request headers instead of a reference
This was a bug waiting to happen and should always have been a
copy. Fortunately, the new use of the AssetFetcher to resolve external
data for i3dm files provoked a crash in the tests.
2024-06-26 10:38:22 +02:00
Tim Moore 8fc74b6aac Add all members for ErrorList initializer lists and others
gcc / clang is less tolerant than Visual Studio, which lets one leave
off the trailing members of a braced initializer list.
2024-06-26 12:18:26 +02:00
Kevin Ring aab5cb9031 Merge remote-tracking branch 'origin/main' into i3dm-misc-fixes 2024-06-26 08:46:24 +10:00
Kevin Ring c7dab324bc
Merge pull request #910 from Ulvesson/fixed_compiler_warnings
Fixed build warning - I3dmToGltfConverter.cpp:634:14: error: ‘positio…
2024-06-25 21:04:12 +10:00
Kevin Ring dd8af15dbe Formatting, tweaks, CHANGES.md. 2024-06-25 20:51:37 +10:00
Tim Moore 2283f5c380 Add axis argument to Cesium3DTilesContent test code 2024-06-24 15:56:21 +02:00
Tim Moore bd5a4805ab Merge remote-tracking branch 'origin/main' into i3dm-misc-fixes 2024-06-24 15:02:17 +02:00
Tim Moore 9c9a5d9dc2 Resolve external data for external i3dm glb content
Calling GltfReader::resolveExternalData() during the i3dm conversion
correctly handles relative path references in the .glb payload or in
an external .glb file. Leaving it to
Cesium3DTilesSelection::TilesetContentManager::loadTileContent(),
where external data is resolved for normal 3D Tiles, gets relative
paths wrong.

Resolves #905.
2024-06-24 14:53:16 +02:00
Kevin Ring ff96b9b07a
Merge pull request #874 from CesiumGS/forced-assertions
Add ability to force assertions
2024-06-21 16:12:56 +10:00
Brian L 74653140f3 Rename to CESIUM_ASSERT 2024-06-20 10:14:38 -06:00
Brian L 91300f9a61 update from main 2024-06-20 09:54:52 -06:00
Tommy Henriks ee5f635b1d Log warning and continue. Copy default values to the buffer. 2024-06-20 16:16:55 +02:00
Tommy Wohlfart 67fd8b5259 Fixed build warning - I3dmToGltfConverter.cpp:634:14: error: ‘position.glm::vec<3, double, glm::packed_highp>::x’ may be used uninitialized [-Werror=maybe-uninitialized] 2024-06-19 11:59:48 +02:00
Ashley Rogers 65dda8335d Respond to review, cut down on stored ellipsoids 2024-06-14 15:33:47 -04:00
Brian L 1f6ac44834 Merge branch 'main' into gltf-ray-intersect 2024-06-12 16:22:01 -06:00
Tim Moore b48f1381af Pass up axis to GltfConverters
The i3dm converter needs to know the coordinate axis convention of the
tileset in order to correctly construct instance transformations.

Resolves #904.
2024-06-11 16:36:47 +02:00
Ashley Rogers f332464b30 Merge with main 2024-06-06 16:57:20 -04:00
Ashley Rogers d961a40e3d Remove as many WGS84 defaults as possible. 2024-06-06 16:53:48 -04:00
Kevin Ring bac574c13d Lots of changes to support Cesium for Unreal. 2024-06-06 20:57:11 +10:00
Kevin Ring ca42500d54 Merge remote-tracking branch 'origin/main' into vcpkg-2 2024-06-05 14:06:47 +10:00
Kevin Ring 0e74915a90 Add i3dm tests and fix some bugs. 2024-06-03 10:57:46 +10:00
Brian L aa95514762 update from main 2024-05-31 12:39:37 -06:00
Tim Moore ba68601bac Renaming and simplification 2024-05-24 13:39:10 +02:00
Tim Moore 80a50912a8 More changes in response to code review 2024-05-24 12:50:41 +02:00
Tim Moore 2a284f5026 formatting and name change 2024-05-23 17:36:54 +02:00