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

2166 Commits (19de24a442ffc552485e106100235b5ceed3daff)

Author SHA1 Message Date
Alexander Gessler 7648ca21c9 Merge pull request #309 from rob100/feature 
Added alpha texture map to object exporter
 2014-07-09 16:28:29 +02:00
Robin 47e7667071 Added alpha texture map (map_d) 2014-07-09 15:51:09 +02:00
Kim Kulling 231e4e0cd0 update: commit not saved changes. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-04 00:23:02 +02:00
Kim Kulling c6b516b68b bugfix: handling possible nullptr access. 
update: replace clear be resize( 0 ) at some places to avoid double allocations ( only a micro optimization ).

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-04 00:22:13 +02:00
Kim Kulling b3b732c12b update: some micro improvements, replace post-increment operator with pre-increment operator. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-03 20:33:52 +02:00
Kim Kulling 0856ff9659 update: replace some clear / push-back by resize( 0 ) / push_back to avoid redundat allocations. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-29 21:16:37 +02:00
Alexander Gessler 3bb815097f Forgot to mention Ogre skeleton format in CHANGES 2014-06-23 15:26:07 +02:00
Alexander Gessler 7abfcd1a4d Merge pull request #300 from eyethereal/fix-obj-exporter-vertex-references 
Fixed vertex reference output format in face element for OBJ exporter
 2014-06-21 18:55:51 +02:00
Alexander Gessler 1207f84f7b Merge pull request #298 from Madrich/master 
Collada fixes, adding XFile Exporter
 2014-06-21 18:54:11 +02:00
Madrich 2c34f24497 Fix XFile define 2014-06-21 17:23:30 +02:00
Kim Kulling 9fbc9c4fb7 Merge pull request #301 from eyethereal/obj-exporter-no-name-no-group 
OBJ Exporter: No "g" lines with empty names
 2014-06-21 15:21:27 +02:00
Nathan Morse 77faf04aa3 OBJ Exporter: No "g" lines with empty names 
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Grouping" -> "Syntax", the structure of the "g" group statement is defined. Though this statement allows multiple names on a single line, it is unclear whether there must be at least one name on the line. However, the examples don't show any "g" group statements with no names. So, let's be conservative and not write out a "g" group statement that doesn't have a name. These empty "g" statements were prompting an error message from the three.js OBJ loader code.
 2014-06-20 16:06:04 -07:00
Nathan Morse d10d20f62f Update ObjExporter.cpp 
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Referencing groups of vertices", there is no support for allowing a trailing slash with no valid vertex normal reference at the end. This commit modifies the vertex reference output code to prevent this behavior, as it has been causing compatibility issues with other software that parse OBJ files.
 2014-06-20 15:08:29 -07:00
Madrich 1cb01c54a3 Fix IOSFixed 
Fix Author/AuthoringTool in Collada by MetaData
 2014-06-20 00:08:11 +02:00
Alexander Gessler 76d39973cb Add link to open3mod to readme. 2014-06-19 21:09:38 +02:00
Alexander Gessler 330e76eb46 Update CHANGES for 3.1.1 (forgot before) 2014-06-18 01:30:01 +02:00
Alexander Gessler be5fc42e16 Fix memory corruption in the aiGetExportFormatDescription() API. Clarify Exporter doc. 2014-06-17 16:10:55 +02:00
Alexander Gessler 75fd29ac19 SceneCombiner: implement proper copying of meta data. This entire module will need to be revamped in future as it is highly likely to cause further regressions as assimp data structures are modified. 2014-06-17 15:18:10 +02:00
Alexander Gessler d044ce7a62 FBXConverter: avoid creating an empty metadata slot (UDP3DSMAX was erased from list _after_ its size was taken)/ 2014-06-17 14:31:14 +02:00
Alexander Gessler 1d0e2685d5 Merge branch 'master' of github.com:assimp/assimp 2014-06-17 14:20:06 +02:00
Alexander Gessler 244f981f6a ObjExporter: cleanup code. Fix bug writing normal: normals would not be transformed by world transform. 2014-06-17 14:15:48 +02:00
Alexander Gessler 8b75bf43cb Merge pull request #299 from filipwasil/builder_fix 
Assimp can now be built as a subproject in CMake based projects
 2014-06-17 13:00:20 +02:00
