v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,181 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

116 Commits (0e4cf64a45688557533b9aac751cfec7a51139e7)

Author SHA1 Message Date
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 54ac680400 fix merge conflict. 2016-01-06 22:19:07 +01:00
Kim Kulling 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013 
and earier ( closes https://github.com/assimp/assimp/issues/743 )
 2016-01-06 15:35:25 +01:00
Danke Xie b2760abeb2 Fix compilation error for Mac OS X and 64-bit architecture 
For a 64-bit architecture, unsigned long and size_t are the same.
This causes a compilation error due to duplicate constructors in document.h.
 2016-01-02 01:29:47 -08:00
Kim Kulling 43be58bbfe rapidjson: add apple-specific constructor with size_t. 2015-12-28 13:02:04 +01:00
Kim Kulling 22f7f60ba0 glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723 2015-12-27 20:36:54 +01:00
carlsonsolutiondesign dd89bd3703 Only test for __APPLE__ here to avoid conflicts with Linux (and maybe Windows) 2015-12-17 17:02:06 -05:00
carlsonsolutiondesign fa0427ca28 Copies the GenericValue(uint64_t) to a GenericValue(unsigned long) for compilation on Mac OS X 10.11.2. Not compiled on Windows yet. Will have to reboot and install Visual Studio or equivalent to compile, so I'm hoping someone else can look at the code and merge for Windows and Linux. Thanks! 2015-12-17 12:16:25 -05:00
Kim Kulling 714630cc11 Contrib: remove deprecated pacakgeContrib: remove deprecated pacakge.. 2015-11-29 20:37:05 +01:00
Otger 64a020965f Added RapidJSON to contrib 2015-11-26 02:33:39 +01:00
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
IOhannes m zmölnig 7806e991d9 Convert Windows-1252 charset to UTF-8 
Windows-1252, seriously?
(this hard-to-detect weirdo charset really makes some problems with some
cmdline text-tool)
 2015-11-13 23:01:49 +01:00
Kim Kulling eadc6116c0 OpenDDLParser: latest greatest. 2015-10-31 09:43:34 +01:00
Kim Kulling e7fa8fa8ae OpenDDLParser: add missing files. 2015-10-02 00:38:50 +02:00
Kim Kulling 4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Wil Shipley f7a8c80fc2 - Previous merge accidentally copied OpenDDL C++ files into include directory. 2015-07-26 19:35:14 -07:00
Wil Shipley 8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd) 
- Added at least some of the new files to my Xcode 6 project, as
well.
    - Built and tested with the DAE importer, seems to work fine.
 2015-07-26 19:16:01 -07:00
Russ Taylor f618387b06 Added const to string definitions so that the compiler won't warn about them being unused. 2015-07-04 18:31:25 -04:00
Russ Taylor 65374b085d Removing another test that cannot fail. 2015-07-04 17:49:15 -04:00
Russ Taylor d5d0ceedae Removing checks for impossible things. The code comments said that we should not be able to get to this case, but if fact we cannot get to the case. 2015-07-04 17:46:59 -04:00
Alexander Gessler 36a9f2be1a Merge pull request #577 from g-pechorin/patch-4 
not-git (and "nested" builds)
 2015-06-04 23:46:05 +02:00
Kim Kulling 9c26f229a3 - OpenDDL-Parser: latest greatest. 
- Add support of OpenGEX-texture types.
 2015-05-31 20:36:55 +02:00
Peter LaValle 99e45b995b fixed warning 2015-05-31 12:56:17 +01:00
Kim Kulling 2c60da38f3 openddl-parser: V0.2.0 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-05-05 22:26:40 +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
Kim Kulling 380d4f53a0 fix build 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-29 17:34:30 +02:00
Kim Kulling ce939b5126 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-29 11:57:13 +02:00
Kim Kulling 444a77e170 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 11:10:21 +02:00
Kim Kulling 223a5385af openddl-parser latest greatest 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 11:09:54 +02:00
abma 8c45a4dc3b Merge remote-tracking branch 'origin' 
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
 2015-04-16 01:03:00 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Kim Kulling 14e65f5325 openddl-parser: latest greatest: 
fix invalid handling of float values stored a hexadecimal literals.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-14 12:04:39 +02:00
Kim Kulling 11b9d83d4c openddlparser: latest greatest ( contains fix for correct handling of data array lists ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-28 10:50:32 +01:00
Kim Kulling d19a677f88 openddl-parser: latest greatest. 
Contains fix for https://github.com/kimkulling/openddl-parser/issues/10 and https://github.com/kimkulling/openddl-parser/issues/13
 2015-03-25 19:55:39 +01:00
Kim Kulling 5b2ab2f76a OpenDDLParser: latest greatest, 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-23 18:46:41 +01:00
Kim Kulling d045dbdb69 fix openddl-issue wih token type containing line end. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-20 21:55:19 +01:00
Kim Kulling abe82a5d73 add missing include 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 12:34:11 +01:00
Kim Kulling 40369010c3 fix usage of c++11 type nullptr. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 12:14:17 +01:00
Kim Kulling f7e5f3ec6b assimp: fix build with latest version of openddl-parser lib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 12:07:16 +01:00
Kim Kulling 05208a5014 try to fix build of win32 crosscompile. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 19:43:41 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
 2015-03-17 14:26:39 +01:00
Kim Kulling 0d5a2ce4c1 openddl-parser: latest greatest with fixes for invalid reference information. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 14:25:15 +01:00
Kim Kulling 207906f039 first parsing of references and geometry objects. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-16 20:34:42 +01:00
Kim Kulling 79db48a0d1 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-09 10:17:23 +01:00
Kim Kulling 0292868917 add geomentry node handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:12:09 +01:00
Kim Kulling f5f0c9f7cf update openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:11:46 +01:00
Kim Kulling bd1168af30 fix invalid line endling handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:46:02 +01:00
Kim Kulling 556bc9c1f3 fix build 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:09:03 +01:00