Kim Kulling
|
e79d105957
|
Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture
|
2023-08-29 15:13:43 +02:00 |
|
Kim Kulling
|
cc2c5d3ae3
|
Merge branch 'master' into collada-ignore-unit-size-property
|
2023-08-29 14:01:40 +02:00 |
tangxin
|
4389c3d80c
|
The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent
|
2023-08-23 14:54:40 +08:00 |
zhucan
|
d07934bf25
|
adjust comment
|
2023-08-18 01:03:49 +08:00 |
|
zhucan
|
554fa8f5e2
|
code format
|
2023-08-18 01:03:49 +08:00 |
|
zhucan
|
2b4606c082
|
add fallback strategy for metallicRoughnessTexture
|
2023-08-18 01:03:49 +08:00 |
朱灿
|
3a03fe31b1
|
gltf2 export diffuse roughness
|
2023-08-18 01:03:49 +08:00 |
|
zhucan
|
32716002ac
|
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
|
2023-08-18 01:03:49 +08:00 |
Alex
|
5c45cdc0ad
|
Fix Invalid-free in Assimp::FBX::Scope::Scope
|
2023-08-16 07:45:23 +00:00 |
|
Kim Kulling
|
d77903423f
|
Merge branch 'master' into floatwarn
|
2023-08-15 12:55:37 +02:00 |
|
Kim Kulling
|
e5d9339c21
|
Merge branch 'master' into 5513536726761472
|
2023-08-12 08:05:27 +02:00 |
Martin Weber
|
d8a7399a04
|
Merge branch 'assimp:master' into collada-ignore-unit-size-property
|
2023-08-10 08:10:18 +02:00 |
|
Alex
|
b9460dd959
|
Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
|
2023-08-08 16:01:00 +00:00 |
Gargaj
|
49ed0711d1
|
Fix another warning
|
2023-08-05 15:43:31 +02:00 |
|
Gargaj
|
8312b31d27
|
fix warning-as-error
|
2023-08-05 15:39:47 +02:00 |
|
Martin Weber
|
bb1873dd22
|
Collada: added import property to disable unit size scaling
|
2023-08-04 09:54:55 +02:00 |
|
Alex
|
f7e7f82b9d
|
Add const
|
2023-08-03 17:10:17 +00:00 |
|
Alex
|
d7dc88e0d0
|
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
|
2023-08-01 13:04:16 +00:00 |
sfjohnston
|
dd40b0ccee
|
Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown
|
2023-07-23 12:05:01 -07:00 |
|
sfjohnston
|
3ec8a36764
|
Merge branch 'assimp:master' into sfjohnston_mods
|
2023-07-23 08:37:47 -07:00 |
Marco Feuerstein
|
37a1366fb7
|
Add missing rapidjson headers.
|
2023-07-21 11:33:06 +02:00 |
|
Kim Kulling
|
64e0ba2625
|
Merge branch 'master' into sfjohnston_mods
|
2023-07-20 09:21:13 +00:00 |
|
Marco Feuerstein
|
bf38d67935
|
Fix detection of KHR_materials_specular.
|
2023-07-13 11:51:56 +02:00 |
|
sfjohnston
|
c7afea3cd7
|
Merge branch 'assimp:master' into sfjohnston_mods
|
2023-07-10 07:58:21 -07:00 |
|
Kim Kulling
|
90ff723b6c
|
Merge branch 'master' into gltf_binary
|
2023-07-03 21:31:28 +02:00 |
|
Kim Kulling
|
ed903543a7
|
Merge branch 'master' into 4879958521806848
|
2023-07-03 19:50:38 +02:00 |
|
Alex
|
093e35dd54
|
Fix eternal loop
|
2023-07-03 09:12:00 +00:00 |
|
Alex
|
edb8375702
|
Fix integer overflow
|
2023-07-03 09:11:38 +00:00 |
PencilAmazing
|
f1561f03ce
|
Merge branch 'master' into irrfix
|
2023-07-02 15:10:04 -04:00 |
|
PencilAmazing
|
0bacc7134d
|
Remove debugging code, clean up some notes
|
2023-07-02 14:32:17 -04:00 |
|
PencilAmazing
|
19da9cc84d
|
Port mesh loading to pugixml. Untested.
|
2023-07-02 14:32:12 -04:00 |
dog
|
3e1fd74940
|
Fix up scene loading. pugixml is a breadth-first parser while irrxml is
a depth first. This only parses scene structure, no mesh loading yet.
|
2023-07-02 14:30:54 -04:00 |
|
PencilAmazing
|
537b445a59
|
Apply clang-format to files
|
2023-07-02 14:17:52 -04:00 |
|
Alex
|
6f3bfb5b60
|
Fix memory leak
|
2023-07-02 14:12:49 -04:00 |
|
Alex
|
3838a8aaf8
|
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
|
2023-07-02 14:12:49 -04:00 |
|
Marco Feuerstein
|
82d3f47432
|
Unify way to check readable blender files.
|
2023-06-29 15:10:28 +02:00 |
|
Marco Feuerstein
|
2875de132f
|
Fix compilation on windows.
|
2023-06-29 08:20:51 +02:00 |
|
Marco Feuerstein
|
17fac97b04
|
Fix magic token usage.
|
2023-06-29 08:20:51 +02:00 |
|
Marco Feuerstein
|
1c0f3c5f87
|
Fix string length calculation.
|
2023-06-29 08:20:50 +02:00 |
|
Marco Feuerstein
|
a2bdfdd05a
|
Improve binary check for gltf and gltf2.
By checking the magic token we don't depend on the extension any more
and follow the official way to detect a gltf file as binary, see also
https://github.com/KhronosGroup/glTF/blob/main/extensions/1.0/Khronos/KHR_binary_glTF/README.md#header
and https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-header.
|
2023-06-29 08:20:50 +02:00 |
|
Kim Kulling
|
1ec3dbd11a
|
Merge branch 'master' into 5093294573486080
|
2023-06-27 17:04:58 +02:00 |
|
Kim Kulling
|
f24224fdc5
|
Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors
|
2023-06-27 13:44:31 +02:00 |
|
Kim Kulling
|
db6c1a8b1c
|
Merge branch 'master' into 5921493454815232
|
2023-06-27 11:03:50 +02:00 |
|
Kim Kulling
|
ef6bf03acd
|
Merge branch 'master' into 5143879191494656
|
2023-06-27 10:23:36 +02:00 |
|
Kim Kulling
|
141e278e1f
|
Merge branch 'master' into 5407417422970880
|
2023-06-27 10:07:21 +02:00 |
|
Kim Kulling
|
b1181b1086
|
Merge branch 'master' into 4508318827937792
|
2023-06-25 21:20:02 +02:00 |
|
Kim Kulling
|
7005a9caa2
|
Merge branch 'master' into 6520123362508800
|
2023-06-25 21:07:34 +02:00 |
|
Kim Kulling
|
3545aab937
|
Merge branch 'master' into 5781186265350144
|
2023-06-25 17:51:01 +02:00 |
|
Kim Kulling
|
bd65af0d44
|
Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors
|
2023-06-20 09:38:53 +02:00 |
Kim Kulling
|
6502b97d3e
|
Fix: Put unused var into comments to later use.
|
2023-06-19 23:38:57 +02:00 |