Bläddra i källkod

Merge pull request #11735 from WestLangley/dev-collada

ColladaLoader: remove preferred shading option
Mr.doob 8 år sedan
förälder
incheckning
5c2ebc708d
2 ändrade filer med 0 tillägg och 18 borttagningar
  1. 0 9
      docs/examples/loaders/ColladaLoader.html
  2. 0 9
      examples/js/loaders/ColladaLoader.js

+ 0 - 9
docs/examples/loaders/ColladaLoader.html

@@ -86,15 +86,6 @@
 		Parse an <em>XML Document</em> and return an [page:Object object] that contain loaded parts: .[page:Scene scene], .[page:Array morphs], .[page:Array skins], .[page:Array animations], .[page:Object dae]
 		</div>
 
-		<h3>[method:null setPreferredShading]( [page:Integer shading] )</h3>
-		<div>
-		[page:Integer shading] — required
-		</div>
-		<div>
-		Set the .[page:Integer shading] property on the resource's materials.<br />
-		Options are [page:Materials THREE.SmoothShading], [page:Materials THREE.FlatShading].
-		</div>
-
 		<h3>[method:null applySkin]( [page:Geometry geometry], [page:Object instanceCtrl], [page:Integer frame] )</h3>
 		<div>
 		[page:Geometry geometry] — required<br />

+ 0 - 9
examples/js/loaders/ColladaLoader.js

@@ -31,7 +31,6 @@ THREE.ColladaLoader = function () {
 	var skins;
 
 	var flip_uv = true;
-	var preferredShading = THREE.SmoothShading;
 
 	var options = {
 		// Force Geometry to always be centered at the local origin of the
@@ -213,12 +212,6 @@ THREE.ColladaLoader = function () {
 
 	}
 
-	function setPreferredShading ( shading ) {
-
-		preferredShading = shading;
-
-	}
-
 	function parseAsset () {
 
 		var elements = COLLADA.querySelectorAll('asset');
@@ -3817,7 +3810,6 @@ THREE.ColladaLoader = function () {
 
 		}
 
-		props[ 'shading' ] = preferredShading;
 		props[ 'side' ] = this.effect.doubleSided ? THREE.DoubleSide : THREE.FrontSide;
 
 		if ( props.diffuse !== undefined ) {
@@ -5536,7 +5528,6 @@ THREE.ColladaLoader = function () {
 
 		load: load,
 		parse: parse,
-		setPreferredShading: setPreferredShading,
 		applySkin: applySkin,
 		geometries : geometries,
 		options: options