Turo Lamminen
5575a54466
Add various checks to avoid either too large or zero-sized memory allocations
2015-08-14 11:53:16 +03:00
Turo Lamminen
e5ddb98dde
STL: Fix another read past EOF
2015-08-14 11:53:13 +03:00
Turo Lamminen
d185cea81c
AC3D: Fix read past end of buffer
2015-08-14 11:37:00 +03:00
Turo Lamminen
4cc716a0f5
MDL: Fix read past end of buffer with malformed input
2015-08-14 11:37:00 +03:00
Andreas Henne
bcf3f985fb
Fixed spelling error.
2015-08-13 13:22:21 +02:00
Andreas Henne
860360bd86
Fixed merge conflicts.
2015-08-13 11:06:22 +02:00
Turo Lamminen
b39446b7bb
Avoid reading past EOF when encountering a malformed STL file
...
Since IsSpaceOrNewLine returns true on '\0' we might try to read past
end of buffer on line 310. Add explicit check to avoid this.
2015-08-10 15:50:05 +03:00
Kim Kulling
295a9abbdc
Update CMakeLists.txt
...
Fix for https://github.com/assimp/assimp/issues/166
2015-08-10 13:13:01 +02:00
Kim Kulling
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
Kim Kulling
d8d64a8422
TLLoader: fix typo in comment.
2015-08-08 11:57:15 +02:00
Kim Kulling
e794aaf017
STL-Loader: fix https://github.com/assimp/assimp/issues/103 .
2015-08-08 10:55:10 +02:00
Kim Kulling
88746af2e6
Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131 .
2015-08-07 21:22:09 +02:00
Kim Kulling
23dba9fcf2
Merge branch 'master' of https://github.com/assimp/assimp
2015-08-07 21:19:17 +02:00
Kim Kulling
8836fd6b34
PLY-Loader: fix https://github.com/assimp/assimp/issues/160 .
2015-08-07 21:18:20 +02:00
Turo Lamminen
154760ab52
Abort early when hitting unexpected EOF in AC3D loader
...
Without this the code will try to loop through the specified number
of surfaces which could be very large even though none will succeed.
2015-08-07 14:18:16 +03:00
Kim Kulling
752961edfe
Merge pull request #625 from turol/afl-fixes
...
Fix out-of-bounds write on malformed input
2015-08-06 17:41:09 +02:00
Turo Lamminen
128923a262
Fix out-of-bounds write on malformed input
2015-08-06 16:16:34 +03:00
Andreas Henne
5030fe8c7e
Formatting changes.
2015-08-06 13:37:16 +02:00
Andreas Henne
fb9e4d1266
Ply export now uses uchar as type for the number of vertices per polygon and int as vertex index type.
2015-08-06 13:30:49 +02:00
Andreas Henne
3fc56de33c
Fixed merge conflicts.
2015-08-06 12:04:05 +02:00
Ilya Smelkov
bb8d936246
Fix volume calculation
2015-08-02 19:45:39 +03:00
Wil Shipley
7a7a496320
- Add include of stdarg, because apparently that's needed to build of Github server with Travis.
2015-07-27 00:54:23 -07:00
Wil Shipley
8b7fa48d27
- Merge in latest from assimp/assimp on GitHub ( 5c00aef7cd
)
...
- Added at least some of the new files to my Xcode 6 project, as
well.
- Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
Kim Kulling
5c00aef7cd
iOpenGEX: use std::string for grammar::token.
2015-07-17 20:03:23 +02:00
Kim Kulling
5a207dbb19
Merge branch 'master' of https://github.com/assimp/assimp
2015-07-10 01:21:57 +02:00
Kim Kulling
14a849b398
Obj-loader: change include brackets.
2015-07-10 01:21:10 +02:00
Kim Kulling
e138a02dd5
Obj: fix issue 121 - set group names as the mesh names.
2015-07-09 20:15:44 +02:00
Kim Kulling
891c17ee7b
Obj: remove dead code.
2015-07-09 19:59:47 +02:00
Kim Kulling
36f0ccced1
Merge branch 'master' of https://github.com/assimp/assimp
...
Conflicts:
tools/assimp_cmd/ImageExtractor.cpp
2015-07-08 00:40:35 +02:00
Kim Kulling
bc8aa18eb2
Fix : https://github.com/assimp/assimp/issues/557
2015-07-08 00:34:28 +02:00
Kim Kulling
4a77170399
Coverity finding: fix 2 more resource leaks.
2015-07-06 20:47:45 +02:00
rdb
1eef4c387f
Correct value for mColorAmbient for COLLADA files
2015-07-05 14:30:27 +02:00
Russ Taylor
c09eb045a1
Explicit conversion of a quantity that should be positive to unsigned to avoid compiler warning.
2015-07-04 18:08:31 -04:00
Kim Kulling
bd0b58d906
Merge pull request #600 from LegalizeAdulthood/cppcheck-format-operator
...
Prefer Format::operator<< over Format::operator,
2015-07-04 09:29:47 +02:00
Kim Kulling
68f88752b3
Build: fix missing commas.
2015-07-04 09:22:11 +02:00
Richard
0faf53af0b
Refactor: Prefer Format::operator<< over Format::operator,
2015-07-03 20:13:00 -06:00
Kim Kulling
05524726c8
Merge branch 'master' of https://github.com/assimp/assimp
2015-07-03 20:40:19 +02:00
Kim Kulling
dff3476e50
Line endings.
2015-07-03 20:40:07 +02:00
Kim Kulling
3af8014055
INcreas readability.
2015-07-03 19:00:21 +02:00
Kim Kulling
001eef2a9f
Coverify: fix resource leak.
2015-07-03 18:58:02 +02:00
Kim Kulling
dc28746269
Compiler warning: fix missing commend block.
2015-07-03 16:11:31 +02:00
Kim Kulling
d763483c67
Merge pull request #596 from LegalizeAdulthood/init-variables
...
Initialize all members in c'tors
2015-07-03 15:36:58 +02:00
Richard
67cb86d166
Fixed: Correct memory leak found by cppcheck
2015-07-02 20:55:56 -06:00
Richard
987034e080
Fixed: Initialize all members in IntSplitGroupData_MDL7
2015-07-02 20:51:46 -06:00
Richard
9f0c12c1c6
Refactor: Prefer value initialization over std::fill
2015-07-02 20:51:46 -06:00
Richard
c69e047dfc
Fixed: Initialize all members in STLImporter
2015-07-02 20:51:46 -06:00
Richard
85f3b38643
Fixed: Initialize all members in SMDImporter
2015-07-02 20:51:46 -06:00
Richard
e584fbdf47
Fixed: Initialize all members in PLYImporter
2015-07-02 20:51:46 -06:00
Richard
99e964d8b1
Fixed: Initialize members in MS3DImporter
2015-07-02 20:51:46 -06:00
Richard
f13c99e898
Fixed: Initialize all members in MDLImporter
2015-07-02 20:51:46 -06:00
Richard
10ca67541e
Fixed: Initialize all members in MDCImporter
2015-07-02 20:51:46 -06:00
Richard
a9aa2b1579
Fixed: Initialize all members in MD5Importer
2015-07-02 20:51:46 -06:00
Richard
3ebf91d5bb
Fixed: Initialize all members in MD3Importer
2015-07-02 20:51:46 -06:00
Richard
abc47f1b4e
Fixed: Initialize all members in MD2Importer
2015-07-02 20:51:46 -06:00
Richard
e5c603ea1a
Fixed: Initialize all members in LWSImporter
2015-07-02 20:51:46 -06:00
Richard
f032c89c2d
Fixed: Initialize members in LWOImporter
2015-07-02 20:51:46 -06:00
Richard
df6e58fd40
Fixed: Initialize all members in LWOAnimation
2015-07-02 20:51:46 -06:00
Richard
6fb38a375e
Fixed: Initialize members in SmoothinGroups
2015-07-02 20:51:46 -06:00
Richard
db4232cb4a
Fixed: Initialize members in LWSLoader
2015-07-02 20:51:46 -06:00
Richard
32a460f667
Fixed: Initialize members in UnrealLoader
2015-07-02 20:51:46 -06:00
Richard
3553c4aff2
Fixed: Initialize members in LWOFileData
2015-07-02 20:51:46 -06:00
Richard
cd63601831
Fixed: Initialize members in LWOAnimation
2015-07-02 20:51:46 -06:00
Richard
d822930848
Fixed: Initialize members in MDCFileData
2015-07-02 20:51:46 -06:00
Richard
eaf63bd04b
Fixed: Initialize members in SMDLoader
2015-07-02 20:51:46 -06:00
Richard
65ada2596f
Fixed: Initialize members in PlyParser
2015-07-02 20:51:46 -06:00
Richard
5cc43ecfad
Fixed: Initialize members in XFileHelper
2015-07-02 20:51:46 -06:00
Richard
3543bb7e5f
Fixed: Initialize members in IRRLoader
2015-07-02 20:51:46 -06:00
Richard
2f0786068d
Fixed: Initialize members in MDLFileData
2015-07-02 20:51:46 -06:00
Richard
c014a2ed21
Fixed: Initialize members in BVHLoader
2015-07-02 20:51:45 -06:00
Richard
7cc46ebc22
Fixed: Initialize member sin ASEImporter
2015-07-02 20:51:45 -06:00
Richard
a9a8796f71
Fixed: Initialize members in ACLoader
2015-07-02 20:51:45 -06:00
Richard
d899f4db57
Fixed: Initialize members in 3DS loader
2015-07-02 20:51:45 -06:00
Kim Kulling
4619625b84
OpenGEX: add class for exporter.
2015-07-01 20:43:37 +02:00
Richard
eee32a5668
Refactor: Expand tags to 4 spaces
2015-06-28 16:12:51 -06:00
Richard
4ec76d88f0
Refactor: Use LF for line endings
2015-06-28 16:11:05 -06:00
Richard
e4b0c27a2e
Refactor: Strip trailing whitespace
2015-06-28 16:09:18 -06: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
Richard
8326535445
Implemented: Add editor config for source code
2015-06-28 15:50:57 -06:00
Richard
1d96486437
Refactored: Reformat CMake files to conform to editor config
2015-06-28 15:50:57 -06:00
Kim Kulling
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
Kim Kulling
db3aea4b18
Remove finding from code analysis.
2015-06-28 21:06:20 +02:00
Kim Kulling
6249a1c06f
CMake: add comment for openddl-parser configuration.
2015-06-23 21:28:13 +02:00
Kim Kulling
85e2f47dc8
Merge pull request #523 from turol/afl-fixes
...
More crash fixes
2015-06-22 16:56:51 +02:00
Henry Stratmann III
328cae8a81
Added mesh name importing to .X ascii format.
2015-06-20 17:35:30 -05:00
Marvin Pohl
ff145bfac5
Removed unused variable
2015-06-19 14:24:34 +01:00
Marvin Pohl
927c9cb3ce
Fixes random crash when loading fbx files
2015-06-19 14:04:30 +01:00
rob100
b8c12fdc6f
CodeQuality improvements
...
Several small code improvements based on a cppcheck result
2015-06-05 09:52:06 +02:00
Alexander Gessler
36a9f2be1a
Merge pull request #577 from g-pechorin/patch-4
...
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
Alexander Gessler
1a2f4ed105
Merge pull request #575 from g-pechorin/patch-3
...
ASSBIN comments seem incorrect
2015-05-31 23:18:17 +02:00
Kim Kulling
9c26f229a3
- OpenDDL-Parser: latest greatest.
...
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
Peter LaValle
72b87ec526
removed x64 warnings
2015-05-31 13:35:10 +01:00
Peter LaValle
6ddb67b321
corrected misinformation in the documentation
...
> corrected note saying that the header was 500 bytes long (512 bytes are written and the number 512 is given elsewhere)
> altered confusing language about how long the chunks are ("length of chunk" implies the number includes the chunk-header. chunk-data-length less so, and reflects the fact that the number written doesn't include the chunk-header)
> removed mistake about how texture coordinates are encoded (the last release, and the current head both write texture coordinates as 3 float components regardless of what they actually are)
2015-05-30 23:40:17 +01: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
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
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
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
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
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
Wil Shipley
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
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
fb4eb83e84
add the ability to export cameras information in a collada file
2015-05-17 20:54:45 +02: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
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
faea2ecccc
OBJ: Support spaces in material names, fixes #545 .
...
Adding test file.
2015-05-10 23:50:18 +02:00
abma
b4f5c57b3e
allow to compile only enabled loaders
2015-05-06 23:15:15 +02:00
Kim Kulling
70722ad318
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-05 22:27:13 +02:00
Kim Kulling
fd3a0d4a9d
fix name handling of geoemtryobjectname nodes
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
Madrich
b6d91ec11a
Fix Path functions
...
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
Madrich
2dde962f0d
FilePath Functions in DefaultIOSystems
...
Replacements in Exporters
2015-05-02 01:56:20 +02:00
Madrich
148207a073
Fix removed AssimpPCH
2015-05-01 23:16:44 +02:00
Madrich
71ae322e7b
Merge pull request #5 from assimp/master
...
Update Fork
2015-05-01 23:01:33 +02:00
Madrich
58a72d9302
Fix Warnings
...
Add Time in Step File
2015-05-01 22:19:40 +02:00
Madrich
ca8a3909be
Add StepExporter.cpp(stp) Export
...
Fix XFile
2015-05-01 21:40:51 +02:00
Highlife1911
4acb1d4c92
Removed FORCE attribute from CMake variable LIBRARY_SUFFIX
2015-05-01 14:13:28 +02:00
Alexander Gessler
2a7e49423a
Merge pull request #547 from assimp/acgessler-patch-2
...
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 15:19:01 +02:00
Kim Kulling
5357772cf5
fix build.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
Kim Kulling
d5699cc89f
fox build: add missing include for ai_assert.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
Kim Kulling
31cce98680
fix color handling in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
Alexander Gessler
78faabf0fa
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 02:37:35 +02:00
Alexander Gessler
880cb473b0
Merge pull request #546 from terziman/master
...
Minor improvments & bug fixes
2015-04-30 02:35:52 +02:00
Léo Terziman
c99bd9825a
Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...)
2015-04-29 18:13:16 +02:00
Kim Kulling
2f8f0b1b02
Merge branch 'master' of https://github.com/assimp/assimp
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Conflicts:
code/ObjFileParser.cpp
2015-04-29 13:18:51 +02:00
Kim Kulling
995bc41d57
color node handling opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
Léo Terziman
ca2e47b205
Fixed some typos
2015-04-29 09:26:11 +02:00
Léo Terziman
91c751a03a
Added missing header
2015-04-28 12:29:39 +02:00
Léo Terziman
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
2015-04-28 12:04:53 +02:00
Alexander Gessler
5c890c1a90
Merge pull request #544 from aru/cygwin-build-fix
...
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
U-ORADEV\albihern
956fde6e66
Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin.
2015-04-20 17:49:02 -05:00
U-ORADEV\albihern
7043551068
Modifying files to let assimp build under cygwin.
2015-04-20 17:36:47 -05:00
Łukasz Twarduś
55ae853c2e
Fix compilation with libc++
2015-04-19 10:55:58 +02:00
Kim Kulling
eb1ee61420
fix code reading findings: use of std::copy
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
Kim Kulling
68ca2ca427
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-18 19:17:19 +02:00
Kim Kulling
08886e28d7
use <> include bracket style.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:10 +02:00
Alexander Gessler
27c6552ae8
Merge pull request #538 from cubeman99/master
...
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
2015-04-18 07:29:37 -07:00
David Jordan
b38572d1bc
std::fabs from cmath should be right
2015-04-17 23:50:14 -04:00
David Jordan
b575acf2b6
std::absf to std::fabsf
2015-04-17 23:38:54 -04:00
David Jordan
e86d40e4e2
Added infinity check for outputting PLY normals
2015-04-17 23:29:26 -04:00
Kim Kulling
76dd9467b2
fix win32-build for assimp_viewer .
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02:00
Alexander Gessler
f435712273
Fix Mac build issues (clang 6.0 compiling x86_64)
2015-04-17 06:42:58 +02:00
David Jordan
f00101f496
Added include of qnan.h (now that AssimpPCH.h include was taken out)
2015-04-16 21:30:50 -04:00
David Jordan
3545d805d2
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 20:40:16 -04:00
David Jordan
fa626aa855
Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND'
2015-04-16 18:01:24 -04:00
Kim Kulling
d12868adc4
use correct type in forward declaration.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:32:35 +02:00
Kim Kulling
97946e25c9
fix travis build
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:09:06 +02:00
Kim Kulling
e4b84ff48a
fix mem leak.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
Kim Kulling
02ee002878
fix build for vs2013
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
Kim Kulling
444a77e170
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 11:10:21 +02:00
Kim Kulling
ead3e8d275
first version of material handling for opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
abma
1c1f3c25f8
awww, merge error
2015-04-16 03:13:19 +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
abma
470ad98281
fix "headercheck":
...
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
Kim Kulling
56e8dc5a43
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-14 12:04:47 +02:00
Kim Kulling
1899de6ea9
remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
Alexander Gessler
0cee21ce3c
COB: code cleanup.
2015-04-13 21:52:09 +02:00
Alexander Gessler
b3a3558da3
Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future.
2015-04-13 21:42:50 +02:00
ulf
28de609a56
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-13 16:02:02 +02:00
ulf
806d3ac8e1
- IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
...
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
Alexander Gessler
e2f234707a
Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401 .
2015-04-12 19:53:24 +02:00
Kim Kulling
ed57fac879
create node tree
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
Kim Kulling
ecf390d51f
set the correct reference to meshes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-06 14:56:12 +02:00
Kim Kulling
22fc756d4a
- fix double initialization.
...
- use correct number of vectors for dynamic array.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 23:17:16 +02:00
Kim Kulling
df1134b1a3
- initiate texture coordinate array.
...
- use correct number of vertices for vertex array,
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:47 +02:00
Kim Kulling
c0e3540ec1
use size_t instead of unsigned int ( static code analysis finding ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:07 +02:00
Alexander Gessler
50d5c5c4ef
Merge pull request #527 from VirusFree/pr_strtol10_64
...
fix for strtol10_64
2015-04-05 17:25:50 +02:00
Alexander Gessler
9a7f90220a
Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init
...
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 17:05:16 +02:00
George Papadopoulos
54ce3d843f
fix for strtol10_64
2015-04-05 16:40:40 +03:00
George Papadopoulos
6a1522ded8
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 16:29:33 +03:00
George Papadopoulos
da3c347a57
add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime)
2015-04-05 15:19:55 +03:00
Kim Kulling
3fa6882384
generate unique indices for importes vertices in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:59 +02:00
Kim Kulling
a50fa5f1de
add missing doc in obj importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:24 +02:00
Kim Kulling
65cb05f381
fix invalid index counter.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-02 01:10:53 +02:00
Turo Lamminen
681c32d5ec
AC3D: Throw DeadlyImportError when too many vertices instead of out-of-memory exception
...
Valgrind can't throw an exception when running out of memory. The program
wil just crash. This fixes it in some cases but not all.
2015-04-01 20:52:58 +03:00
Turo Lamminen
bf5c9413f9
AC3D: Throw exception when encountering a bad vertex index
2015-04-01 16:22:46 +03:00