Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,682 Commits 19 Branches 43 Tags
98b234020b45ee7adbd09e41b52d75ce1f01fd39
Commit Graph

1620 Commits

Author SHA1 Message Date
shin_mbpr_late2013
98b234020b Fixed AssBin loader. 
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
 2015-05-16 23:39:24 +09:00
Alexander Gessler
a1268bf864 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-12 21:52:25 +02:00
Alexander Gessler
0fe8e739c3 Use "wb" when writing binary STL exports, fixes #556. 2015-05-12 21:51:27 +02:00
Alexander Gessler
e3c29b7e4b Merge pull request #554 from assimp/fix-obj-material-name-spaces 
OBJ: Support spaces in material names, fixes #545.
 2015-05-12 21:44:07 +02:00
Alexander Gessler
faea2ecccc OBJ: Support spaces in material names, fixes #545. 
Adding test file.
 2015-05-10 23:50:18 +02:00
abma
b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00
Kim Kulling
70722ad318 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-05 22:27:13 +02:00
Kim Kulling
fd3a0d4a9d fix name handling of geoemtryobjectname nodes 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-05-05 22:27:05 +02:00
Madrich
b6d91ec11a Fix Path functions 
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
 2015-05-02 12:19:20 +02:00
Madrich
2dde962f0d FilePath Functions in DefaultIOSystems 
Replacements in Exporters
 2015-05-02 01:56:20 +02:00
Madrich
148207a073 Fix removed AssimpPCH 2015-05-01 23:16:44 +02:00
Madrich
71ae322e7b Merge pull request #5 from assimp/master 
Update Fork
 2015-05-01 23:01:33 +02:00
Madrich
58a72d9302 Fix Warnings 
Add Time in Step File
 2015-05-01 22:19:40 +02:00
Madrich
ca8a3909be Add StepExporter.cpp(stp) Export 
Fix XFile
 2015-05-01 21:40:51 +02:00
Highlife1911
4acb1d4c92 Removed FORCE attribute from CMake variable LIBRARY_SUFFIX 2015-05-01 14:13:28 +02:00
Alexander Gessler
2a7e49423a Merge pull request #547 from assimp/acgessler-patch-2 
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
 2015-04-30 15:19:01 +02:00
Kim Kulling
5357772cf5 fix build. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-30 14:31:23 +02:00
Kim Kulling
d5699cc89f fox build: add missing include for ai_assert. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-30 13:47:33 +02:00
Kim Kulling
31cce98680 fix color handling in opengex importer. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-30 12:54:59 +02:00
Alexander Gessler
78faabf0fa Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail. 2015-04-30 02:37:35 +02:00
Alexander Gessler
880cb473b0 Merge pull request #546 from terziman/master 
Minor improvments & bug fixes
 2015-04-30 02:35:52 +02:00
Léo Terziman
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
Kim Kulling
2f8f0b1b02 Merge branch 'master' of https://github.com/assimp/assimp 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ObjFileParser.cpp
 2015-04-29 13:18:51 +02:00
Kim Kulling
995bc41d57 color node handling opengex 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-29 11:57:39 +02:00
Léo Terziman
ca2e47b205 Fixed some typos 2015-04-29 09:26:11 +02:00
Léo Terziman
91c751a03a Added missing header 2015-04-28 12:29:39 +02:00
Léo Terziman
5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +02:00
Alexander Gessler
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
U-ORADEV\albihern
956fde6e66 Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin. 2015-04-20 17:49:02 -05:00
U-ORADEV\albihern
7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Łukasz Twarduś
55ae853c2e Fix compilation with libc++ 2015-04-19 10:55:58 +02:00
Kim Kulling
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
Kim Kulling
68ca2ca427 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-18 19:17:19 +02:00
Kim Kulling
08886e28d7 use <> include bracket style. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-18 19:17:10 +02:00
Alexander Gessler
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
David Jordan
b38572d1bc std::fabs from cmath should be right 2015-04-17 23:50:14 -04:00
David Jordan
b575acf2b6 std::absf to std::fabsf 2015-04-17 23:38:54 -04:00
David Jordan
e86d40e4e2 Added infinity check for outputting PLY normals 2015-04-17 23:29:26 -04:00
Kim Kulling
76dd9467b2 fix win32-build for assimp_viewer . 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-17 20:02:55 +02:00
Alexander Gessler
f435712273 Fix Mac build issues (clang 6.0 compiling x86_64) 2015-04-17 06:42:58 +02:00
David Jordan
f00101f496 Added include of qnan.h (now that AssimpPCH.h include was taken out) 2015-04-16 21:30:50 -04:00
David Jordan
3545d805d2 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 20:40:16 -04:00
David Jordan
fa626aa855 Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND' 2015-04-16 18:01:24 -04:00
Kim Kulling
d12868adc4 use correct type in forward declaration. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 12:32:35 +02:00
Kim Kulling
97946e25c9 fix travis build 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 12:09:06 +02:00
Kim Kulling
e4b84ff48a fix mem leak. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 11:47:14 +02:00
Kim Kulling
02ee002878 fix build for vs2013 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 11:38:53 +02:00
Kim Kulling
444a77e170 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 11:10:21 +02:00
Kim Kulling
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
abma
1c1f3c25f8 awww, merge error 2015-04-16 03:13:19 +02:00