Commit Graph

2722 Commits

Author SHA1 Message Date
Peter LaValle
db8b973aec wrapped the CRT warning macro
I already have these in an outer-script
2015-05-31 11:52:04 +01:00
Kim Kulling
ab95b1a3c1 Replace tabs with whitespaces in CMake-file. 2015-05-30 18:13:08 +02:00
Kim Kulling
6cc32a946b Fix transformation parsing for OpenGEX-parser. 2015-05-29 20:50:09 +02:00
Kim Kulling
670278da82 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-29 20:46:10 +02:00
Kim Kulling
5e1fc39448 Add parsing of texture nodes of OpenGEX-format importer. 2015-05-29 20:45:31 +02:00
Alexander Gessler
9a9a121b2d Merge pull request #573 from jaimemachado/master
Creating the functionality to list all Importer descriptions and the …
2015-05-26 19:37:21 +02:00
Jaime Machado Neto
de6f0f2a7d Creating the functionality to list all Importer descriptions and the number of importers available. 2015-05-26 08:40:43 -03:00
Kim Kulling
4d05dd913c Merge pull request #572 from asmaloney/fix/code_cleanup
Code Cleanups
2015-05-24 12:17:27 -07:00
Andy Maloney
4cbce374b6 Code Cleanups
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
Alexander Gessler
8e24695f29 Merge pull request #571 from jdduke/fix_cmake
Fix issue with CMAKE_CXX_FLAGS initialization
2015-05-24 00:52:13 +02:00
Jared Duke
ef306d5666 Fix issue with CMAKE_CXX_FLAGS initialization
Append the necessary flags to CMAKE_CXX_FLAGS, rather than replacing
the previous values. It's critical that that flags are preserved to
ensure proper and consistent compilation.
2015-05-23 13:46:35 -07:00
Alexander Gessler
9538b7ed42 Merge pull request #570 from wise86-android/colladaExportLightAndCamera
Collada export light and camera
2015-05-23 12:06:23 +02:00
wise86Android
26b3328f3b fix xml syntax + more deap test 2015-05-23 11:03:56 +02:00
wise86Android
5ad6179bc5 export the light in the collada file 2015-05-19 23:15:18 +02:00
wise86Android
b1d085b6a9 fix the foruma for compute the mAngleOuterCone values 2015-05-19 23:08:31 +02:00
wise86Android
2c194f629a fix macro for be uesed with expression 2015-05-19 21:57:51 +02:00
Alexander Gessler
4c0171a0e9 Merge pull request #563 from asmaloney/fix/overlapping_merge
Fix overlapping merges
2015-05-18 23:09:24 +02:00
Andy Maloney
28cc934bb9 Fix overlapping merges 2015-05-18 09:51:09 -04:00
Kim Kulling
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
Kim Kulling
4bdf23aece Merge pull request #561 from LegalizeAdulthood/warnings
Fix compiler warnings
2015-05-18 09:48:01 +02:00
Richard
9cbef8cba3 Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 20:50:58 -06:00
Richard
cac8707121 Refactor: Delete unused field 2015-05-17 20:48:04 -06:00
Richard
4a5e9352d6 Refactor: Delete unused functions 2015-05-17 20:46:56 -06:00
Richard
a34adb8450 Refactor: Delete unused functions 2015-05-17 20:45:16 -06:00
Richard
814ef32dce Refactor: Delete unused fields 2015-05-17 20:43:25 -06:00
Richard
5bb09377cb Refactor: Delete unused variable 2015-05-17 20:40:35 -06:00
Richard
7b3fa5ebc2 Refactor: Delete unused forward decls, delete unused function 2015-05-17 20:22:31 -06:00
Richard
79c916daf4 Refactor: Remove unused variable 2015-05-17 20:05:05 -06:00
Richard
2de6dd4973 Refactor: Delete unused variable 2015-05-17 20:02:58 -06:00
Richard
6ae9797648 Refactor: Initialize members in declaration order; initialize POD arrays 2015-05-17 20:01:51 -06:00
Richard
d25c36960a Refactor: Initialize all POD members 2015-05-17 19:57:11 -06:00
Richard
8c94e51e90 Refactor: Delete unused functions 2015-05-17 19:47:13 -06:00
Richard
fbf90a28ff Fixed: Ensure variable is always initialized before use 2015-05-17 19:46:01 -06:00
Richard
63520d562a Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 19:42:30 -06:00
Richard
bf4a73e42e Refactor: Remove unused member variable 2015-05-17 19:42:07 -06:00
Andy Maloney
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
wise86Android
08499dbd0b add test file 2015-05-17 21:25:47 +02:00
wise86Android
fb4eb83e84 add the ability to export cameras information in a collada file 2015-05-17 20:54:45 +02:00
Alexander Gessler
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
shin_mbpr_late2013
6c01bcff53 Reverted AddGTest.cmake.
Changes to the file caused CI build broken.
2015-05-17 00:36:19 +09:00
shin_mbpr_late2013
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
Kim Kulling
e1cf5150f1 Merge pull request #558 from wise86-android/fixImportTest
test fail, fix file path
2015-05-16 13:36:27 +02:00
wise86Android
af54bf4c42 test fail, fix file path 2015-05-16 12:28:49 +02:00
Alexander Gessler
a1268bf864 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-12 21:52:25 +02:00
Alexander Gessler
0fe8e739c3 Use "wb" when writing binary STL exports, fixes #556. 2015-05-12 21:51:27 +02:00
Alexander Gessler
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
Alexander Gessler
7771ce5db2 Update regression db. 2015-05-12 20:59:54 +02:00
Alexander Gessler
faea2ecccc OBJ: Support spaces in material names, fixes #545.
Adding test file.
2015-05-10 23:50:18 +02:00
Alexander Gessler
696407f6c5 Merge pull request #552 from abma/master
allow to compile only enabled importers
2015-05-07 11:49:19 +02:00
abma
b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00