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

81 Commits (d2d41a8aee2704c849c34dec31abc43871a68338)

Author SHA1 Message Date
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
Jared Duke 66e608a393 Replace cppunit with the googletest framework 
The GTest framework has a more active support base, and natively
supports CMake. Introduce it as an external dependency (using CMake's
ExternalProject_Add), replacing cppunit and porting the associated unit
tests.
 2014-09-07 16:52:03 -07:00
abma c7ab8383bd fix warning: 
equality comparison with extraneous parentheses
 2014-08-17 23:39:49 +02:00
abma 56ddb4f4af fix some compile warnings: 
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
 2014-08-17 23:28:00 +02:00
Léo Terziman 505a8d42aa Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	contrib/zlib/CMakeLists.txt
 2014-01-31 11:14:59 +01:00
Kim Kulling f99e307c4b bugfix: 
- remove commented code in cmake build for zlib_static.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-01-29 21:07:21 +01:00
Léo Terziman bac6b34504 Removing null characters from xml parser input to avoid parsing failures 2014-01-17 11:48:42 +01:00
Léo Terziman 2071b4fb2f Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib 
Conflicts:
	CMakeLists.txt
	contrib/zlib/CMakeLists.txt
	contrib/zlib/zconf.h.included
 2014-01-17 11:30:33 +01:00
Léo Terziman e4867646ab Small corrections for the upgrading of zlib 2014-01-17 11:25:22 +01:00
Alexander Gessler 639afc6f01 Apply patch from #168. Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea, but leave all Zlib install stuff commented. 2013-10-29 00:52:47 +01:00
Alexander Gessler 561f3bc6ea Update CMakeLists.txt for zlib to build on MSVC again, closes #170. 2013-10-27 18:19:08 +01:00
Kim Kulling 1867a4a3a3 bugfix: add missing zconf file for cmake. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-10-14 20:09:35 +02:00
Kim Kulling b96cd522fa bugfix : add cmakein file for zlib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-10-14 20:06:16 +02:00
Kim Kulling e88fcb27bf update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 ) 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-10-14 19:27:40 +02:00
Jared Duke 9f2336e5d4 Fix Android compilation with STLport 
Satisfy STLport's runtime_error constructor with an explicit string argument.
 2013-08-20 20:02:07 -07:00
Kim Kulling d62c929b7a bugfix : fix compiler warning. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-08-15 20:51:34 +02:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
aramis_acg 0696d97399 - update clipper to v4.8.8 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1311 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-17 00:41:29 +00:00
acgessler 879f2ed177 - fix some -Wall warnings 2012-07-08 03:28:14 +02:00
kimmi 37fb338c1f - Update : Fix the M3-Importer: geometry import works. 
- Update : Add a non-bsp example model for the m3-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-19 09:10:04 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 03:38:30 +00:00
aramis_acg db3cee8501 # Ifc: fix bug while filling window contours. 
# Ifc: filter out duplicate openings.
- poly2tri: change comparison epsilon to a more suitable value (found by trial&error).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1146 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 02:28:25 +00:00
aramis_acg 02fc5effba # poly2tri: fix Point::operator!= (http://code.google.com/p/poly2tri/issues/detail?id=38). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1135 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-02 03:05:41 +00:00