djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade for gltf-pipeline

This commit is contained in:
Sean Lilley 2016-06-09 13:33:08 -04:00
parent f3499320ad
commit 4052ef1b77
23 changed files with 816 additions and 1864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,3 +1,6 @@
**/node_modules
node_modules
npm-debug.log
.idea/workspace.xml
.idea/tasks.xml
.DS_Store
Thumbs.db

9
.idea/OBJ2GLTF.iml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="OBJ2GLTF node_modules" level="project" />
</component>
</module>

6
.idea/encodings.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

6
.idea/jsLibraryMappings.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<file url="file://$PROJECT_DIR$" libraries="{OBJ2GLTF node_modules}" />
</component>
</project>

14
.idea/libraries/OBJ2GLTF_node_modules.xml Normal file
View File

@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="OBJ2GLTF node_modules" type="javaScript">
<properties>
<option name="frameworkName" value="node_modules" />
<sourceFilesUrls>
<item url="file://$PROJECT_DIR$/node_modules" />
</sourceFilesUrls>
</properties>
<CLASSES>
<root url="file://$PROJECT_DIR$/node_modules" />
</CLASSES>
<SOURCES />
</library>
</component>

13
.idea/misc.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/OBJ2GLTF.iml" filepath="$PROJECT_DIR$/.idea/OBJ2GLTF.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

60
.jshintrc Normal file
View File

@ -0,0 +1,60 @@
{
"bitwise": false,
"camelcase": false,
"curly": true,
"eqeqeq": true,
"forin": true,
"freeze": true,
"immed": true,
"latedef": "nofunc",
"noarg": true,
"noempty": true,
"nonbsp": true,
"nonew": true,
"plusplus": false,
"quotmark": false,
"undef": true,
"unused": "strict",
"strict": true,
"asi": false,
"boss": false,
"debug": false,
"eqnull": false,
"moz": false,
"evil": false,
"expr": false,
"funcscope": false,
"globalstrict": false,
"iterator": false,
"lastsemic": false,
"laxbreak": false,
"laxcomma": false,
"loopfunc": false,
"multistr": true,
"noyield": false,
"notypeof": false,
"proto": false,
"scripturl": false,
"shadow": false,
"sub": false,
"supernew": false,
"validthis": false,
"browser": false,
"browserify": false,
"couch": false,
"devel": true,
"dojo": false,
"jasmine": false,
"jquery": false,
"mocha": true,
"mootools": false,
"node": true,
"nonstandard": false,
"prototypejs": false,
"qunit": false,
"rhino": false,
"shelljs": false,
"worker": false,
"wsh": false,
"yui": false
}

8
.npmignore Normal file
View File

@ -0,0 +1,8 @@
node_modules
npm-debug.log
.idea
.DS_Store
Thumbs.db
.npmignore
gulpfile.js
.jshintrc

1
README.md
View File

@ -20,7 +20,6 @@ Run `node bin/obj2gltf.js` and pass it the path to an OBJ file.
|`-i`|Path to the input OBJ file.| :white_check_mark: Yes|
|`-o`|Directory or filename for the exported glTF file.|No|
|`-e`|Embed glTF resources, including images, into the exported glTF file.|No, default `false`|
|`-t`|Shading technique. Possible values are `lambert`, `phong`, `blinn`, and `constant`. The shading technique is typically determined by the MTL file, but this allows more explicit control.|No|
|`-h`|Display help|No|
###Examples:

60
bin/obj2gltf.js
View File

