kimkulling
|
a1bcca2c99
|
remove step prototype: does not work this way.
|
2020-05-07 14:00:40 +02:00 |
|
Kim Kulling
|
89a865ce19
|
Merge branch 'master' into master
|
2020-05-06 22:07:39 +02:00 |
|
Sercan Degirmenci
|
201347700f
|
fix incorrect header path on framework build
|
2020-05-06 16:15:23 +03:00 |
|
Yingying Wang
|
60e8146b9f
|
fix wrong target idx when importing
|
2020-05-05 12:51:40 -07:00 |
|
RichardTea
|
56a4e61533
|
Collada: Don't copy the scene when exporting
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
|
2020-05-05 10:16:13 +01:00 |
|
RichardTea
|
6e447b2c44
|
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
|
2020-05-05 09:52:08 +01:00 |
|
RichardTea
|
d1ae6ac77a
|
Fix typo in <visual_scene>
Swapped Id and Name
|
2020-05-05 09:51:41 +01:00 |
|
RichardTea
|
fa1d2f09db
|
Merge branch 'master' into bug-3177-dae-geo-id
|
2020-05-05 09:33:48 +01:00 |
|
Kim Kulling
|
ddee1b1ddb
|
Merge branch 'master' into aaronfranke-file-formatting
|
2020-05-05 10:21:46 +02:00 |
|
kkulling
|
4e16716924
|
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
|
2020-05-05 10:17:52 +02:00 |
|
Kim Kulling
|
bf95d1da7c
|
fix conversion
|
2020-05-04 21:48:46 +02:00 |
|
RichardTea
|
8e73984a11
|
Collada Root Nodes aren't allowed to have meshes
Create a null parent node instead
|
2020-05-04 17:47:09 +01:00 |
|
RichardTea
|
6e200cb0d3
|
Merge branch 'master' into bug-3177-dae-geo-id
Impossible merge, have discarded upstream
|
2020-05-04 13:59:09 +01:00 |
|
RichardTea
|
ea917bd4ae
|
Move Collada into AssetLib folder
Should make the merge easier
|
2020-05-04 13:54:49 +01: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
|
3b06f57150
|
add missing inclde +
|
2020-05-02 21:11:47 +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
|
f8e6512a63
|
Move format importer and exporter into its won folder.
|
2020-05-02 15:14:38 +02:00 |
|
Trevor David Black
|
a0aa067b5f
|
Moved Texture writing into its own function
|
2020-05-01 08:35:04 -07: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
|
3e2dd186d1
|
Merge branch 'master' into bug-3177-dae-geo-id
|
2020-05-01 12:08:12 +01:00 |
|
RichardTea
|
5b9f207f1f
|
ColladaExporter cleanup
Namespace, NULL and includes
|
2020-05-01 11:54:34 +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 |
|
Trevor David Black
|
2c9d3bea64
|
Printing out unique textures
|
2020-04-30 14:01:09 -07:00 |
|
RichardTea
|
083ebdbc2e
|
Collada Export: More unique Ids
Nodes, Materials, Animations, Lights, Cameras, Bones
|
2020-04-30 18:28:06 +01: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 |
|
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 |
|
Rafał Mikrut
|
6967a02fcb
|
Merge branch 'master' into added_check_before_using
|
2020-04-28 18:33:29 +00:00 |
|
qarmin
|
4dfdbbf171
|
Check index before using
|
2020-04-28 20:31:59 +02:00 |
|
Kim Kulling
|
efa046366e
|
Retrigger build
|
2020-04-28 09:14:53 +02:00 |
|
luca
|
4488e3e745
|
build on Linux with gcc and clang; warning as error only for 'assimp' target
|
2020-04-27 23:38:33 -07:00 |
|
Paul Arden
|
81abd90ee1
|
Fix reading of orthographic camera data. Fixes #3028.
|
2020-04-28 10:07:56 +10:00 |
|
Kim Kulling
|
b0c9711894
|
Small format finding
|
2020-04-27 15:16:57 +02:00 |
|
Inho Lee
|
629320a3a0
|
Add timescale for collada
|
2020-04-27 11:52:04 +02:00 |
|
luca
|
d98787f35b
|
CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt;
|
2020-04-26 12:50:42 -07:00 |
|
Kim Kulling
|
6c1e21d754
|
fix formatting.
|
2020-04-26 19:14:30 +02:00 |
|
Kim Kulling
|
bafb8e3189
|
closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning.
|
2020-04-26 08:59:52 +02:00 |
|
Kim Kulling
|
638df2ceac
|
Merge branch 'master' into master
|
2020-04-25 12:07:06 +02:00 |
|
Trevor David Black
|
3dc550a9b2
|
Got a working geometry prototype, sponza renders correctly when camera and light is added
|
2020-04-25 00:10:31 -07:00 |
|
Trevor David Black
|
07065e2235
|
Working first proof of concept. Renders ambient term in pbrt
|
2020-04-22 13:38:06 -07:00 |
|
Kim Kulling
|
9b1759dcc2
|
Merge branch 'master' into migenius-migenius-rsws53-mig-2
|
2020-04-22 19:59:53 +02:00 |
|
Kim Kulling
|
ca70b44e44
|
Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2
|
2020-04-22 19:58:41 +02:00 |
|
Kim Kulling
|
c36b028412
|
fix type error for template deduction.
|
2020-04-21 16:39:18 +02:00 |
|