Merge pull request #89 from AnalyticalGraphicsInc/keep-diffuse

Keep diffuse intact so that shader generation for generateNormals works
CesiumGS · Jun 23, 2017 · 813290a · 813290a
2 parents 604e273 + d2eee3e
commit 813290a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,7 @@ Change Log
 ### Next release
 
 * Change texture sampling to use NEAREST_MIPMAP_LINEAR by default [#83](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/83).
+* Fixed normal generation.
 
 ### 1.1.1 2017-04-25
 

diff --git a/lib/createGltf.js b/lib/createGltf.js
@@ -17,7 +17,7 @@ module.exports = createGltf;
  *
  * @private
  */
-function createGltf(objData) {
+function createGltf(objData, options) {
     var nodes = objData.nodes;
     var materials = objData.materials;
     var images = objData.images;
@@ -67,7 +67,7 @@ function createGltf(objData) {
         return 'texture_' + getImageId(imagePath);
     }
 
-    function createMaterial(material, hasNormals) {
+    function createMaterial(material, hasNormals, options) {
         var ambient = defaultValue(defaultValue(getTextureId(material.ambientTexture), material.ambientColor));
         var diffuse = defaultValue(defaultValue(getTextureId(material.diffuseTexture), material.diffuseColor));
         var emission = defaultValue(defaultValue(getTextureId(material.emissionTexture), material.emissionColor));
@@ -95,7 +95,7 @@ function createGltf(objData) {
 
         var doubleSided = transparent;
 
-        if (!hasNormals) {
+        if (!hasNormals && !options.generateNormals) {
             // Constant technique only factors in ambient and emission sources - set emission to diffuse
             emission = diffuse;
             diffuse = [0, 0, 0, 1];
@@ -303,7 +303,7 @@ function createGltf(objData) {
                 }
 
                 if (!defined(gltfMaterial)) {
-                    gltf.materials[materialId] = createMaterial(material, hasNormals);
+                    gltf.materials[materialId] = createMaterial(material, hasNormals, options);
                 }
 
                 gltfMeshPrimitives.push({

diff --git a/lib/obj2gltf.js b/lib/obj2gltf.js
@@ -61,6 +61,7 @@ function obj2gltf(objPath, gltfPath, options) {
     var outputUpAxis = defaultValue(options.outputUpAxis, defaults.outputUpAxis);
     var logger = defaultValue(options.logger, defaults.logger);
 
+    options.generateNormals = generateNormals;
     options.separate = separate;
     options.separateTextures = separateTextures;
     options.checkTransparency = checkTransparency;
@@ -112,7 +113,7 @@ function obj2gltf(objPath, gltfPath, options) {
 
     return loadObj(objPath, options)
         .then(function(objData) {
-            return createGltf(objData);
+            return createGltf(objData, options);
         })
         .then(function(gltf) {
             return writeUris(gltf, gltfPath, resourcesDirectory, options);

diff --git a/specs/lib/createGltfSpec.js b/specs/lib/createGltfSpec.js
@@ -67,15 +67,15 @@ describe('createGltf', function() {
     });
 
     it('simple gltf', function(done) {
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         expect(writeUris(gltf, boxGltfUrl, path.dirname(boxGltfUrl), defaultOptions)
             .then(function() {
                 expect(gltf).toEqual(boxGltf);
             }), done).toResolve();
     });
 
     it('multiple nodes, meshes, and primitives', function(done) {
-        var gltf = createGltf(groupObjData);
+        var gltf = createGltf(groupObjData, defaultOptions);
 
         expect(writeUris(gltf, groupGltfUrl, path.dirname(groupGltfUrl), defaultOptions)
             .then(function() {
@@ -97,7 +97,7 @@ describe('createGltf', function() {
     it('sets default material values', function() {
         boxObjData.materials.Material = new Material();
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var material = gltf.materials.Material;
         var kmc = material.extensions.KHR_materials_common;
         var values = kmc.values;
@@ -116,7 +116,7 @@ describe('createGltf', function() {
         boxObjData.materials.Material = material;
         boxObjData.images[diffuseTextureUrl] = diffuseTexture;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
         var texture = gltf.textures.texture_cesium;
         var image = gltf.images.cesium;
@@ -154,7 +154,7 @@ describe('createGltf', function() {
         material.alpha = 0.4;
         boxObjData.materials.Material = material;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.values.diffuse).toEqual([0.5, 0.5, 0.5, 0.4]);
@@ -171,7 +171,7 @@ describe('createGltf', function() {
 
         boxObjData.images[diffuseTextureUrl] = diffuseTexture;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.values.diffuse).toEqual('texture_cesium');
@@ -187,7 +187,7 @@ describe('createGltf', function() {
 
         boxObjData.images[transparentDiffuseTextureUrl] = transparentDiffuseTexture;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.values.diffuse).toBe('texture_diffuse');
@@ -202,7 +202,7 @@ describe('createGltf', function() {
         material.specularShininess = 0.1;
         boxObjData.materials.Material = material;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.technique).toBe('PHONG');
@@ -219,7 +219,7 @@ describe('createGltf', function() {
 
         boxObjData.images[diffuseTextureUrl] = diffuseTexture;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.technique).toBe('CONSTANT');
@@ -231,7 +231,7 @@ describe('createGltf', function() {
         material.diffuseTexture = diffuseTextureUrl;
         boxObjData.materials.Material = material;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.values.diffuse).toEqual([0.5, 0.5, 0.5, 1.0]);
@@ -241,7 +241,7 @@ describe('createGltf', function() {
         boxObjData.nodes[0].meshes[0].primitives[0].material = undefined;
 
         // Creates a material called "default"
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         expect(gltf.materials.default).toBeDefined();
         var kmc = gltf.materials.default.extensions.KHR_materials_common;
         expect(kmc.values.diffuse).toEqual([0.5, 0.5, 0.5, 1.0]);
@@ -251,7 +251,7 @@ describe('createGltf', function() {
         boxObjData.materials = {};
 
         // Uses the original name of the material
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc = gltf.materials.Material.extensions.KHR_materials_common;
 
         expect(kmc.values.diffuse).toEqual([0.5, 0.5, 0.5, 1.0]);
@@ -262,7 +262,7 @@ describe('createGltf', function() {
         boxObjData.nodes.push(duplicateBoxObjData.nodes[0]);
         boxObjData.nodes[1].meshes[0].normals.length = 0;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc1 = gltf.materials.Material.extensions.KHR_materials_common;
         var kmc2 = gltf.materials.Material_constant.extensions.KHR_materials_common;
 
@@ -275,7 +275,7 @@ describe('createGltf', function() {
         boxObjData.nodes.push(duplicateBoxObjData.nodes[0]);
         boxObjData.nodes[0].meshes[0].normals.length = 0;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var kmc1 = gltf.materials.Material.extensions.KHR_materials_common;
         var kmc2 = gltf.materials.Material_shaded.extensions.KHR_materials_common;
 
@@ -286,7 +286,7 @@ describe('createGltf', function() {
     it('runs without normals', function() {
         boxObjData.nodes[0].meshes[0].normals.length = 0;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var attributes = gltf.meshes[Object.keys(gltf.meshes)[0]].primitives[0].attributes;
         expect(attributes.POSITION).toBeDefined();
         expect(attributes.NORMAL).toBeUndefined();
@@ -296,7 +296,7 @@ describe('createGltf', function() {
     it('runs without uvs', function() {
         boxObjData.nodes[0].meshes[0].uvs.length = 0;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var attributes = gltf.meshes[Object.keys(gltf.meshes)[0]].primitives[0].attributes;
         expect(attributes.POSITION).toBeDefined();
         expect(attributes.NORMAL).toBeDefined();
@@ -307,7 +307,7 @@ describe('createGltf', function() {
         boxObjData.nodes[0].meshes[0].normals.length = 0;
         boxObjData.nodes[0].meshes[0].uvs.length = 0;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var attributes = gltf.meshes[Object.keys(gltf.meshes)[0]].primitives[0].attributes;
         expect(attributes.POSITION).toBeDefined();
         expect(attributes.NORMAL).toBeUndefined();
@@ -347,7 +347,7 @@ describe('createGltf', function() {
         var indicesLength = mesh.primitives[0].indices.length;
         var vertexCount = mesh.positions.length / 3;
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var primitive = gltf.meshes[Object.keys(gltf.meshes)[0]].primitives[0];
         var indicesAccessor = gltf.accessors[primitive.indices];
         expect(indicesAccessor.count).toBe(indicesLength);
@@ -361,7 +361,7 @@ describe('createGltf', function() {
     it('ambient of [1, 1, 1] is treated as [0, 0, 0]', function() {
         boxObjData.materials.Material.ambientColor = [1.0, 1.0, 1.0, 1.0];
 
-        var gltf = createGltf(boxObjData);
+        var gltf = createGltf(boxObjData, defaultOptions);
         var ambient = gltf.materials.Material.extensions.KHR_materials_common.values.ambient;
 
         expect(ambient).toEqual([0.0, 0.0, 0.0, 1.0]);