Kim Kulling
5aa84a2610
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
2017-11-30 00:32:51 +01:00
Kim Kulling
ac23034816
fix the exporter unittest when the export is disabled.
2017-11-30 00:32:37 +01:00
Kim Kulling
c27fda62e5
Merge branch 'master' into export_3mf
2017-11-30 00:32:23 +01:00
Daniel Hritzkiv
5c9ed540b2
Add test for GLB import
...
Currently fails (testing the issue in #1600 )
2017-11-29 12:20:44 -05:00
Kim Kulling
8e413ac1e3
Merge branch 'master' into export_3mf
2017-11-27 22:50:17 +01:00
Kim Kulling
7280dec838
fix unittest.
2017-11-27 22:46:57 +01:00
Kim Kulling
e35f789ace
Merge branch 'master' into scene_combiner_crash
2017-11-22 13:46:14 +01:00
Kim Kulling
b474e75e29
3Mf-Export: add prototypes for relations and rest of 3MF-document.
2017-11-21 18:41:16 +01:00
Turo Lamminen
127705d347
Unit tests: Enable data structure validation in cases where it doesn't cause failures
2017-11-21 18:04:22 +02:00
Kim Kulling
9707fde709
check for nullptr dereferencing before copying scene data
2017-11-19 17:41:31 +01:00
Turo Lamminen
40bb3f3d0f
Unit test: Fix signed/unsigned comparison warnings
2017-11-18 15:32:42 +02:00
Kim Kulling
24b728b3ea
FindDegeneratives: adapt unittests and add configs
2017-11-12 22:09:18 +01:00
Kim Kulling
75fdd25b6b
Merge branch 'master' into issue_104
2017-11-07 11:27:06 +01:00
Kim Kulling
26171a7949
SLD: add test model and a unit test.
2017-11-06 22:37:52 +01:00
Kim Kulling
ab3cf3687c
Merge branch 'master' into UnitTest_X3D
2017-11-05 18:10:10 +01:00
Kim Kulling
770f531cc6
X3D-Importer: add missing file.
2017-11-05 17:46:25 +01:00
Kim Kulling
4879fe13ca
Merge branch 'unittest_obj_importer' of https://github.com/aavenel/assimp
2017-11-04 16:58:35 +01:00
thomas-lemaire
931542bf3c
Merge branch 'master' into ObjExporter_nomtl
2017-11-02 10:46:57 +01:00
Kim Kulling
64ee21024b
Add missing file.
2017-10-31 13:07:07 +01:00
Kim Kulling
ae020281e2
Add unittest
2017-10-31 12:24:32 +01:00
Alexandre Avenel
c1c4a5ed2a
Add two unit tests for OBJ importer
2017-10-29 15:12:56 +01:00
Thomas Lemaire
a6688243a7
[ObjExporter] add a test for the "no mtl" version of the obj exporter
2017-10-27 10:14:53 +02:00
Alexandre Avenel
ff758e4c15
OBJ : add unit test to validate relative indices
2017-10-16 20:35:02 +02:00
Kim Kulling
f56e28ea3c
UnitTest: use correct initialized normals in unittest.
2017-10-14 16:40:39 +02:00
Kim Kulling
8f141c1966
Update utObjImportExport.cpp
...
Remove unused header.
2017-10-10 18:56:37 +02:00
Kim Kulling
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
Jared Mulconry
4a915653f5
Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk.
2017-10-08 23:42:28 +11:00
Kim Kulling
b57011552b
Merge branch 'master' into issue_1453
2017-10-07 19:08:52 +02:00
Kim Kulling
f925e2cf4e
Reproduce issue and remove assertion when a nullptr makes more sence
2017-10-07 19:08:20 +02:00
Turo Lamminen
1bee5b0025
utRemoveVCProcess: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
9eef4c16a8
utMetadata: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
ae8a4c0c62
Fix warning about non-constant array size
2017-10-06 18:22:58 +03:00
Kim Kulling
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
Turo Lamminen
674fb5a46c
utRemoveVCProcess: Fix memory leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
9bcfce63dc
utMetadata: Fix memory leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
1ef3b0f3f3
Fix warning about non-constant array size
2017-10-05 10:45:40 +03:00
Jared Mulconry
1eb7eceddf
Addressed a number of memory leaks identified in unit tests by asan
2017-10-02 11:03:24 +03:00
Jared Mulconry
29e46e4bb8
Addressed asan failures caused by misuse of APIs within unit tests.
2017-10-02 11:03:18 +03:00
Turo Lamminen
da96b32fb9
Fix out-of-bounds read in MaterialSystem unit test
2017-10-02 10:55:26 +03:00
Kim Kulling
2056e56bdb
Obj: prepare test to reproduce crash on linux.
2017-09-30 10:45:14 +02:00
Jared Mulconry
e77e89c8b7
Improved the naming of temporary file generator function. Replaced use of tmpnam in utIOStreamBuffer with this facility to addresssafety warning.
2017-09-26 22:41:20 +10:00
Jared Mulconry
980d2b0eee
Added a header to hold the file generation code for unit testing purposes.
2017-09-26 22:08:52 +10:00
Jared Mulconry
e2ab3e0d29
Changed the method by which temporary files are created for unit the FileSizeTest. Will apply to other tests next.
2017-09-26 21:32:11 +10:00
Jared Mulconry
4360267cb2
Replaced flakey macros with specific functions to serve the purpose
2017-09-25 22:58:47 +10:00
Jared Mulconry
f6fc5a7a11
Changed the FileSizeTest to not rely on tmpnam to eliminate warning on gcc.
2017-09-25 22:07:01 +10:00
Daniel Hritzkiv
023cb27784
Revert "Remove simple gltf2 export unit test"
...
This reverts commit 4b01ecaf10
.
2017-09-12 09:57:58 -04:00
Daniel Hritzkiv
4b01ecaf10
Remove simple gltf2 export unit test
...
Segfaults on Linux for some reason. No other tests test exporting, so it’s fine
2017-09-11 16:31:40 -04:00
Daniel Hritzkiv
86a8a58d12
Exclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
ed2b699c4b
Add gltf2 basic unit test
2017-09-11 11:02:15 -04:00
Kim Kulling
c143d2e02c
closes https://github.com/assimp/assimp/issues/1404 : set name with merged meshes for output mesh.
2017-09-07 20:30:17 +02:00
Kim Kulling
f8146e4da2
fix the buil
2017-08-31 14:15:23 +02:00
Kim Kulling
2df704edef
fix the buil
2017-08-31 14:06:56 +02:00
Kim Kulling
82f0dae835
FIx build
2017-08-31 11:53:00 +02:00
Kim Kulling
11f70e2140
Tests: add 3D-importer test.
2017-08-31 11:39:10 +02:00
Kim Kulling
00e3b03c5b
closes https://github.com/assimp/assimp/issues/1406 : fix merge issue + improve 3MF-tests
2017-08-31 11:04:13 +02:00
Kim Kulling
267d3f41e8
ply-loader: add brackets.
2017-08-03 14:58:39 +02:00
Kim Kulling
ba658e7813
ply-importer: fix creation of vertex attributes.
2017-08-03 14:57:48 +02:00
Kim Kulling
4b860dfc42
fix build second try
2017-07-27 13:31:22 +02:00
Kim Kulling
d74306ad67
fix build
2017-07-27 13:07:26 +02:00
Kim Kulling
cf0a83de17
unittests: fix build.
2017-07-25 09:46:54 +02:00
Kim Kulling
4013b319af
unittests: add missing include to utProfiler.
2017-07-25 09:38:35 +02:00
Kim Kulling
256f28432a
unittests: fix the build again.
2017-07-25 09:37:28 +02:00
Kim Kulling
2cb1a9efc6
Profiler: add a unittest.
2017-07-25 00:00:43 +02:00
Kim Kulling
b394546e55
unittests: fix typo.
2017-07-18 20:53:47 +02:00
Kim Kulling
6f9dabe49c
unittests: fix version test.
2017-07-18 20:42:55 +02:00
Kim Kulling
d40b6089e8
Fix compiler warnings + one review finding.
2017-07-09 22:17:35 +02:00
Kim Kulling
27b7b44c9d
fix unittests.
2017-06-28 20:11:13 +02:00
Kim Kulling
5011e382c7
unittest: fix compiler warning.
2017-06-21 23:02:26 +02:00
Kim Kulling
51520cb5f1
unittest: Fix compiler warning
2017-06-15 08:37:44 +02:00
Kim Kulling
e1df9e5be9
Merge branch 'master' of https://github.com/assimp/assimp
2017-06-10 11:19:25 +02:00
Kim Kulling
616a18b0c7
Unittests: fix uppercase typo in export path for ply export test.
2017-06-09 21:57:41 +02:00
Kim Kulling
ad74bfc260
Unitetsts: reformats.
2017-06-09 20:20:24 +02:00
Kim Kulling
548c09271b
ply-exporter: add unittest.
2017-06-07 14:06:38 +02:00
Kim Kulling
c121cec68a
Obj-Importer: introduce working test for line breaks.
2017-05-29 22:00:13 +02:00
Kim Kulling
d30b1e585c
Tests how o adress this topic.
2017-05-28 22:25:06 +02:00
Kim Kulling
96839bd860
Unittests: fix import material test.
2017-05-26 20:29:21 +02:00
Kim Kulling
e93355c8b4
Build: fix some compiler warnings for g++.
2017-05-26 09:18:23 +02:00
Kim Kulling
1b4cbcc6ad
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-25 22:40:36 +02:00
Kim Kulling
f3407ef804
aiMetaData: introduce aiMetaData::Dealloc.
2017-05-25 22:35:27 +02:00
Kim Kulling
1bfff8ba1d
ObjImporter: Add unittest.
2017-05-22 21:11:01 +02:00
Kim Kulling
3d5e94477f
Merge pull request #1272 from assimp/issue-1262
...
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-19 23:13:40 +02:00
Kim Kulling
badd8cb6a4
OpenGEX: fix lowercase typo for linux.
2017-05-19 23:00:57 +02:00
Kim Kulling
febf94f6aa
Merge pull request #1212 from aoowweenn/umw_dev
...
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
Kim Kulling
3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
Kim Kulling
6c70edaf28
build: add missing files.
2017-05-16 21:46:04 +02:00
Kim Kulling
0c3a145729
issue-1266: add unittest for it.
2017-05-15 21:18:34 +02:00
Kim Kulling
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
Kim Kulling
f60f1544f7
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-19 19:57:56 +02:00
Kim Kulling
1a8b23712e
Unittests: add validation for TestIOSystem parameters.
2017-04-19 19:57:20 +02:00
Kim Kulling
ad80f97930
closes github.com/assimp/assimp/issues/1228: use test extension for exported test files.
2017-04-17 14:26:54 +02:00
Kim Kulling
babb783336
Unittest: add missing test for ply-parser.
2017-04-17 14:15:33 +02:00
Andy Maloney
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
aoowweenn
0a8966a3e6
add .pmx sample
2017-03-27 23:17:48 +08:00
aoowweenn
51dae22828
merge master and adjust assimp/DefaultIOSystem.h
2017-03-27 22:35:19 +08:00
Kim Kulling
baafa63621
Unittests: add 3mf load test.
2017-03-14 19:24:20 +01:00
Kim Kulling
bb7f387bcf
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-11 22:13:48 +01:00
Kim Kulling
1c6145b39e
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
2017-03-11 18:19:36 +01:00
Kim Kulling
143f91d541
Unittests: fix version test.
2017-03-08 10:54:12 +01:00
Kim Kulling
b725d7dbf5
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
2017-03-08 10:27:57 +01:00
Kim Kulling
3bd9efa82c
Cleanup_includes: fix linux build.
2017-03-08 09:55:44 +01:00
aoowweenn
7226d73682
merge master and mv FindDevIL to cmake-modules
2017-03-05 23:07:06 +08:00
Antoine Bolvy
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
Kim Kulling
4d92c01933
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-27 20:19:42 +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
aoowweenn
4045466f73
pass through but panic
2017-02-24 08:35:15 +08:00
Kim Kulling
0f3731ab20
Issue-1169: add a unittest.
2017-02-21 17:12:22 +01:00
Kim Kulling
a75fa44bde
PLY: prepare bugfix by adding missing unittest.
2017-02-11 14:19:34 +01:00
Kim Kulling
db1c6f5fc8
Update utObjImportExport.cpp
...
Unittest: make execution of base exporter test for obj depending of ASSIMP_BUILD_NO_EXPORT.
2017-02-06 13:15:53 +01:00
Kim Kulling
8a7e30b6a7
Update utObjImportExport.cpp
...
Unittest: Make obj-exporter test depending on export state.
2017-02-06 13:06:47 +01:00
Kim Kulling
95387298ab
Obj-Exporter test: fix test fixure if no export was requetsed.
2017-02-05 21:00:06 +01:00
Kim Kulling
da34ffd6ce
Fix the build: next try ( with full namespaces ).
2017-02-05 20:51:18 +01:00
Kim Kulling
6ed1f7570e
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-05 19:30:11 +01:00
Kim Kulling
11e2ca173d
Fix the build.
2017-02-04 18:15:50 +01:00
Kim Kulling
692fb216f7
closes https://github.com/assimp/assimp/issues/809 : add vertex color
...
export support.
2017-02-04 14:51:23 +01:00
Kim Kulling
c6cceef867
Scene: add method to add children.
2017-01-15 17:37:45 +01:00
Kim Kulling
4d8c1bb54c
unittest: add missing file to fix the build.
2017-01-12 21:41:19 +01:00
Kim Kulling
69052812f5
unit: add format import test for lws-format.
2017-01-12 20:17:35 +01:00
Kim Kulling
2b4f16d2d2
unittest: add import test for ifc file importer.
2017-01-09 20:01:13 +01:00
Kim Kulling
c62015fe6b
unittest: add unittest for hmp import format.
2017-01-07 21:29:22 +01:00
Kim Kulling
a0ab85b159
unittest: add a disabled glft unittest.
2017-01-07 21:16:24 +01:00
Kim Kulling
779c698453
unittest: add unittest for CSM format importer / exporter.
2017-01-07 21:07:41 +01:00
Kim Kulling
a9d3a60617
unittest: add import export test for collada file importer exporter.
2017-01-07 20:32:35 +01:00
Kim Kulling
8b015b31ec
unittest: add unittest for bvh file importer.
2017-01-07 20:27:59 +01:00
Kim Kulling
3b05a720d6
unittest: add unittest for b3d format importer / exporte3r.
2017-01-07 20:02:36 +01:00
Kim Kulling
80f3c64b87
unittest: add unittest from ASE format importer.
2017-01-07 19:58:27 +01:00
Kim Kulling
83b88ae5b8
unittest: add import export unittest for AMF-format.
2017-01-07 17:58:31 +01:00
Kim Kulling
abb507bf6d
unittest: add unittest form 3ds-format.
2017-01-07 17:48:33 +01:00
Kim Kulling
b78af0f80f
unittest: new unittest for 3D-importer.
2017-01-07 17:45:29 +01:00
Kim Kulling
61ddd9141c
Unittest: new unittests.
2017-01-07 17:33:18 +01:00
Kim Kulling
061afba7ab
Blender: add import test to unit test suite.
2017-01-07 16:14:09 +01:00
Kim Kulling
dfa3409de9
Blender: add missing constructors.
2017-01-05 20:23:02 +01:00
Kim Kulling
2038d01f22
Unittest: fix compiler warning: unused variable.
2016-12-31 16:20:59 +01:00
Kim Kulling
6813ed49bb
Unittest: fix compiler warning: signed unsigned mismatch.
2016-12-31 16:18:13 +01:00
Kim Kulling
7bb59004c3
SceneDiffer: fix compiler warning: unused function.
2016-12-31 16:14:06 +01:00
Kim Kulling
4e43763523
Unittests: fix compiler warning signed unsigned mismatch.
2016-12-31 16:00:03 +01:00
Kim Kulling
b934331985
closes https://github.com/assimp/assimp/issues/1111 : add warning when
...
detecting invalid mat definition.
2016-12-19 20:44:00 +01:00
Kim Kulling
859d15d3a0
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 21:22:03 +01:00
Kim Kulling
dcaaabcb10
Merge pull request #1103 from assimp/dxf_testsuite
...
Initial test suite for DFX-format.
2016-12-08 19:42:21 +01:00
Kim Kulling
4ed6db57a2
Initial test suite for DFX-format.
2016-12-08 19:24:25 +01:00
Kim Kulling
eb302dab82
Remove compile warning.
2016-12-03 09:23:07 +01:00
Kim Kulling
05510f82af
Unittest: fix a uppcase typo for the example FBX-file.
2016-12-02 16:47:54 +01:00
Kim Kulling
769805efd0
Merge branch 'master' into issue_1089
2016-12-02 14:31:18 +01:00
Kim Kulling
dcfc696e86
FBX: woraround for issue 1089.
2016-12-02 11:32:34 +01:00
Kim Kulling
edfb3fc410
New tests for importers.
2016-12-01 10:29:39 +01:00
Kim Kulling
c80777f13f
Enable SIBImport test.
2016-11-30 17:49:22 +01:00
Kim Kulling
a46b481985
Generate TestModelFactory for uniform test models in unittests.
2016-11-30 16:36:45 +01:00
Kim Kulling
12ea506504
Enable unittest for apacity bug for dae files.
2016-11-30 15:05:06 +01:00
Kim Kulling
c54dcf6180
Remove dead code.
2016-11-29 19:38:42 +01:00
Jared Mulconry
98e7eb476d
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/ObjFileImporter.cpp
2016-11-27 13:00:33 +11:00
Kim Kulling
d82fd0d750
closes https://github.com/assimp/assimp/issues/1076 : use ai_assert instead
...
of assert.
2016-11-24 21:15:07 +01:00
Kim Kulling
1939aca31c
anim-header: fix some review findings + andd base tests.
2016-11-23 22:00:52 +01:00
Kim Kulling
83e472cef3
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-23 20:20:45 +01:00
Kim Kulling
d87400b76a
Fix some findings in animation header.
2016-11-23 20:20:11 +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
61e974f767
Merge pull request #1074 from assimp/testsuite_aiMetadata
...
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:20:02 +01:00
Kim Kulling
a446d75250
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:06:14 +01:00
Kim Kulling
c5e3058ab3
Fix coverity findings.
2016-11-22 10:22:15 +01:00
Kim Kulling
566aa1ae00
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-21 23:55:14 +01:00
Kim Kulling
c61146f52e
Add unittest fixure for aiMetadata.
2016-11-21 23:54:39 +01: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
Kim Kulling
cae8a172c3
Merge branch 'master' into coverity_scan
2016-11-18 11:38:45 +01:00
Kim Kulling
631eef49c3
BatchImporter: make validation configurable and add unittest for class.
2016-11-11 12:49:05 +01:00
Kim Kulling
888ea72f20
Merge pull request #1061 from assimp/optimized_faces_in_obj
...
ObjImporter: remove unnecessary allocations of std::vector
2016-11-09 20:52:22 +01:00
Kim Kulling
ae956044aa
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
...
face.
2016-11-09 20:09:45 +01:00
Kim Kulling
5ff1c39e02
Obj-Parser: Fix performance issue.
2016-11-08 20:34:55 +01:00
Kim Kulling
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01:00
Kim Kulling
337990510c
Fix rounding issue in unittest for block calculation.
2016-10-30 11:16:31 +01:00
Kim Kulling
293654fe7c
Fix unittest.
2016-10-30 08:55:11 +01:00
Kim Kulling
b9261f01a3
Obj-Stream-Handling: fix compiler-errors and warnings.
2016-10-29 21:41:24 +02:00
Kim Kulling
8bae6ad7b7
Add missing license info.
2016-10-29 19:11:00 +02:00
Kim Kulling
b13c30f50e
Obj: Fix some small issues
2016-10-29 19:07:30 +02:00
Kim Kulling
084a6f6415
Obj-Streaming: add new io-stream for line-wise cached reading + first
...
bugfixes.
2016-10-12 15:30:04 +02:00
Kim Kulling
3aa1bdfd12
SceneDiffer: add face tester.
2016-09-26 20:53:42 +02:00
wise86Android
93d9b19995
remove unused unit test
2016-09-24 19:22:10 +02:00
wise86Android
04e0552f9e
134062 Use after free
2016-09-24 12:33:53 +02:00
Kim Kulling
e72dbad130
Refactoring: rename ModelDiffer to Scenediffer.
2016-09-23 10:22:14 +02:00
Kim Kulling
68d33a99a1
ModelDiffer: update material testser + create material for unittests.
2016-09-23 10:10:00 +02:00
Kim Kulling
1e7af6f24a
ObjImporter: fix test for vertices import.
2016-09-22 09:15:41 +02:00
Kim Kulling
ce2532e93b
ModelDiffer: use Equal-method to compare vectors.
2016-09-20 19:48:03 +02:00
Kim Kulling
2e943e5443
Obj: prepare unittest and add missing tests for mesh comparison in
...
Modeldiffer.
2016-09-20 11:27:58 +02:00
Kim Kulling
61419cc0ae
Unittest: add first approach for modeldiffer.
2016-09-19 21:35:45 +02:00
wise86Android
99c34961b9
Covery: 152484 Buffer not null terminated
2016-09-18 21:37:31 +02:00
Kim Kulling
bdcff35d5d
closes https://github.com/assimp/assimp/issues/901
2016-08-12 17:13:18 +02:00
Kim Kulling
6994b89347
Blender: Add a positive test for object compare.
2016-07-17 13:57:07 +02:00
Chris Russ
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
Chris Russ
fa1d6d8c55
propagating precision requirments into operations
2016-07-16 18:23:33 +10:00
Kim Kulling
742e513deb
Add new testcase.
2016-07-15 11:31:01 +02:00
Kim Kulling
9678da72c9
Public includes: add pragma statement and formalize include guard schema.
2016-07-11 20:56:38 +02:00
Kim Kulling
070fb3363f
Closes https://github.com/assimp/assimp/issues/940 : use standard offsetof
...
instead of an own version.
2016-07-08 18:30:26 +02:00
Kim Kulling
7c63208515
Fix resource leaks in unit tests.
2016-07-04 22:15:23 +02:00
Kim Kulling
32e8c80c24
Fix resource leak.
2016-07-04 20:19:24 +02:00
Kim Kulling
072a9e77ad
Unittests: diable broken test.
2016-06-28 11:59:20 +02:00
Kim Kulling
5321072007
Static code analysis: fix minor finding.
2016-06-28 11:25:04 +02:00
Kim Kulling
9b6de15b74
closes https://github.com/assimp/assimp/issues/904 : add ai_strtof for
...
VS2012.
2016-06-20 20:30: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
b37e25cd7d
Replaced boost::format with internal formater
2016-04-06 00:03:05 +02:00
Kim Kulling
e5f07dc96c
License info: fix dates
2016-02-25 18:22:59 +01:00
boxdot
6de709410f
Fix special case in aiMatrix3x3t::FromToMatrix.
2016-02-15 20:53:39 +01:00
Kim Kulling
51c9a9f80c
Unittests: add test if export is disabled.
2016-02-05 18:31:19 +01:00
Kim Kulling
a74b321ed1
Add unittests for defect reproduction.
2016-02-04 20:43:02 +01:00
wise86Android
c7f69e151e
fix memory leak
2016-01-17 15:18:12 +01:00
wise86Android
4af9632269
fix memory leak
2016-01-17 00:00:43 +01:00
wise86Android
bd032488e4
remove read unitilize memory
2016-01-16 23:42:43 +01:00
Kim Kulling
f839232938
Uinittests: add missing license info headers.
2015-12-02 14:54:29 +01:00
Kim Kulling
e6ac1ed66a
glTF-Importer: add files.
2015-11-08 20:29:05 +01:00
Kim Kulling
02ad376631
assimp/issues/685: add test for correct usage.
2015-11-07 10:00:55 +01:00
Kim Kulling
0ea4682586
Collada Export test: fix unit test for lightsCollada Export test: fix unit
...
test for lights..
2015-11-02 21:09:26 +01:00
Kim Kulling
c642d9f25e
Collada exporter: fix access violation.
2015-11-01 15:15:39 +01:00
Kim Kulling
95c20cb5ab
Collada exporter: fix invalid access to already release scene after
...
reimporting exported scene.
2015-11-01 13:48:55 +01:00
Kim Kulling
6be8df5fde
Boost::tuple: fix compiler-specifc test.
2015-11-01 12:20:35 +01:00
Kim Kulling
4a8b459706
OpenDDLParser: latest greatest.
2015-10-01 20:29:15 +02:00
Kim Kulling
e4510c26ba
Obj-Importer: fix https://github.com/assimp/assimp/issues/641
2015-08-30 15:21:53 +02:00
Richard
08169a6934
Fixed: Use CMake to identify directory containing test models
2015-06-30 19:59:55 -06:00
Richard
bceac46d39
Fixed: Remove absolute path from exported file
2015-06-29 22:23:04 -06:00
Richard
6ae07f8da5
Refactor: Expand tabs to 4 spaces
2015-06-28 16:08:06 -06:00
Richard
4b0f9f3e89
Refactor: Use LF for end of line
2015-06-28 16:08:06 -06: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
2c194f629a
fix macro for be uesed with expression
2015-05-19 21:57:51 +02:00
wise86Android
08499dbd0b
add test file
2015-05-17 21:25:47 +02:00
wise86Android
af54bf4c42
test fail, fix file path
2015-05-16 12:28:49 +02:00
Léo Terziman
07f3f4b487
Updated unit tests to use new SetProperty interface
2015-04-28 17:27:20 +02:00
abma
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
Kim Kulling
6c7b623d1b
add missing unittest,
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-03 21:23:27 +01:00
Kim Kulling
15e0175007
fix compiler warning.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 23:35:57 +01:00
Kim Kulling
94f61300c2
bugfix:
...
- remove and comment some gcc compiler warnings for not used vaiables.
2014-10-23 21:02:43 +02:00
Jared Duke
43c82b0b38
Remove std::isnan and std::isinf usage from utFastAtofTest
...
These functions were added in C++11, and should not be used nakedly
in the current code base. Replace them with suitable C++03 constructs.
2014-09-09 16:34:10 -07:00
Jared Duke
0e28416104
Add tests for fast_atof
...
The custom implementation for fast_atof currently lacks test coverage,
making it susceptiple to regressions with future changes. Add some
basic test coverage, in addition to a few documented cases that are
known to fail.
2014-09-08 17:30:21 -07:00
Jared Duke
66e608a393
Replace cppunit with the googletest framework
...
The GTest framework has a more active support base, and natively
supports CMake. Introduce it as an external dependency (using CMake's
ExternalProject_Add), replacing cppunit and porting the associated unit
tests.
2014-09-07 16:52:03 -07:00
abma
6c5f9ecb06
fix most warnings with -pendantic
2014-08-18 02:09:06 +02:00
abma
48a772b20b
fix compiler warnings:
...
- defined but not used
- deprecated conversion from string constant to ‘char*’
2014-08-18 00:46:21 +02:00
abma
d795491c48
fix unittests on linux / enable on travis-ci
2014-08-18 00:34:45 +02:00
Kim Kulling
fb1c9ab86d
bugfix: fix cexport API for c compilers.
2014-05-11 16:50:35 +02:00
aramis_acg
bbaf838463
- update unit tests.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1238 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 23:00:44 +00:00
aramis_acg
6fa251c2f2
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:04:06 +00:00
aramis_acg
4dbf539b44
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
aramis_acg
3d00f36faf
# fix unit tests, although static linkage to Assimp is a requirement or symbols will be missing. This involves declaring some members of certain pp step classes public to give the tests access to them. Those are harmless and completely safe to use from outside, though.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1092 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-29 13:53:24 +00:00
aramis_acg
621bdef663
- rework exporter interface to be based primarily on the existing IOSystem.
...
- implement ExportToBlob/aiExportToBlob via a custom IOSystem implementation.
- split exporter C and C++ interfaces.
+ test cases for the exporter interface
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@913 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:09:54 +00:00
aramis_acg
fdda697af7
Move test models with problematic license restrictions to test/models-nonbsd and update the test suites accordingly.
...
Update note in LICENSE accordingly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-13 17:57:06 +00:00
aramis_acg
72a64192b8
Unittests: make them compile again in builds with regular boost.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@799 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:03:34 +00:00
aramis_acg
20cc623ecd
noboost: Add working implementation for boost.format to get proper Collada error messages. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3820367 .
...
Add unit test for this.
Fix build errors due to invalid pch settings in vc9 | release-noboost.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@798 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 17:49:03 +00:00
aramis_acg
24edb60955
Add a tiny test script to load all files in a test directory using one importer instance repeatedly.
...
Fix importer unit test, wasn't yet migrated to DeadlyImportError's.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@626 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-23 18:26:48 +00:00
aramis_acg
762a7df46a
Revamp exception handling. ImportErrorException renamed to DeadlyImportError to avoid silent regressions. Exceptions now thrown by value, and caught by reference. Put guards in all C++ and C API functions to avoid unwanted exception propagation across module and language boundaries.
...
PLEASE TEST CAREFULLY IF THIS SHOULD CAUSE REGRESSIONS.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@617 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-18 17:00:12 +00:00
aramis_acg
8ab6bc8a26
- Fix: unittest suite now shutdowns the logging system correctly.
...
- Add alternative model+ppfx testing sequence to importertest.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@594 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-11 18:38:35 +00:00
aramis_acg
e2daf37a39
- Fix http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3591099 .
...
- Add unit test to avoid ppfx-related issue with re-use of Importer's in future.
- X file loader now properly resets all of its members.
- OptimizeMeshes step now properly resets all of its member.
- Fix old (and already deprecated) makefile.mingw.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@593 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-11 18:24:54 +00:00
klickverbot
ac8479f542
Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …).
...
Please be quick to suspect this commit if the build should break on Windows/MSVC.
(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 21:48:23 +00:00
aramis_acg
5738860990
- Change BaseImporter::GetExtensionList to add all known file extensions to a std::set, so uniqueness is guaranteed. Also rewrite all related functions in Importer. NOTE: This does *not* change the public interface.
...
- FIX build error on vc8/release-noboost x64, ConvertUTF.c had wrong PCH settings.
- ADD knowext and listext verbs to assimp_cmd, add some raw docs.
- Update unit tests to reflect these changes. Currently I keep getting failures in some tests, this needs to be resolved *urgently*.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@567 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 17:38:01 +00:00
aramis_acg
2e3fee99f0
ADD Vertex utility class to simplify conversion from and to interleaved vertices.
...
Refactor JoinVerticesProcess to utilize the new utility.
ADD basic operators for aiColor4D, move to dedicated header and implementation file.
ADD some utility functions to SpatialSort.
ADD my existing Catmull-Clark implementation to Assimp for all model formats with support for subdivision surfaces. Slightly WIP, likely to produce errors on non-closed meshes. Currently only implemented in the AC3D loader.
Switch to byteswap intrinsics instead of inline assembly (bswap). Currently MSVC only.
FIX phong shading in assimp_view.
VertexTriangleAdjacency class now also works on arbitrary polygons - UNTESTED, tbd.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@532 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-01-28 21:17:25 +00:00
aramis_acg
adb4ab602e
Adding Importer::ReadFileFromMemory to make Chromanoid happy.
...
Updating unit test suite to verify the newly added stuff for correctness.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@444 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-06-21 19:44:48 +00:00
aramis_acg
d881a16402
Logging functions are now available to C-Users, too. Cleaning up headers.
...
Changing spelling of some enums to camel.
Ply loader loads tristrips correctly now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@425 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-05-28 11:32:54 +00:00
aramis_acg
afcfdf27ea
Fixing crash at Importer::IsExtensionSupported().
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@411 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-27 19:58:34 +00:00
aramis_acg
29c33760e4
Triangulation:
...
- FEATURE: Concave polygons are now triangulated correctly.
- internal face order is ccw now, flipwinding part of converttolh flag
- added test files for the various formats supporting such polygons
FindDegenerates:
- improved behaviour when processing polygons, more tolerant.
Obj:
- material files are now properly read using the given IOSystem
- redirecting some std::cerr calls to our logger
- spaces and tabs are now allowed at the beginning of a line
Viewer:
- max smoothing angle for normals is set to 90 deg now
vc9-workspace
- added assimp_cmd, renamed some virtual folders to be sexier.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@374 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-02 15:16:01 +00:00
aramis_acg
4bbc03332b
General
...
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
aramis_acg
7dabd7cd72
Enabled 'fast' STL for vc9. secure_stl=0 && iterator_debugging=0.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@318 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-21 21:33:56 +00:00
aramis_acg
3d5eae6be5
Moved some defines into the core, away from the public stuff.
...
Fixed build error regarding zutil.c with vc9.
Updated VC9 project files (again ...)
Moved version getters to aiVersion.h.
Deleted redundant fast_atof.h from irrXML.
Added vc9 config for cppunit
Fixed a missing include when building against stlport
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 19:34:34 +00:00
aramis_acg
462bb953c2
Removed OptimizeGraph step - actually it isn't really useful, although I got it working very well.
...
Updated credits.
VC9 workspace updated by hand (no vc9 ...) so be careful.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@300 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-15 21:08:28 +00:00
aramis_acg
58eb786d62
Major API cleanup. Unified formatting & doxygen tags in the public API.
...
Added factory provider for default log streams.
Added default log streams to std::out and std::cerr.
Updated VC8 project config, boost workarounds is now working for the viewer.
Updated unit test suite.
Fixed some minor issues in the postprocessing-framework.
BROKEN: DebugDLL build.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@292 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-12 22:06:54 +00:00
aramis_acg
383a614931
Fixed some minor issues in the AC loader. However, it still crashes with large and complicated models. Line handling is complete.
...
Moved the code to find degenerated primitives to a separate step that is not anymore active by default.
The FindInvalidData-Step isn't active by default now. It hast a flag and must be explicitly requested.
Added line and point handling code to the CalcTangentsStep - not yet tested.
Added support for the Sense 8 (WorldToolKit) NFF file format. The format uses the same file extension as the "Neutral File Format" (and is implemented in the same loader). Seems to work well, added test files for it.
Added itoa10 function - so we have itoa on all platforms.
Small optimizations in the SortByPType step.
Fixed the material validation: textured meshes without uv coords cause a warning now.
Fixed a minor isses with the OFF loader.
Added empty unit tests for the new steps - to be filled in the next days.
Added SceneCombiner.cpp. It contains utilities to join meshes and scenes. The latter will be needed by the LWS loader (LWS files contain references to external LWO files and the LWO loader is already to complicated that it would make sense to add an additional code path to it). Mesh joining is needed by some pp steps, but the code has not yet been moved to its new location.
Added WIP light & camera support to the ASE loader. Works for the moment, but there's much missing. ASE parser refactored, the code is still quite long but at least cleaner. Fixed a bug that caused ASE to import invalid texture coordinates.
Makefiles and VC8 solution are up-to-date. The rest isn't.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@192 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-22 20:06:16 +00:00
aramis_acg
3aecad406c
Added DXF test file containing lines
...
Added Cube.off, an off files that contains more than 3 idxs per face. It crashes at the moment, but my current revision here is able to load it.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@184 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-18 22:52:05 +00:00
aramis_acg
1db46c242f
Added temporary boost workaround - some assimp features work with reduced functionality in this case.
...
Added AC-loader, WIP version.
PLY loader is now able to load models from blender, test model added. Refactoring.
Added FindInvalidData step.
Added support for precompiled headers, the release builds in VC8 are configued to use PCH now.
Added separate makefile for mingw, no -FPic warning anymore, -clear works now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-13 16:45:48 +00:00
aramis_acg
927cd1cd46
Added support for point and line primitives.
...
Added SortByPType and DeterminePType (anon.) steps
Optimized ASE, fixed 3DS.
Rewrite all loaders to conform to the api changes.
Optimized normal computation code in LWOLoader.cpp
Added new unit tests
Added test file for AC3D (good old wuson again)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@167 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-09-30 20:20:56 +00:00
aramis_acg
832f9cf672
Added unit test for SharedPostProcessInfo
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@165 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-09-27 19:26:13 +00:00
aramis_acg
38d04b6796
MD5 bugfix.
...
WIP version of the OptimizeGraph-Step.
Added hashes to some string routines (speedup).
Improved property system for float and strings.
Refactoring code for computing normals from smoothinggroups.
Implemented C-ASSIMP.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@116 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-08-28 17:35:36 +00:00
aramis_acg
f13edd8acf
Fixes from Andrew Galante for build with gcc4. LWOB materials finished, some research for LWO2. Unit tests are working again. Added makefile and project workspace for xcode3 (from Andrew, too).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@110 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-08-13 23:46:46 +00:00
aramis_acg
2f36cc5f5f
Added MD5 (md5mesh works, md5anim has not yet been tested) and STL. new unittests, although not yet complete (material system, normals). Bugfixes (GFn and MDL7). Added HMP5 support. Rewrote MD2 and MD3 to be more stable.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@77 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-08-06 23:01:38 +00:00
aramis_acg
8aa56a62c2
Bufixes to the ASE loader, added "RemoveRedundantMaterials"-Step. Rewrite debug output.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@74 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-07-30 23:00:25 +00:00
aramis_acg
76ebdecd7a
The "SplitLargeMeshes"-Process handles bones correctly now. Added Unittest for it and fixed some minor details.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@73 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-07-29 20:36:27 +00:00
aramis_acg
e8511e89ff
Added "ImproveCacheLocality"-Step; Added Unit tests (3 at the moment); Fixed hp spelling errors.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@68 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-07-22 22:52:16 +00:00