Commit Graph

329 Commits

Author SHA1 Message Date
Sean Lilley 47a4733090 Update generate-gltf-classes to support 3D Tiles 2021-10-10 17:39:22 -04:00
Kevin Ring ee5c9f0857
Merge pull request #351 from CesiumGS/gltf-schema-updates
Update generated files with newer glTF schema
2021-10-06 12:41:10 +11:00
Sean Lilley 525f8e15be Support const property in anyOf elements 2021-10-03 14:19:14 -04:00
Sean Lilley 4f2bad8ab6 Fix accidental copy-paste 2021-10-03 12:06:13 -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
Sean Lilley cf5f3b24c1 Merge branch 'gltf-generator-enum-fixes' into gltf-schema-updates 2021-09-26 13:32:30 -04: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
Sean Lilley 8dfa62a73e Changes to generated files 2021-09-26 11:39:10 -04:00
Marco Hutter 5519532b1e Initialize members to proper (non-default) values. 2021-09-26 16:52:54 +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 106c3065ad Formatting after adding noexcept specifiers 2021-09-15 17:03:56 +02:00
Marco Hutter 3e75d1fc6b Added further missing noexcept specifiers
C26440: Function ... can be declared noexcept
2021-09-15 17:03:15 +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
Nithin Pranesh e06cc3afbf replace getIndex std::function with templates 2021-08-27 13:59:13 -04:00
Nithin Pranesh f9d769371e fix unsafe normalization 2021-08-27 11:43:19 -04:00
Marco Hutter 8ddb163f6d Perform component-wise vector comparison 2021-08-23 21:04:42 +02:00
Nithin Pranesh 08e56e68b6 more gcc/clang fixes 2021-08-23 13:33:36 -04:00
Nithin Pranesh 34e4a14120 replace local std::function parameters with template 2021-08-23 13:12:37 -04:00
Nithin Pranesh 6d3f8ee262 attempt to fix gcc/clang errors 2021-08-23 13:12:21 -04:00
Nithin Pranesh 24e9acb1ed add tests for triangle strips and fans 2021-08-23 12:22:06 -04:00
Nithin Pranesh e7932e0ce4 add tests for smooth normals and forEachPrimitive 2021-08-21 12:15:29 -04:00
Nithin Pranesh e5a59f85ee parse alternative node transform format 2021-08-18 12:48:30 -04:00
Nithin Pranesh 913190c273 move addTriangleNormalToVertexNormals into standalone function, instead of lambda 2021-08-18 12:00:46 -04:00
Nithin Pranesh 8cc6a1d064 only need unsigned index types 2021-08-18 11:50:42 -04:00
Nithin Pranesh 02430a1643 remove flat normal generation from cesium-native 2021-08-17 16:57:25 -04:00
Nithin Pranesh d769b17fda add generate missing flat normals options 2021-08-16 12:26:50 -04:00
Nithin Pranesh 32d1352fb5 reuse existing position buffer when flattening indices 2021-08-16 10:46:52 -04:00
Nithin Pranesh b136045efc fix gcc/clang warnings 2021-08-16 09:17:51 -04:00
Nithin Pranesh c17b8bc9a4 WIP generate missing flat normals in cesium-native 2021-08-15 21:26:37 -04:00
Nithin Pranesh 19f55611dc apply review suggestion 2021-08-15 13:27:22 -04:00
Nithin Pranesh 6a4477136d WIP move code to CesiumGltf::Model 2021-08-15 12:57:35 -04:00
Kevin Ring 9b7539d013 PropertyType doesn't need to be a bitmask. 2021-07-28 15:19:52 +10:00
Kevin Ring 3c6185f278 Formatting. 2021-07-28 12:34:25 +10:00
Kevin Ring 8a18a473f7 Default constructors for views, IsMetadataInteger/Floating. 2021-07-27 17:25:56 +10: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 52c52984b5 ReinterpretCastSpan -> reinterpretCastSpan. 2021-07-24 20:50:15 +10:00
Bao Tran 303bc24f4f add reintepret_cast for span 2021-07-23 13:23:24 -04:00
Bao Tran c7906e2a94 use span byte for numeric MetadataArrayView 2021-07-23 11:36:48 -04:00
Bao Tran ca0b853b73 add comment about the status of property view 2021-07-20 12:36:02 -04:00
Bao Tran 8ccd633dfb add status for property view 2021-07-20 12:15:13 -04:00
Bao Tran 31d85a358d add status for property view 2021-07-19 12:17:54 -04:00
Bao Tran 3d9e0c13bd convert type to PropertyType instead of uint32 2021-07-17 23:55:04 -04:00
Bao Tran 2e7d9b8c97 fix compiler warning 2021-07-15 20:11:16 -04:00
Bao Tran 5f4add636a fix more compiler warning 2021-07-15 19:52:20 -04:00
Bao Tran a6d8f69e57 fix compiler warning 2021-07-15 19:49:29 -04:00
Bao Tran eca0952eb2 add assertion when converting binary metadata 2021-07-15 19:25:42 -04:00
Bao Tran e420e729ec fix compiler warning 2021-07-15 19:10:59 -04:00
Bao Tran 1185d2e78f use int64 for meta array 2021-07-15 17:17:30 -04:00
Bao Tran c19b847261 fix test 2021-07-15 17:00:31 -04:00
Bao Tran dab9312560 use int64_t for property view 2021-07-13 13:47:01 -04:00
Bao Tran e709e8fc34 add float and double type to comment for feature table view and property view 2021-07-13 11:38:29 -04:00
Bao Tran ced959eccb add p prefix for pointer 2021-07-13 11:30:08 -04:00
Bao Tran fb24d8d6ca add comment to FeatureTableView 2021-07-08 18:29:38 -04: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
Bao Tran e8521c280a retrieve property by using callback 2021-06-28 18:52:02 -04:00
Bao Tran 380697c6c9 add document for PropertyTypeTrait 2021-06-20 19:31:15 -04:00
Bao Tran 4ecf9af04d add documentation for FeatureTableView 2021-06-20 19:03:35 -04:00
Bao Tran 78719b60df add comment for PropertyView 2021-06-20 17:45:23 -04:00
Bao Tran 3091533ef6 change PropertyView to MetadataPropertyView 2021-06-20 15:58:08 -04:00
Bao Tran 3846381cc9 change names of property type trait 2021-06-20 15:56:06 -04:00
Bao Tran c64fea091e test property trait and format 2021-06-20 15:51:53 -04:00
Bao Tran 3243f9c4ed test property type 2021-06-20 15:14:34 -04:00
Bao Tran c0faaf18dc change file name for batch table to EXT_feature_metadata 2021-06-20 14:51:15 -04:00
Bao Tran 951cb7a23e pass rapidjson::Document for batch table json to metadata upgrader 2021-06-20 14:47:36 -04:00
Bao Tran 6035cc8387 clean up unused headers 2021-06-20 12:11:18 -04:00
Bao Tran 0e1d188636 remove bool getter in feature table view 2021-06-20 11:54:02 -04:00
Bao Tran e1909b3bf7 remove getter for bool array in feature table view 2021-06-20 11:44:15 -04:00
Bao Tran 661db543d2 replace operator[] with get() for PropertyView 2021-06-20 01:40:27 -04:00
Bao Tran 76f2d10ccb test to validate dynamic array of string 2021-06-18 18:44:41 -04:00
Bao Tran 96c49c4529 test fixed array of string 2021-06-18 14:48:29 -04:00
Bao Tran 9a68718dc6 test for dynamic bool array 2021-06-18 11:41:46 -04:00
Bao Tran b6c8047c18 add test to validate fixed bool array 2021-06-17 17:00:49 -04:00
Bao Tran 6300cae267 test to validate dynamic numeric array 2021-06-17 15:26:31 -04:00
Bao Tran 47b891fac8 fix compiler warning 2021-06-17 13:28:02 -04:00
Bao Tran 7ac819dcf5 add test to validate fixed numeric array 2021-06-17 13:07:28 -04:00
Bao Tran 21f44e7a29 test to make sure offset values are sorted 2021-06-16 16:43:35 -04:00
Bao Tran d7c42c559d add test for string validation 2021-06-16 16:11:20 -04:00
Bao Tran 0506eed5c3 add test validation for bool property 2021-06-15 17:11:28 -04:00
Bao Tran 1c2a758274 add more tests to validate metadata bufferview 2021-06-15 15:15:40 -04:00
Bao Tran 3288dc5bca fix compiler warning 2021-06-15 14:51:30 -04:00
Bao Tran 62b89c365d WIP test feature table view to read property correctly 2021-06-15 14:05:26 -04:00
Bao Tran 3363cee7e8 change MetadataPropertyView to PropertyView 2021-06-14 18:35:36 -04:00
Bao Tran bc8dd36951 impl FeatureTableView 2021-06-14 18:30:01 -04:00
Bao Tran 774730381e fix property view when accessing fixed array of boolean 2021-06-08 18:53:11 -04:00
Bao Tran 4ee41a8bf5 fix property view for array of boolean 2021-06-08 18:17:11 -04:00
Bao Tran 15fcfbf7a2 fix compiler error 2021-06-08 11:41:49 -04:00
Bao Tran b1bcfd46c8 fix dynamic array of string 2021-06-07 02:20:40 -04:00
Bao Tran ab56949efa fix string offset array 2021-06-07 00:20:29 -04:00
Bao Tran 5ef1e6b2db upgrade json array of string 2021-06-06 23:11:46 -04:00
Bao Tran b1546b0d7b change order of property type enum 2021-06-03 09:21:13 -04:00
Bao Tran a4a4068e78 add test for upgrading batch table 2021-06-01 19:37:46 -04:00
Bao Tran 8d6d46ef30 test dynamic array of bool 2021-06-01 01:39:00 -04:00
Bao Tran f2e6dfed59 test fixed array of bool 2021-06-01 01:09:36 -04:00
Bao Tran a750fc2f9f impl dynamic array of string test 2021-05-31 20:25:32 -04:00
Bao Tran b9c5c77ed6 WIP template property view 2021-05-31 00:12:31 -04:00
Bao Tran 3dff283062 custom meta array view for property 2021-05-29 21:42:03 -04:00
Bao Tran 3cc40b6ed1 add boolean property view 2021-05-27 18:12:31 -04:00
Bao Tran b457b7db3c format 2021-05-27 15:41:11 -04:00
Bao Tran b7a84cfb61 fix string test 2021-05-27 14:23:55 -04:00
Bao Tran 2b79291e43 fix dynamic array tests 2021-05-27 14:15:57 -04:00
Bao Tran df7427ad2d add tests back again 2021-05-27 13:39:02 -04:00
Bao Tran 077680acae fix out of bound tests 2021-05-27 13:25:10 -04:00
Bao Tran 524306a68c isolate more failed tests 2021-05-27 13:00:47 -04:00
Bao Tran f108442a7f simplify getter for scalar 2021-05-27 12:48:51 -04:00
Bao Tran 6bdaa7d563 isolate failed tests 2021-05-27 12:12:36 -04:00
Bao Tran 9ca931c455 uncomment some failed tests 2021-05-27 11:52:37 -04:00
Bao Tran 5896978de3 isolate failed test 2021-05-27 11:36:17 -04:00
Bao Tran ca668bba47 test for string 2021-05-26 18:25:25 -04:00
Bao Tran f00bb6436e add double dynamic array test 2021-05-26 16:20:16 -04:00
Bao Tran 24b9119169 test dynamic array 2021-05-26 16:17:49 -04:00
Bao Tran e623ca7f54 format 2021-05-26 14:54:50 -04:00
Bao Tran 9634eddeb9 add test for fixed array of other numeric type 2021-05-26 14:53:58 -04:00
Bao Tran 84a01ecd21 format 2021-05-26 14:05:06 -04:00
Bao Tran 3dec7b9c8c fix fixed array doesn't have correct stride 2021-05-26 14:01:48 -04:00
Bao Tran c26a8c065b fix array property getter 2021-05-26 13:18:06 -04:00
Bao Tran e1829afb3a impl fixed and dynamic array 2021-05-26 11:23:24 -04:00
Bao Tran fd2ef64614 default offset buffer type to be uint32_t 2021-05-26 01:30:23 -04:00
Bao Tran 47a120d344 get array and string offset buffer 2021-05-26 01:09:28 -04:00
Bao Tran 474cf356ed format 2021-05-25 23:54:56 -04:00
Bao Tran 5af1880c49 test wrong property format 2021-05-25 23:53:13 -04:00
Bao Tran 40b0bca1f5 test with buffer view stride 2021-05-25 23:21:54 -04:00
Bao Tran b82d1399de check buffer stride 2021-05-25 21:55:15 -04:00
Bao Tran 34a022780b clean up interface 2021-05-25 21:47:46 -04:00
Bao Tran 058da9bd3c simplify PropertyAccessorView 2021-05-25 20:37:20 -04:00
Bao Tran 1c8b6216ab WIP initial support for scalar property type 2021-05-25 18:50:55 -04:00
Bao Tran 5a2b91e853 WIP PropertyView 2021-05-25 16:39:20 -04:00
Kevin Ring 7ec6bdfb80 Formatting. 2021-05-21 09:30:13 +10:00
Kevin Ring 04149ee0c4 Improve test, and hopefully fix Linux compile problems. 2021-05-21 09:28:46 +10:00
Kevin Ring b429342b81 Fix return type. 2021-05-21 08:42:57 +10:00
Kevin Ring b275392038 Formatting. 2021-05-20 21:50:19 +10:00
Kevin Ring 7315cb6e4b Allow use of createAccessorView with a simple lambda. 2021-05-20 21:37:31 +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 ed42e46d5f Add support for EXT_feature_metadata on Primitives. 2021-05-07 16:18:13 +10:00
Kevin Ring b29b8c64ad EXT_feature_metadata progress. 2021-05-07 15:34:16 +10:00
Kevin Ring 527e6051c1 Fix more code gen problems. 2021-05-06 17:30:39 +10:00
Kevin Ring 8762721d03 Regenerated glTF classes and re-run the formatter.
The only changes are to incorrectly-wrapped comments, now that comments
no longer get incorrectly wrapped.
2021-05-05 16:38:35 +10:00
Marco Hutter 51e43bbd49 Comment fixes for clang formatting 2021-04-29 17:06:34 +02:00
Kevin Ring acd13e2992
Merge pull request #219 from CesiumGS/gltf-writer-tech-debt
Address technical debt in CesiumGltfWriter
2021-04-22 10:27:21 +10:00
Samuel Vargas 00870929ee
Remove extraneous CESIUM_NATIVE_GSL_INCLUDE_DIR from CMakeLists.txt 2021-04-21 16:03:36 -04:00
Kevin Ring 10b0f92a64 Use std::as_const instead of const_cast. 2021-04-20 21:00:36 +10:00