Commit Graph

8909 Commits (ae05dbb2527da54e791e3a115975c3d06504093d)

Author SHA1 Message Date
RichardTea ea917bd4ae Move Collada into AssetLib folder
Should make the merge easier
2020-05-04 13:54:49 +01:00
RichardTea 5a986090ca Merge branch 'master' into collada_unit_test_cleanup 2020-05-04 13:25:38 +01:00
RichardTea c6213836aa Merge remote-tracking branch 'upstream/master' 2020-05-04 13:21:52 +01:00
Kim Kulling c4ea522b6d
Merge branch 'master' into master 2020-05-04 10:18:03 +02:00
Kim Kulling 8675bb0912
Merge pull request #3197 from assimp/kimkulling_dev
Kimkulling dev
2020-05-03 18:58:49 +02:00
Kim Kulling 918d3d4206 fix invalid endif statement in cmake. 2020-05-03 15:55:42 +02:00
Kim Kulling 91fa9a102b closes https://github.com/assimp/assimp/issues/3181: fix typo for light type. 2020-05-03 12:17:32 +02:00
Kim Kulling 09dcb76063
Merge branch 'master' into kimkulling_dev 2020-05-03 11:50:18 +02:00
Kim Kulling 3b06f57150 add missing inclde + 2020-05-02 21:11:47 +02:00
Kim Kulling 4f902faddf build: move option for viewer to the other options. 2020-05-02 21:08:24 +02:00
Kim Kulling 514593548d add assert-test for nullptr. 2020-05-02 21:07:41 +02:00
Kim Kulling 3329e76263 closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream. 2020-05-02 21:06:55 +02:00
Kim Kulling a874facbbf
Merge pull request #3196 from assimp/kimkulling_dev
Kimkulling dev
2020-05-02 19:55:33 +02:00
Kim Kulling f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00
David M. Golembiowski 314bdf196b
Merge branch 'master' into master 2020-05-01 18:34:29 -04:00
David M. Golembiowski 8c243b80c0
Merge pull request #3 from dmgolembiowski/rust-port
Rust port
2020-05-01 18:24:33 -04:00
David Golembiowski 57e837092e populated module level files 2020-05-01 18:23:14 -04:00
David Golembiowski 778c3afbbb Rust's import system dictates that we must make directories rather than use individual files to provide a clean public interface 2020-05-01 18:11:44 -04:00
David Golembiowski 2d43a24475 memory info struct 2020-05-01 17:41:16 -04:00
David Golembiowski a286506c23 fixed a couple of things. Adding MaterialPropertyString 2020-05-01 17:32:55 -04:00
David Golembiowski e6837f7394 Need to consider different implementations of String kinds in Rust, and additionally how we may want to `impl Copy for Str`, i.e. `std::mem::swap` with placeholders to keep performance up. 2020-05-01 17:25:02 -04:00
David Golembiowski 38b80f6c6b populating plane struct 2020-05-01 16:58:32 -04:00
David Golembiowski ba633f95bb populating colors 2020-05-01 16:54:56 -04:00
David Golembiowski 4f8eb0f79c populating Texel struct definition for textures 2020-05-01 16:50:31 -04:00
David Golembiowski c338c5ca02 Populating 3d and 4d matrix struct definitions 2020-05-01 16:47:35 -04:00
David Golembiowski c6f2196f60 vector definitions 2020-05-01 16:32:25 -04:00
RichardTea 1dabb1a094 Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES
Add unit test for this
2020-05-01 14:59:09 +01:00
RichardTea 29c75f4948
Merge branch 'master' into collada_unit_test_cleanup 2020-05-01 12:09:28 +01:00
RichardTea 3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-01 12:08:12 +01:00
RichardTea e27f3791ab Merge remote-tracking branch 'upstream/master' 2020-05-01 12:07:10 +01:00
RichardTea 5b9f207f1f ColladaExporter cleanup
Namespace, NULL and includes
2020-05-01 11:54:34 +01:00
RichardTea e6c4175d8d Rename Collada export tests
Use existing naming convention.
Brings all Collada tests together in Test Explorers
2020-05-01 11:49:15 +01:00
RichardTea ee16d2c4c9 Fix camera, light and bone unique ids
Bones don't have a unit test yet
2020-05-01 11:13:38 +01:00
Kim Kulling 52122a9900 Merge branch 'master' into kimkulling_dev 2020-05-01 10:49:03 +02:00
Kim Kulling 08609feb54
Merge pull request #3170 from assimp/opencollective-opencollective
Opencollective opencollective
2020-04-30 21:32:42 +02:00
Kim Kulling 1505a57ad2
Merge branch 'master' into opencollective-opencollective 2020-04-30 21:05:50 +02:00
Kim Kulling b495c42a33
Merge pull request #3171 from assimp/kimkulling-patch-github-actions
Add sanitizer support
2020-04-30 21:04:08 +02:00
RichardTea 083ebdbc2e Collada Export: More unique Ids
Nodes, Materials, Animations, Lights, Cameras, Bones
2020-04-30 18:28:06 +01:00
Kim Kulling a639221ede
Update to float
- Temporary change to analyze leak.
2020-04-30 09:14:42 +02:00
Kim Kulling 6956ef53d9
Merge branch 'master' into opencollective-opencollective 2020-04-30 09:08:55 +02:00
Kim Kulling 2d9d112015 fix warning 2020-04-29 21:35:42 +02:00
Kim Kulling 1c30b7bf8e tryout: check if leak is coupled to type double. 2020-04-29 21:31:01 +02:00
Kim Kulling e0bc0f7fad try to fix double memleak. 2020-04-29 21:19:15 +02:00
Kim Kulling da2bf5c7a4 fix wrong size 2020-04-29 21:13:46 +02:00
Kim Kulling f808ed9fb5 fbxconverter: fix memoryleak. 2020-04-29 20:52:49 +02:00
Kim Kulling c6131ce38a scenecombiner: fix leak. 2020-04-29 20:43:23 +02:00
Kim Kulling fd555a1349 review findings. 2020-04-29 20:33:37 +02:00
RichardTea ff9f3b8608 Collada: Ensure <geometry> has unique id
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
2020-04-29 17:17:46 +01:00
RichardTea 2c6ac23a4e Apply Assimp clangformat to touched Collada files 2020-04-29 14:21:17 +01:00
Kim Kulling b9c597d055
Fix review finding. 2020-04-29 13:46:01 +02:00