v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,312 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

41 Commits (edfaaed56fb656a3923807cac1c875cc8ff2f4ba)

Author SHA1 Message Date
Marc-Antoine Lortie 4e7e47bd43 Updated copyright dates. 
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
 2020-01-20 08:53:12 -05:00
Kim Kulling cce77345e5
Update ColladaHelper.h 
Add missing include.
 2020-01-04 11:57:26 +01:00
Kim Kulling 12ee1a6776
Merge branch 'master' into fix/collada-combining-animations 2020-01-03 12:13:52 +01:00
RichardTea 4e50b05b85 Fix off-by-one error 2020-01-02 13:24:50 +00:00
RichardTea ab50b5e181 Fix typo, fix GCC build 2020-01-02 13:02:40 +00:00
RichardTea d11af753f2 Fix Codacity warnings, test Exporter metadata 
Pass std::string around instead as need to create one anyway.

Use CamelCase version to avoid caseSensiTivity issues
as will usually want the camelcase edition anyway.
Not UTF-8 but the standard XML tags are ASCII anyway
 2020-01-02 12:35:00 +00:00
Felipeek 5ce373c312 Don't combine Collada animations when channels are shared 2019-12-29 16:05:33 -03:00
Kim Kulling 0ff04b9769
Update ColladaParser.cpp 
Fix the build and fix 2 possible nullptr dereferences.
 2019-12-13 11:20:50 +01:00
Kim Kulling 53bf442beb
Update ColladaParser.cpp 
Fix review findings.
 2019-12-13 08:30:40 +01:00
Kim Kulling 71d7ff63f5
Update ColladaHelper.cpp 
Add spaces instead of tabs.
 2019-12-13 08:25:45 +01:00
RichardTea f498a395e4 Add common metadata to Collada 
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
 2019-12-09 14:05:41 +00:00
Kim Kulling 0c3c88270a
Merge branch 'master' into master 2019-11-11 10:19:22 +01:00
Kim Kulling 805bc2e766
Update ColladaParser.cpp 
Add missing brackets.
 2019-10-31 20:18:39 +01:00
Kim Kulling 61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
Raphael Dümig 2d086fd236 ColladaParser: fix handling of empty XML-elements 2019-10-25 15:23:13 +02:00
Kim Kulling c350d4f487
Update ColladaExporter.cpp 
Small review findings.
 2019-10-19 12:08:57 +02:00
RichardTea 198bc428fa Fix some warnings in Collada import 2019-10-14 12:15:02 +01:00
RichardTea 6a6ccc0fb0 Rename ConvertPath() to UriDecodePath() 2019-10-14 11:27:34 +01:00
RichardTea ce5c71d2e7 Collada ZAE import must convert manifest and image paths 
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML

Added more EXPECTS to the Collada tests
 2019-10-11 18:57:38 +01:00
Chris Weermann (TGE) 38153748ab ColladaExporter: use actual mesh names when available 2019-10-02 19:18:48 +02:00
Chris Weermann (TGE) c08a78f7c6 ColladaExporter: improve name/id handling 2019-10-02 01:32:53 +02:00
Bruno dbf47f7769 fix issue #2551 2019-09-18 17:54:30 +02:00
Kim Kulling 8b95479bb0 closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon 2019-09-15 19:25:37 +02:00
escherstair 2d0d2374c1
fix ColladaLoader::findMesh() declaration 2019-08-29 12:00:44 +02:00
escherstair 789e8abfe8
prefer prefix ++ operator for non-primitive types 2019-08-29 08:44:49 +02:00
escherstair dbb498095d
function parameter 'meshid' should be passed by const reference 2019-08-29 08:05:45 +02:00
RichardTea 5c6ea5d7ba Fix memory leak in Collada ZAE and 3MF ZipFile reading 
Must close the file!
 2019-07-25 09:54:39 +01:00
Kim Kulling 41ea607739
Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
kkulling a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02:00
kimkulling c1670b6a97 closes https://github.com/assimp/assimp/issues/2548: check if weight are set or set the weight to 1.0f 2019-07-16 11:40:34 +02:00
RichardTea 2a72c9b616 Read embedded textures from Collada ZAE 2019-07-12 14:46:48 +01:00
RichardTea d64e1bde13 First pass of Collada ZAE support 
Reads the manifest and loads the DAE
Does not yet load embedded textures
 2019-07-12 11:29:35 +01:00
Kim Kulling 39dc9801e0
Update ColladaLoader.cpp 
- add header memory
- Fix format stuff
 2019-07-09 20:35:57 +02:00
Kim Kulling a01302dd4d
Merge branch 'master' into issue_2182 2019-07-09 19:45:40 +02:00
Kim Kulling ed6dbf9533 closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception. 2019-07-09 19:44:56 +02:00
Kim Kulling af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision 2019-06-26 17:31:11 +02:00
Kim Kulling 853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import 2019-06-25 20:19:42 +02:00
Kim Kulling 1952144445 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2019-06-24 21:46:05 +02:00
RichardTea bf252c4452 Add configuration of text format precision 
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
 2019-06-20 18:11:11 +01:00
RichardTea 59f732e10d DAE Import: Don't use SkipElement() to skip empty Text 
IrrXML doesn't recognise the construction: `<author></author>` as being an empty element, and so ColladaParser::TestTextContent advances the element stream into the `</author>` element.

Use TestClosing(const char*) instead of SkipElement() to skip an empty text element.
 2019-06-20 16:30:52 +01:00
Kim Kulling 57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00