djsundog/obj2gltf
1
0
Fork 0
mirror of https://github.com/CesiumGS/obj2gltf.git synced 2025-03-03 06:51:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into single-bin

Browse Source
This commit is contained in:
Sean Lilley 2017-04-20 14:56:45 -04:00
commit 6f99265a65
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
specs/lib/gltfSpec.js → specs/lib/createGltfSpec.js
View File

@ -26,7 +26,7 @@ var defaultOptions = obj2gltf.defaults;
var checkTransparencyOptions = clone(defaultOptions); var checkTransparencyOptions = clone(defaultOptions);
checkTransparencyOptions.checkTransparency = true; checkTransparencyOptions.checkTransparency = true;
describe('gltf', function() { describe('createGltf', function() {
var boxObjData; var boxObjData;
var duplicateBoxObjData; var duplicateBoxObjData;
var groupObjData; var groupObjData;

2
specs/lib/imageSpec.js → specs/lib/loadImageSpec.js
View File

@ -15,7 +15,7 @@ var transparentImage = 'specs/data/box-complex-material/diffuse.png';
var defaultOptions = obj2gltf.defaults; var defaultOptions = obj2gltf.defaults;
describe('image', function() { describe('loadImage', function() {
it('loads png image', function(done) { it('loads png image', function(done) {
expect(loadImage(pngImage, defaultOptions) expect(loadImage(pngImage, defaultOptions)
.then(function(info) { .then(function(info) {

2
specs/lib/mtlSpec.js → specs/lib/loadMtlSpec.js
View File

@ -9,7 +9,7 @@ function getImagePath(objPath, relativePath) {
return path.resolve(path.dirname(objPath), relativePath); return path.resolve(path.dirname(objPath), relativePath);
} }
describe('mtl', function() { describe('loadMtl', function() {
it('loads complex material', function(done) { it('loads complex material', function(done) {
expect(loadMtl(complexMaterialUrl) expect(loadMtl(complexMaterialUrl)
.then(function(materials) { .then(function(materials) {

2
specs/lib/objSpec.js → specs/lib/loadObjSpec.js
View File

@ -61,7 +61,7 @@ function getImagePath(objPath, relativePath) {
var defaultOptions = obj2gltf.defaults; var defaultOptions = obj2gltf.defaults;
describe('obj', function() { describe('loadObj', function() {
it('loads obj with positions, normals, and uvs', function(done) { it('loads obj with positions, normals, and uvs', function(done) {
expect(loadObj(objUrl, defaultOptions) expect(loadObj(objUrl, defaultOptions)
.then(function(data) { .then(function(data) {