Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
2dc6ea85ec Merge branch 'master' of https://github.com/assimp/assimp 2016-02-03 20:20:16 +01:00
Kim Kulling
aff932cd9c Fix license date. 2016-02-03 20:19:59 +01:00
Kim Kulling
aef69ffe91 Merge pull request #779 from turol/master 
SIBImporter: Properly fix C++11 issues for Clang
 2016-02-02 20:40:52 +01:00
Turo Lamminen
0e06404ec1 SIBImporter: Properly fix C++11 issues for Clang 
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
 2016-02-02 20:29:40 +02:00
Kim Kulling
d9f133edec Doc: add missing ports to start README page. 2016-02-02 17:48:23 +01:00
Kim Kulling
b77228c7ea Android build doc: reformatting. 2016-02-02 11:00:28 +01:00
Kim Kulling
219bf32efe Rename android renameRename android rename. 2016-02-02 10:59:07 +01:00
Kim Kulling
7233aedac3 DOC: add link to ports in global readme. 2016-02-02 10:58:15 +01:00
Kim Kulling
72d720ecfb Doc: use markup format for android build instructions. 2016-02-02 10:52:28 +01:00
Kim Kulling
59ece7b9fa Datatypes: add missing unions for vector + color types. 2016-02-02 00:59:47 +01:00
Kim Kulling
aaec1656f3 Closes https://github.com/assimp/assimp/issues/43 : provide different 
matrix scheme via union.
 2016-02-01 16:16:48 +01:00
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
Paul Holland
c571b92dd7 bug fix 2016-01-28 08:06:52 -08: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
Andrew Parlane
109f6feb6e 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.

This time I've fixed the order of evaluation bug in the call to getFace().
 2016-01-25 20:44:31 -04:00
Andrew Parlane
c7d86e97cc 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-25 20:43:34 -04: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
rmitton
f23285a1ce Fixed whitespace to match coding standard. 2016-01-25 13:45:08 -08:00
rmitton
94a35dfdd2 Fixed NULL pointers to match coding standards. 2016-01-25 13:42:30 -08: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
rmitton
ae2cce0899 Validation fix for empty scenes. 
The validator requires empty scenes to have NULL pointers.
 2016-01-23 15:22:48 -08: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