Kim Kulling
2be0eba1ab
put one in comments because the file seems to be corrupt.
2019-09-14 19:32:47 +02:00
Kim Kulling
79056da4be
closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch.
2019-09-14 09:12:08 +02:00
Kim Kulling
a1254f067e
closes https://github.com/assimp/assimp/issues/2627 - fix typo
...
Remove code from ai_assert test, will be removed in release versions.
2019-09-13 12:05:29 +02:00
Kim Kulling
3bd63c006f
Merge branch 'gltf_add_ortho_cam' of https://github.com/assimp/assimp into gltf_add_ortho_cam
2019-09-12 20:27:53 +02:00
Kim Kulling
a25a1f0772
fix the build.
2019-09-12 20:27:35 +02:00
Kim Kulling
f10bd72100
Merge branch 'master' into gltf_add_ortho_cam
2019-09-12 00:30:06 +02:00
Kim Kulling
f9c6fed190
Add a camera unittest.
2019-09-11 22:34:53 +02:00
Kim Kulling
f67c18d41a
introduce inline helper.
2019-09-11 22:21:20 +02:00
kimkulling
7ff7a5d64e
glTF: Try to remove duplicate code.
2019-09-11 17:00:39 +02:00
escherstair
0307327999
Merge branch 'master' into fix-codacy-issues
2019-09-11 10:06:16 +02:00
Kim Kulling
28d0300dbe
Merge branch 'master' into gltf_add_ortho_cam
2019-09-11 09:32:14 +02:00
Kim Kulling
d91eebf347
Add ortho camera.
2019-09-10 22:13:54 +02:00
escherstair
b9cff2a019
prefer prefix ++/-- operators for non-primitive types
2019-09-10 07:54:07 +02:00
escherstair
db55ba4908
possible inefficient checking for 'tlist' emptiness
2019-09-09 15:00:28 +02:00
RevoluPowered
ddc26e1c46
Added maya stingray support for textures
2019-09-08 19:15:27 +01:00
RevoluPowered
da97f1be79
Implemented basic PBR materials into assimp.
...
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS
This is the first small change required.
We only support maya right now.
2019-09-08 19:15:27 +01:00
Kim Kulling
ad2dd2dc18
Merge branch 'master' into fix-codacy-issues
2019-09-08 12:08:01 +02:00
Kim Kulling
5d8482dae6
Merge branch 'master' into master
2019-09-07 18:53:26 +02:00
Kim Kulling
f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 10:02:20 +02:00
Kim Kulling
336ae0e55a
Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 09:58:07 +02:00
Kim Kulling
3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor
2019-09-06 20:45:16 +02:00
escherstair
570b3838c9
Merge branch 'master' into fix-codacy-issues
2019-09-06 13:20:00 +02:00
escherstair
91706a1f6e
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:29:52 +02:00
escherstair
d177c722b1
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:28:38 +02:00
escherstair
eb8479a95e
possible inefficient checking for 'tlist' emptiness
2019-09-06 11:19:27 +02:00
Kim Kulling
6661e7047a
Merge branch 'master' into unicode_fix
2019-09-06 08:59:21 +02:00
RumbleballTheReal
22bd047db5
Added VertexColors to FBX exporter (one channel)
...
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
2019-09-05 23:44:54 +02:00
Mike Samsonov
b271091c64
fix division by zero
2019-09-05 11:44:02 +01:00
Mike Samsonov
4029fe5e46
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
Mike Samsonov
9adc4e87fa
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
Mike Samsonov
873a358ce4
A crash in the aiMesh descructor
2019-09-05 11:44:02 +01:00
Ryan McCampbell
eb762e654e
Removed WindowsStore checks
2019-09-03 23:13:44 -04:00
Ryan McCampbell
a16906686f
Fixed type conversion warnings
2019-09-03 21:06:48 -04:00
Kim Kulling
50820e48b9
Merge branch 'master' into fix-codacy-issues
2019-09-03 21:54:59 +02:00
Ryan McCampbell
a8822a2b29
Cleaned up formatting in DefaultIOSystem.cpp
2019-09-03 11:18:01 -04:00
Ryan McCampbell
0685e415ad
removed extra null character in Utf8ToWide and WideToUtf8
2019-09-03 11:18:01 -04:00
Ryan McCampbell
6c65b5b549
Cleaned up unicode code and removed fixed-size buffers
2019-09-03 11:18:01 -04:00
Ryan McCampbell
727cf0c49f
Fixed unicode on windows
2019-09-03 11:18:01 -04:00
escherstair
ceacad237f
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:00:12 +02:00
escherstair
33e71ee8df
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:59:17 +02:00
escherstair
75993ad653
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:57:58 +02:00
escherstair
53d795c1c9
possible inefficient checking for 'tlist' emptiness
2019-09-03 07:57:08 +02:00
escherstair
ec1930478c
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:56:37 +02:00
escherstair
c1d4ed7873
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:55:27 +02:00
Kim Kulling
0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose
2019-09-02 20:47:04 +02:00
Kim Kulling
b34f9839f1
Merge branch 'master' into fix-missing-scale-data
2019-08-31 12:42:40 +02:00
Malcolm Tyrrell
01d0f06d3a
Make IsVerbose accessible outside the exporter
2019-08-30 11:42:23 +01:00
escherstair
de51122639
fix regression
2019-08-29 12:09:56 +02:00
escherstair
2d0d2374c1
fix ColladaLoader::findMesh() declaration
2019-08-29 12:00:44 +02:00
escherstair
89079ead12
prefer prefix ++/-- operators for non-primitive types
2019-08-29 11:44:41 +02:00
escherstair
946d64282b
fix inefficient checking for 'url' emptiness
2019-08-29 10:58:01 +02:00
escherstair
340611785a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:57:23 +02:00
escherstair
cb2beba073
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:58 +02:00
escherstair
aec4726d21
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:21 +02:00
escherstair
b3788039df
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:55:09 +02:00
escherstair
3ef0860f30
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:54:21 +02:00
escherstair
e8ae086b35
fix function definition
2019-08-29 10:48:51 +02:00
escherstair
75fed8340d
fix function declaration
2019-08-29 10:46:50 +02:00
escherstair
a044852938
fix inefficient checking for lists emptiness
2019-08-29 10:44:19 +02:00
escherstair
ba3e4ae892
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:42:47 +02:00
escherstair
2f53d42d45
fix inefficient checking for 'SceneNode_Child' emptiness
2019-08-29 10:42:09 +02:00
escherstair
cca81e877a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:34 +02:00
escherstair
b363fa3883
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:00 +02:00
escherstair
69fce64b9c
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:40:31 +02:00
escherstair
44d7cb8177
possible inefficient checking for lists emptiness
2019-08-29 10:37:19 +02:00
escherstair
02444be251
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:36:09 +02:00
escherstair
65ba0c4b46
fix inefficient checking for lists emptiness
2019-08-29 10:30:50 +02:00
escherstair
ebb061d89c
fix inefficient check for 'mNodeElement_List' emptiness
2019-08-29 10:29:24 +02:00
escherstair
0d17315166
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:25:38 +02:00
escherstair
f009c216b6
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:24:58 +02:00
escherstair
eadbc89a1f
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:23:27 +02:00
escherstair
438b070508
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:22:50 +02:00
escherstair
805fda3df8
possible inefficient checking for 'NodeElement_List' emptiness
2019-08-29 09:05:15 +02:00
escherstair
b1f8f6ae3b
prefer prefix ++/-- operators for non-primitive types
2019-08-29 09:04:27 +02:00
escherstair
ffb30fbc85
prefer prefix ++ operator for non-primitive types
2019-08-29 09:02:19 +02:00
escherstair
789e8abfe8
prefer prefix ++ operator for non-primitive types
2019-08-29 08:44:49 +02:00
escherstair
f1e0c460ed
Prefer prefix ++ operator for non-primitive types
2019-08-29 08:43:56 +02:00
escherstair
8e90bf8381
fix inefficient checking for lists emptiness
2019-08-29 08:43:09 +02:00
escherstair
43865e6bc9
fix inefficient checking for 'url' emptiness
2019-08-29 08:34:18 +02:00
escherstair
60f2535dcd
fix inefficient check for 'SceneNode_Mesh' emptiness
2019-08-29 08:30:24 +02:00
escherstair
7d8a25993b
prefer prefix ++ operator for non-primitive types
2019-08-29 08:29:30 +02:00
escherstair
765c0e71f6
prefer prefix ++ operator for non-primitive types
2019-08-29 08:25:19 +02:00
escherstair
806bcf76b1
fix inefficient checking for lists emptiness
2019-08-29 08:23:09 +02:00
escherstair
30eb3c56c3
prefer prefix ++ operator for non-primitive types
2019-08-29 08:12:22 +02:00
escherstair
dbb498095d
function parameter 'meshid' should be passed by const reference
2019-08-29 08:05:45 +02:00
escherstair
0dd1ae0196
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:51 +02:00
escherstair
9ad7ce1129
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:08 +02:00
escherstair
a9d902946d
fix inefficient check for 'Composition' emptiness
2019-08-29 08:01:00 +02:00
Kim Kulling
e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import
2019-08-28 09:14:51 +02:00
Gordon MacPherson
43cb76653b
Removed depreciated FBX Unit and scaling code
2019-08-27 15:54:27 +01:00
Gordon MacPherson
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
Gordon MacPherson
ad971468ef
size_t cannot be less than 0
2019-08-27 15:15:40 +01:00
Kim Kulling
0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong
2019-08-27 14:06:00 +02:00
Gordon MacPherson
7e12257ebc
Fix segfault #2614
2019-08-26 22:44:25 +01:00
Gordon MacPherson
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
Gordon MacPherson
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
Kim Kulling
48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones
2019-08-25 09:34:20 +02:00
Kim Kulling
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
Kim Kulling
9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-23 17:24:04 +02:00
Gordon MacPherson
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00