Commit Graph

1792 Commits (0860254a2bf343f81442b7ac309c93804b7b50d8)

Author SHA1 Message Date
Alexander Gessler 98aec0955d - remove web shortcuts from root. 2013-04-30 00:48:07 +02:00
Alexander Gessler 48591e17b1 Merge pull request #34 from assimp/msvc-pch
- LWO: fix crash when computing normals for meshes that contain line or point faces.
2013-04-26 07:54:59 -07:00
Alexander Gessler 51d7bf8266 Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-26 16:51:43 +02:00
Alexander Gessler 7efb94580f - LWO: fix crash when computing normals for meshes that contain line or point faces. Thanks to Thomas Sevaldrud for the patch. 2013-04-26 16:49:24 +02:00
Alexander Gessler 8b7fdb3a39 Merge pull request #33 from assimp/msvc-pch
- CMake: enable multicore compilation with vc.
2013-04-21 06:05:06 -07:00
Alexander Gessler 758e470a49 Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-21 15:04:04 +02:00
Alexander Gessler b786d6e375 - CMake: enable multicore compilation with msvc. 2013-04-21 15:03:16 +02:00
Alexander Gessler 680c8e31d9 Merge pull request #32 from assimp/msvc-pch
- CMake: use precompiled headers when compiling with msvc,
2013-04-20 14:22:19 -07:00
Alexander Gessler 61b1cf7be1 Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-20 23:17:16 +02:00
Alexander Gessler 4b748c2442 - CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster. 2013-04-20 23:15:59 +02:00
Alexander Gessler a2541a8984 Update .travis.yml 2013-04-19 01:41:45 +03:00
Alexander Gessler a81c10265a - update travis.yml to also test compilation without the export part (2nd try). 2013-04-19 01:40:02 +03:00
Alexander Gessler 540265f617 - update travis.yml to also test compilation without the export part. 2013-04-19 01:37:41 +03:00
Alexander Gessler 17e888e762 Merge pull request #31 from jdduke/patch-1
Enable aiMaterial::AddProperty template specializations in ASSIMP_NO_EXPORT builds
2013-04-18 01:15:48 -07:00
Jared Duke 6551fd4903 Update material.inl
aiMaterial::AddProperty template specializations are used by import methods in B3DImporter and SceneProcessor; they should be defined accordingly even when ASSIMP_BUILD_NO_EXPORT is defined.
2013-04-17 18:47:52 -07:00
Alexander Gessler 863645e88b Merge pull request #30 from assimp/gcc-fixes
workaround for older gcc versions (<4.6) sometimes copying temporaries even though they shouldn't.
2013-04-13 07:17:28 -07:00
Alexander Gessler f476634461 Merge branch 'master' of github.com:assimp/assimp into gcc-fixes 2013-04-13 16:10:37 +02:00
Alexander Gessler 17e2588588 - workaround for older gcc versions (<4.6) sometimes copying temporaries even though they shouldn't. 2013-04-13 16:08:13 +02:00
Alexander Gessler 02533c11a0 Merge pull request #28 from assimp/gcc-fixes
Gcc fixes based on this build: https://travis-ci.org/assimp/assimp/jobs/6160384

silence gcc false positive warnings and fix real issues that were pointed out.
2013-04-08 14:27:04 -07:00
Alexander Gessler afe1dd8c02 Merge branch 'master' of github.com:assimp/assimp into gcc-fixes 2013-04-08 23:21:33 +02:00
Alexander Gessler a288a631e2 - FBX: avoid more gcc warnings. 2013-04-08 20:21:28 +02:00
Kim bd05acf872 bugfix : fix unresolved symbols if 3DS-import is configured not to be oart of the lib.
Signed-off-by: Kim <Kulling>
2013-04-08 20:16:56 +02:00
Alexander Gessler 232e69dc2a - Ifc: code cleanup, remove various non-needed variables as pointed out by gcc. 2013-04-08 20:10:25 +02:00
Alexander Gessler 052a8634d2 OgreMaterial: remove unneeded variable. 2013-04-08 20:05:56 +02:00
Alexander Gessler f6cb467275 - FBX::ImportSettings: fix initialization list order. 2013-04-08 20:05:19 +02:00
Alexander Gessler 68f3f4c80a Merge pull request #27 from assimp/clang-fixes
Clang fixes based on this clang build: https://travis-ci.org/assimp/assimp/jobs/6158706

