djsundog/obj2gltf
1
0
Fork 0
mirror of https://github.com/CesiumGS/obj2gltf.git synced 2024-11-30 03:50:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
425 Commits 5 Branches 32 Tags 1.1 MiB
28fdfc35e4
Commit Graph

425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed Mackey
42c4b33521
Merge pull request #114 from AnalyticalGraphicsInc/npmrc 
Prevent npm from creating package-lock.json
 2017-11-07 11:52:52 -05:00
Sean Lilley
21c4b94d26 Prevent npm from creating package-lock.json 2017-11-07 09:33:11 -05:00
Sean Lilley
4b85d87655 Switched texture loading order so diffuse is always first 2017-11-07 09:20:42 -05:00
likangning93
90b0f319c0
Merge pull request #113 from AnalyticalGraphicsInc/node-8 
Node 8 upgrade
 2017-11-06 15:25:22 -05:00
Sean Lilley
37cf7858cc Node 8 upgrade 2017-11-06 09:46:45 -05:00
Sean Lilley
a3c2c38a99 Merge pull request #109 from timknip/master 
fix texture paths and parse texture map options
 2017-10-12 09:09:14 -04:00
Tim Knip
bdebfeadee proper indent 2017-10-10 15:06:45 +02:00
Tim Knip
fab88cfdfa remove texture options from texture name 2017-10-10 13:23:09 +02:00
Tim Knip
3e41cdc7f6 Fix texture options ending up in texture filename #109 
This happens when in `*.mtl` a relative texture path does not have a
`./` prefix.
eg: map_bump -bm 0.1 foo.jpg
 2017-10-02 01:52:31 +02:00
Tim Knip
3cff129933 fixing merge conflict #109 2017-09-29 20:21:02 +02:00
Tim Knip
3ec919e9c4 better regexp for #109 2017-09-29 20:16:55 +02:00
Tim Knip
ac756bed05 fix texture paths and parse texture map options 
When the mtl has statements like ```map_Bump -bm 0.2 ./foo.jpg``` then
the options end up in the texture path.
eg: ```./-bm 0.2/foo.jpg```.

This commit fixes the path and parses the options.
 2017-09-29 19:31:14 +02:00
Tim Knip
c18f8c49eb fix texture paths and parse texture map options 
When the mtl has statements like `map_Bump -bm 0.2 ./foo.jpg` then
the options end up in the texture path.
eg: `/bar/-bm 0.2/foo.jpg`.

This commit fixes the path and parses the options.
 2017-09-29 19:26:51 +02:00
Shehzan Mohammed
8f3f0d3862 Merge pull request #108 from AnalyticalGraphicsInc/constant-lighting 
Constant lighting added back to materialsCommon
 2017-09-21 10:53:44 -04:00
Sean Lilley
723a059e3e Update CHANGES.md 2017-09-21 10:45:56 -04:00
Sean Lilley
3c5f055182 Constant lighting added back to materialsCommon 2017-09-21 10:40:44 -04:00
Shehzan Mohammed
3934450b56 Merge pull request #107 from AnalyticalGraphicsInc/alpha-0 
Treat alpha of 0 as 1
 2017-09-19 13:28:57 -04:00
Sean Lilley
3015383fa3 Added test and updated CHANGES.md 2017-09-19 13:10:32 -04:00
Sean Lilley
e36668ab14 Treat alpha of 0 as 1 2017-09-19 11:59:51 -04:00
Patrick Cozzi
4f2e2add43 Merge pull request #104 from AnalyticalGraphicsInc/better-readme 
Add sample code for saving gltf to readme
 2017-09-01 14:17:04 -04:00
Sean Lilley
56388cb2ab Add sample code for saving gltf to readme 2017-09-01 12:28:29 -04:00
Patrick Cozzi
e17db649a5 Add CODEOWNERS 2017-08-19 17:38:57 -04:00
Sean Lilley
a1f5550c59 Merge branch 'gltf-2.0' 2017-08-11 12:30:37 -04:00
Sean Lilley
0e11909860 Updated to version 1.3.0 2017-08-11 12:23:07 -04:00
Sean Lilley
b2e4fb6deb Add doc 2017-08-11 12:01:23 -04:00
Sean Lilley
72baced2ed Merge branch 'master' into gltf-2.0 2017-08-10 09:52:19 -04:00
Sean Lilley
b20df62524 Merge pull request #85 from rahwang/more-vertices-faces 
Support concave and/or n-vertex faces
 2017-08-09 17:54:19 -04:00
Sean Lilley
60a080be46 Reorganization of material loading and returning buffer rather than writing file 2017-08-08 15:09:00 -04:00
Rachel Hwang
3293621155 correct winding order check bug 2017-08-08 11:59:02 -04:00
Sean Lilley
cda657e9a6 Fixed interleaving and added comment 2017-07-28 18:00:39 -04:00
Sean Lilley
487eca91f8 Move incompatible argument checking to bin file 2017-07-28 17:34:56 -04:00
Sean Lilley
3da691df62 Cleanup overriding images 2017-07-28 17:01:45 -04:00
Rachel Hwang
563d5243a2 cleanup edits 2017-07-27 14:05:10 -04:00
Sean Lilley
e54f3af37f Async image reading/writing and other cleanup 2017-07-27 11:28:14 -04:00
Sean Lilley
125edddef9 Fix eslint error 2017-07-25 13:04:38 -04:00
Sean Lilley
d85e72b19c Updates to package.json, README, and CHANGES 2017-07-25 13:04:14 -04:00
Sean Lilley
2a44e0d1a8 Misc fixes 2017-07-25 12:32:24 -04:00
Sean Lilley
b8c5ebc8aa Fix texture index when texture is shared by multiple material values 2017-07-25 11:41:39 -04:00
Sean Lilley
8d491afc70 bin script tweaks 2017-07-24 21:32:51 -04:00
Sean Lilley
3b4e30d5e3 Supply images on the command line 2017-07-24 21:26:56 -04:00
Sean Lilley
9da383e434 Style edits 2017-07-24 16:42:03 -04:00
Sean Lilley
b52f63543e Small fixes 2017-07-24 09:36:45 -04:00
Sean Lilley
aaf44e75dc Fix incompatible byte strides 2017-07-19 17:56:24 -04:00
Sean Lilley
ab6786e463 Remove dependence on gltf-pipeline and added gltfToGlb function 2017-07-19 13:23:06 -04:00
Sean Lilley
608234dcc4 Rounded out materialCommon, pbrMetallicRoughness, and pbrSpecularGlosiness tests 2017-07-17 17:45:58 -04:00
Sean Lilley
df20748d60 Merge branch 'master' into gltf-2.0 2017-07-17 14:38:20 -04:00
Sean Lilley
8701c87767 Bumped to 1.2.0 2017-07-11 11:59:38 -04:00
Matthew Amato
88d1396370 Merge pull request #95 from AnalyticalGraphicsInc/fragile-tests 
Rework fragile tests
 2017-07-11 11:39:07 -04:00
Sean Lilley
3df055c42a Rework fragile tests 2017-07-11 11:33:18 -04:00
Patrick Cozzi
b1cc54bcdc Merge pull request #92 from AnalyticalGraphicsInc/event-stream 
Remove dependency on event-stream
 2017-06-28 14:00:31 -04:00