56ddb4f4af
fix some compile warnings:
...
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
2014-08-17 23:28:00 +02:00
aafc8d5f3f
CMake: changed cached bools into "option"
2014-08-17 23:10:06 +02:00
0ede630b10
bugfix:
...
- fix unhandled exception with sample SimpleTexturedOpenGL #308
- remove commented code, which made no sense any more.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 13:34:35 +02:00
d2e4dda393
update: add testcase for empty color.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 11:54:04 +02:00
5e265610fb
bugfix: add obj-material handling for <color> 0 instead of <color> r g b.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 11:39:28 +02:00
3d6b1932f9
Update Readme.md
2014-08-13 23:27:22 -07:00
9b5bb6b088
Add assbin file format to readme
2014-08-08 22:47:19 -07:00
f55ef85578
Merge pull request #328 from Gargaj/assbin-arraywrite
...
Use specialized writes for arrays
2014-08-08 13:59:30 +02:00
58b78fa265
comment
2014-08-08 13:10:05 +02:00
fa99aa0d3a
add remaining specializations
...
hopefully i didnt mess this up too bad
2014-08-08 12:56:11 +02:00
b712bf1770
Change to looped writes
...
to avoid struct packing issues
2014-08-08 12:46:29 +02:00
ede0fa4b91
Merge pull request #1 from assimp/master
...
Merge from master
2014-08-08 10:37:55 +02:00
9f795c64d5
Merge pull request #326 from Gargaj/newprogresshandler
...
More elaborate progress handler
2014-08-07 11:45:29 +02:00
63a110468f
Merge pull request #327 from Gargaj/assbinintegrate
...
Integrate import/export for .ASSBIN format
2014-08-07 11:41:35 +02:00
5886154247
tweaks according to the comments of kimkulling
2014-08-07 11:30:44 +02:00
c3977bd132
unify data types
2014-08-07 09:32:00 +02:00
61ecff3474
missed one 32/64 type conversion
2014-08-07 09:30:20 +02:00
b53a425fe4
make templates gcc compatible
2014-08-07 09:28:50 +02:00
2775141da3
#include should be outside
2014-08-07 09:07:09 +02:00
3c172988bb
remove BUG notices (discussed with acgessler)
2014-08-07 08:43:52 +02:00
df4b17d145
code style
2014-08-07 08:26:34 +02:00
aa5c1a1a23
syntax
2014-08-07 08:26:04 +02:00
7925dcadba
avoid NULL, just in case
...
(loader might just probably crash anyway)
2014-08-07 08:25:10 +02:00
523d87bbe7
use 0..fileSize as progress metric (easier for loaders)
2014-08-07 08:22:47 +02:00
061911bdbf
add support for compressed, drop support for shortened
2014-08-07 08:05:07 +02:00
fb546b694e
code style
2014-08-06 15:25:39 +02:00
1aeaef2037
add lights and cameras
2014-08-06 15:01:04 +02:00
97c9ce1d5b
add animations and textures
2014-08-06 14:44:06 +02:00
886a704c17
some notes to self
2014-08-06 14:43:47 +02:00
5048793096
add material import
2014-08-06 14:21:53 +02:00
f38dd8e6e2
add mesh loader
2014-08-06 14:06:08 +02:00
ad298cd84f
fix code style
2014-08-06 13:29:09 +02:00
ac5c1f9df1
add to cmake
2014-08-06 13:27:09 +02:00
87dff6a00e
start importer, load nodes
2014-08-06 13:26:26 +02:00
b2cf7b6f67
Merge pull request #324 from Gargaj/patch-1
...
Fix wrong nesting
2014-08-05 20:05:54 -07:00
5b512dd9dd
add info + header check
2014-08-06 00:52:05 +02:00
9cdecc780b
Fix wrong nesting
...
Otherwise doesn't compile if ASSIMP_BUILD_NO_3DS_IMPORTER is defined because the #endif is inside the namespace block
2014-08-06 00:44:30 +02:00
0f822d38cd
add basic framework for importer
2014-08-06 00:39:54 +02:00
cd86818888
- add compression support
...
- remove unneeded code
- change log warning to exception
- document
2014-08-05 23:18:45 +02:00
fc9b4e2adf
follow assimp code style (tabs)
2014-08-05 22:55:20 +02:00
2592ff0796
convert exporter from tools/assimp_cmd
2014-08-05 22:54:45 +02:00
3d5e1b5cbc
add basic framework (files, etc)
2014-08-05 20:54:38 +02:00
8f960f0ed2
avoid division by zero
2014-08-05 19:36:18 +02:00
6b8cbe5c83
this isn't needed anymore
2014-08-05 00:10:23 +02:00
dbc553343c
Granulate file loading too
2014-08-05 00:05:18 +02:00
dfe1f03e5b
Split off postprocessing progress
2014-08-04 23:57:08 +02:00
203d5d6fcc
Obj: make mtl importer accept kd, ks etc. as well (Kd, Ks being the correct form). This is for keeping up compatibility with assimp's own Obj exporter, which has been inaccurate about this since inception.
2014-08-02 21:18:21 -07:00
f5b9f5cb50
Merge pull request #321 from Gargaj/patch-1
...
Add FieldOfView token type (fixes #245 )
2014-08-02 11:38:23 -07:00
95139b3576
Merge pull request #322 from Gargaj/patch-2
...
Handle both types of element names
2014-08-02 10:07:39 -07:00
e5ed62581d
Handle both types of element names
...
MAX seems to add an "s" to "Binormal" and "Tangent" when exporting
2014-08-02 14:57:43 +02:00
abma
Kim Kulling
Alexander Gessler
Kim Kulling
Gargaj