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

8368 Commits (1ad0e48a154da238ef0ba305fdf5436745ede726)

Author SHA1 Message Date
Kim Kulling 70f793f52e
Merge pull request #2843 from 9739654/patch-1 
Update SMDLoader.cpp
 2019-12-24 08:13:55 +01:00
Kim Kulling 97bc855e80
Merge branch 'master' into patch-1 2019-12-23 23:27:21 +01:00
Kim Kulling b9ac4c3fda
Merge pull request #2825 from bztsrc/master 
MSVC workarounds
 2019-12-23 23:26:52 +01:00
Mateusz Paluch ae92a34d91
Update SMDLoader.cpp 
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
 2019-12-22 09:57:02 +01:00
Kim Kulling 79aeb65ab4
Merge branch 'master' into master 2019-12-22 09:18:02 +01:00
Kim Kulling 66750588cf
Merge pull request #2839 from apanteleev/vcruntime-fix 
Made the CMake config more submodule friendly
 2019-12-22 09:17:29 +01:00
Marc-Antoine Lortie 4050f7601f
Merge branch 'master' into hl1-mdl-loader 2019-12-19 09:47:19 -05:00
Kim Kulling e350650a93
Merge branch 'master' into vcruntime-fix 2019-12-19 14:26:26 +01:00
Kim Kulling 9f196f7d02
Merge pull request #2813 from umlaeute/python-fixes 
Python fixes: ctypes declarations and cosmetics
 2019-12-19 14:25:51 +01:00
Kim Kulling ce11ae2ec8
Merge branch 'master' into python-fixes 2019-12-19 10:41:00 +01:00
Kim Kulling 49839796e6
Merge pull request #2841 from MalcolmTyrrell/fixTypos 
Fix typos
 2019-12-18 20:18:16 +01:00
Marc-Antoine Lortie 6a3f2e89f3
Merge branch 'master' into hl1-mdl-loader 2019-12-18 12:40:59 -05:00
Malcolm Tyrrell 3b7e2bc3fa Fix typos 2019-12-18 16:13:23 +00:00
Marc-Antoine Lortie 607243448f Fixed int/unsigned int comparaisons. 2019-12-18 08:33:41 -05:00
Marc-Antoine Lortie 5d79639a8a Removed unused variable. 2019-12-18 08:10:12 -05:00
Marc-Antoine Lortie 87de50e1f3 Added missing parentheses around assignment in while condition. 2019-12-18 07:51:45 -05:00
Marc-Antoine Lortie 02c2bfa2b8 Added missing member initializations. 2019-12-18 07:35:30 -05:00
Marc-Antoine Lortie 7c2cec2182 Fixed member initialization order. 
anim_headers_ is declared before animbuffers_ in HL1MDLLoader.h.
 2019-12-18 07:28:52 -05:00
Alexey Panteleev 03a17f87fa Made the CMake config more submodule friendly. 2019-12-17 17:54:23 -08:00
Kim Kulling 03e6e0c69e
Merge pull request #2776 from dylankenneally/warning-level-max 
Added CMake option to set the compiler warning to max (-Wall, /W4). Off by default
 2019-12-18 01:00:29 +01:00
Marc-Antoine Lortie 69902c99c8 Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct. 
My apologies, as this was a mistake. I misread the problem and removed the wrong PACK_STRUCT.
 2019-12-17 18:22:22 -05:00
Marc-Antoine Lortie 188ee6562e Moved/Added several includes to file HL1MDLLoader.h. 
GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
 2019-12-17 17:47:26 -05:00
Marc-Antoine Lortie fe2fdcf77c Removed unwanted PACK_STRUCT on union. 2019-12-17 17:27:21 -05:00
Marc-Antoine Lortie 330d9ca916 Replaced strncpy by individual character assigments. 2019-12-17 16:37:32 -05:00
Marc-Antoine Lortie e85776aaab Added missing null terminator. 2019-12-17 16:16:18 -05:00
Kim Kulling 1e1248d019
Merge branch 'master' into warning-level-max 2019-12-17 21:42:25 +01:00
Marc-Antoine Lortie a45e13b183 Fixed compilation issue. 
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
 2019-12-17 15:12:19 -05:00
Marc-Antoine Lortie 4144a222d3 Added HL1 MDL loader tests. 
Added new unit test source files.
Added MDL samples for tests.
Updated CMakeLists file to include the new unit tests.
 2019-12-16 11:31:41 -05:00
Marc-Antoine Lortie eed0bd3ef6 Added support to load Half-Life 1 MDL files. 
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
 2019-12-16 10:26:46 -05:00
bzt 8a800e7aa5 Removed functionality and minor material-mapping fix 2019-12-15 12:25:34 +01:00
Kim Kulling 487ce954db
Merge pull request #2819 from RichardTea/partial-cleanup-m3d 
Update M3D ASCII exporter ident and extension
 2019-12-14 22:39:11 +01:00
Kim Kulling 7244f53f5f
Merge branch 'master' into partial-cleanup-m3d 2019-12-14 19:22:19 +01:00
bzt a10b0d4de3 Requested modifications 2019-12-14 08:52:48 +01:00
Kim Kulling 0ff04b9769
Update ColladaParser.cpp 
Fix the build and fix 2 possible nullptr dereferences.
 2019-12-13 11:20:50 +01:00
bzt 512e6dff4f Fixed ANSI C compiler issue 2019-12-13 09:16:41 +01:00
Zoltan Baldaszti 2fc72c8f72
Merge branch 'master' into master 2019-12-13 09:17:06 +01:00
bzt 453eeb65cd Merge branch 'master' of https://github.com/bztsrc/assimp 2019-12-13 09:05:06 +01:00
bzt f151a5d11d MSVC2013 alternative to thread_local 2019-12-13 09:04:40 +01:00
Kim Kulling 53bf442beb
Update ColladaParser.cpp 
Fix review findings.
 2019-12-13 08:30:40 +01:00
Kim Kulling 9ef2d7fb7d
Merge branch 'master' into collada_modeller_metadata 2019-12-13 08:28:50 +01:00
Kim Kulling 71d7ff63f5
Update ColladaHelper.cpp 
Add spaces instead of tabs.
 2019-12-13 08:25:45 +01:00
Kim Kulling b2ea762b02
Merge pull request #2829 from MalcolmTyrrell/fixTexcoord 
Fix texcoord
 2019-12-13 08:23:30 +01:00
Kim Kulling 8be1060ec4
Update m3d.h 
Fix vs-defines for unused define as well.
 2019-12-13 08:21:45 +01:00
Kim Kulling 32835873f0
Update m3d.h 
Fix review warning.
 2019-12-13 08:19:39 +01:00
bzt 6b2fe41a3b Replaced mutex with thread-local variable 2019-12-13 07:30:59 +01:00
bzt 30634ff56e Be more tolerant to invalid input 2019-12-13 06:38:49 +01:00
Zoltan Baldaszti 7a83e89b02
Merge branch 'master' into master 2019-12-13 04:49:57 +01:00
Malcolm Tyrrell b6553b8a78
Merge branch 'master' into fixTexcoord 2019-12-12 12:19:02 +00:00
Malcolm Tyrrell 2124da8340 Add a texcoord unit test. 2019-12-12 12:06:36 +00:00
Malcolm Tyrrell b70c05b4e0 Fix texcoords. 2019-12-12 09:38:50 +00:00