Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,199 Commits 19 Branches 43 Tags
a1bd83d7976fbddf9e5caa50f0fa4e3b08b2e97a
Commit Graph

3199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
a1bd83d797 ai_assert: split 2 checks in one macro to 2 separate ai_assert tests. 2016-02-01 16:16:09 +01:00
Kim Kulling
f1666d22ce Closes https://github.com/assimp/assimp/issues/778: export android system. 2016-01-31 13:44:15 +01:00
Kim Kulling
9f9f69d6cc AndroidJNIIOSystem: update license info to 2016. 2016-01-31 13:43:05 +01:00
Kim Kulling
16fffb2ab1 Merge branch 'master' of https://github.com/assimp/assimp 2016-01-31 00:42:02 +01:00
Kim Kulling
a37ea18f09 SIBImporter: fix c++14 compilation issue for clang. 2016-01-31 00:41:14 +01:00
Kim Kulling
bcd38707c5 3DSConverter: fix level 4 compiler warning. 2016-01-29 21:22:41 +01:00
Kim Kulling
bac6067869 gltf: make code more radable and check against one possible null ptr 
access.
 2016-01-27 20:26:38 +01:00
Kim Kulling
0e7446af83 Merge branch 'master' of https://github.com/assimp/assimp 2016-01-27 18:49:26 +01:00
Kim Kulling
8bbd55a790 PostProcessing: first prototype of customized post processing. 2016-01-27 18:49:01 +01:00
Kim Kulling
f473b17c99 Merge pull request #773 from boxdot/master 
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
 2016-01-27 17:20:26 +01:00
Kim Kulling
ce9ae0ae53 Merge pull request #772 from abma/master 
fix new / delete missmatch
 2016-01-27 17:19:52 +01:00
boxdot
13ec11bca8 Import mClipPlane{Near,Far} and mHorizontalFOV from Blender. 2016-01-27 02:12:15 +01:00
abma
b3b08728fa fix new / delete missmatch 2016-01-26 22:47:50 +01:00
Kim Kulling
11d0085f4d Merge pull request #770 from assimp/revert-765-master 
Revert "Fix issue: OBJ import takes forever (#759)"
 2016-01-26 00:14:27 +01:00
Kim Kulling
4633266c31 Revert "Fix issue: OBJ import takes forever (#759)" 2016-01-25 23:53:59 +01:00
Kim Kulling
d58f5613dd Merge pull request #765 from andrewparlane/master 
Fix issue: OBJ import takes forever (#759)
 2016-01-24 19:36:18 +01:00
Andrew Parlane
9969167c2a ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code. 
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
 2016-01-23 20:01:44 -04:00
Andrew Parlane
ce64dfb3fd ObjTools: Update getName() to work with const iterators. 
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
 2016-01-23 20:01:44 -04:00
Kim Kulling
0e4cf64a45 Merge pull request #763 from andrewparlane/mtlFix 
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
 2016-01-23 19:51:49 +01:00
Andrew Parlane
3c4e06c23f ObjFileMtlImporter: Fixed a segfault due to NULL ptr access. 
We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.
 2016-01-23 13:11:47 -04:00
Kim Kulling
a3a42fd08b Merge pull request #756 from StepanHrbek/master 
Collada exporter: improve compatibility when exported path contains ':'.
 2016-01-22 22:32:40 +01:00
Stepan Hrbek
c062eb0db4 Collada exporter: improve compatibility when exported path contains ':'. 
Old code exported "c:/foo.jpg" path as "c%3a/foo.jpg".
Replacing : with %3a was probably legal, but it made paths unreadable for existing Max importers.
 2016-01-21 22:35:44 +01:00
Kim Kulling
df9bb8b915 Update license date. 2016-01-21 19:53:25 +01:00
Kim Kulling
c02a1dd11a closes assimp/assimp/issues/710: use correct include for importerdesc in 
cimport.h
 2016-01-20 21:25:47 +01:00
Kim Kulling
ded37e8307 Merge pull request #736 from StepanHrbek/collada-unicode 
Collada exporter: fix unicode.
 2016-01-19 16:35:48 +01:00
Kim Kulling
9e6f22b913 Merge pull request #753 from wise86-android/ValgrinFree 
Valgrin free
 2016-01-19 16:34:58 +01:00
Stepan Hrbek
24f03141d6 Reimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version. 2016-01-18 10:10:49 +01:00
wise86Android
c7f69e151e fix memory leak 2016-01-17 15:18:12 +01:00
wise86Android
4af9632269 fix memory leak 2016-01-17 00:00:43 +01:00
wise86Android
bd032488e4 remove read unitilize memory 2016-01-16 23:42:43 +01:00
wise86Android
d51c2e6435 free the allocated import 2016-01-16 23:37:24 +01:00
wise86Android
f0fca826db remove initialization warnings 2016-01-16 23:28:52 +01:00
wise86Android
01a5035920 remove initialization warnings 2016-01-16 23:26:46 +01:00
Kim Kulling
8c13c8a558 PLYExporter: forbit copying + add empty destructor. 2016-01-14 20:44:09 +01:00
Kim Kulling
8f70830103 Closes https://github.com/assimp/assimp/issues/84: add another search path 
for XCode framework paths for IPhones.
 2016-01-13 18:55:47 +01:00
Kim Kulling
18c0e41d8f Colladaloader: fix usage of floorf. 2016-01-13 10:04:24 +01:00
Kim Kulling
42c1f9d3ba Closes https://github.com/assimp/assimp/issues/630: fix mis-merge. 2016-01-12 20:22:37 +01:00
Kim Kulling
d3ddabbd3e Merge branch 'master' of https://github.com/assimp/assimp 2016-01-11 21:16:17 +01:00
Kim Kulling
36668aa31a ASEParser: fix invalid size of buffer for log writing. 2016-01-11 21:15:30 +01:00
Kim Kulling
48eed0d2c6 Merge pull request #749 from andrewparlane/master 
ObjImporter: Added better progress reporting during file import.
 2016-01-11 20:39:09 +01:00
Andrew Parlane
1632f1fbb9 ObjImporter: Added better progress reporting during file import. 
There are two stages to this:
1) Processing '\'s - this accounts for 1/3rd of the file import progress.
2) Parsing the file data - this accounts for the other 2/3rds.
 2016-01-11 12:21:24 -04:00
Kim Kulling
bd268bd864 coverity scan: add missing initialization. 2016-01-10 20:25:01 +01:00
Kim Kulling
ec32da512b coverity scan: fix not initialized member in copy constructor. 2016-01-10 20:21:32 +01:00
Kim Kulling
3033d8c847 ColladaLoader: add missing .f 2016-01-09 18:09:52 +01:00
Kim Kulling
d18f978178 ColladaLoader: add missing members to initializer list. 2016-01-09 18:09:10 +01:00
Kim Kulling
1f356e87a8 appveyor: enable x86 build as well. 2016-01-09 12:13:39 +01:00
Kim Kulling
3d2140afee coverity finding: get latest openddlparser to get fix against possible nullptr access. 2016-01-08 16:55:31 +01:00
Kim Kulling
114d76765e OpenDDLParser: latest greatest to get fix for coverity finding ( dereferenfing possible null ptr ). 2016-01-08 16:46:13 +01:00
Kim Kulling
430b614a69 coverity scan: make place of false positive more understandable. 2016-01-08 16:18:32 +01:00
Kim Kulling
7ef579674d GenVertexNormalsProcess: use initalizer list instead of setting the earch angle in the constructor. 2016-01-07 15:03:10 +01:00