Commit Graph

7635 Commits

Author SHA1 Message Date
Kim Kulling
fed7fcf2fb Update utFBXImporterExporter.cpp
put test in comments.
2019-09-18 14:09:48 +02:00
Kim Kulling
06542c49df Update utFBXImporterExporter.cpp
Disable test
2019-09-18 11:50:26 +02:00
Kim Kulling
8add762eac Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev 2019-09-17 22:12:43 +02:00
Kim Kulling
f5dcd5060f add missing namespace." 2019-09-17 22:11:58 +02:00
Kim Kulling
f7da7d8f67 Merge branch 'master' into kimkullig_dev 2019-09-17 22:01:29 +02:00
Kim Kulling
2edcf82f5a add missing include. 2019-09-17 21:58:46 +02:00
Kim Kulling
7f3b33d1c2 Merge pull request #2655 from PascalGilbraith/issue_2603
Issue 2603
2019-09-16 17:23:08 +02:00
Kim Kulling
8b95479bb0 closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon 2019-09-15 19:25:37 +02:00
PascalGilbraith
7f7918957a Issue 2603
Normal face indices added to end of already resized vector, so normal faces did not match position faces.
Use vector index rather than push.
2019-09-15 13:05:04 +01:00
Kim Kulling
2be0eba1ab put one in comments because the file seems to be corrupt. 2019-09-14 19:32:47 +02:00
Kim Kulling
ca0549558b closes https://github.com/assimp/assimp/issues/2653: introduce 2 tests to reproduce fbx-tokenize issue. 2019-09-14 10:31:35 +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
ab3528f726 Merge pull request #2646 from RumbleballTheReal/master
Build Binaries example batch
2019-09-14 01:07:22 +02:00
Kim Kulling
818a5b633f Merge branch 'master' into master 2019-09-13 22:23:49 +02:00
Kim Kulling
446381e1ca Merge pull request #2647 from FabienPean/patch-1
Update Sample_SimpleOpenGL.c
2019-09-13 18:51:52 +02:00
Kim Kulling
cc7ba5288c Merge branch 'master' into patch-1 2019-09-13 14:35:29 +02:00
Kim Kulling
ee1ed502e7 Merge pull request #2654 from assimp/kimkulling-patch-4
closes https://github.com/assimp/assimp/issues/2627 - fix typo
2019-09-13 14:35:10 +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
f985bcba83 Merge branch 'master' into patch-1 2019-09-13 11:21:57 +02:00
Kim Kulling
a642b1d51a Merge pull request #2649 from assimp/gltf_add_ortho_cam
Gltf add ortho cam
2019-09-12 21:40:01 +02:00
Kim Kulling
4d2adf5bea Merge branch 'master' into gltf_add_ortho_cam 2019-09-12 20:28:18 +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
783f92e148 Merge branch 'master' into patch-1 2019-09-12 16:26:35 +02:00
Kim Kulling
3069e2272d Merge pull request #2648 from rspencer01/master
Fix indentation error in python bindings
2019-09-12 16:26:00 +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
Kim Kulling
55b735b6c3 Merge branch 'master' into master 2019-09-11 20:18:53 +02:00
Kim Kulling
3cbcfd3cd8 Merge pull request #2650 from escherstair/fix-codacy-issues
Fix codacy issues - part #4
2019-09-11 20:15:41 +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
Robert Spencer
e1322f9178 Fix indentation error in python bindings 2019-09-10 20:38:31 +01:00
escherstair
b9cff2a019 prefer prefix ++/-- operators for non-primitive types 2019-09-10 07:54:07 +02:00
Fabien Péan
52d0170470 Update CMakeLists.txt 2019-09-09 23:00:04 +02:00
Fabien Péan
1899aaef6e Update Sample_SimpleOpenGL.c 2019-09-09 22:44:58 +02:00
Kim Kulling
bfac0aae9c Merge branch 'master' into master 2019-09-09 22:36:50 +02:00
Kim Kulling
d672ae21d0 Merge pull request #2640 from RevoluPowered/feature/implement-PBR-materials-fbx
FBX Implemented basic PBR material textures
2019-09-09 22:36:22 +02:00
RumbleballTheReal
a16645f3f7 Update BUILDBINARIES_EXAMPLE.bat 2019-09-09 21:20:44 +02:00
RumbleballTheReal
c19bd3d1d1 Merge branch 'master' into master 2019-09-09 21:17:22 +02:00
Kim Kulling
b4fdc009e2 Merge branch 'master' into feature/implement-PBR-materials-fbx 2019-09-09 20:51:20 +02:00
Kim Kulling
66e5765387 Merge branch 'master' of https://github.com/assimp/assimp 2019-09-09 20:22:48 +02:00
RumbleballTheReal
a0fb50146a Update BUILDBINARIES_EXAMPLE.bat 2019-09-09 15:56:21 +02:00
RumbleballTheReal
621a7a1abd Create BUILDBINARIES_EXAMPLE.bat 2019-09-09 15:50:57 +02:00
escherstair
db55ba4908 possible inefficient checking for 'tlist' emptiness 2019-09-09 15:00:28 +02:00
escherstair
027ee6ee00 Merge pull request #5 from escherstair/master
Merge master into fix-codacy-issues
2019-09-09 14:58:27 +02:00
escherstair
03514a9237 Merge pull request #4 from assimp/master
Sync with upstream repo
2019-09-09 14:20:15 +02:00
Kim Kulling
c519a91233 Merge pull request #2644 from FabienPean/patch-1
Fix Sample_SimpleOpenGL.c
2019-09-08 23:06:57 +02:00