Filip Wasil 139790f963 Assimp can now be built as a subproject in CMake based projects 
Signed-off-by: Filip Wasil <filip.wasil@gmail.com>
 2014-06-17 12:05:23 +02:00
Alexander Gessler 247f5cee3a Assimp_cmd: Drop malformed version spec from rc file. 2014-06-14 22:47:18 +02:00
Alexander Gessler 1c4a8e9017 Update doxygen documentation. Drop custom stylesheet. 2014-06-14 19:00:09 +02:00
Alexander Gessler 8328f79b1e Drop VC solutions. Fixes #292. 2014-06-14 17:14:12 +02:00
Kim Kulling 7bab8cd4d9 workaround: disable config for boost. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-14 09:47:01 +02:00
Kim Kulling 01057f6ef0 bugfix: assimp now deals with boost 1.55. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-13 17:33:58 +02:00
Alexander Gessler 69570f675e Merge pull request #297 from gjaegy/master 
fixed collada import bug + added obj importer '\' newline feature
 2014-06-13 12:56:48 +02:00
Gregory Jaegy 5efc0207f3 Merge branch 'master' of https://github.com/assimp/assimp 2014-06-13 10:59:16 +02:00
Gregory Jaegy 16ae05eeeb obj loader: added multiline support 
collada loaded: bug fixed when importing several files, whith one containing animation
 2014-06-13 10:56:10 +02:00
Madrich edc7a950c4 ReFix the stuff before 
Fix XFileExporter Normal
Fix Collada (Triangle->Poly)
 2014-06-11 00:41:18 +02:00
Alexander Gessler bd0c2835f8 Merge pull request #294 from treiguts/master 
fixed OgreImporter compilation error with boost scoped_ptr
 2014-06-10 22:24:08 +02:00
EdgarsT 8549e4b1b1 fixed OgreImporter compilation error with boost scoped_ptr 2014-06-10 19:58:02 +03:00
Madrich 272a59cd36 Fix convertToLH for uv coordinates 
Fix Collada export
Fix XFile export
 2014-06-10 13:14:41 +02:00
Madrich c4021fbaaf Fix Collada export validated by Schema 2014-06-09 15:17:45 +02:00
Madrich 77cec96d74 Fix collada 2014-06-07 21:17:31 +02:00
Madrich ec2ce90654 Add Scene Author + AuthorTool 
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
 2014-06-06 01:56:54 +02:00
Kim Kulling e09d88fa59 bugfix: fix cmake static linkage option. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-04 21:08:19 +02:00
Alexander Gessler 8b1a6ba920 Bump version number to 3.1 2014-06-02 01:45:23 +02:00
Alexander Gessler 1403cabb71 FBXParser: fix compiler warning on double -> float. 2014-06-01 17:34:11 +02:00
Alexander Gessler 79d8e4c14a SimpleTexturedOpenGL/CMakeLists.txt: add path to DEVIL prebuilt library. 2014-06-01 17:33:50 +02:00
Madrich 9ddd459fe8 Extend Collada Exporter using lines and triangles 2014-05-31 12:50:11 +02:00
Alexander Gessler 84eb1930ea Merge pull request #291 from jonnenauha/dev 
Fixes for #284 and #290
 2014-05-31 03:02:47 +02:00
Jonne Nauha 199d455261 Make aiMatrix4x4t ctor that takes in pos, rot and scale take in const refs. Fixes #284. 2014-05-30 02:01:29 +03:00
Jonne Nauha fe87b09246 Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290. 2014-05-30 01:57:21 +03:00
Alexander Gessler 340b94f9a5 Merge pull request #287 from arkeon7/master 
Correction on FBX material texture UV index
 2014-05-28 17:05:19 +02:00
arkeon 3acf60f5d7 Correction on quaternion initialization values 
a 0 0 0 0 quaternion is not valid
 2014-05-27 11:26:55 +02:00
arkeon b2ac7b878f Correction on FBX material texture UV index 
(keep the previous method for "allMaterials" option, this should be change too since the materials indexes used are not the good ones, or just remove the object / material test
 2014-05-27 09:11:27 +02:00
Alexander Gessler 62554a055d Merge pull request #285 from jdduke/blend_fix_mirror_winding 
Properly orient mirrored blend mesh faces
 2014-05-25 01:34:52 +02:00