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

7596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
escherstair
c0ec5140ee init variable in initializer list 2019-09-18 08:18:52 +02:00
escherstair
6d4854f12c init variable in initializer list 2019-09-18 08:15:50 +02:00
escherstair
116dcce0ba init member in itilializer list 2019-09-18 08:04:46 +02:00
escherstair
3b608307c8 prefer prefix ++/-- operators for non-primitive types 2019-09-18 08:00:58 +02:00
escherstair
0307327999 Merge branch 'master' into fix-codacy-issues 2019-09-11 10:06:16 +02:00
escherstair
b9cff2a019 prefer prefix ++/-- operators for non-primitive types 2019-09-10 07:54:07 +02:00
Kim Kulling
d672ae21d0 Merge pull request #2640 from RevoluPowered/feature/implement-PBR-materials-fbx 
FBX Implemented basic PBR material textures
 2019-09-09 22:36:22 +02:00
Kim Kulling
b4fdc009e2 Merge branch 'master' into feature/implement-PBR-materials-fbx 2019-09-09 20:51:20 +02:00
escherstair
db55ba4908 possible inefficient checking for 'tlist' emptiness 2019-09-09 15:00:28 +02:00
escherstair
027ee6ee00 Merge pull request #5 from escherstair/master 
Merge master into fix-codacy-issues
 2019-09-09 14:58:27 +02:00
escherstair
03514a9237 Merge pull request #4 from assimp/master 
Sync with upstream repo
 2019-09-09 14:20:15 +02:00
Kim Kulling
c519a91233 Merge pull request #2644 from FabienPean/patch-1 
Fix Sample_SimpleOpenGL.c
 2019-09-08 23:06:57 +02:00
Kim Kulling
602b0cf0c2 Update Sample_SimpleOpenGL.c 
Introduce C_STRUCT  for c-compatibility mode.
 2019-09-08 21:03:08 +02:00
RevoluPowered
ddc26e1c46 Added maya stingray support for textures 2019-09-08 19:15:27 +01:00
RevoluPowered
da97f1be79 Implemented basic PBR materials into assimp. 
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS

This is the first small change required.
We only support maya right now.
 2019-09-08 19:15:27 +01:00
Fabien Péan
1b86de9d14 Fix Sample_SimpleOpenGL.c 
Extra `struct` causing problems
 2019-09-08 19:15:57 +02:00
Kim Kulling
3801b84ef9 Merge pull request #2639 from escherstair/fix-codacy-issues 
Fix codacy issues - part #3
 2019-09-08 16:04:00 +02:00
Kim Kulling
ad2dd2dc18 Merge branch 'master' into fix-codacy-issues 2019-09-08 12:08:01 +02:00
Kim Kulling
a835afeb2b Merge pull request #2638 from RumbleballTheReal/master 
Added VertexColor to FBX exporter (one channel)
 2019-09-07 21:00:28 +02:00
Kim Kulling
5d8482dae6 Merge branch 'master' into master 2019-09-07 18:53:26 +02:00
Kim Kulling
86886cb2e4 Merge pull request #2643 from assimp/thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 
Thomasbiang fix issue join identical vertices not needed
 2019-09-07 18:43:52 +02:00
Kim Kulling
f8bcd7cb40 Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 10:02:20 +02:00
Kim Kulling
336ae0e55a Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 09:58:07 +02:00
Kim Kulling
c1d4549d19 Merge pull request #2626 from muxanickms/crash_in_ai_mesh_desctuctor 
A crash in the aiMesh destructor
 2019-09-07 09:31:47 +02:00
Kim Kulling
3546403284 Merge branch 'master' into crash_in_ai_mesh_desctuctor 2019-09-06 20:45:16 +02:00
escherstair
570b3838c9 Merge branch 'master' into fix-codacy-issues 2019-09-06 13:20:00 +02:00
escherstair
1503608aaa prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:31:07 +02:00
escherstair
91706a1f6e prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:29:52 +02:00
Kim Kulling
1a8375f925 Merge pull request #2633 from rmccampbell/unicode_fix 
Unicode fix
 2019-09-06 11:28:57 +02:00
escherstair
d177c722b1 prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:28:38 +02:00
escherstair
eb8479a95e possible inefficient checking for 'tlist' emptiness 2019-09-06 11:19:27 +02:00
Kim Kulling
6661e7047a Merge branch 'master' into unicode_fix 2019-09-06 08:59:21 +02:00
RumbleballTheReal
8fc625513e Merge pull request #1 from RumbleballTheReal/patch-1 
Added VertexColors to FBX exporter (one channel)
 2019-09-05 23:53:21 +02:00
RumbleballTheReal
22bd047db5 Added VertexColors to FBX exporter (one channel) 
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
 2019-09-05 23:44:54 +02:00
Kim Kulling
9b897a8e8d Merge pull request #2634 from escherstair/fix-codacy-issues 
Fix codacy issues - part #2
 2019-09-05 21:11:32 +02:00
Kim Kulling
af26c090db Merge branch 'master' into fix-codacy-issues 2019-09-05 19:50:31 +02:00
Mike Samsonov
b271091c64 fix division by zero 2019-09-05 11:44:02 +01:00
Mike Samsonov
4029fe5e46 alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00
Mike Samsonov
9adc4e87fa alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00
Mike Samsonov
0324643cd5 Missing model files 2019-09-05 11:44:02 +01:00
Mike Samsonov
873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Kim Kulling
8ca9d2ed40 Merge branch 'master' into unicode_fix 2019-09-04 17:47:45 +02:00
Kim Kulling
893a0177ff Merge pull request #2624 from congard/master 
Fix #2618
 2019-09-04 16:31:01 +02:00
Ryan McCampbell
eb762e654e Removed WindowsStore checks 2019-09-03 23:13:44 -04:00
Ryan McCampbell
a16906686f Fixed type conversion warnings 2019-09-03 21:06:48 -04:00
Kim Kulling
50820e48b9 Merge branch 'master' into fix-codacy-issues 2019-09-03 21:54:59 +02:00
Ryan McCampbell
a8822a2b29 Cleaned up formatting in DefaultIOSystem.cpp 2019-09-03 11:18:01 -04:00
Ryan McCampbell
0685e415ad removed extra null character in Utf8ToWide and WideToUtf8 2019-09-03 11:18:01 -04:00
Ryan McCampbell
6c65b5b549 Cleaned up unicode code and removed fixed-size buffers 2019-09-03 11:18:01 -04:00
Ryan McCampbell
727cf0c49f Fixed unicode on windows 2019-09-03 11:18:01 -04:00