This silences false positives and fixes any real issues pointed out by clang - at least two of which were critical.
2013-04-08 10:55:17 -07:00
Alexander Gessler 5fe03f692e - FBX: silence some warnings produced by clang about missing switch cases. Add TokenType_BINARY_DATA to TokenTypeString() function. 2013-04-08 19:45:09 +02:00
Alexander Gessler 47b2832dd8 - XGL: fix non isocpp-compliant definition of LogFunctions::log_prefix outside the namespace where the class resides. 2013-04-08 19:41:18 +02:00
Alexander Gessler d25715ad2c - Ifc: fix issue pointed out by clang that caused an epsilon check to go totally wrong. A pair of extra parentheses invoked C++ expression evaluation instead of argument passing. 2013-04-08 19:39:15 +02:00
Alexander Gessler 67472f3feb - remove self-assignment in MD5Loader.cpp 2013-04-08 19:37:08 +02:00
Alexander Gessler 8f2e816042 - LWS: fix bugs pointed out by clang leading to path strings being incorrectly build. 2013-04-08 19:36:24 +02:00
Alexander Gessler d4dcbc4a11 - fix travis link. 2013-04-08 19:49:19 +03:00
Alexander Gessler 831f26c24d - update readme.md, add link to travis-ci 2013-04-08 19:02:59 +03:00
Alexander Gessler 1a46406745 Merge branch 'master' of github.com:assimp/assimp into assimp-metadata 2013-04-08 17:52:26 +02:00
Alexander Gessler c6add7a851 - drop ./configure from .travis.yml - not needed with cmake. 2013-04-08 17:51:52 +02:00
Alexander Gessler d7ad9a8ff2 Merge pull request #26 from assimp/assimp-metadata
- try out a .travis.yml for use with the travis CI service.
2013-04-08 08:46:32 -07:00
Alexander Gessler 0a1f844d92 - try out a .travis.yml for use with the travis CI service. 2013-04-08 17:45:39 +02:00
Alexander Gessler 4277413052 Merge pull request #23 from blandinw/ios-xcode46
[workspaces/xcode] Make all targets build + iOS target (OSX 10.8.3 + Xcode 4.6.1)
2013-03-31 05:59:38 -07:00
Willy Blandin 27767031e6 make all targets build under OSX 10.8.2 and add iOS target 2013-03-31 21:48:38 +09:00
Alexander Gessler e39915348b Merge pull request #22 from severin-lemaignan/master
Polishing of pyassimp code
2013-03-30 09:42:29 -07:00
Séverin Lemaignan da140f2a05 [pyassimp] Minor tuning in 3d_viewer.py 2013-03-30 14:35:50 +01:00
Séverin Lemaignan fa7ff915c1 [pyassimp] Renamed the 3d for better clarity + added a short README 2013-03-30 14:35:21 +01:00
Séverin Lemaignan 3574b6973c [pyassimp] Make sure sample.py and quicktest.py work 2013-03-30 14:35:21 +01:00
Séverin Lemaignan fb280d7cf5 [pyassimp] Make it easier to import pyassimp
'import pyassimp' (instead of 'from pyassimp import core') is now sufficient
2013-03-30 14:35:21 +01:00
Séverin Lemaignan b00ee8b24a [pyassimp] Minor fixes to the simplified open_gl viwer 2013-03-30 14:35:21 +01:00
Séverin Lemaignan bf7d39280e [pyassimp] Simplified and beautify simple_opengl_viewer.py
Since the new SDL based viewer is much better suited to interactive exploration, simplify
the basic OpenGL viewer to make it an easy introductive read.
2013-03-30 14:35:21 +01:00
Alexander Gessler eaee34b028 Merge pull request #21 from assimp/assimp-metadata
Assimp metadata implementation. This adds aiNode::mMetaData, the <assimp/metadata.h> header containing the aiMetaData structure. Also adds support for Ifc reading metadata to test out the new feature.
2013-03-29 12:08:29 -07:00
Alexander Gessler afc07503d6 - Ifc: limit nesting of IfcComplexProperty's. 2013-03-29 14:21:06 +01:00
Alexander Gessler 2ad24f7940 - Ifc: support reading IfcComplexProperty 2013-03-29 14:07:28 +01:00
Alexander Gessler 0155a5ade1 - update docs. 2013-03-29 13:42:38 +01:00