@ -1,67 +1,37 @@
#!/usr/bin/env node
"use strict";
var fs = require('fs');
var path = require('path');
var argv = require('minimist')(process.argv.slice(2));
var parseObj = require('../lib/obj');
var createGltf = require('../lib/gltf');
var util = require('../lib/util');
var defined = util.defined;
var defaultValue = util.defaultValue;
var argv = require('yargs').argv;
var Cesium = require('Cesium');
var defined = Cesium.defined;
var defaultValue = Cesium.defaultValue;
var convert = require('../lib/convert');
// TODO : support zlib
// TODO : support binary export
if (process.argv.length < 3 || defined(argv.h) || defined(argv.help)) {
console.log('Usage: ./bin/obj2gltf.js [INPUT] [OPTIONS]\n');
console.log('Usage: ./bin/obj2gltf.js [INPUT] [OPTIONS]');
console.log(' -i, --input Path to obj file');
console.log(' -o, --output Directory or filename for the exported glTF file');
console.log(' -b, --binary Output binary glTF');
console.log(' -e, --embed Embed glTF resources into a single file');
console.log(' -t, --technique Shading technique. Possible values are lambert, phong, blinn, constant');
console.log(' -h, --help Display this help');
process.exit(0);
}
var objFile = defaultValue(argv._[0], defaultValue(argv.i, argv.input));
var outputPath = defaultValue(argv._[1], defaultValue(argv.o, argv.output));
var binary = defaultValue(defaultValue(argv.b, argv.binary), false);
var embed = defaultValue(defaultValue(argv.e, argv.embed), false);
var technique = defaultValue(argv.t, argv.technique);
var binary = defaultValue(argv.b, argv.binary);
var embed = defaultValue(argv.e, argv.embed);
if (!defined(objFile)) {
console.error('-i or --input argument is required. See --help for details.');
process.exit(1);
throw new Error('-i or --input argument is required. See --help for details.');
}
if (!defined(outputPath)) {
outputPath = path.dirname(objFile);
}
console.time('Total');
if (defined(technique)) {
technique = technique.toUpperCase();
if ((technique !== 'LAMBERT') && (technique !== 'PHONG') && (technique !== 'BLINN') && (technique !== 'CONSTANT')) {
console.log('Unrecognized technique \'' + technique + '\'. Using default instead.');
}
}
var options = {
binary : binary,
embed : embed
};
var inputPath = path.dirname(objFile);
var modelName = path.basename(objFile, '.obj');
var outputIsGltf = /.gltf$/.test(outputPath);
if (outputIsGltf) {
modelName = path.basename(outputPath, '.gltf');
outputPath = path.dirname(outputPath);
}
fs.mkdir(outputPath, function(){
console.time('Total');
console.time('Parse Obj');
parseObj(objFile, inputPath, function(data) {
console.timeEnd('Parse Obj');
console.time('Create glTF');
createGltf(data, modelName, inputPath, outputPath, binary, embed, technique, function() {
console.timeEnd('Create glTF');
convert(objFile, outputPath, options, function() {
console.timeEnd('Total');
});
});
});

25
gulpfile.js Normal file
View File

@ -0,0 +1,25 @@
'use strict';
var jshint = require('gulp-jshint');
var gulp = require('gulp');
var jsHintFiles = ['index.js', 'bin/*.js', 'lib/*.js'];
gulp.task('default', ['jsHint']);
gulp.task('jsHint', function() {
return gulp.src(jsHintFiles)
.pipe(jshint.extract('auto'))
.pipe(jshint())
.pipe(jshint.reporter('jshint-stylish'))
.pipe(jshint.reporter('fail'));
});
gulp.task('jsHint-watch', function() {
gulp.watch(jsHintFiles).on('change', function(event) {
gulp.src(event.path)
.pipe(jshint.extract('auto'))
.pipe(jshint())
.pipe(jshint.reporter('jshint-stylish'));
});
});

3
index.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = {
convert : require('./lib/convert')
};

300
lib/WebGLConstants.js
View File

@ -1,300 +0,0 @@
"use strict";
module.exports = {
DEPTH_BUFFER_BIT : 0x00000100,
STENCIL_BUFFER_BIT : 0x00000400,
COLOR_BUFFER_BIT : 0x00004000,
POINTS : 0x0000,
LINES : 0x0001,
LINE_LOOP : 0x0002,
LINE_STRIP : 0x0003,
TRIANGLES : 0x0004,
TRIANGLE_STRIP : 0x0005,
TRIANGLE_FAN : 0x0006,
ZERO : 0,
ONE : 1,
SRC_COLOR : 0x0300,
ONE_MINUS_SRC_COLOR : 0x0301,
SRC_ALPHA : 0x0302,
ONE_MINUS_SRC_ALPHA : 0x0303,
DST_ALPHA : 0x0304,
ONE_MINUS_DST_ALPHA : 0x0305,
DST_COLOR : 0x0306,
ONE_MINUS_DST_COLOR : 0x0307,
SRC_ALPHA_SATURATE : 0x0308,
FUNC_ADD : 0x8006,
BLEND_EQUATION : 0x8009,
BLEND_EQUATION_RGB : 0x8009, /* same as BLEND_EQUATION */
BLEND_EQUATION_ALPHA : 0x883D,
FUNC_SUBTRACT : 0x800A,
FUNC_REVERSE_SUBTRACT : 0x800B,
BLEND_DST_RGB : 0x80C8,
BLEND_SRC_RGB : 0x80C9,
BLEND_DST_ALPHA : 0x80CA,
BLEND_SRC_ALPHA : 0x80CB,
CONSTANT_COLOR : 0x8001,
ONE_MINUS_CONSTANT_COLOR : 0x8002,
CONSTANT_ALPHA : 0x8003,
ONE_MINUS_CONSTANT_ALPHA : 0x8004,
BLEND_COLOR : 0x8005,
ARRAY_BUFFER : 0x8892,
ELEMENT_ARRAY_BUFFER : 0x8893,
ARRAY_BUFFER_BINDING : 0x8894,
ELEMENT_ARRAY_BUFFER_BINDING : 0x8895,
STREAM_DRAW : 0x88E0,
STATIC_DRAW : 0x88E4,
DYNAMIC_DRAW : 0x88E8,
BUFFER_SIZE : 0x8764,
BUFFER_USAGE : 0x8765,
CURRENT_VERTEX_ATTRIB : 0x8626,
FRONT : 0x0404,
BACK : 0x0405,
FRONT_AND_BACK : 0x0408,
CULL_FACE : 0x0B44,
BLEND : 0x0BE2,
DITHER : 0x0BD0,
STENCIL_TEST : 0x0B90,
DEPTH_TEST : 0x0B71,
SCISSOR_TEST : 0x0C11,
POLYGON_OFFSET_FILL : 0x8037,
SAMPLE_ALPHA_TO_COVERAGE : 0x809E,
SAMPLE_COVERAGE : 0x80A0,
NO_ERROR : 0,
INVALID_ENUM : 0x0500,
INVALID_VALUE : 0x0501,
INVALID_OPERATION : 0x0502,
OUT_OF_MEMORY : 0x0505,
CW : 0x0900,
CCW : 0x0901,
LINE_WIDTH : 0x0B21,
ALIASED_POINT_SIZE_RANGE : 0x846D,
ALIASED_LINE_WIDTH_RANGE : 0x846E,
CULL_FACE_MODE : 0x0B45,
FRONT_FACE : 0x0B46,
DEPTH_RANGE : 0x0B70,
DEPTH_WRITEMASK : 0x0B72,
DEPTH_CLEAR_VALUE : 0x0B73,
DEPTH_FUNC : 0x0B74,
STENCIL_CLEAR_VALUE : 0x0B91,
STENCIL_FUNC : 0x0B92,
STENCIL_FAIL : 0x0B94,
STENCIL_PASS_DEPTH_FAIL : 0x0B95,
STENCIL_PASS_DEPTH_PASS : 0x0B96,
STENCIL_REF : 0x0B97,
STENCIL_VALUE_MASK : 0x0B93,
STENCIL_WRITEMASK : 0x0B98,
STENCIL_BACK_FUNC : 0x8800,
STENCIL_BACK_FAIL : 0x8801,
STENCIL_BACK_PASS_DEPTH_FAIL : 0x8802,
STENCIL_BACK_PASS_DEPTH_PASS : 0x8803,
STENCIL_BACK_REF : 0x8CA3,
STENCIL_BACK_VALUE_MASK : 0x8CA4,
STENCIL_BACK_WRITEMASK : 0x8CA5,
VIEWPORT : 0x0BA2,
SCISSOR_BOX : 0x0C10,
COLOR_CLEAR_VALUE : 0x0C22,
COLOR_WRITEMASK : 0x0C23,
UNPACK_ALIGNMENT : 0x0CF5,
PACK_ALIGNMENT : 0x0D05,
MAX_TEXTURE_SIZE : 0x0D33,
MAX_VIEWPORT_DIMS : 0x0D3A,
SUBPIXEL_BITS : 0x0D50,
RED_BITS : 0x0D52,
GREEN_BITS : 0x0D53,
BLUE_BITS : 0x0D54,
ALPHA_BITS : 0x0D55,
DEPTH_BITS : 0x0D56,
STENCIL_BITS : 0x0D57,
POLYGON_OFFSET_UNITS : 0x2A00,
POLYGON_OFFSET_FACTOR : 0x8038,
TEXTURE_BINDING_2D : 0x8069,
SAMPLE_BUFFERS : 0x80A8,
SAMPLES : 0x80A9,
SAMPLE_COVERAGE_VALUE : 0x80AA,
SAMPLE_COVERAGE_INVERT : 0x80AB,
COMPRESSED_TEXTURE_FORMATS : 0x86A3,
DONT_CARE : 0x1100,
FASTEST : 0x1101,
NICEST : 0x1102,
GENERATE_MIPMAP_HINT : 0x8192,
BYTE : 0x1400,
UNSIGNED_BYTE : 0x1401,
SHORT : 0x1402,
UNSIGNED_SHORT : 0x1403,
INT : 0x1404,
UNSIGNED_INT : 0x1405,
FLOAT : 0x1406,
DEPTH_COMPONENT : 0x1902,
ALPHA : 0x1906,
RGB : 0x1907,
RGBA : 0x1908,
LUMINANCE : 0x1909,
LUMINANCE_ALPHA : 0x190A,
UNSIGNED_SHORT_4_4_4_4 : 0x8033,
UNSIGNED_SHORT_5_5_5_1 : 0x8034,
UNSIGNED_SHORT_5_6_5 : 0x8363,
FRAGMENT_SHADER : 0x8B30,
VERTEX_SHADER : 0x8B31,
MAX_VERTEX_ATTRIBS : 0x8869,
MAX_VERTEX_UNIFORM_VECTORS : 0x8DFB,
MAX_VARYING_VECTORS : 0x8DFC,
MAX_COMBINED_TEXTURE_IMAGE_UNITS : 0x8B4D,
MAX_VERTEX_TEXTURE_IMAGE_UNITS : 0x8B4C,
MAX_TEXTURE_IMAGE_UNITS : 0x8872,
MAX_FRAGMENT_UNIFORM_VECTORS : 0x8DFD,
SHADER_TYPE : 0x8B4F,
DELETE_STATUS : 0x8B80,
LINK_STATUS : 0x8B82,
VALIDATE_STATUS : 0x8B83,
ATTACHED_SHADERS : 0x8B85,
ACTIVE_UNIFORMS : 0x8B86,
ACTIVE_ATTRIBUTES : 0x8B89,
SHADING_LANGUAGE_VERSION : 0x8B8C,
CURRENT_PROGRAM : 0x8B8D,
NEVER : 0x0200,
LESS : 0x0201,
EQUAL : 0x0202,
LEQUAL : 0x0203,
GREATER : 0x0204,
NOTEQUAL : 0x0205,
GEQUAL : 0x0206,
ALWAYS : 0x0207,
KEEP : 0x1E00,
REPLACE : 0x1E01,
INCR : 0x1E02,
DECR : 0x1E03,
INVERT : 0x150A,
INCR_WRAP : 0x8507,
DECR_WRAP : 0x8508,
VENDOR : 0x1F00,
RENDERER : 0x1F01,
VERSION : 0x1F02,
NEAREST : 0x2600,
LINEAR : 0x2601,
NEAREST_MIPMAP_NEAREST : 0x2700,
LINEAR_MIPMAP_NEAREST : 0x2701,
NEAREST_MIPMAP_LINEAR : 0x2702,
LINEAR_MIPMAP_LINEAR : 0x2703,
TEXTURE_MAG_FILTER : 0x2800,
TEXTURE_MIN_FILTER : 0x2801,
TEXTURE_WRAP_S : 0x2802,
TEXTURE_WRAP_T : 0x2803,
TEXTURE_2D : 0x0DE1,
TEXTURE : 0x1702,
TEXTURE_CUBE_MAP : 0x8513,
TEXTURE_BINDING_CUBE_MAP : 0x8514,
TEXTURE_CUBE_MAP_POSITIVE_X : 0x8515,
TEXTURE_CUBE_MAP_NEGATIVE_X : 0x8516,
TEXTURE_CUBE_MAP_POSITIVE_Y : 0x8517,
TEXTURE_CUBE_MAP_NEGATIVE_Y : 0x8518,
TEXTURE_CUBE_MAP_POSITIVE_Z : 0x8519,
TEXTURE_CUBE_MAP_NEGATIVE_Z : 0x851A,
MAX_CUBE_MAP_TEXTURE_SIZE : 0x851C,
TEXTURE0 : 0x84C0,
TEXTURE1 : 0x84C1,
TEXTURE2 : 0x84C2,
TEXTURE3 : 0x84C3,
TEXTURE4 : 0x84C4,
TEXTURE5 : 0x84C5,
TEXTURE6 : 0x84C6,
TEXTURE7 : 0x84C7,
TEXTURE8 : 0x84C8,
TEXTURE9 : 0x84C9,
TEXTURE10 : 0x84CA,
TEXTURE11 : 0x84CB,
TEXTURE12 : 0x84CC,
TEXTURE13 : 0x84CD,
TEXTURE14 : 0x84CE,
TEXTURE15 : 0x84CF,
TEXTURE16 : 0x84D0,
TEXTURE17 : 0x84D1,
TEXTURE18 : 0x84D2,
TEXTURE19 : 0x84D3,
TEXTURE20 : 0x84D4,
TEXTURE21 : 0x84D5,
TEXTURE22 : 0x84D6,
TEXTURE23 : 0x84D7,
TEXTURE24 : 0x84D8,
TEXTURE25 : 0x84D9,
TEXTURE26 : 0x84DA,
TEXTURE27 : 0x84DB,
TEXTURE28 : 0x84DC,
TEXTURE29 : 0x84DD,
TEXTURE30 : 0x84DE,
TEXTURE31 : 0x84DF,
ACTIVE_TEXTURE : 0x84E0,
REPEAT : 0x2901,
CLAMP_TO_EDGE : 0x812F,
MIRRORED_REPEAT : 0x8370,
FLOAT_VEC2 : 0x8B50,
FLOAT_VEC3 : 0x8B51,
FLOAT_VEC4 : 0x8B52,
INT_VEC2 : 0x8B53,
INT_VEC3 : 0x8B54,
INT_VEC4 : 0x8B55,
BOOL : 0x8B56,
BOOL_VEC2 : 0x8B57,
BOOL_VEC3 : 0x8B58,
BOOL_VEC4 : 0x8B59,
FLOAT_MAT2 : 0x8B5A,
FLOAT_MAT3 : 0x8B5B,
FLOAT_MAT4 : 0x8B5C,
SAMPLER_2D : 0x8B5E,
SAMPLER_CUBE : 0x8B60,
VERTEX_ATTRIB_ARRAY_ENABLED : 0x8622,
VERTEX_ATTRIB_ARRAY_SIZE : 0x8623,
VERTEX_ATTRIB_ARRAY_STRIDE : 0x8624,
VERTEX_ATTRIB_ARRAY_TYPE : 0x8625,
VERTEX_ATTRIB_ARRAY_NORMALIZED : 0x886A,
VERTEX_ATTRIB_ARRAY_POINTER : 0x8645,
VERTEX_ATTRIB_ARRAY_BUFFER_BINDING : 0x889F,
IMPLEMENTATION_COLOR_READ_TYPE : 0x8B9A,
IMPLEMENTATION_COLOR_READ_FORMAT : 0x8B9B,
COMPILE_STATUS : 0x8B81,
LOW_FLOAT : 0x8DF0,
MEDIUM_FLOAT : 0x8DF1,
HIGH_FLOAT : 0x8DF2,
LOW_INT : 0x8DF3,
MEDIUM_INT : 0x8DF4,
HIGH_INT : 0x8DF5,
FRAMEBUFFER : 0x8D40,
RENDERBUFFER : 0x8D41,
RGBA4 : 0x8056,
RGB5_A1 : 0x8057,
RGB565 : 0x8D62,
DEPTH_COMPONENT16 : 0x81A5,
STENCIL_INDEX : 0x1901,
STENCIL_INDEX8 : 0x8D48,
DEPTH_STENCIL : 0x84F9,
RENDERBUFFER_WIDTH : 0x8D42,
RENDERBUFFER_HEIGHT : 0x8D43,
RENDERBUFFER_INTERNAL_FORMAT : 0x8D44,
RENDERBUFFER_RED_SIZE : 0x8D50,
RENDERBUFFER_GREEN_SIZE : 0x8D51,
RENDERBUFFER_BLUE_SIZE : 0x8D52,
RENDERBUFFER_ALPHA_SIZE : 0x8D53,
RENDERBUFFER_DEPTH_SIZE : 0x8D54,
RENDERBUFFER_STENCIL_SIZE : 0x8D55,
FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE : 0x8CD0,
FRAMEBUFFER_ATTACHMENT_OBJECT_NAME : 0x8CD1,
FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL : 0x8CD2,
FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE : 0x8CD3,
COLOR_ATTACHMENT0 : 0x8CE0,
DEPTH_ATTACHMENT : 0x8D00,
STENCIL_ATTACHMENT : 0x8D20,
DEPTH_STENCIL_ATTACHMENT : 0x821A,
NONE : 0,
FRAMEBUFFER_COMPLETE : 0x8CD5,
FRAMEBUFFER_INCOMPLETE_ATTACHMENT : 0x8CD6,
FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT : 0x8CD7,
FRAMEBUFFER_INCOMPLETE_DIMENSIONS : 0x8CD9,
FRAMEBUFFER_UNSUPPORTED : 0x8CDD,
FRAMEBUFFER_BINDING : 0x8CA6,
RENDERBUFFER_BINDING : 0x8CA7,
MAX_RENDERBUFFER_SIZE : 0x84E8,
INVALID_FRAMEBUFFER_OPERATION : 0x0506,
UNPACK_FLIP_Y_WEBGL : 0x9240,
UNPACK_PREMULTIPLY_ALPHA_WEBGL : 0x9241,
CONTEXT_LOST_WEBGL : 0x9242,
UNPACK_COLORSPACE_CONVERSION_WEBGL : 0x9243,
BROWSER_DEFAULT_WEBGL : 0x9244
};

51
lib/convert.js Normal file
View File

@ -0,0 +1,51 @@
"use strict";
var path = require('path');
var gltfPipeline = require('gltf-pipeline').gltfPipeline;
var parseObj = require('./obj');
var createGltf = require('./gltf');
var Cesium = require('cesium');
var defined = Cesium.defined;
var defaultValue = Cesium.defaultValue;
module.exports = convert;
function convert(objFile, outputPath, options, done) {
var binary = defaultValue(options.binary, false);
var embed = defaultValue(options.embed, true);
if (!defined(objFile)) {
throw new Error('objFile is required');
}
if (!defined(outputPath)) {
outputPath = path.dirname(objFile);
}
var inputPath = path.dirname(objFile);
var modelName = path.basename(objFile, '.obj');
var extension = path.extname(outputPath);
if (extension !== '') {
modelName = path.basename(outputPath, extension);
outputPath = path.dirname(outputPath);
}
extension = binary ? '.glb' : '.gltf';
var gltfFile = path.join(outputPath, modelName + extension);
parseObj(objFile, inputPath, function(data) {
createGltf(data, modelName, function(gltf) {
var options = {
binary : binary,
embed : embed,
createDirectory : false
};
gltfPipeline.processJSONToDisk(gltf, gltfFile, options, function(error) {
if (error) {
throw error;
}
done();
});
});
});
}

211
lib/gltf.js
View File

@ -1,90 +1,23 @@
"use strict";
var fs = require('fs');
var fsExtra = require('fs-extra');
var path = require('path');
var async = require('async');
var zlib = require('zlib');
var util = require('./util');
var defined = util.defined;
var defaultValue = util.defaultValue;
var imageInfo = require('./image');
var WebGLConstants = require('./WebGLConstants');
var modelMaterialsCommon = require('./modelMaterialsCommon');
var Cesium = require('cesium');
var defined = Cesium.defined;
var defaultValue = Cesium.defaultValue;
var WebGLConstants = Cesium.WebGLConstants;
module.exports = createGltf;
function getImages(inputPath, outputPath, embed, materials, done) {
var images = [];
for (var name in materials) {
if (materials.hasOwnProperty(name)) {
var material = materials[name];
if (defined(material.ambientColorMap) && (images.indexOf(material.ambientColorMap) === -1)) {
images.push(material.ambientColorMap);
}
if (defined(material.diffuseColorMap) && (images.indexOf(material.diffuseColorMap) === -1)) {
images.push(material.diffuseColorMap);
}
if (defined(material.emissionColorMap) && (images.indexOf(material.emissionColorMap) === -1)) {
images.push(material.emissionColorMap);
}
if (defined(material.specularColorMap) && (images.indexOf(material.specularColorMap) === -1)) {
images.push(material.specularColorMap);
}
}
}
var imagesInfo = {};
async.each(images, function (image, callback) {
var imagePath = image;
if (!path.isAbsolute(imagePath)) {
imagePath = path.join(inputPath, image);
}
var baseName = path.basename(image);
var copyPath = path.join(outputPath, baseName);
imageInfo(imagePath, function(info) {
var uri;
if (embed) {
uri = 'data:application/octet-stream;base64,' + info.data.toString('base64');
} else {
uri = baseName;
}
imagesInfo[image] = {
transparent : info.transparent,
channels : info.channels,
uri : uri
};
if (embed) {
callback();
} else if (path.relative(imagePath, copyPath) !== '') {
fsExtra.copy(imagePath, copyPath, {clobber : true}, function (err) {
if (err) {
throw err;
}
callback();
});
}
});
}, function (err) {
if (err) {
throw err;
}
done(imagesInfo);
});
}
function createGltf(data, modelName, inputPath, outputPath, binary, embed, technique, done) {
function createGltf(data, modelName, done) {
var vertexCount = data.vertexCount;
var vertexArray = data.vertexArray;
var positionMin = data.positionMin;
var positionMax = data.positionMax;
var hasUVs = data.hasUVs;
var hasNormals = data.hasNormals;
var materialGroups = data.materialGroups;
var materials = data.materials;
var images = data.images;
getImages(inputPath, outputPath, embed, materials, function(images) {
var i, j, name;
var sizeOfFloat32 = 4;
@ -152,12 +85,24 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
}
var positionByteOffset = 0;
var normalByteOffset = sizeOfFloat32 * 3;
var uvByteOffset = sizeOfFloat32 * 6;
var vertexByteStride = hasUVs ? sizeOfFloat32 * 8 : sizeOfFloat32 * 6;
var normalByteOffset = 0;
var uvByteOffset = 0;
var vertexByteStride = 0;
if (hasNormals && hasUVs) {
normalByteOffset = sizeOfFloat32 * 3;
uvByteOffset = sizeOfFloat32 * 6;
vertexByteStride = sizeOfFloat32 * 8;
} else if (hasNormals && !hasUVs) {
normalByteOffset = sizeOfFloat32 * 3;
vertexByteStride = sizeOfFloat32 * 6;
} else if (!hasNormals && hasUVs) {
uvByteOffset = sizeOfFloat32 * 3;
vertexByteStride = sizeOfFloat32 * 5;
} else if (!hasNormals && !hasUVs) {
vertexByteStride = sizeOfFloat32 * 3;
}
var binaryRelPath = modelName + '.bin';
var binaryPath = path.join(outputPath, binaryRelPath);
var bufferId = 'buffer_' + modelName;
var bufferViewVertexId = 'bufferView_vertex';
var bufferViewIndexId = 'bufferView_index';
@ -193,7 +138,6 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
asset : {},
buffers : {},
bufferViews : {},
extensionsUsed : ['KHR_materials_common'],
images : {},
materials : {},
meshes : {},
@ -227,12 +171,7 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
gltf.samplers[samplerId] = {}; // Use default values
var bufferUri;
if (embed) {
bufferUri = 'data:application/octet-stream;base64,' + buffer.toString('base64');
} else {
bufferUri = binaryRelPath;
}
var bufferUri = 'data:application/octet-stream;base64,' + buffer.toString('base64');
gltf.buffers[bufferId] = {
byteLength : bufferByteLength,
@ -276,6 +215,7 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
type : 'VEC3'
};
if (hasNormals) {
gltf.accessors[accessorNormalId] = {
bufferView : bufferViewVertexId,
byteOffset : normalByteOffset,
@ -284,6 +224,7 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
count : vertexCount,
type : 'VEC3'
};
}
if (hasUVs) {
gltf.accessors[accessorUVId] = {
@ -304,7 +245,9 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
var gltfAttributes = {};
gltfAttributes.POSITION = accessorPositionId;
if (hasNormals) {
gltfAttributes.NORMAL = accessorNormalId;
}
if (hasUVs) {
gltfAttributes.TEXCOORD_0 = accessorUVId;
}
@ -318,6 +261,25 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
});
}
for (name in materials) {
if (materials.hasOwnProperty(name)) {
var material = materials[name];
var materialId = getMaterialId(name);
var values = {
ambient : defaultValue(defaultValue(getTextureId(material.ambientColorMap), material.ambientColor), [0, 0, 0, 1]),
diffuse : defaultValue(defaultValue(getTextureId(material.diffuseColorMap), material.diffuseColor), [0, 0, 0, 1]),
emission : defaultValue(defaultValue(getTextureId(material.emissionColorMap), material.emissionColor), [0, 0, 0, 1]),
specular : defaultValue(defaultValue(getTextureId(material.specularColorMap), material.specularColor), [0, 0, 0, 1]),
shininess : defaultValue(material.specularShininess, 0.0)
};
gltf.materials[materialId] = {
name: name,
values: values
};
}
}
for (name in images) {
if (images.hasOwnProperty(name)) {
var image = images[name];
@ -354,80 +316,5 @@ function createGltf(data, modelName, inputPath, outputPath, binary, embed, techn
}
}
for (i = 0; i < primitivesLength; ++i) {
var materialName = primitives[i].material;
var material = materials[materialName];
var materialId = getMaterialId(materialName);
// Get shading technique
var shadingTechnique = technique;
var specularColor = defaultValue(material.specularColor, [0, 0, 0, 1]);
var specularShininess = material.specularShininess;
var hasSpecularColor = (specularColor[0] > 0) || (specularColor[1] > 0) || (specularColor[2] > 0);
var hasSpecularColorMap = defined(material.specularColorMap);
if (defined(shadingTechnique)) {
if ((shadingTechnique === 'PHONG') || (shadingTechnique === 'BLINN')) {
if (!defined(specularShininess)) {
specularShininess = 10.0;
}
if (!hasSpecularColor) {
specularColor[0] = specularColor[1] = specularColor[2] = 0.5;
}
}
} else {
shadingTechnique = 'BLINN';
if (!hasSpecularColorMap && !hasSpecularColor) {
shadingTechnique = 'LAMBERT';
}
}
var values = {
ambient : defaultValue(defaultValue(getTextureId(material.ambientColorMap), material.ambientColor), [0, 0, 0, 1]),
diffuse : defaultValue(defaultValue(getTextureId(material.diffuseColorMap), material.diffuseColor), [0, 0, 0, 1]),
emission : defaultValue(defaultValue(getTextureId(material.emissionColorMap), material.emissionColor), [0, 0, 0, 1]),
specular : defaultValue(getTextureId(material.specularColorMap), specularColor),
shininess : defaultValue(specularShininess, 0.0),
transparency : defaultValue(material.alpha, 1.0)
};
// If an image is transparent, set transparency to 0.99 to force alpha path
var diffuseColorMap = material.diffuseColorMap;
if (defined(diffuseColorMap) && images[diffuseColorMap].transparent) {
values.transparency = 0.99 * (values.transparency || 1.0);
}
gltf.materials[materialId] = {
name : materialName,
extensions : {
KHR_materials_common: {
technique: shadingTechnique,
values: values
}
}
};
}
// Generate techniques, shaders, and programs
gltf = modelMaterialsCommon(gltf);
// Save .gltf file
var gltfPath = path.join(outputPath, modelName) + '.gltf';
var gltfString = JSON.stringify(gltf, null, 4);
fs.writeFile(gltfPath, gltfString, function(error) {
if (error) {
throw error;
}
if (embed) {
done();
} else {
// Save .bin file
fs.writeFile(binaryPath, buffer, function(error) {
if (error) {
throw error;
}
done();
});
}
});
});
done(gltf);
}

12
lib/image.js
View File

@ -1,8 +1,8 @@
"use strict";
var fs = require('fs');
var fs = require('fs-extra');
var path = require('path');
module.exports = imageInfo;
module.exports = loadImage;
function getChannels(colorType) {
switch (colorType) {
@ -19,10 +19,10 @@ function getChannels(colorType) {
}
}
function imageInfo(imagePath, done) {
fs.readFile(imagePath, function(err, data) {
if (err) {
throw(err);
function loadImage(imagePath, done) {
fs.readFile(imagePath, function(error, data) {
if (error) {
throw(error);
}
var info = {

750
lib/modelMaterialsCommon.js
View File

@ -1,750 +0,0 @@
"use strict";
var WebGLConstants = require('./WebGLConstants');
var util = require('./util');
var defined = util.defined;
var defaultValue = util.defaultValue;
module.exports = modelMaterialsCommon;
function webGLConstantToGlslType(webGLValue) {
switch(webGLValue) {
case WebGLConstants.FLOAT:
return 'float';
case WebGLConstants.FLOAT_VEC2:
return 'vec2';
case WebGLConstants.FLOAT_VEC3:
return 'vec3';
case WebGLConstants.FLOAT_VEC4:
return 'vec4';
case WebGLConstants.FLOAT_MAT2:
return 'mat2';
case WebGLConstants.FLOAT_MAT3:
return 'mat3';
case WebGLConstants.FLOAT_MAT4:
return 'mat4';
case WebGLConstants.SAMPLER_2D:
return 'sampler2D';
}
}
function generateLightParameters(gltf) {
var result = {};
var lights;
if (defined(gltf.extensions) && defined(gltf.extensions.KHR_materials_common)) {
lights = gltf.extensions.KHR_materials_common.lights;
}
if (defined(lights)) {
// Figure out which node references the light
var nodes = gltf.nodes;
for (var nodeName in nodes) {
if (nodes.hasOwnProperty(nodeName)) {
var node = nodes[nodeName];
if (defined(node.extensions) && defined(node.extensions.KHR_materials_common)) {
var nodeLightId = node.extensions.KHR_materials_common.light;
if (defined(nodeLightId) && defined(lights[nodeLightId])) {
lights[nodeLightId].node = nodeName;
}
delete node.extensions.KHR_materials_common;
}
}
}
// Add light parameters to result
var lightCount = 0;
for(var lightName in lights) {
if (lights.hasOwnProperty(lightName)) {
var light = lights[lightName];
var lightType = light.type;
if ((lightType !== 'ambient') && !defined(light.node)) {
delete lights[lightName];
continue;
}
var lightBaseName = 'light' + lightCount.toString();
light.baseName = lightBaseName;
switch(lightType) {
case 'ambient':
var ambient = light.ambient;
result[lightBaseName + 'Color'] = {
type: WebGLConstants.FLOAT_VEC3,
value: ambient.color
};
break;
case 'directional':
var directional = light.directional;
result[lightBaseName + 'Color'] =
{
type: WebGLConstants.FLOAT_VEC3,
value: directional.color
};
if (defined(light.node)) {
result[lightBaseName + 'Transform'] =
{
node: light.node,
semantic: 'MODELVIEW',
type: WebGLConstants.FLOAT_MAT4
};
}
break;
case 'point':
var point = light.point;
result[lightBaseName + 'Color'] =
{
type: WebGLConstants.FLOAT_VEC3,
value: point.color
};
if (defined(light.node)) {
result[lightBaseName + 'Transform'] =
{
node: light.node,
semantic: 'MODELVIEW',
type: WebGLConstants.FLOAT_MAT4
};
}
result[lightBaseName + 'Attenuation'] =
{
type: WebGLConstants.FLOAT_VEC3,
value: [point.constantAttenuation, point.linearAttenuation, point.quadraticAttenuation]
};
break;
case 'spot':
var spot = light.spot;
result[lightBaseName + 'Color'] =
{
type: WebGLConstants.FLOAT_VEC3,
value: spot.color
};
if (defined(light.node)) {
result[lightBaseName + 'Transform'] =
{
node: light.node,
semantic: 'MODELVIEW',
type: WebGLConstants.FLOAT_MAT4
};
result[lightBaseName + 'InverseTransform'] = {
node: light.node,
semantic: 'MODELVIEWINVERSE',
type: WebGLConstants.FLOAT_MAT4,
useInFragment: true
};
}
result[lightBaseName + 'Attenuation'] =
{
type: WebGLConstants.FLOAT_VEC3,
value: [spot.constantAttenuation, spot.linearAttenuation, spot.quadraticAttenuation]
};
result[lightBaseName + 'FallOff'] =
{
type: WebGLConstants.FLOAT_VEC2,
value: [spot.fallOffAngle, spot.fallOffExponent]
};
break;
}
++lightCount;
}
}
}
return result;
}
function getNextId(dictionary, baseName, startingCount) {
var count = defaultValue(startingCount, 0);
var nextId;
do {
nextId = baseName + (count++).toString();
} while(defined(dictionary[nextId]));
return nextId;
}
var techniqueCount = 0;
var vertexShaderCount = 0;
var fragmentShaderCount = 0;
var programCount = 0;
function generateTechnique(gltf, khrMaterialsCommon, attributes, lightParameters, jointCount) {
var techniques = gltf.techniques;
var shaders = gltf.shaders;
var programs = gltf.programs;
attributes = defaultValue(attributes, []);
var attributesCount = attributes.length;
var lightingModel = khrMaterialsCommon.technique.toUpperCase();
var lights;
if (defined(gltf.extensions) && defined(gltf.extensions.KHR_materials_common)) {
lights = gltf.extensions.KHR_materials_common.lights;
}
var hasSkinning = (jointCount > 0);
var values = khrMaterialsCommon.values;
var isDoubleSided = values.doubleSided;
delete values.doubleSided;
var vertexShader = 'precision highp float;\n';
var fragmentShader = 'precision highp float;\n';
// Generate IDs for our new objects
var techniqueId = getNextId(techniques, 'technique', techniqueCount);
var vertexShaderId = getNextId(shaders, 'vertexShader', vertexShaderCount);
var fragmentShaderId = getNextId(shaders, 'fragmentShader', fragmentShaderCount);
var programId = getNextId(programs, 'program', programCount);
// Add techniques
var lowerCase;
var techniqueAttributes = {};
for (var i=0;i<attributesCount;++i) {
lowerCase = attributes[i].toLowerCase();
techniqueAttributes['a_' + lowerCase] = lowerCase;
}
var techniqueParameters = {
// Add matrices
modelViewMatrix: {
semantic: 'MODELVIEW',
type: WebGLConstants.FLOAT_MAT4
},
normalMatrix: {
semantic: 'MODELVIEWINVERSETRANSPOSE',
type: WebGLConstants.FLOAT_MAT3
},
projectionMatrix: {
semantic: 'PROJECTION',
type: WebGLConstants.FLOAT_MAT4
}
};
if (hasSkinning) {
techniqueParameters.jointMatrix = {
count: jointCount,
semantic: 'JOINTMATRIX',
type: WebGLConstants.FLOAT_MAT4
};
}
// Add material parameters
var hasAlpha = false;
var typeValue;
for(var name in values) {
if (values.hasOwnProperty(name)) {
var value = values[name];
var type = typeof value;
typeValue = -1;
switch (type) {
case 'string':
typeValue = WebGLConstants.SAMPLER_2D;
break;
case 'number':
typeValue = WebGLConstants.FLOAT;
if (!hasAlpha && (name === 'transparency')) {
hasAlpha = (value !== 1.0);
}
break;
default:
if (Array.isArray(value)) {
// 35664 (vec2), 35665 (vec3), 35666 (vec4)
typeValue = 35662 + value.length;
if (!hasAlpha && (typeValue === WebGLConstants.FLOAT_VEC4) && (name === 'diffuse')) {
hasAlpha = (value[3] !== 1.0);
}
}
break;
}
if (typeValue > 0) {
lowerCase = name.toLowerCase();
techniqueParameters[lowerCase] = {
type: typeValue
};
}
}
}
// Copy light parameters into technique parameters
if (defined(lightParameters)) {
for (var lightParamName in lightParameters) {
if (lightParameters.hasOwnProperty(lightParamName)) {
techniqueParameters[lightParamName] = lightParameters[lightParamName];
}
}
}
// Generate uniforms object before attributes are added
var techniqueUniforms = {};
for (var paramName in techniqueParameters) {
if (techniqueParameters.hasOwnProperty(paramName)) {
var param = techniqueParameters[paramName];
techniqueUniforms['u_' + paramName] = paramName;
var arraySize = defined(param.count) ? '['+param.count+']' : '';
if (((param.type !== WebGLConstants.FLOAT_MAT3) && (param.type !== WebGLConstants.FLOAT_MAT4)) ||
param.useInFragment) {
fragmentShader += 'uniform ' + webGLConstantToGlslType(param.type) + ' u_' + paramName + arraySize + ';\n';
delete param.useInFragment;
}
else {
vertexShader += 'uniform ' + webGLConstantToGlslType(param.type) + ' u_' + paramName + arraySize + ';\n';
}
}
}
// Add attributes with semantics
var vertexShaderMain = '';
if (hasSkinning) {
vertexShaderMain += ' mat4 skinMat = a_weight.x * u_jointMatrix[int(a_joint.x)];\n';
vertexShaderMain += ' skinMat += a_weight.y * u_jointMatrix[int(a_joint.y)];\n';
vertexShaderMain += ' skinMat += a_weight.z * u_jointMatrix[int(a_joint.z)];\n';
vertexShaderMain += ' skinMat += a_weight.w * u_jointMatrix[int(a_joint.w)];\n';
}
// TODO: Handle multiple texture coordinates for now we just use 1
var v_texcoord;
for (i=0;i<attributesCount;++i) {
var attribute = attributes[i];
typeValue = -1;
if (attribute === 'POSITION') {
typeValue = WebGLConstants.FLOAT_VEC3;
vertexShader += 'attribute vec3 a_position;\n';
vertexShader += 'varying vec3 v_positionEC;\n';
if (hasSkinning) {
vertexShaderMain += ' vec4 pos = u_modelViewMatrix * skinMat * vec4(a_position,1.0);\n';
}
else {
vertexShaderMain += ' vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);\n';
}
vertexShaderMain += ' v_positionEC = pos.xyz;\n';
vertexShaderMain += ' gl_Position = u_projectionMatrix * pos;\n';
fragmentShader += 'varying vec3 v_positionEC;\n';
}
else if (attribute === 'NORMAL') {
typeValue = WebGLConstants.FLOAT_VEC3;
vertexShader += 'attribute vec3 a_normal;\n';
vertexShader += 'varying vec3 v_normal;\n';
if (hasSkinning) {
vertexShaderMain += ' v_normal = u_normalMatrix * mat3(skinMat) * a_normal;\n';
}
else {
vertexShaderMain += ' v_normal = u_normalMatrix * a_normal;\n';
}
fragmentShader += 'varying vec3 v_normal;\n';
}
else if (attribute.indexOf('TEXCOORD') === 0) {
typeValue = WebGLConstants.FLOAT_VEC2;
lowerCase = attribute.toLowerCase();
var a_texcoord = 'a_' + lowerCase;
v_texcoord = 'v_' + lowerCase;
vertexShader += 'attribute vec2 ' + a_texcoord + ';\n';
vertexShader += 'varying vec2 ' + v_texcoord + ';\n';
vertexShaderMain += ' ' + v_texcoord + ' = ' + a_texcoord + ';\n';
fragmentShader += 'varying vec2 ' + v_texcoord + ';\n';
}
else if (attribute === 'JOINT') {
typeValue = WebGLConstants.FLOAT_VEC4;
vertexShader += 'attribute vec4 a_joint;\n';
}
else if (attribute === 'WEIGHT') {
typeValue = WebGLConstants.FLOAT_VEC4;
vertexShader += 'attribute vec4 a_weight;\n';
}
if (typeValue > 0) {
lowerCase = attribute.toLowerCase();
techniqueParameters[lowerCase] = {
semantic: attribute,
type: typeValue
};
}
}
var hasNormals = defined(techniqueParameters.normal);
var hasSpecular = hasNormals && ((lightingModel === 'BLINN') || (lightingModel === 'PHONG')) &&
defined(techniqueParameters.specular) && defined(techniqueParameters.shininess);
// Generate lighting code blocks
var hasNonAmbientLights = false;
var hasAmbientLights = false;
var fragmentLightingBlock = '';
for (var lightName in lights) {
if (lights.hasOwnProperty(lightName)) {
var light = lights[lightName];
var lightType = light.type.toLowerCase();
var lightBaseName = light.baseName;
fragmentLightingBlock += ' {\n';
var lightColorName = 'u_' + lightBaseName + 'Color';
var varyingName;
if(lightType === 'ambient') {
hasAmbientLights = true;
fragmentLightingBlock += ' ambientLight += ' + lightColorName + ';\n';
}
else if (hasNormals && (lightingModel !== 'CONSTANT')) {
hasNonAmbientLights = true;
varyingName = 'v_' + lightBaseName + 'Direction';
vertexShader += 'varying vec3 ' + varyingName + ';\n';
fragmentShader += 'varying vec3 ' + varyingName + ';\n';
if (lightType === 'directional') {
vertexShaderMain += ' ' + varyingName + ' = mat3(u_' + lightBaseName + 'Transform) * vec3(0.,0.,1.);\n';
fragmentLightingBlock += ' float attenuation = 1.0;\n';
}
else {
vertexShaderMain += ' ' + varyingName + ' = u_' + lightBaseName + 'Transform[3].xyz - pos.xyz;\n';
fragmentLightingBlock += ' float range = length(' + varyingName + ');\n';
fragmentLightingBlock += ' float attenuation = 1.0 / (u_' + lightBaseName + 'Attenuation.x + ';
fragmentLightingBlock += '(u_' + lightBaseName + 'Attenuation.y * range) + ';
fragmentLightingBlock += '(u_' + lightBaseName + 'Attenuation.z * range * range));\n';
}
fragmentLightingBlock += ' vec3 l = normalize(' + varyingName + ');\n';
if (lightType === 'spot') {
fragmentLightingBlock += ' vec4 spotPosition = u_' + lightBaseName + 'InverseTransform * vec4(v_positionEC, 1.0);\n';
fragmentLightingBlock += ' float cosAngle = dot(vec3(0.0,0.0,-1.0), normalize(spotPosition.xyz));\n';
fragmentLightingBlock += ' if (cosAngle < cos(u_' + lightBaseName + 'FallOff.x * 0.5))\n';
fragmentLightingBlock += ' {\n';
fragmentLightingBlock += ' attenuation *= max(0.0, pow(cosAngle, u_' + lightBaseName + 'FallOff.y));\n';
}
fragmentLightingBlock += ' diffuseLight += ' + lightColorName + '* max(dot(normal,l), 0.) * attenuation;\n';
if (hasSpecular) {
if (lightingModel === 'BLINN') {
fragmentLightingBlock += ' vec3 h = normalize(l + viewDir);\n';
fragmentLightingBlock += ' float specularIntensity = max(0., pow(max(dot(normal, h), 0.), u_shininess)) * attenuation;\n';
}
else { // PHONG
fragmentLightingBlock += ' vec3 reflectDir = reflect(-l, normal);\n';
fragmentLightingBlock += ' float specularIntensity = max(0., pow(max(dot(reflectDir, viewDir), 0.), u_shininess)) * attenuation;\n';
}
fragmentLightingBlock += ' specularLight += ' + lightColorName + ' * specularIntensity;\n';
}
if (lightType === 'spot') {
fragmentLightingBlock += ' }\n';
}
}
fragmentLightingBlock += ' }\n';
}
}
if (!hasAmbientLights) {
// Add an ambient light if we don't have one
fragmentLightingBlock += ' ambientLight += vec3(0.1, 0.1, 0.1);\n';
}
if (!hasNonAmbientLights && (lightingModel !== 'CONSTANT')) {
fragmentLightingBlock += ' vec3 l = normalize(czm_sunDirectionEC);\n';
fragmentLightingBlock += ' diffuseLight += vec3(1.0, 1.0, 1.0) * max(dot(normal,l), 0.);\n';
if (hasSpecular) {
if (lightingModel === 'BLINN') {
fragmentLightingBlock += ' vec3 h = normalize(l + viewDir);\n';
fragmentLightingBlock += ' float specularIntensity = max(0., pow(max(dot(normal, h), 0.), u_shininess));\n';
}
else { // PHONG
fragmentLightingBlock += ' vec3 reflectDir = reflect(-l, normal);\n';
fragmentLightingBlock += ' float specularIntensity = max(0., pow(max(dot(reflectDir, viewDir), 0.), u_shininess));\n';
}
fragmentLightingBlock += ' specularLight += vec3(1.0, 1.0, 1.0) * specularIntensity;\n';
}
}
vertexShader += 'void main(void) {\n';
vertexShader += vertexShaderMain;
vertexShader += '}\n';
fragmentShader += 'void main(void) {\n';
var colorCreationBlock = ' vec3 color = vec3(0.0, 0.0, 0.0);\n';
if (hasNormals) {
fragmentShader += ' vec3 normal = normalize(v_normal);\n';
if (isDoubleSided) {
fragmentShader += ' if (gl_FrontFacing == false)\n';
fragmentShader += ' {\n';
fragmentShader += ' normal = -normal;\n';
fragmentShader += ' }\n';
}
}
var finalColorComputation;
if (lightingModel !== 'CONSTANT') {
if (defined(techniqueParameters.diffuse)) {
if (techniqueParameters.diffuse.type === WebGLConstants.SAMPLER_2D) {
fragmentShader += ' vec4 diffuse = texture2D(u_diffuse, ' + v_texcoord + ');\n';
}
else {
fragmentShader += ' vec4 diffuse = u_diffuse;\n';
}
fragmentShader += ' vec3 diffuseLight = vec3(0.0, 0.0, 0.0);\n';
colorCreationBlock += ' color += diffuse.rgb * diffuseLight;\n';
}
if (hasSpecular) {
if (techniqueParameters.specular.type === WebGLConstants.SAMPLER_2D) {
fragmentShader += ' vec3 specular = texture2D(u_specular, ' + v_texcoord + ').rgb;\n';
}
else {
fragmentShader += ' vec3 specular = u_specular.rgb;\n';
}
fragmentShader += ' vec3 specularLight = vec3(0.0, 0.0, 0.0);\n';
colorCreationBlock += ' color += specular * specularLight;\n';
}
if (defined(techniqueParameters.transparency)) {
finalColorComputation = ' gl_FragColor = vec4(color * diffuse.a, diffuse.a * u_transparency);\n';
}
else {
finalColorComputation = ' gl_FragColor = vec4(color * diffuse.a, diffuse.a);\n';
}
}
else {
if (defined(techniqueParameters.transparency)) {
finalColorComputation = ' gl_FragColor = vec4(color, u_transparency);\n';
}
else {
finalColorComputation = ' gl_FragColor = vec4(color, 1.0);\n';
}
}
if (defined(techniqueParameters.emission)) {
if (techniqueParameters.emission.type === WebGLConstants.SAMPLER_2D) {
fragmentShader += ' vec3 emission = texture2D(u_emission, ' + v_texcoord + ');\n';
}
else {
fragmentShader += ' vec3 emission = u_emission.rgb;\n';
}
colorCreationBlock += ' color += emission;\n';
}
if (defined(techniqueParameters.ambient)) {
if (techniqueParameters.ambient.type === WebGLConstants.SAMPLER_2D) {
fragmentShader += ' vec3 ambient = texture2D(u_ambient, ' + v_texcoord + ');\n';
}
else {
fragmentShader += ' vec3 ambient = u_ambient.rgb;\n';
}
}
else {
fragmentShader += ' vec3 ambient = diffuse.rgb;\n';
}
fragmentShader += ' vec3 viewDir = -normalize(v_positionEC);\n';
fragmentShader += ' vec3 ambientLight = vec3(0.0, 0.0, 0.0);\n';
colorCreationBlock += ' color += ambient * ambientLight;\n';
// Add in light computations
fragmentShader += fragmentLightingBlock;
fragmentShader += colorCreationBlock;
fragmentShader += finalColorComputation;
fragmentShader += '}\n';
// TODO: Handle texture transparency
var techniqueStates;
if (hasAlpha) {
techniqueStates = {
enable: [
WebGLConstants.DEPTH_TEST,
WebGLConstants.BLEND
],
depthMask: false,
functions: {
"blendEquationSeparate": [
WebGLConstants.FUNC_ADD,
WebGLConstants.FUNC_ADD
],
"blendFuncSeparate": [
WebGLConstants.ONE,
WebGLConstants.ONE_MINUS_SRC_ALPHA,
WebGLConstants.ONE,
WebGLConstants.ONE_MINUS_SRC_ALPHA
]
}
};
}
else {
techniqueStates = {
enable: [
WebGLConstants.CULL_FACE,
WebGLConstants.DEPTH_TEST
]
};
}
techniques[techniqueId] = {
attributes: techniqueAttributes,
parameters: techniqueParameters,
program: programId,
states: techniqueStates,
uniforms: techniqueUniforms
};
// Add shaders
shaders[vertexShaderId] = {
type: WebGLConstants.VERTEX_SHADER,
uri: '',
extras: {
source: vertexShader
}
};
shaders[fragmentShaderId] = {
type: WebGLConstants.FRAGMENT_SHADER,
uri: '',
extras: {
source: fragmentShader
}
};
// Add program
var programAttributes = [];
for (i=0;i<attributesCount;++i) {
programAttributes.push('a_' + attributes[i].toLowerCase());
}
programs[programId] = {
attributes: programAttributes,
fragmentShader: fragmentShaderId,
vertexShader: vertexShaderId
};
return techniqueId;
}
function getTechniqueKey(khrMaterialsCommon) {
var techniqueKey = '';
techniqueKey += 'technique:' + khrMaterialsCommon.technique + ';';
var values = khrMaterialsCommon.values;
var keys = Object.keys(values).sort();
var keysCount = keys.length;
for (var i=0;i<keysCount;++i) {
var name = keys[i];
if (values.hasOwnProperty(name)) {
var value = values[name];
techniqueKey += name + ':';
var type = typeof value;
switch (type) {
case 'string':
techniqueKey += 'texture';
break;
case 'number':
techniqueKey += 'float';
break;
default:
if (Array.isArray(value)) {
techniqueKey += 'vec' + value.length.toString();
}
break;
}
techniqueKey += ';';
}
}
}
function getPrimitiveInfo(materialId, gltf) {
var meshes = gltf.meshes;
for (var name in meshes) {
if (meshes.hasOwnProperty(name)) {
var mesh = meshes[name];
var primitives = mesh.primitives;
var primitivesCount = primitives.length;
for (var i=0;i<primitivesCount;++i) {
var primitive = primitives[i];
if (primitive.material === materialId) {
var jointCount = 0;
if (defined(primitive.attributes.JOINT)) {
var nodes = gltf.nodes;
for (var nodeName in nodes) {
if (nodes.hasOwnProperty(nodeName)) {
var node = nodes[nodeName];
// We have skinning for this node and it contains this mesh
if (defined(node.skeletons) && defined(node.meshes) &&
(node.meshes.indexOf(name) !== -1)) {
jointCount = node.skeletons.length;
}
}
}
}
return {
attributes : Object.keys(primitive.attributes),
jointCount : jointCount
};
}
}
}
}
}
/**
* Modifies gltf in place.
*
* @private
*/
function modelMaterialsCommon(gltf) {
if (!defined(gltf)) {
return undefined;
}
var hasExtension = false;
var extensionsUsed = gltf.extensionsUsed;
if (defined(extensionsUsed)) {
var extensionsUsedCount = extensionsUsed.length;
for(var i=0;i<extensionsUsedCount;++i) {
if (extensionsUsed[i] === 'KHR_materials_common') {
hasExtension = true;
extensionsUsed.splice(i, 1);
break;
}
}
}
if (hasExtension) {
if (!defined(gltf.programs)) {
gltf.programs = {};
}
if (!defined(gltf.shaders)) {
gltf.shaders = {};
}
if (!defined(gltf.techniques)) {
gltf.techniques = {};
}
var lightParameters = generateLightParameters(gltf);
var techniques = {};
var materials = gltf.materials;
var meshes = gltf.meshes;
for (var name in materials) {
if (materials.hasOwnProperty(name)) {
var material = materials[name];
if (defined(material.extensions) && defined(material.extensions.KHR_materials_common)) {
var khrMaterialsCommon = material.extensions.KHR_materials_common;
var techniqueKey = getTechniqueKey(khrMaterialsCommon);
var technique = techniques[techniqueKey];
if (!defined(technique)) {
var primitiveInfo = getPrimitiveInfo(name, gltf);
technique = generateTechnique(gltf, khrMaterialsCommon, primitiveInfo.attributes,
lightParameters, primitiveInfo.jointCount);
}
// Take advantage of the fact that we generate techniques that use the
// same parameter names as the extension values.
material.values = khrMaterialsCommon.values;
material.technique = technique;
delete material.extensions.KHR_materials_common;
}
}
}
if (defined(gltf.extensions)) {
delete gltf.extensions.KHR_materials_common;
}
//var json = JSON.stringify(gltf, null, 4);
//var a = document.createElement('a');
//a.setAttribute('href', 'data:text;base64,' + btoa(json));
//a.setAttribute('target', '_blank');
//a.setAttribute('download', 'model.json');
//a.click();
}
return gltf;
}

6
lib/mtl.js
View File

@ -1,5 +1,5 @@
"use strict";
var fs = require('fs');
var fs = require('fs-extra');
module.exports = {
getDefault : getDefault,
@ -31,8 +31,8 @@ function getDefault() {
}
function parse(mtlPath, done) {
fs.readFile(mtlPath, 'utf-8', function (err, contents) {
if (err) {
fs.readFile(mtlPath, 'utf-8', function (error, contents) {
if (error) {
console.log('Could not read material file at ' + mtlPath + '. Using default material instead.');
done({});
return;

237
lib/obj.js
View File

@ -1,46 +1,32 @@
"use strict";
var fs = require('fs');
var async = require('async');
var fs = require('fs-extra');
var path = require('path');
var loadImage = require('./image');
var Material = require('./mtl');
var util = require('./util');
var defined = util.defined;
var normalize = util.normalize;
var faceNormal = util.faceNormal;
var Cesium = require('cesium');
var Cartesian3 = Cesium.Cartesian3;
var defined = Cesium.defined;
module.exports = parseObj;
// OBJ regex patterns are from ThreeJS (https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/OBJLoader.js)
function getMaterials(contents, inputPath, done) {
var hasMaterialGroups = /^usemtl/gm.test(contents);
if (!hasMaterialGroups) {
done({});
return;
}
var mtllibMatches = contents.match(/^mtllib.*/gm);
if (mtllibMatches === null) {
done({});
} else {
var mtlFile = mtllibMatches[0].substring(7).trim();
var mtlPath = mtlFile;
if (!path.isAbsolute(mtlPath)) {
mtlPath = path.join(inputPath, mtlFile);
}
Material.parse(mtlPath, function (materials) {
done(materials);
});
}
}
function parseObj(objFile, inputPath, done) {
fs.readFile(objFile, 'utf-8', function (err, contents) {
if (err) {
throw err;
fs.readFile(objFile, 'utf-8', function (error, contents) {
if (error) {
throw error;
}
getMaterials(contents, inputPath, function (materials) {
getImages(inputPath, materials, function (images) {
processObj(contents, materials, images, done);
});
});
});
}
function processObj(contents, materials, images, done) {
var i, length;
// A vertex is specified by indexes into each of the attribute arrays,
@ -62,37 +48,21 @@ function parseObj(objFile, inputPath, done) {
var hasUVs = /^vt/gm.test(contents);
if (!hasPositions) {
console.log('Error: could not process OBJ file, no positions.');
process.exit(1);
throw new Error('Could not process OBJ file, no positions.');
}
// Auto-generate normals if they are missing from the obj file
var generateNormals = !hasNormals;
var vertexLocations = [];
var vertexNormals;
if (generateNormals) {
var locations = contents.match(/^v\s/gm).length;
vertexNormals = new Array(locations*3);
for (i = 0; i < locations; ++i) {
vertexNormals[i * 3 + 0] = 0;
vertexNormals[i * 3 + 1] = 0;
vertexNormals[i * 3 + 2] = 0;
}
}
// Map material to index array
var materialGroups = {};
var matIndexArray;
var materialGroups = {}; // Map material to index array
var currentIndexArray;
// Switch to the material-specific index array, or create it if it doesn't exist
function useMaterial(material) {
if (!defined(materials[material])) {
useDefaultMaterial();
} else {
matIndexArray = materialGroups[material];
if (!defined(matIndexArray)) {
matIndexArray = [];
materialGroups[material] = matIndexArray;
currentIndexArray = materialGroups[material];
if (!defined(currentIndexArray)) {
currentIndexArray = [];
materialGroups[material] = currentIndexArray;
}
}
}
@ -131,9 +101,6 @@ function parseObj(objFile, inputPath, done) {
var ny = normals[ni + 1];
var nz = normals[ni + 2];
vertexArray.push(nx, ny, nz);
} else {
// Normals will be auto-generated later
vertexArray.push(0.0, 0.0, 0.0);
}
// UVs
@ -156,11 +123,6 @@ function parseObj(objFile, inputPath, done) {
index = vertexCount++;
vertexCache[v] = index;
createVertex(p, u, n);
if (generateNormals) {
var pi = (parseInt(p) - 1);
vertexLocations.push(pi);
}
}
return index;
@ -171,46 +133,16 @@ function parseObj(objFile, inputPath, done) {
var index2 = addVertex(v2, p2, u2, n2);
var index3 = addVertex(v3, p3, u3, n3);
matIndexArray.push(index1);
matIndexArray.push(index2);
matIndexArray.push(index3);
currentIndexArray.push(index1);
currentIndexArray.push(index2);
currentIndexArray.push(index3);
// Triangulate if the face is a quad
if (defined(v4)) {
var index4 = addVertex(v4, p4, u4, n4);
matIndexArray.push(index1);
matIndexArray.push(index3);
matIndexArray.push(index4);
}
if (generateNormals) {
// Get face normal
var i1 = (parseInt(p1) - 1) * 3;
var i2 = (parseInt(p2) - 1) * 3;
var i3 = (parseInt(p3) - 1) * 3;
var normal = faceNormal(
positions[i1], positions[i1 + 1], positions[i1 + 2],
positions[i2], positions[i2 + 1], positions[i2 + 2],
positions[i3], positions[i3 + 1], positions[i3 + 2]
);
// Add face normal to each vertex normal
vertexNormals[i1 + 0] += normal[0];
vertexNormals[i1 + 1] += normal[1];
vertexNormals[i1 + 2] += normal[2];
vertexNormals[i2 + 0] += normal[0];
vertexNormals[i2 + 1] += normal[1];
vertexNormals[i2 + 2] += normal[2];
vertexNormals[i3 + 0] += normal[0];
vertexNormals[i3 + 1] += normal[1];
vertexNormals[i3 + 2] += normal[2];
if (defined(v4)) {
var i4 = (parseInt(p4) - 1) * 3;
vertexNormals[i4 + 0] += normal[0];
vertexNormals[i4 + 1] += normal[1];
vertexNormals[i4 + 2] += normal[2];
}
currentIndexArray.push(index1);
currentIndexArray.push(index3);
currentIndexArray.push(index4);
}
}
@ -252,12 +184,8 @@ function parseObj(objFile, inputPath, done) {
var nx = parseFloat(result[1]);
var ny = parseFloat(result[2]);
var nz = parseFloat(result[3]);
var normal = normalize(nx, ny, nz);
normals.push(
normal[0],
normal[1],
normal[2]
);
var normal = Cartesian3.normalize(new Cartesian3(nx, ny, nz), new Cartesian3());
normals.push(normal.x, normal.y, normal.z);
} else if ((result = uvPattern.exec(line)) !== null) {
uvs.push(
parseFloat(result[1]),
@ -298,34 +226,83 @@ function parseObj(objFile, inputPath, done) {
}
}
if (generateNormals) {
length = vertexLocations.length;
for (i = 0; i < length; ++i) {
// Normalize normal
var index = vertexLocations[i] * 3;
var normal = normalize(
vertexNormals[index + 0],
vertexNormals[index + 1],
vertexNormals[index + 2]
);
// Set new normal in vertex array
var offset = i * (hasUVs ? 8 : 6) + 3;
vertexArray[offset + 0] = normal[0];
vertexArray[offset + 1] = normal[1];
vertexArray[offset + 2] = normal[2];
}
}
done({
vertexCount: vertexCount,
vertexArray: vertexArray,
vertexCount : vertexCount,
vertexArray : vertexArray,
positionMin : positionMin,
positionMax : positionMax,
hasUVs: hasUVs,
materialGroups: materialGroups,
materials: materials
});
});
hasUVs : hasUVs,
hasNormals : hasNormals,
materialGroups : materialGroups,
materials : materials,
images : images
});
}
function getImages(inputPath, materials, done) {
// Collect all the image files from the materials
var images = [];
for (var name in materials) {
if (materials.hasOwnProperty(name)) {
var material = materials[name];
if (defined(material.ambientColorMap) && (images.indexOf(material.ambientColorMap) === -1)) {
images.push(material.ambientColorMap);
}
if (defined(material.diffuseColorMap) && (images.indexOf(material.diffuseColorMap) === -1)) {
images.push(material.diffuseColorMap);
}
if (defined(material.emissionColorMap) && (images.indexOf(material.emissionColorMap) === -1)) {
images.push(material.emissionColorMap);
}
if (defined(material.specularColorMap) && (images.indexOf(material.specularColorMap) === -1)) {
images.push(material.specularColorMap);
}
}
}
// Load the image files
var imagesInfo = {};
async.each(images, function (image, callback) {
var imagePath = image;
if (!path.isAbsolute(imagePath)) {
imagePath = path.join(inputPath, image);
}
loadImage(imagePath, function(info) {
var uri = 'data:application/octet-stream;base64,' + info.data.toString('base64');
imagesInfo[image] = {
transparent : info.transparent,
channels : info.channels,
uri : uri
};
callback();
});
}, function (error) {
if (error) {
throw error;
}
done(imagesInfo);
});
}
function getMaterials(contents, inputPath, done) {
var hasMaterialGroups = /^usemtl/gm.test(contents);
if (!hasMaterialGroups) {
done({});
return;
}
var mtllibMatches = contents.match(/^mtllib.*/gm);
if (mtllibMatches === null) {
done({});
} else {
var mtlFile = mtllibMatches[0].substring(7).trim();
var mtlPath = mtlFile;
if (!path.isAbsolute(mtlPath)) {
mtlPath = path.join(inputPath, mtlFile);
}
Material.parse(mtlPath, function (materials) {
done(materials);
});
}
}

41
lib/util.js
View File

@ -1,41 +0,0 @@
"use strict";
module.exports = {
defined : defined,
defaultValue : defaultValue,
normalize : normalize,
faceNormal : faceNormal
};
function defined(value) {
return value !== undefined;
}
function defaultValue(a, b) {
if (a !== undefined) {
return a;
}
return b;
}
var result = [0, 0, 0];
function normalize(x, y, z) {
var magnitude = Math.sqrt(x * x + y * y + z * z);
result[0] = x / magnitude;
result[1] = y / magnitude;
result[2] = z / magnitude;
return result;
}
function faceNormal(x1, y1, z1, x2, y2, z2, x3, y3, z3) {
var e1x = x2 - x1;
var e1y = y2 - y1;
var e1z = z2 - z1;
var e2x = x3 - x1;
var e2y = y3 - y1;
var e2z = z3 - z1;
result[0] = (e1y * e2z) - (e1z * e2y);
result[1] = (e1z * e2x) - (e1x * e2z);
result[2] = (e1x * e2y) - (e1y * e2x);
return result;
}

22
package.json
View File

@ -20,22 +20,20 @@
"url": "https://github.com/AnalyticalGraphicsInc/OBJ2GLTF/issues"
},
"scripts": {
"jshint": "./node_modules/jshint/bin/jshint bin/*.js lib/*.js"
},
"directories": {
"bin": "./bin",
"lib": "./lib"
"jsHint": "gulp jsHint",
"jsHint-watch": "gulp jsHint-watch"
},
"dependencies": {
"async": "^1.4.2",
"fs-extra": "^0.24.0",
"minimist": "^1.2.0",
"path": "^0.12.7"
"cesium": "^1.22.0",
"fs-extra": "^0.30.0",
"path": "^0.12.7",
"yargs": "^4.7.1"
},
"devDependencies": {
"jshint": "^2.6.0"
},
"jshintConfig": {
"node": true
"gulp": "^3.9.1",
"gulp-jshint": "^2.0.1",
"jshint": "^2.6.0",
"jshint-stylish": "^2.2.0"
}
}