Kim Kulling
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
BuildTools
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
Turo Lamminen
f35d5952dc
BlenderLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:13:43 +02:00
Jared Mulconry
341222697a
Address warnings on Clang 3.9 caused by having a static data member in a class template.
2017-10-05 23:55:10 +11:00
VennGrayDog
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
Kim Kulling
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
Kim Kulling
8d27945619
Merge branch 'master' into cleanup_includes
2017-03-05 15:15:29 +01:00
Kim Kulling
7a47f1f8f7
Issue-1183: add stp to the list of supported extensions for step-files.
2017-02-27 20:11:59 +01:00
Kim Kulling
ef540f46a3
Remove unused headers.
2017-02-22 17:20:26 +01:00
Kim Kulling
31bb9f7ba6
Obj: fix code review findings.
2017-02-04 18:32:04 +01:00
Jared Mulconry
f206249fbf
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
2016-11-23 22:24:04 +11:00
Kim Kulling
e50ac81b65
Merge branch 'master' into coverity_scan
2016-11-21 18:57:56 +01:00
Jared Mulconry
4b6c69c4f8
Fixed an incorrect cast introduced in an earlier commit.
2016-11-19 03:17:39 +11:00
Jared Mulconry
06beb50391
Fixed build warnings on MSVC14 x64 in the Blender format sources, as well as
...
build warnings in tests.
2016-11-19 01:54:27 +11:00
Eshed
25cda401c5
use cmath and C++ (std::) versions of functions
2016-10-15 03:29:45 +03:00
Kim Kulling
f51cd4c6d4
Merge branch 'master' into coverity_scan
2016-09-12 12:42:11 +02:00
Kim Kulling
0c00edb40e
Blender: fix some minor findings.
2016-09-12 12:41:49 +02:00
Kim Kulling
a54835c91d
Merge master
2016-09-04 20:41:20 +02:00
TrianglesPCT
66c1a176de
Add files via upload
...
forcing a new build
2016-07-25 23:04:08 -06:00
TrianglesPCT
667aa37fdd
Add files via upload
...
used ai_real instead of float
2016-07-24 18:45:41 -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
Kim Kulling
7207e5117c
Use new include bracktes.
2016-06-06 22:04:29 +02:00
ciechowoj
c554b55f97
Merge branch 'blender_materials'
...
Conflicts:
test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
ciechowoj
c4a542a994
Adds blender material loading.
2016-05-17 21:17:51 +02:00
ciechowoj
25d84a6aff
Adds support for area lights.
2016-05-16 13:04:43 +02:00
mensinda
5dacda0a08
replaced boost smart pointers with c++11 smart pointers
2016-04-05 23:23:53 +02:00
mensinda
18843fe5e1
Replaced BOOST_FOREACH with c++11 ranged for loops
2016-04-05 22:53:54 +02:00
boxdot
0d44479399
Import reflectance factor from Blender.
2016-03-29 21:16:26 +02:00
boxdot
13ec11bca8
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 02:12:15 +01:00
Kim Kulling
6bfdeb6a12
sprintf replacement: introduce au_snprintf to support snprintf for v2013
...
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
Kim Kulling
c3d4be1dce
sprintf: replace more sprintf by snprintf.
2016-01-04 22:24:25 +01:00
Kim Kulling
1191d03405
Update license info.
2016-01-01 21:07:24 +01:00
Richard
83de707587
Refactor: Expand tabs to 4 spaces
2015-06-28 16:04:15 -06:00
Richard
a96a595a7a
Refactor: Trim trailing whitespace
2015-06-28 16:01:32 -06:00
Richard
4c1a0507fe
Refactor: Line endings are LF, not CRLF
2015-06-28 15:59:33 -06:00
Kim Kulling
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
abma
611778045d
fix for upstream changes
2015-04-16 02:55:41 +02:00
abma
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
abma
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
Alexander Gessler
7ee5eaafc6
Fix compile: set::erase() returns void prior to C++11.
2015-03-15 23:40:29 +01:00
Alexander Gessler
dc441d09e5
Blender importer: fix accidental use of uninitialized fields in the default material.
...
IMHO C++03+ guarantees zero initialization here, so it may be a MSVC-specific issue.
2015-03-15 14:42:28 +01:00
Alexander Gessler
1c64c590f2
Blender importer: always sort sets of objects by their name. Previously we accidentally ordered pointers to objects by their memory address, which was non-deterministic and caused regression tests to be flaky.
2015-03-15 01:26:15 +01:00
Jared Duke
a1a1bf77a8
Temporarily disable Blender BMesh conversion
...
Disable BMesh conversion while associated unresolved issues receive due
attention. Referencing #400 , #373 , #318 #315 and #132 .
2014-10-10 14:16:42 -07:00
abma
6c5f9ecb06
fix most warnings with -pendantic
2014-08-18 02:09:06 +02:00
Alice
01a6ec9059
Adding tessellation support for new Blender 2.6 polygons
...
- Added BlenderBMesh.cpp/h which contains a class to convert a BMesh to an old style tri/quad mesh
- Added BlenderTessellator.cpp/h which contains a class to tessellate the poly loops contained within a BMesh
2013-11-22 13:17:21 +01:00
Calvin Hsu
a9a881cde6
Blender: map texture influence to aiTextureType
...
Previously assimp mapped all blender image textures as
aiTextureType_DIFFUSE. This change interprets the "mapto" property
which corresponds to the Blender "Influence" in the properties editor.
* Blender's Normal influence with "Normal Map" unchecked maps to
aiTextureType_HEIGHT.
* Blender's Normal influence with "Normal Map" checked maps to
aiTextureType_NORMAL.
* Influence scale is placed into AI_MATKEY_BUMPSCALING.
2013-10-08 19:01:02 -07:00
Calvin Hsu
2fb07823f1
Add basic light and camera support
...
* Convert point and directional light
* Convert perspective camera
Not suppoted:
* Spotlight, area lights
* Perspective camera fov angle / focal length
* Orthogonal camera
2013-10-02 16:41:49 -07:00
acgessler
b8ed6fbcef
Fix Heap corruption in BlenderImporter::ConvertMesh function. closes #36
2013-05-03 23:16:56 +02:00
Kester Maddock
3713383b0f
Added uv and colour support
2013-03-26 21:28:15 +01:00
Kester Maddock
eaf9cbc120
Added (basic) Blender 2.63 support. No uvs or colours supported yet.
2013-03-26 21:28:15 +01:00