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
Antoine Bolvy
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05:00
Tan Li Boon
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
Andy Maloney
3c5f1578c2
Fixes two type warnings and a missing case option
2016-12-07 20:30:45 -05:00
Jared Mulconry
2d563180ac
Fixed build warnings on MSVC14 x64 in sweep context sources.
2016-11-27 13:39:09 +11:00
Jared Mulconry
12aab0f4ef
Fixed build warnings on MSVC14 x64 in the O3DGC sources.
2016-11-20 12:29:01 +11:00
Kim Kulling
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
Kim Kulling
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
rdb
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
smalcom
dad4d0fa99
[F] min/max redefined when including windows.h
2016-09-15 22:25:34 +03:00
Alexandr Arutjunov
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
Kim Kulling
68e6f2a32c
Unittest: add gtest as part of the contrib to avoid build issues on
...
offline systems.
2016-09-11 16:06:29 +02:00
Alexandr Arutjunov
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
Kim Kulling
c403565d06
Update rapidjson to v1.0.2
2016-08-14 11:58:12 +02:00
Alexandr Arutjunov
0dcf4dcd16
[F] Typo.
2016-08-11 01:02:32 +03:00
Alexandr Arutjunov
e61fc06c40
[F] Comparison between signed and unsigned integer.
2016-08-08 19:04:37 +03:00
Alexandr Arutjunov
054820e6ff
[+] Added Open3DGC codec from KhronosGroup repository.
2016-08-03 03:34:54 +03:00
TrianglesPCT
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
Kim Kulling
41eeacefab
Merge pull request #923 from tgoulart/fix_ios_build
...
Fix compilation of iOS static libraries
2016-06-28 22:48:58 +02:00
Kim Kulling
19ba6448f0
OpenDDLParser: latest greatest.
2016-06-28 13:13:08 +02:00
Thiago Goulart
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
Squareys
6bc36eb2b6
Fix mistake while switching to new PI constants
...
From previous pullrequest (https://github.com/assimp/assimp/pull/859 ),
commit 7c0e40a3f4
introduced the error.
Thanks @mosra for catching it!
Signed-off-by: Squareys <Squareys@googlemail.com>
2016-04-21 15:23:14 +02:00
Squareys
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
Kim Kulling
a998055cbd
OpenDDLParser: add missing files.
2016-02-07 17:59:56 +01:00
Kim Kulling
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
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