Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,597 Commits 19 Branches 43 Tags
fe511fddc46dfd5440ab73ba1f25bfcfb36455ce
Commit Graph

10597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Wasylishen
ee8d1b0417 SimpleTexturedDirectx11: embedded texture loading fixes 
- remove assumption that embedded texture names start with "*0", etc.
- rename ModelLoader::getTextureFromModel() to loadEmbeddedTexture()
- support loading uncompressed embedded textures

Fixes display of bullsquid.mdl from Half-Life (which has an
embdedded texture named "bottommap.bmp")
 2021-04-24 14:13:51 -06:00
Krishty
5c64a4dc1e devirtualized a function that is called once and never overridden 2021-04-24 18:33:57 +02:00
Krishty
e6a47d93c2 removed dead code from 0d29203e24 2021-04-24 13:29:15 +02:00
Kim Kulling
7cd6ddad8a Merge branch 'master' into fix-scale-msg 2021-04-24 12:44:42 +02:00
Krishty
afe947d5db fixed malformatted message 2021-04-24 12:38:31 +02:00
Kim Kulling
cd3e283bcb Merge branch 'master' into kimkulling-patch-3 2021-04-23 18:03:40 +02:00
Scott Baldric
44834408c8 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-23 09:00:12 -05:00
Kim Kulling
21d7085be6 Merge pull request #3794 from assimp/kimkulling-patch-1 
Update Readme.md
 2021-04-23 15:30:30 +02:00
Kim Kulling
0b14eb7523 Fix formatter. 2021-04-23 15:30:12 +02:00
Krishty
9dc66b0003 removed dead code 
BaseImporter::GetExtensionList() is not a virtual function; overriding it is useless. This probably stemmed from a misunderstanding.
 2021-04-23 15:15:21 +02:00
Kim Kulling
4db4e7206d Update Readme.md 2021-04-23 15:14:38 +02:00
Scott Baldric
359fcadd87 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-23 08:14:26 -05:00
Kim Kulling
574ea5acf9 Merge pull request #3793 from assimp/kimkulling-codacy_batch 
Add Codacy Badge
 2021-04-23 15:13:55 +02:00
Krishty
196deea7ce added missing file extensions to aiImporterDesc::mFileExtensions 2021-04-23 15:05:09 +02:00
Kim Kulling
31438a03a6 Add Codacy Badge 
- Add assimp to codacy
- Add batch to readme
 2021-04-23 14:52:31 +02:00
Scott Baldric
4b47b7a552 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-23 07:42:32 -05:00
Kim Kulling
c8ad1cb078 Merge pull request #3763 from krishty/strip-useless-gltf-write 
fixed glTF export stuff being pulled into the EXE even if building wi…
 2021-04-22 21:34:24 +02:00
Scott Baldric
aae3788247 Fix: Removing double delete of texture items. 
Textures were being double deleted after a merge scene because the
texture array wasn't being properly deleted at the end of merging.
Furthermore, the texture array was being sized to the number of
materials instead of the number of textures.
 2021-04-22 08:49:47 -05:00
Kim Kulling
8881e65d62 Merge branch 'master' into strip-useless-gltf-write 2021-04-22 09:55:00 +02:00
Max Vollmer (Microsoft Havok)
44dc08f128 Remove GLTF tag, postprocessing is format independent 2021-04-21 16:20:58 +01:00
Max Vollmer (Microsoft Havok)
746d5cf964 * Throw instead of assert on invalid file input 
* Check JSON object type before accessing members
* Ensure samplers input and output references are set before accessing them
 2021-04-21 16:17:03 +01:00
Kim Kulling
6027c10969 Merge pull request #3776 from krishty/fix-import-export-confusion 
fixed export exceptions on import
 2021-04-20 20:39:00 +02:00
Kim Kulling
873c6ffabe Merge branch 'master' into fix-import-export-confusion 2021-04-19 21:08:52 +02:00
Krishty
55dd5faafb fixed export exceptions on import 
Ogre and 3MF imports threw DeadlyExportErrors under some circumstances. Bad for people who assumed that they only needed to catch DeadlyImportErrors. Changed them to DeadlyImportErrors.
 2021-04-19 19:33:41 +02:00
Tobias Rittig
0643786288 Add PBRT to exportable file formats list 
As of #3580 assimp can export to the newest version of the PBRT renderer. This was not listed here.
 2021-04-19 15:27:59 +02:00
