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

226 Commits (259d670f5415579d27ff21e1d59a829c5b28a168)

Author SHA1 Message Date
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
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
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
IOhannes m zmölnig 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
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