c99bd9825a
Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...)
2015-04-29 18:13:16 +02:00
ca2e47b205
Fixed some typos
2015-04-29 09:26:11 +02:00
91c751a03a
Added missing header
2015-04-28 12:29:39 +02:00
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
2015-04-28 12:04:53 +02:00
5c890c1a90
Merge pull request #544 from aru/cygwin-build-fix
...
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
956fde6e66
Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin.
2015-04-20 17:49:02 -05:00
7043551068
Modifying files to let assimp build under cygwin.
2015-04-20 17:36:47 -05:00
55ae853c2e
Fix compilation with libc++
2015-04-19 10:55:58 +02:00
eb1ee61420
fix code reading findings: use of std::copy
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
68ca2ca427
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-18 19:17:19 +02:00
08886e28d7
use <> include bracket style.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:10 +02:00
27c6552ae8
Merge pull request #538 from cubeman99/master
...
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
2015-04-18 07:29:37 -07:00
b38572d1bc
std::fabs from cmath should be right
2015-04-17 23:50:14 -04:00
b575acf2b6
std::absf to std::fabsf
2015-04-17 23:38:54 -04:00
e86d40e4e2
Added infinity check for outputting PLY normals
2015-04-17 23:29:26 -04:00
76dd9467b2
fix win32-build for assimp_viewer .
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02:00
f435712273
Fix Mac build issues (clang 6.0 compiling x86_64)
2015-04-17 06:42:58 +02:00
f00101f496
Added include of qnan.h (now that AssimpPCH.h include was taken out)
2015-04-16 21:30:50 -04:00
3545d805d2
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 20:40:16 -04:00
fa626aa855
Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND'
2015-04-16 18:01:24 -04:00
d12868adc4
use correct type in forward declaration.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:32:35 +02:00
97946e25c9
fix travis build
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:09:06 +02:00
e4b84ff48a
fix mem leak.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
02ee002878
fix build for vs2013
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
444a77e170
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 11:10:21 +02:00
ead3e8d275
first version of material handling for opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
1c1f3c25f8
awww, merge error
2015-04-16 03:13:19 +02:00
611778045d
fix for upstream changes
2015-04-16 02:55:41 +02:00
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
470ad98281
fix "headercheck":
...
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
56e8dc5a43
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-14 12:04:47 +02:00
1899de6ea9
remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
0cee21ce3c
COB: code cleanup.
2015-04-13 21:52:09 +02:00
b3a3558da3
Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future.
2015-04-13 21:42:50 +02:00
28de609a56
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-13 16:02:02 +02:00
806d3ac8e1
- IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
...
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
e2f234707a
Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401 .
2015-04-12 19:53:24 +02:00
ed57fac879
create node tree
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
ecf390d51f
set the correct reference to meshes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-06 14:56:12 +02:00
22fc756d4a
- fix double initialization.
...
- use correct number of vectors for dynamic array.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 23:17:16 +02:00
df1134b1a3
- initiate texture coordinate array.
...
- use correct number of vertices for vertex array,
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:47 +02:00
c0e3540ec1
use size_t instead of unsigned int ( static code analysis finding ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:07 +02:00
50d5c5c4ef
Merge pull request #527 from VirusFree/pr_strtol10_64
...
fix for strtol10_64
2015-04-05 17:25:50 +02:00
9a7f90220a
Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init
...
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 17:05:16 +02:00
54ce3d843f
fix for strtol10_64
2015-04-05 16:40:40 +03:00
6a1522ded8
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 16:29:33 +03:00
da3c347a57
add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime)
2015-04-05 15:19:55 +03:00
3fa6882384
generate unique indices for importes vertices in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:59 +02:00
a50fa5f1de
add missing doc in obj importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:24 +02:00
Léo Terziman
Alexander Gessler
U-ORADEV\albihern
Łukasz Twarduś
Kim Kulling
David Jordan
Alexander Gessler
abma
ulf
George Papadopoulos