Browse Source

Reflectivity clean up.

Mr.doob 9 years ago
parent
commit
24ff0dba11
2 changed files with 4 additions and 6 deletions
  1. 3 5
      src/loaders/Loader.js
  2. 1 1
      utils/exporters/maya/plug-ins/threeJsFileTranslator.py

+ 3 - 5
src/loaders/Loader.js

@@ -227,10 +227,11 @@ THREE.Loader.prototype = {
 						console.warn( 'THREE.Loader.createMaterial: transparency has been renamed to opacity' );
 						json.opacity = value;
 						break;
-					case 'opacity':
-					case 'transparent':
 					case 'depthTest':
 					case 'depthWrite':
+					case 'opacity':
+					case 'reflectivity':
+					case 'transparent':
 					case 'visible':
 					case 'wireframe':
 						json[ name ] = value;
@@ -239,9 +240,6 @@ THREE.Loader.prototype = {
 						if ( value === true ) json.vertexColors = THREE.VertexColors;
 						if ( value === 'face' ) json.vertexColors = THREE.FaceColors;
 						break;
-					case 'reflectivity':
-                				json.reflectivity = value;
-                        			break;
 					default:
 						console.error( 'THREE.Loader.createMaterial: Unsupported', name, value );
 						break;

+ 1 - 1
utils/exporters/maya/plug-ins/threeJsFileTranslator.py

@@ -241,8 +241,8 @@ class ThreeJsWriter(object):
             "vertexColors": False
         }
         if isinstance(mat, nodetypes.Phong):
-            result["reflectivity"] = mat.getReflectivity()
             result["colorSpecular"] = mat.getSpecularColor().rgb
+            result["reflectivity"] = mat.getReflectivity()
             result["specularCoef"] = mat.getCosPower()
             if self.options["specularMaps"]:
                 self._exportSpecularMap(result, mat)