Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,239 Commits 19 Branches 43 Tags
574c192575e297efcce3c7cb1fc8932c789530bd
Commit Graph

139 Commits

Author SHA1 Message Date
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