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

3677 Commits (64273d58e34516a9ae8b3df3de2156ffc5736556)

Author SHA1 Message Date
Lucas Stanek 4dfe2a1bad Add -fPIC to C Flags for 64bit linux Shared Object builds without checking if zlib is being built. 2016-08-19 03:28:55 +00:00
Lucas Stanek aef1b1c51b Building static ZLIB on 64b LInux requires -fPIC for C compiler. 2016-08-19 03:28:53 +00:00
Daniel Knezevic 50a2e80e96 Use Assimp namespace to fix build for big-endian architectures 2016-08-19 03:28:50 +00:00
James Walker 666d1ce164 Changed C-style casts to static_cast. 2016-08-18 10:55:24 -07:00
Alexander Gessler 9afb760e06 Merge pull request #986 from Deni90/master 
Use Assimp namespace to fix build for big-endian architectures
 2016-08-18 15:41:48 +02:00
Daniel Knezevic c2c12c1db5 Use Assimp namespace to fix build for big-endian architectures 2016-08-18 10:51:20 +02:00
James Walker e9ecd6f8a7 Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: <https://github.com/assimp/assimp/issues/980> 2016-08-17 17:48:29 -07:00
Chris Russ 3f08cebfab include config.h to always have the correct types (float/double) exposed 2016-08-17 07:57:31 +10:00
Chris Russ 4f7b624fe8 fix precision issue within memory copy 2016-08-16 16:03:56 +10:00
Chris Russ 6128987210 add explicit config.h include to export 2016-08-16 16:03:56 +10:00
Chris Russ 6613b6382f renaming define for double precision to be picked up by cmake correctly 2016-08-16 16:03:56 +10:00
Chris Russ 63a4591683 Fixing bugs related to 64-bit upgrade in materials 2016-08-16 16:03:56 +10:00
Kim Kulling cc16d4a0db Merge pull request #983 from roshanch/master 
adding support to store all the layered textures
 2016-08-15 21:30:46 +02:00
roshan.c 27f81884f9 adding support to store all the layered textures 2016-08-15 09:58:53 -07:00
Kim Kulling 644557c6d6 Merge pull request #979 from assimp/issue_975 
Fix copy-paste-error.
 2016-08-14 21:25:07 +02:00
Kim Kulling 39e52341c2 Fix copy-paste-error. 2016-08-14 21:24:00 +02:00
Kim Kulling aaaadd2236 Merge pull request #978 from assimp/issue_975 
closes https://github.com/assimp/assimp/issues/97: define for 32-bit …
 2016-08-14 15:20:59 +02:00
Kim Kulling 86470541b1 Merge pull request #976 from assimp/issues_967 
closes https://github.com/assimp/assimp/issues/967: add unzip include path
 2016-08-14 12:24:49 +02:00
Kim Kulling 6ae545b609 Merge pull request #977 from assimp/update_rapidjson_version_1_0_2 
Update rapidjson to v1.0.2
 2016-08-14 12:24:39 +02:00
Kim Kulling ec67a1f2ea closes https://github.com/assimp/assimp/issues/97: define for 32-bit linux 2016-08-14 12:23:16 +02:00
Kim Kulling c403565d06 Update rapidjson to v1.0.2 2016-08-14 11:58:12 +02:00
Kim Kulling b916857659 closes https://github.com/assimp/assimp/issues/967: add unzip include path 
when no other version was found.
 2016-08-14 11:44:21 +02:00
Kim Kulling eb82a800cb CMakeLists: cleanup, move all options to one place for mantenace. 2016-08-13 09:13:22 +02:00
Kim Kulling d586aab53b Update Readme.md 
fix link to chat channel. IRC is obsolete now.
 2016-08-12 19:44:07 +02:00
Kim Kulling e2a1a2f751 Merge pull request #974 from assimp/issue_901 
closes https://github.com/assimp/assimp/issues/901
 2016-08-12 19:38:09 +02:00
Kim Kulling 0379675fca Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0 2016-08-12 18:47:37 +02:00
Kim Kulling 83b02ff41f DefaultIOStream: add missing detection for apple-based OS. 2016-08-12 18:14:26 +02:00
Kim Kulling bdcff35d5d closes https://github.com/assimp/assimp/issues/901 2016-08-12 17:13:18 +02:00
Kim Kulling 8ba10cf26a Closes https://github.com/assimp/assimp/issues/966: add missing doc for 
assimp_cmd.
 2016-08-09 13:42:33 +02:00
Alexander Gessler fefa4ee9c1 Merge pull request #970 from nyorain/patch-1 
Added documentation for embedded textures
 2016-08-09 01:43:19 +02:00
nyorain e7ed352078 Added documentation for embedded textures 2016-08-09 01:06:43 +02:00
Kim Kulling 86f30e4852 Merge pull request #965 from waldyrious/patch-1 
fix long option name for --om
 2016-08-08 19:48:49 +02:00
Waldir Pimenta a9ebac6b54 fix long option name for --om 
to match the actual code in tools/assimp_cmd/Main.cpp
 2016-08-08 11:46:41 +01:00
Kim Kulling 042b2bbe77 Merge pull request #964 from waldyrious/patch-1 
dox_cmd.h: fix typo 'dumb' --> 'dump'
 2016-08-05 22:19:42 +02:00
Waldir Pimenta a98e524fe2 dox_cmd.h: fix typo 'dumb' --> 'dump' 2016-08-05 19:54:58 +01:00
Kim Kulling ad133a05ec CMake: remove dead code. 2016-08-03 10:20:03 +02:00
Kim Kulling 6003616b07 Merge pull request #960 from smalcom/assimp_qt_viewer 
[+] 3D viewer which uses Assimp and Qt4.
 2016-08-01 20:15:00 +02:00
Alexandr Arutjunov 2a815df888 [F] Texture coordinate Y must be flipped for OpenGL. 2016-08-01 13:13:35 +03:00
Alexandr Arutjunov 6fe0895799 [F] Added checks for building assimp_qt_viewer. 2016-07-31 22:51:15 +03:00
Alexandr Arutjunov 28c0109b41 [F] Added include dirs and libraries for OpenGL and DevIL. 2016-07-31 15:50:48 +03:00
Alexandr Arutjunov 7df5e48129 [F] DevIL is needed for compilation. 2016-07-31 15:14:49 +03:00
Alexandr Arutjunov 2d921316ca [+] 3D viewer which uses Assimp and Qt4. 2016-07-31 14:56:30 +03:00
Alexander Gessler 454320ad08 Merge pull request #953 from TrianglesPCT/master 
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
 2016-07-27 21:37:02 +02:00
TrianglesPCT 66c1a176de Add files via upload 
forcing a new build
 2016-07-25 23:04:08 -06:00
Kim Kulling 86e2876083 Merge pull request #956 from adishavit/master 
Fixes a few build issues with MSVC 2015 and gcc
 2016-07-26 00:16:16 +02:00
Adi Shavit @ MacBookPro f119447549 Fixes compilation on OSX with gcc. 
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.
 2016-07-25 16:33:25 +03:00
TrianglesPCT 667aa37fdd Add files via upload 
used ai_real instead of float
 2016-07-24 18:45:41 -06:00
Adi Shavit @ MacBookPro 5fe4b975ba Removes MSVC warning with explicit cast. 2016-07-24 15:54:16 +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
TrianglesPCT 28c9f56c5e Add files via upload 
scale blender vert color out to 0-1 range as aiColor specifies
 2016-07-24 02:26:23 -06:00