3b608307c8
prefer prefix ++/-- operators for non-primitive types
2019-09-18 08:00:58 +02:00
2be0eba1ab
put one in comments because the file seems to be corrupt.
2019-09-14 19:32:47 +02:00
03514a9237
Merge pull request #4 from assimp/master
...
Sync with upstream repo
2019-09-09 14:20:15 +02:00
1503608aaa
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:31:07 +02:00
bbb1f6a1dc
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:01:05 +02:00
db3bb22933
Xml: Prepare replacement of irrXml.
2019-07-21 12:19:19 +02:00
5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
dbd0f06d32
Update CMakeLists.txt
...
Make IrrXml dynamic only on BSD
2019-04-08 20:21:20 +02:00
98ed6a2e18
Merge branch 'master' into issue_2336
2019-04-08 16:39:54 +02:00
79f62b0174
closes https://github.com/assimp/assimp/issues/2336 : use new cmp_048 policy even for zlib in the assimp build.
2019-04-08 14:24:33 +02:00
37357515fa
Update irrXML.h
...
FIx export directive for linux.
2019-04-08 12:49:07 +02:00
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
d62724ab4f
Update test.c
...
fix compiler warnings.
2019-03-29 09:05:24 +01:00
92ec834fec
Update zip.c
...
Fix compiler warnings.
2019-03-29 08:42:19 +01:00
7b4c704e6b
Update README.md
...
Fix format findings.
2019-03-29 08:27:38 +01:00
ab92f50fa8
Add upstreamed change to miniz.h
2019-03-27 11:28:37 -04:00
bb11f90983
Update zip library to current head. Closes assimp/assimp#2388
2019-03-26 22:45:20 -04:00
525566b8b8
try to fix shared object issue.
2019-03-16 18:36:26 +01:00
a3fdb46f67
fix typo.
2019-03-16 17:02:38 +01:00
f4ec02a34b
Fix install folders for cmake - os files.
2019-03-16 16:10:30 +01:00
e9b6a4895d
Fix the build.
2019-03-16 15:32:47 +01:00
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
3f9a25df5a
Devil: replace this by header-only lib.
2019-02-07 17:09:05 +01:00
b59d931486
Correction on clipper crash on some IFC files when points are empty
2019-01-02 14:56:38 +01:00
6e95601875
OpenDDLParserUtils: replace chartype_table with simple comparison
2018-11-26 12:06:08 +01:00
f75bf6d99c
MAke noexcept compiler-specific.
2018-09-21 16:25:27 +02:00
f818a909e5
Fix static-code-analysis findings.
2018-09-21 16:07:09 +02:00
e13f6876bb
closes https://github.com/assimp/assimp/issues/1340 : Fix handling of empty nodes in openddl-parser.
2018-07-11 10:10:26 +02:00
59ea3b6c85
fixed android zlib compile error.
2018-02-09 16:02:27 +01:00
280c995191
closes https://github.com/assimp/assimp/issues/905 : add missing contrib source from zlib.
2018-01-31 22:55:05 +01:00
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
cf59c7d153
Update o3dgcTimer.h
...
closes https://github.com/assimp/assimp/issues/1642 : fix build on Hurd
2018-01-03 00:56:32 +01:00
fb660823fc
new gtest version: 1.8.0
2018-01-01 19:42:01 +01:00
6a9df80f68
closes https://github.com/assimp/assimp/issues/1655 : add typedef for android NDK.
2017-12-28 14:52:41 +01:00
0cc25491a4
irrXML: Remove horrible hack
2017-12-24 15:38:42 +02:00
f9b599355c
unzip: fix build with older zlib
...
Fixes "unzip.c:150:11: error: unknown type name 'z_crc_t'"
2017-12-12 02:28:03 -08:00
36cddcc8b7
Update miniz.h
...
retrigger CI.
2017-12-04 15:20:23 +01:00
fe6608175b
Update miniz.h
...
Fix test against null bytes to push back.
2017-12-04 15:19:34 +01:00
98cb898463
Merge branch 'master' into kimkulling-miniz-memoryaccessfix
2017-12-04 13:31:00 +01:00
b92c3ca161
fix invalid op
2017-12-04 13:19:34 +01:00
45f2f31011
miniz: Remove some dead assignments
2017-12-02 17:59:04 +02:00
2897433358
Update miniz.h
...
Add an assertion test and return true to not change the expected behaviour of buggy function.
2017-11-30 10:47:52 +01:00
915ee95ad3
Fx nullptr dereference.
2017-11-30 09:12:41 +01:00
59dcfefeb2
fix unaligned memory access.
2017-11-29 16:45:09 +01:00
fd2da59427
fix unaligned memory access.
2017-11-29 16:23:12 +01:00
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
53119e74f8
Open3DGC: Fix strict-aliasing warnings
2017-11-18 15:59:30 +02:00
07a99e0843
Merge branch 'master' into issue_1513
2017-11-16 17:32:34 +01:00
7db10022e9
closes https://github.com/assimp/assimp/issues/1513 : fix assimp for cross compile for android
2017-11-15 21:26:25 +01:00
983e52e308
unzip: Remove dead assignment
2017-11-15 12:45:27 +02:00
76de3e0828
clipper: Add assertion to silence a static analyzer warning
2017-11-15 12:35:06 +02:00
c248ae3797
unzip: Remove dead assignments
2017-11-15 12:33:34 +02:00
9b88715361
unzip: Bail on bad compression method
2017-11-15 12:32:24 +02:00
0bc259fd95
unzip: Fix possibly uninitialized variables
2017-11-15 12:30:55 +02:00
11fdaa31bc
clipper: Add assertion to silence a static analyzer warning
2017-11-15 12:18:39 +02:00
fc59f190ae
OpenDDLExport: Reduce scope of a variable
2017-11-15 12:15:53 +02:00
ef91211231
OpenDDLExport: Remove dead variable
2017-11-15 12:14:56 +02:00
be1d346c28
Open3DGC: Add assertions to silence static analyzer warnings
2017-11-15 12:12:06 +02:00
58d5d04e82
OpenDDLParser: Remove dead assignment
2017-11-15 12:06:30 +02:00
635a515e69
OpenDDLParser: Fix another potential memory leak
2017-11-15 12:06:21 +02:00
eb5f47f5c5
OpenDDLParser: Fix potential memory leak
2017-11-15 11:58:13 +02:00
2929a27edc
add unittest for x3d-importer.
2017-11-05 17:41:26 +01:00
5b76a31485
fix trivial warnings
...
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
f90d874978
Open3DGC: Remove redundant const qualifiers from return types
2017-10-08 12:48:45 +03:00
9f5b58e706
Upgrade RapidJSON to get rid of a clang warning
2017-10-06 18:23:28 +03:00
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
4a9ab98240
Merge pull request #1474 from jaredmulconry/issue_1470
...
Update zlib contribution
2017-10-06 15:40:36 +02:00
65547d5760
Upgrade RapidJSON to get rid of a clang warning
2017-10-05 12:15:28 +03:00
e7c112916b
Removed unnecessary files from zlib contribution
2017-10-05 20:11:18 +11:00
bab6ca2085
Upgraded zlib to 1.2.11.1 from the develop branch.
2017-10-04 20:33:59 +11:00
c202d43d8f
Merge pull request #1466 from jaredmulconry/issue_1330
...
Eliminated warnings when building the project with clang
2017-10-01 20:03:30 +02:00
45d93701f8
Open3DGC: Fix some uninitialized variable warnings
2017-09-30 16:45:53 +03:00
9088deeb1d
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
2017-09-30 23:29:56 +10:00
4feac1b1f9
Changed a couple more function interfaces to correct the input type.
2017-09-29 01:40:05 +10:00
12b6895f7b
Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table
2017-09-29 01:29:11 +10:00
94a6fc78f4
Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen.
2017-09-15 18:27:59 +10:00
d0d45d1d22
Fix linking issue with irrXML
2017-08-20 19:07:09 +01:00
c3cd7349d0
unzip: latest greatest.
2017-08-05 18:46:34 +02:00
afb2f3036e
OpenDDLParser: latest greatest.
2017-06-25 13:21:36 +02:00
51b915c97b
openddlparser: closes https://github.com/assimp/assimp/issues/1271 .
2017-06-19 21:07:18 +02:00
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
f84851e893
PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
...
IFC :
- update poly2tri to avoid crash on some IFC files
Collada :
- manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
4a0171bd82
- Apply mechanism to decide use for IrrXML external or internal
...
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05:00
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
3c5f1578c2
Fixes two type warnings and a missing case option
2016-12-07 20:30:45 -05:00
2d563180ac
Fixed build warnings on MSVC14 x64 in sweep context sources.
2016-11-27 13:39:09 +11:00
12aab0f4ef
Fixed build warnings on MSVC14 x64 in the O3DGC sources.
2016-11-20 12:29:01 +11:00
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
b5c7c9c3ac
Fix compile error with MSVC 2015
...
This patch fixes compilation with MSVC 2015. WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.
2016-11-02 18:42:16 +01:00
dad4d0fa99
[F] min/max redefined when including windows.h
2016-09-15 22:25:34 +03:00
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
68e6f2a32c
Unittest: add gtest as part of the contrib to avoid build issues on
...
offline systems.
2016-09-11 16:06:29 +02:00
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
c403565d06
Update rapidjson to v1.0.2
2016-08-14 11:58:12 +02:00
0dcf4dcd16
[F] Typo.
2016-08-11 01:02:32 +03:00
e61fc06c40
[F] Comparison between signed and unsigned integer.
2016-08-08 19:04:37 +03:00
054820e6ff
[+] Added Open3DGC codec from KhronosGroup repository.
2016-08-03 03:34:54 +03:00
e888e72599
Fix warning
...
The call to sprintf was causing a warning in vs2015 because of wrong type.
2016-07-24 02:33:33 -06:00
41eeacefab
Merge pull request #923 from tgoulart/fix_ios_build
...
Fix compilation of iOS static libraries
2016-06-28 22:48:58 +02:00
19ba6448f0
OpenDDLParser: latest greatest.
2016-06-28 13:13:08 +02:00
867063d8c3
Fix compilation of iOS static libraries.
...
1. Building for any targets using clang-703.0.31 failed with multiple errors. Using c++11 or c++14 as -std builds successfully.
2. Building for arm64 failed compilation due to duplicate constructors in rapidjson's document.h.
2016-06-24 02:24:11 -07:00
6bc36eb2b6
Fix mistake while switching to new PI constants
...
From previous pullrequest (https://github.com/assimp/assimp/pull/859 ),
commit 7c0e40a3f4
2016-04-21 15:23:14 +02:00
7c0e40a3f4
Add definition for PI and PI_2
...
M_PI and M_PI_2 are not C++ standard and are therefore not present, in
MinGW-w64 gcc 5.1.0 for example. We therefore replace it with an own
definition.
Since math.h was only included for M_PI and M_PI_2 makros, we can now
remove it.
Signed-off-by: Squareys <Squareys@googlemail.com>
2016-04-21 08:17:06 +02:00
a998055cbd
OpenDDLParser: add missing files.
2016-02-07 17:59:56 +01:00
522f4e0882
Closes https://github.com/assimp/assimp/issues/786 :
...
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
3d2140afee
coverity finding: get latest openddlparser to get fix against possible nullptr access.
2016-01-08 16:55:31 +01:00
114d76765e
OpenDDLParser: latest greatest to get fix for coverity finding ( dereferenfing possible null ptr ).
2016-01-08 16:46:13 +01:00
54ac680400
fix merge conflict.
2016-01-06 22:19:07 +01:00
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
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
43be58bbfe
rapidjson: add apple-specific constructor with size_t.
2015-12-28 13:02:04 +01:00
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
dd89bd3703
Only test for __APPLE__ here to avoid conflicts with Linux (and maybe Windows)
2015-12-17 17:02:06 -05:00
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
714630cc11
Contrib: remove deprecated pacakgeContrib: remove deprecated pacakge..
2015-11-29 20:37:05 +01:00
64a020965f
Added RapidJSON to contrib
2015-11-26 02:33:39 +01:00
db8845d2b2
glTF: add jsn reader + example model to work on.
2015-11-25 22:03:39 +01:00
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
eadc6116c0
OpenDDLParser: latest greatest.
2015-10-31 09:43:34 +01:00
e7fa8fa8ae
OpenDDLParser: add missing files.
2015-10-02 00:38:50 +02:00
4a8b459706
OpenDDLParser: latest greatest.
2015-10-01 20:29:15 +02:00
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
f7a8c80fc2
- Previous merge accidentally copied OpenDDL C++ files into include directory.
2015-07-26 19:35:14 -07:00
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
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
65374b085d
Removing another test that cannot fail.
2015-07-04 17:49:15 -04:00
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
36a9f2be1a
Merge pull request #577 from g-pechorin/patch-4
...
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
9c26f229a3
- OpenDDL-Parser: latest greatest.
...
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
99e45b995b
fixed warning
2015-05-31 12:56:17 +01:00
2c60da38f3
openddl-parser: V0.2.0
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:26:40 +02:00
31cce98680
fix color handling in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
380d4f53a0
fix build
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 17:34:30 +02:00
ce939b5126
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:13 +02:00
444a77e170
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 11:10:21 +02:00
223a5385af
openddl-parser latest greatest
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:09:54 +02:00
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
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
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
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
5b2ab2f76a
OpenDDLParser: latest greatest,
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-23 18:46:41 +01:00
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
abe82a5d73
add missing include
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 12:34:11 +01:00
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
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
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
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
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
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
79db48a0d1
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-09 10:17:23 +01:00
0292868917
add geomentry node handling.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-14 16:12:09 +01:00
f5f0c9f7cf
update openddl-parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-14 16:11:46 +01:00
bd1168af30
fix invalid line endling handling.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:46:02 +01:00
556bc9c1f3
fix build
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:09:03 +01:00
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
20b3ce6a40
replace opengexparser by using openddl-parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 12:47:53 +01:00
e9dcad4181
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 21:23:50 +01:00
455d190fd0
CMakeLists: backwards compatibility with CMake < 3.0.
2015-01-31 20:51:36 +01:00
0e579bfb06
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 12:01:18 +01:00
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
8e87613bb3
add mmissing header.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:31:39 +01:00
1ee4c06e4b
add openddl-parser to contrib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:07:48 +01:00
8b55d276e9
Revert "Fix warnings under Visual Studio 12"
2015-01-26 19:54:02 +01:00
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
1cf81227c4
Simplify behavior of SweepContext::InitEdges
2015-01-26 15:46:55 +00:00
7c17c5f46b
Also install zlibstatic
2014-12-29 16:30:44 +01:00
e6988f62f6
Fixed cmake 3x cmp0048 warning
2014-12-29 16:18:17 +01:00
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
c7ab8383bd
fix warning:
...
equality comparison with extraneous parentheses
2014-08-17 23:39:49 +02:00
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
505a8d42aa
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
contrib/zlib/CMakeLists.txt
2014-01-31 11:14:59 +01:00
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
bac6b34504
Removing null characters from xml parser input to avoid parsing failures
2014-01-17 11:48:42 +01:00
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
e4867646ab
Small corrections for the upgrading of zlib
2014-01-17 11:25:22 +01:00
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
561f3bc6ea
Update CMakeLists.txt for zlib to build on MSVC again, closes #170 .
2013-10-27 18:19:08 +01:00
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
b96cd522fa
bugfix : add cmakein file for zlib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:06:16 +02:00
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
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
d62c929b7a
bugfix : fix compiler warning.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-15 20:51:34 +02:00
bae9db2f03
Merge branch 'master' of git://github.com/assimp/assimp
2012-12-21 16:24:05 +01:00
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
879f2ed177
- fix some -Wall warnings
2012-07-08 03:28:14 +02:00
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
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
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
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
850285b56e
# poly2tri: add missing <stdexcept>
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1117 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:37:46 +00:00
56eb2dd7ee
+ add polyclipper to assimp repository.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1116 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:19:20 +00:00
1ebd116dff
+ add poly2tri to assimp repository.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1115 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:17:50 +00:00
2ffac898d6
[3393728] [PATCH 1/2] ommit->omit and splitted->split
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1064 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-20 22:00:33 +00:00
3db25db8e2
# when compiling with MSVC's C compiler, (void)param won't be accepted, omit it at all to avoid trouble.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1031 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:43:28 +00:00
9edc0a9b8e
merge with git://github.com/tonttu/assimp.git
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:32 +00:00
c05acabea9
- update cmake build environment, now includes targets to build debian packages for Assimp.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 19:34:21 +00:00
escherstair
Kim Kulling
Rémi Verschelde
Kim Kulling
Charlie Gettys
Arkeon
Martin Jerabek
Marco Di Benedetto
BuildTools
Turo Lamminen
ilovezfs
Thomas Lemaire
Jared Mulconry
Lee Jeffery
Helio Chissini de Castro
Antoine Bolvy
Tan Li Boon
Andy Maloney
Jared Mulconry
rdb
smalcom
TrianglesPCT
Thiago Goulart
Squareys
Danke Xie
carlsonsolutiondesign
Otger
IOhannes m zmölnig
Wil Shipley
Russ Taylor
Alexander Gessler
Peter LaValle
abma
Alexander Gessler
Joe Hermaszewski
Gustav
Jared Duke
Léo Terziman
aramis_acg
kimmi