Kim Kulling
0af558a11c Merge pull request #3774 from krishty/version-string-fix 
Version string fix (if anyone cares)
 2021-04-19 13:20:26 +02:00
Krishty
930cc25c0e fixed version string test 2021-04-19 09:51:44 +02:00
Krishty
3fead344ad updated version string (if anyone cares) 2021-04-19 07:37:12 +02:00
Krishty
a19299d501 moved MD2/MDC tables from BSS to const data 
Visual C++ is unable to identify them as constant data during optimization, so explicitly declare them const.
 2021-04-17 00:32:04 +02:00
Krishty
f761dc72f4 style fix - initializing and assigning empty std::string properly 
std::string s(""); s = ""; calls the copy constructor, which in turn calls strlen(), … assigning a default-constructed string generates fewer instructions and is therefore preferred.

With C++11 uniform initialization, you’d simply write s = { } instead.
 2021-04-16 23:43:56 +02:00
Krishty
6cbeca5518 fixed glTF export stuff being pulled into the EXE even if building with ASSIMP_BUILD_NO_EXPORT 
“LazyDictBase::WriteObjects()” in the two glTF implementations is only used for export. Since it’s a virtual method, and many compilers have trouble removing unreferenced virtual methods, glTF export stuff is pulled into the binary even if compiling without exports.

This commit removes said virtual function if only compiling for import.

This removes 75 KiB of useless code when compiled with Visual Studio for x64.
 2021-04-16 20:44:40 +02:00
Kim Kulling
cd42b9954b Merge pull request #3757 from mahiuchun/tr1 
Flip the check on _MSC_VER for using TR1 containers.
 2021-04-14 13:03:51 +02:00
Kim Kulling
21b56b0058 Merge branch 'master' into tr1 2021-04-14 12:46:59 +02:00
Kim Kulling
83c0dce075 Merge branch 'master' into Q1MDLgroup 2021-04-14 10:48:26 +02:00
Kim Kulling
c282b9a775 Merge pull request #3742 from Garux/patch-1 
Fix MDC loader
 2021-04-14 10:47:34 +02:00
Kim Kulling
0b61a8875a Merge branch 'master' into patch-1 2021-04-14 10:22:42 +02:00
Kim Kulling
bbfefd89d7 Merge pull request #3758 from assimp/kimkulling-update-assimp.net 
Update repo for assimp-net
 2021-04-14 09:37:20 +02:00
Kim Kulling
bef2304c53 Update repo for assimp-net 2021-04-14 08:55:55 +02:00
Hill Ma
4aa52b3af8 Flip the check on _MSC_VER for using TR1 containers. 2021-04-13 11:15:52 -07:00
Kim Kulling
182418e818 Merge pull request #3755 from assimp/kimkulling-issue3754 
Not resize empty vectors.
 2021-04-12 23:31:06 +02:00
Kim Kulling
a6e4672df1 Fix a typo. 2021-04-12 23:19:00 +02:00
Kim Kulling
d1eeb80e1a Not resize empty vectors. 
closes https://github.com/assimp/assimp/issues/3754
 2021-04-12 21:05:46 +02:00
Kim Kulling
c9ba616eb6 Merge pull request #3708 from urschanselmann/master 
Fix import of FBX files with last UV duplicated (caused by bug in FBX SDK 2019.0+)
 2021-04-12 11:50:12 +02:00
Kim Kulling
263d450300 Merge branch 'master' into master 2021-04-12 09:35:03 +02:00
Kim Kulling
67fa0a13bc Merge pull request #3749 from pcwalton/ms3d-fixes 
Fix incorrect indices in the MilkShape 3D loader
 2021-04-11 20:37:31 +02:00
Kim Kulling
a3ee377af7 Merge branch 'master' into ms3d-fixes 2021-04-11 19:12:06 +02:00
Kim Kulling
cf4ef04a80 Merge branch 'master' into master 2021-04-07 20:58:40 +02:00
Kim Kulling
6eae925441 Merge pull request #3695 from AllegorithmicSAS/feature/gltf_fb_ngon_encoding 
[gltf2-exporter] Adding FB_ngon_encoding support
 2021-04-07 20:52:05 +02:00
Clement JACOB
e66232d8c3 Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-07 13:54:31 +02:00
Patrick Walton
a44ba41413 Fix incorrect indices in the MilkShape 3D loader 2021-04-05 19:14:48 -07:00