4c0171a0e9
Merge pull request #563 from asmaloney/fix/overlapping_merge
...
Fix overlapping merges
2015-05-18 23:09:24 +02:00
28cc934bb9
Fix overlapping merges
2015-05-18 09:51:09 -04:00
7cd8cc1b1f
Merge pull request #560 from asmaloney/fixes/init_cleanup
...
Fix inits and a couple of empty checks
2015-05-18 09:49:59 +02:00
4bdf23aece
Merge pull request #561 from LegalizeAdulthood/warnings
...
Fix compiler warnings
2015-05-18 09:48:01 +02:00
9cbef8cba3
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 20:50:58 -06:00
cac8707121
Refactor: Delete unused field
2015-05-17 20:48:04 -06:00
4a5e9352d6
Refactor: Delete unused functions
2015-05-17 20:46:56 -06:00
a34adb8450
Refactor: Delete unused functions
2015-05-17 20:45:16 -06:00
814ef32dce
Refactor: Delete unused fields
2015-05-17 20:43:25 -06:00
5bb09377cb
Refactor: Delete unused variable
2015-05-17 20:40:35 -06:00
7b3fa5ebc2
Refactor: Delete unused forward decls, delete unused function
2015-05-17 20:22:31 -06:00
79c916daf4
Refactor: Remove unused variable
2015-05-17 20:05:05 -06:00
2de6dd4973
Refactor: Delete unused variable
2015-05-17 20:02:58 -06:00
6ae9797648
Refactor: Initialize members in declaration order; initialize POD arrays
2015-05-17 20:01:51 -06:00
d25c36960a
Refactor: Initialize all POD members
2015-05-17 19:57:11 -06:00
8c94e51e90
Refactor: Delete unused functions
2015-05-17 19:47:13 -06:00
fbf90a28ff
Fixed: Ensure variable is always initialized before use
2015-05-17 19:46:01 -06:00
63520d562a
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 19:42:30 -06:00
bf4a73e42e
Refactor: Remove unused member variable
2015-05-17 19:42:07 -06:00
91ca983d5f
- Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines".
...
- When I encounter this condition I just print a warning and use the actual number of points in the file instead of the number they give, as opposed to throwing an exception and bailing on the whole file.
- For an example of this kind of file see https://3dwarehouse.sketchup.com/warehouse/getpubliccontent?contentId=e4587719-2609-49ed-a2f6-20b98d1215f3&fn=Kartell-GE.zip
- Some people have complained about this on http://forums.sketchup.com/t/bug-in-lines-exported-at-collada-format/8145
2015-05-17 18:36:17 -07:00
c014bb977c
- add missing initialization of several class members
...
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
2015-05-17 20:48:23 -04:00
08499dbd0b
add test file
2015-05-17 21:25:47 +02:00
fb4eb83e84
add the ability to export cameras information in a collada file
2015-05-17 20:54:45 +02:00
93579ca734
Merge pull request #559 from shocker-0x15/fix_assbin_release_and_AddGTest_CMake
...
Fixed AssBin loader.
2015-05-17 12:59:27 +02:00
6c01bcff53
Reverted AddGTest.cmake.
...
Changes to the file caused CI build broken.
2015-05-17 00:36:19 +09:00
98b234020b
Fixed AssBin loader.
...
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
2015-05-16 23:39:24 +09:00
e1cf5150f1
Merge pull request #558 from wise86-android/fixImportTest
...
test fail, fix file path
2015-05-16 13:36:27 +02:00
af54bf4c42
test fail, fix file path
2015-05-16 12:28:49 +02:00
d1f36bf947
- Removed '/Users/wjs' from a path (that snuck in).
2015-05-12 16:10:09 -07:00
a1268bf864
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-12 21:52:25 +02:00
0fe8e739c3
Use "wb" when writing binary STL exports, fixes #556 .
2015-05-12 21:51:27 +02:00
e3c29b7e4b
Merge pull request #554 from assimp/fix-obj-material-name-spaces
...
OBJ: Support spaces in material names, fixes #545 .
2015-05-12 21:44:07 +02:00
7771ce5db2
Update regression db.
2015-05-12 20:59:54 +02:00
faea2ecccc
OBJ: Support spaces in material names, fixes #545 .
...
Adding test file.
2015-05-10 23:50:18 +02:00
9e95fda002
- Turn off "-Wshorten-64-to-32" so we don't have TEN MILLION warnings when compiling with assimp.
...
- Sure, it'd be better if this code were clean, but these warnings
ONLY appear when we build for the simulator, NOT for iOS or OS X for
real, so f' em.
2015-05-08 17:50:31 -07:00
696407f6c5
Merge pull request #552 from abma/master
...
allow to compile only enabled importers
2015-05-07 11:49:19 +02:00
b4f5c57b3e
allow to compile only enabled loaders
2015-05-06 23:15:15 +02:00
39c6622697
- Added a generic renderToImage() function to SCNRenderer, so we can share with StackOverflow / Goossens.
2015-05-05 15:42:01 -07:00
70722ad318
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-05 22:27:13 +02:00
fd3a0d4a9d
fix name handling of geoemtryobjectname nodes
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
2c60da38f3
openddl-parser: V0.2.0
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:26:40 +02:00
01bd198a55
Merge pull request #549 from Madrich/master
...
Step (stp) Exporter
2015-05-02 19:28:28 +02:00
b6d91ec11a
Fix Path functions
...
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
2dde962f0d
FilePath Functions in DefaultIOSystems
...
Replacements in Exporters
2015-05-02 01:56:20 +02:00
437706f20d
Merge pull request #535 from assimp/regression-whitelist-travis-diff
...
Regression whitelist, add regression diff test to Travis CI
2015-05-02 01:30:52 +02:00
67fb135ce8
Fix syntax errors.
2015-05-02 01:00:04 +02:00
068778953a
Updated regression db for Collada.
2015-05-02 00:48:04 +02:00
1851bf3acc
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-02 00:39:28 +02:00
7eb5586c05
Output files in alphabetical order.
2015-05-02 00:33:29 +02:00
8fb9e84aea
Cleanup old messages.
2015-05-02 00:10:51 +02:00
Alexander Gessler
Andy Maloney
Kim Kulling
Richard
Wil Shipley
wise86Android
shin_mbpr_late2013
Alexander Gessler
abma
Kim Kulling
Madrich