Kim Kulling
d898ecc80c
Fix another typo.
2021-01-06 18:59:13 +01:00
Kim Kulling
2ad4218d25
Merge branch 'master' into master
2021-01-06 18:54:57 +01:00
Kim Kulling
5222ab989f
Fix a typo
2021-01-06 18:51:59 +01:00
Kim Kulling
b23ecb4864
Update CMakeLists.txt
...
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
2021-01-06 18:51:30 +01:00
ihsinme
e1052f421b
Update OpenDDLParser.cpp
2021-01-06 16:52:28 +03:00
ihsinme
177304bb7c
Update o3dgcArithmeticCodec.cpp
2021-01-06 16:50:07 +03:00
Fabrice Fontaine
bfe35fc06b
contrib/zlib/CMakeLists.txt: don't install zlib
...
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-12-27 15:27:41 +01:00
Jean-Louis
c464d01778
Fix fopen64, ftello64, fseeko64 declarations on all platforms
2020-12-24 03:18:09 +01:00
Jean-Louis
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
Biswapriyo Nath
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
Biswapriyo Nath
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
Kim Kulling
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
Kim Kulling
22ad7028f0
Delete CMakeLists.txt
2020-10-27 09:42:46 +01:00
Kim Kulling
4bba338d92
Update CMakeLists.txt
2020-10-27 09:23:20 +01:00
Kim Kulling
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
Kim Kulling
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
Silvio Traversaro
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
Kim Kulling
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
Kim Kulling
9303fb31f6
Enable export only for windows
2020-10-02 11:30:37 +02:00
Kim Kulling
9d296f3943
export pugixml symbold in assimp
2020-10-01 22:02:03 +02:00
kimkulling
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
kimkulling
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
Kim Kulling
484d305987
pugi: enable static linkage explicitely.
2020-09-29 20:33:39 +02:00
Kim Kulling
8f0888f7fc
diable hunter fr pugi.
2020-09-28 20:03:51 +02:00
Kim Kulling
a6b90c354b
fix pugi warnings
2020-09-27 20:38:09 +02:00
Kim Kulling
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
Arthur (fuj1n) Uzulin
995ab805ff
Update utf8cpp to fix use of C++17 deprecated feature
2020-08-17 17:54:48 +10:00
Kim Kulling
c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax
2020-07-24 11:14:15 +02:00
MeyerFabian
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
MeyerFabian
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
awr1
77cf6e3433
Ensure that zip.h warning disable is pushed
2020-07-14 22:07:24 -05:00
awr1
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
Kim Kulling
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
Kim Kulling
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
kimkulling
f0f6612b81
disable warning for radjson.
2020-06-15 20:52:11 +02:00
Hanif Bin Ariffin
d4ca91f408
Evaluated the following expressions to either values.
2020-05-28 19:20:54 -04:00
Kim Kulling
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
Kim Kulling
ea26cba420
Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001
2020-05-09 11:10:33 +02:00
kkulling
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
luca
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
Peter Seiderer
74c8d09bd8
contrib/zlib: disable dynamic library building
...
Fixes compile failure for static only toolchains (and assimp
links against the static one).
2020-04-13 14:55:57 +02:00
Kim Kulling
d2499ac197
Update CMakeLists.txt
...
Linke irrXml static for apple
2020-04-10 12:52:54 +02:00
Kim Kulling
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
Andy Maloney
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
Kim Kulling
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
Kim Kulling
9f7d9becb2
fix the linux build.
2020-03-21 08:56:49 +01:00
Aaron Franke
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
kimkulling
ac3f08a4d8
fix 3rdparty warnings.
2020-03-20 09:49:36 +01:00
Kim Kulling
9aa5e3e04f
fix new vs2013 warnings.
2020-03-18 21:32:17 +01:00
Kim Kulling
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
Kim Kulling
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
kimkulling
bb3db0ebaf
closes https://github.com/assimp/assimp/issues/2954 : upgrade to latest greatest.
2020-03-09 10:51:26 +01:00
Kim Kulling
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
Marc-Antoine Lortie
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
Kim Kulling
92da00329f
Update irrArray.h
...
fix init ordering.
2020-02-16 18:10:52 +01:00
Kim Kulling
d75f46280d
Update irrString.h
...
fiix ordering of initializiation
2020-02-16 15:32:29 +01:00
Kim Kulling
4a3ecbea14
disable arning for irrXml.
2020-02-15 11:43:35 +01:00
Kim Kulling
b072614fad
disable warnings for zib.
2020-02-15 11:40:26 +01:00
Kim Kulling
a905303764
IrrXml: replaced irrXml by pugixml.
2020-01-23 21:16:10 +01:00
Kim Kulling
d48b93cf34
Merge branch 'master' into pugi_xml
2020-01-18 08:28:19 +01:00
Kim Kulling
783430667b
fix initializer ordering for irrXml.
2020-01-17 20:21:53 +01:00
Kim Kulling
f51b9378b1
updating irrXml.
2020-01-17 19:26:58 +01:00
Kim Kulling
40d882af4f
fix irrreader leak.
2020-01-16 20:25:47 +01:00
Kim Kulling
f78446b14a
closes https://github.com/assimp/assimp/issues/2733 : update of zlip to fix gcc build for v9.2.0 32 bit
2019-11-19 20:30:40 +01:00
tanolino
82f926971b
Update CXMLReaderImpl.h
...
Issues with German locale number converter expecting German numbers.
In Germany we have numbers like #,## instead of #.## . Thus a unit conversion in COLLADA of 0.01 (centimeter) turned out to be 0.00.
2019-11-01 17:01:52 +01:00
Kim Kulling
4b9cc1a484
Merge branch 'master' into fix-codacy-issues
2019-09-18 20:32:49 +02:00
escherstair
3b608307c8
prefer prefix ++/-- operators for non-primitive types
2019-09-18 08:00:58 +02:00
Kim Kulling
2be0eba1ab
put one in comments because the file seems to be corrupt.
2019-09-14 19:32:47 +02:00
escherstair
03514a9237
Merge pull request #4 from assimp/master
...
Sync with upstream repo
2019-09-09 14:20:15 +02:00
escherstair
1503608aaa
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:31:07 +02:00
escherstair
bbb1f6a1dc
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:01:05 +02:00
Kim Kulling
db3bb22933
Xml: Prepare replacement of irrXml.
2019-07-21 12:19:19 +02:00
Rémi Verschelde
5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
Kim Kulling
dbd0f06d32
Update CMakeLists.txt
...
Make IrrXml dynamic only on BSD
2019-04-08 20:21:20 +02:00
Kim Kulling
98ed6a2e18
Merge branch 'master' into issue_2336
2019-04-08 16:39:54 +02:00
kimkulling
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
Kim Kulling
37357515fa
Update irrXML.h
...
FIx export directive for linux.
2019-04-08 12:49:07 +02:00
Kim Kulling
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
Kim Kulling
d62724ab4f
Update test.c
...
fix compiler warnings.
2019-03-29 09:05:24 +01:00
Kim Kulling
92ec834fec
Update zip.c
...
Fix compiler warnings.
2019-03-29 08:42:19 +01:00
Kim Kulling
7b4c704e6b
Update README.md
...
Fix format findings.
2019-03-29 08:27:38 +01:00
Charlie Gettys
ab92f50fa8
Add upstreamed change to miniz.h
2019-03-27 11:28:37 -04:00
Charlie Gettys
bb11f90983
Update zip library to current head. Closes assimp/assimp#2388
2019-03-26 22:45:20 -04:00
Kim Kulling
525566b8b8
try to fix shared object issue.
2019-03-16 18:36:26 +01:00
Kim Kulling
a3fdb46f67
fix typo.
2019-03-16 17:02:38 +01:00
Kim Kulling
f4ec02a34b
Fix install folders for cmake - os files.
2019-03-16 16:10:30 +01:00
Kim Kulling
e9b6a4895d
Fix the build.
2019-03-16 15:32:47 +01:00
Kim Kulling
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
kimkulling
3f9a25df5a
Devil: replace this by header-only lib.
2019-02-07 17:09:05 +01:00
Arkeon
b59d931486
Correction on clipper crash on some IFC files when points are empty
2019-01-02 14:56:38 +01:00
Martin Jerabek
6e95601875
OpenDDLParserUtils: replace chartype_table with simple comparison
2018-11-26 12:06:08 +01:00
kimkulling
f75bf6d99c
MAke noexcept compiler-specific.
2018-09-21 16:25:27 +02:00
kimkulling
f818a909e5
Fix static-code-analysis findings.
2018-09-21 16:07:09 +02:00
kimkulling
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
Marco Di Benedetto
59ea3b6c85
fixed android zlib compile error.
2018-02-09 16:02:27 +01:00
Kim Kulling
280c995191
closes https://github.com/assimp/assimp/issues/905 : add missing contrib source from zlib.
2018-01-31 22:55:05 +01:00
BuildTools
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
Kim Kulling
cf59c7d153
Update o3dgcTimer.h
...
closes https://github.com/assimp/assimp/issues/1642 : fix build on Hurd
2018-01-03 00:56:32 +01:00
Kim Kulling
fb660823fc
new gtest version: 1.8.0
2018-01-01 19:42:01 +01:00
Kim Kulling
6a9df80f68
closes https://github.com/assimp/assimp/issues/1655 : add typedef for android NDK.
2017-12-28 14:52:41 +01:00
Turo Lamminen
0cc25491a4
irrXML: Remove horrible hack
2017-12-24 15:38:42 +02:00
ilovezfs
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
Kim Kulling
36cddcc8b7
Update miniz.h
...
retrigger CI.
2017-12-04 15:20:23 +01:00
Kim Kulling
fe6608175b
Update miniz.h
...
Fix test against null bytes to push back.
2017-12-04 15:19:34 +01:00
Kim Kulling
98cb898463
Merge branch 'master' into kimkulling-miniz-memoryaccessfix
2017-12-04 13:31:00 +01:00
Kim Kulling
b92c3ca161
fix invalid op
2017-12-04 13:19:34 +01:00
Turo Lamminen
45f2f31011
miniz: Remove some dead assignments
2017-12-02 17:59:04 +02:00
Kim Kulling
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
Kim Kulling
915ee95ad3
Fx nullptr dereference.
2017-11-30 09:12:41 +01:00
Kim Kulling
59dcfefeb2
fix unaligned memory access.
2017-11-29 16:45:09 +01:00
Kim Kulling
fd2da59427
fix unaligned memory access.
2017-11-29 16:23:12 +01:00
Kim Kulling
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
Turo Lamminen
53119e74f8
Open3DGC: Fix strict-aliasing warnings
2017-11-18 15:59:30 +02:00
Kim Kulling
07a99e0843
Merge branch 'master' into issue_1513
2017-11-16 17:32:34 +01:00
Kim Kulling
7db10022e9
closes https://github.com/assimp/assimp/issues/1513 : fix assimp for cross compile for android
2017-11-15 21:26:25 +01:00
Turo Lamminen
983e52e308
unzip: Remove dead assignment
2017-11-15 12:45:27 +02:00
Turo Lamminen
76de3e0828
clipper: Add assertion to silence a static analyzer warning
2017-11-15 12:35:06 +02:00
Turo Lamminen
c248ae3797
unzip: Remove dead assignments
2017-11-15 12:33:34 +02:00
Turo Lamminen
9b88715361
unzip: Bail on bad compression method
2017-11-15 12:32:24 +02:00
Turo Lamminen
0bc259fd95
unzip: Fix possibly uninitialized variables
2017-11-15 12:30:55 +02:00
Turo Lamminen
11fdaa31bc
clipper: Add assertion to silence a static analyzer warning
2017-11-15 12:18:39 +02:00
Turo Lamminen
fc59f190ae
OpenDDLExport: Reduce scope of a variable
2017-11-15 12:15:53 +02:00
Turo Lamminen
ef91211231
OpenDDLExport: Remove dead variable
2017-11-15 12:14:56 +02:00
Turo Lamminen
be1d346c28
Open3DGC: Add assertions to silence static analyzer warnings
2017-11-15 12:12:06 +02:00
Turo Lamminen
58d5d04e82
OpenDDLParser: Remove dead assignment
2017-11-15 12:06:30 +02:00
Turo Lamminen
635a515e69
OpenDDLParser: Fix another potential memory leak
2017-11-15 12:06:21 +02:00
Turo Lamminen
eb5f47f5c5
OpenDDLParser: Fix potential memory leak
2017-11-15 11:58:13 +02:00
Kim Kulling
2929a27edc
add unittest for x3d-importer.
2017-11-05 17:41:26 +01:00
Thomas Lemaire
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
Turo Lamminen
f90d874978
Open3DGC: Remove redundant const qualifiers from return types
2017-10-08 12:48:45 +03:00
Turo Lamminen
9f5b58e706
Upgrade RapidJSON to get rid of a clang warning
2017-10-06 18:23:28 +03:00
Kim Kulling
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
Kim Kulling
4a9ab98240
Merge pull request #1474 from jaredmulconry/issue_1470
...
Update zlib contribution
2017-10-06 15:40:36 +02:00
Turo Lamminen
65547d5760
Upgrade RapidJSON to get rid of a clang warning
2017-10-05 12:15:28 +03:00
Jared Mulconry
e7c112916b
Removed unnecessary files from zlib contribution
2017-10-05 20:11:18 +11:00
Jared Mulconry
bab6ca2085
Upgraded zlib to 1.2.11.1 from the develop branch.
2017-10-04 20:33:59 +11:00
Kim Kulling
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
Turo Lamminen
45d93701f8
Open3DGC: Fix some uninitialized variable warnings
2017-09-30 16:45:53 +03:00
Jared Mulconry
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
Jared Mulconry
4feac1b1f9
Changed a couple more function interfaces to correct the input type.
2017-09-29 01:40:05 +10:00
Jared Mulconry
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
Jared Mulconry
94a6fc78f4
Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen.
2017-09-15 18:27:59 +10:00
Lee Jeffery
d0d45d1d22
Fix linking issue with irrXML
2017-08-20 19:07:09 +01:00
Kim Kulling
c3cd7349d0
unzip: latest greatest.
2017-08-05 18:46:34 +02:00
Kim Kulling
afb2f3036e
OpenDDLParser: latest greatest.
2017-06-25 13:21:36 +02:00
Kim Kulling
51b915c97b
openddlparser: closes https://github.com/assimp/assimp/issues/1271 .
2017-06-19 21:07:18 +02:00
Kim Kulling
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
Kim Kulling
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
Arkeon
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
Helio Chissini de Castro
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