Commit Graph

208 Commits

Author SHA1 Message Date
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
Tim Moore 029d0aba7a Renamed LegacyUtilities to GltfConverterUtility 2024-05-23 17:33:12 +02:00
Tim Moore edc22cb5d5 Test compilation and gcc fixes 2024-05-20 15:41:57 +02:00
Tim Moore e60e936e67 format fixes 2024-05-17 19:42:22 +02:00
Tim Moore ed9bfa851c Merge branch 'tmp/quatFunc' into i3dm-2024 2024-05-17 19:32:49 +02:00
Tim Moore c6b5321d0a Merge remote-tracking branch 'origin/i3dm-2024' into i3dm-2024 2024-05-17 19:32:19 +02:00
Tim Moore be323a4887 Move rotation function to CesiumUtility/Math.h 2024-05-17 19:30:45 +02:00
Tim Moore 88a3b8dfb7 Use gsl:span instead of raw pointers 2024-05-17 18:35:08 +02:00
Tim Moore 7369873a40 Rework applyRTC and meshGpuTransforms
Rename and rework arguments in response to review comments.
2024-05-17 16:43:35 +02:00
Tim Moore 598fd2e92f Break i3dm JSON parsing out into a helper function 2024-05-17 15:54:09 +02:00
Tim Moore 068f70ed50 WIP responding to review comments 2024-05-17 12:24:31 +02:00
Tim Moore ea79bb8a76 Reponse to feedback: change ConverterSubprocessor to AssetFetcher 2024-05-16 17:05:33 +02:00
Tim Moore d238025621 Add a perpVec function and use it
A simple function for computing a perpendicular vector.
2024-05-07 17:58:06 +02:00
Tim Moore 5731d48998 Squash some CI compilation errors
Fix a real truncation issue, and some noise from overzealous gcc.
2024-05-07 16:27:42 +02:00
Tim Moore 1cd4ab750c Modify Cesium3DTilesContent tests to use ConverterSubprocessor
Tests compile again.
2024-05-07 15:51:21 +02:00
Brian L 47414f09fb Make our ASSERT macro. Move everything to use this. 2024-05-03 12:50:50 -06:00
Tim Moore 46581092d1 Refactor with helpers for converting glTF values to glm. 2024-04-26 16:54:18 +02:00
Tim Moore 9661e40ead Refactor and support existing instances in GLB
Simplified the code by not trying to optimize the inclusion of
rotation and scale transforms.
2024-04-26 11:19:28 +02:00
Tim Moore 80ade66237 I3dm: Support the EAST_NORTH_UP global semantic 2024-04-26 10:23:01 +02:00
Tim Moore 616bf74e73 Rebase instance positions to their mean
Construct an RTC_CENTER, in effect. Otherwise instance positions could
be too large to render without jitter.
2024-04-19 18:19:55 +02:00
Tim Moore 0a4a5a9665 Merge branch 'main' into i3dm-2024 2024-04-17 17:56:57 +02:00
Tim Moore 7db60d6234 Add std::move in response to compiler warning 2024-04-17 17:16:29 +02:00
Tim Moore 81bb2ff1bd Change ConverterSubprocessor arguments from pointer to reference
It's required now.
2024-04-17 16:55:35 +02:00
Tim Moore 806d0edfec WIP glTF converter functions return a Future 2024-04-17 12:40:24 +02:00
Brian Langevin c55660118c
Merge branch 'main' into upsampling-inverted-v 2024-04-12 14:49:08 -06:00
Janine Liu 43b15c8876 Minor changes 2024-04-12 11:40:52 -04:00
Kevin Ring abaf72bada upsampleGltfForRasterOverlays -> RasterOverlayUtilities 2024-04-12 16:59:24 +10:00
Tim Moore 37f3684ef9 Preserve double values from i3dm, WIP 2024-04-11 11:54:30 +02:00
Tim Moore b1c9f9484d More formatting fun 2024-04-11 11:02:17 +02:00
Tim Moore 9b2bde2626 remove const from static_cast to satisfy gcc 2024-04-11 10:12:18 +02:00
Kevin Ring 44ceb53856
Merge branch 'main' into upsampling-inverted-v 2024-04-10 16:50:26 -04:00
Tim Moore 72a8fb5201 Fix convert calls in tests 2024-04-10 16:02:15 +02:00
Tim Moore fe1f01d01c use npm format properly 2024-04-09 12:25:24 +02:00
Tim Moore dd563d5c72 Add support for I3dm 3D Tile instance files
Initial commit of the main body of new code. A lot was taken or
inspired from PntsToGltfConverter, which should now be refactored to
use the new common functions.

ENU rotations are not supported yet.
2024-04-08 18:43:35 +02:00
Kevin Ring 1b41edb3c3 Fix Clang/GCC warning-as-error. 2024-04-08 21:44:30 +10:00
Kevin Ring 0f3364a9d2 Add Draco bufferView test. 2024-04-08 21:04:53 +10:00
Kevin Ring 5c694f4e14 More tests. 2024-04-08 19:39:15 +10:00
Kevin Ring b89f43db42 Add test for CESIUM_RTC in extensionsUsed. 2024-04-08 19:31:38 +10:00
Kevin Ring e094899d16 More tests, clarify changelog. 2024-04-08 19:09:50 +10:00
Kevin Ring 665ec11a1a Add some tests. 2024-04-08 17:38:58 +10:00
Kevin Ring 8c05f96f6e Various fixed to correctness of glTF generation. 2024-04-08 15:40:56 +10:00
Kevin Ring 470218423a Merge remote-tracking branch 'origin/main' into cesium-legacy-terrain 2024-04-06 19:05:27 +11:00
Kevin Ring 07ea4b3b9f
Merge branch 'main' into upsampling-inverted-v 2024-04-06 04:02:05 -04:00
Janine Liu 2840801aa1 Quick fixes 2024-04-05 15:33:24 -04:00
Janine Liu 8902e48810
Merge branch 'main' into quantized-mesh-gltf-fixes 2024-04-05 15:19:40 -04:00
Janine Liu 4c0b7d1441 Doc tweak and reorganize tests 2024-04-05 14:17:23 -04:00
Kevin Ring 2b113b6270 Add tests and doc. 2024-04-05 18:00:49 +11:00
Kevin Ring 18251942c8 Fix unnecessarily complicated (and broken) logic. 2024-04-05 17:00:43 +11:00
Kevin Ring a18610a77a Fix upsampling with inverted V coordinate and images. 2024-04-05 17:00:43 +11:00
Kevin Ring f024e53448 Add hasInvertedVCoordinate option to upsampleGltfForRasterOverlays. 2024-04-05 17:00:43 +11:00
Kevin Ring 45dc731f33 upsampleGltfForRasterOverlays takes tex coord attr name as a parameter. 2024-04-05 17:00:43 +11:00
Kevin Ring b3b49446fe Improve doc. 2024-04-04 23:45:45 +11:00
Kevin Ring 2e0d1273f7 Add tests, update CHANGES.md. 2024-04-04 23:42:59 +11:00
Kevin Ring 4be1cbb758 Add TileTransform::setTransform. 2024-04-04 23:24:42 +11:00