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

103 Commits (2fa797949b0345738ececb44bdf853ca5efb070e)

Author SHA1 Message Date
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
Kim Kulling c3e2fa0761 - untabify obj parser. 
- bugfix openddl: latest version

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 19:31:23 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 12:47:53 +01:00
Kim Kulling e9dcad4181 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 21:23:50 +01:00
Alexander Gessler 455d190fd0 CMakeLists: backwards compatibility with CMake < 3.0. 2015-01-31 20:51:36 +01:00
Kim Kulling 0e579bfb06 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 12:01:18 +01:00
Kim Kulling e1c6a16b85 support of openddlparser lib without x++11. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:46:13 +01:00
Kim Kulling 8e87613bb3 add mmissing header. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:31:39 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:07:48 +01:00
Alexander Gessler 8b55d276e9 Revert "Fix warnings under Visual Studio 12" 2015-01-26 19:54:02 +01:00
Joe Hermaszewski 00d561982c Use size_t instead of int for number of points 
This squashes warnings under Visual Studio 12
 2015-01-26 15:46:58 +00:00
Joe Hermaszewski 1cf81227c4 Simplify behavior of SweepContext::InitEdges 2015-01-26 15:46:55 +00:00
Gustav 7c17c5f46b Also install zlibstatic 2014-12-29 16:30:44 +01:00
Gustav e6988f62f6 Fixed cmake 3x cmp0048 warning 2014-12-29 16:18:17 +01:00