Mugen87 пре 5 година
родитељ
комит
cddd6ef43c

+ 2 - 2
examples/js/loaders/3MFLoader.js

@@ -1072,12 +1072,12 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto
 
 					case 'texture':
 						var texture2dgroup = modelData.resources.texture2dgroup[ resourceId ];
-						meshes.push( buildTexturedMesh( texture2dgroup, triangleProperties, modelData, meshData, textureData ) );
+						meshes.push( buildTexturedMesh( texture2dgroup, triangleProperties, modelData, meshData, textureData, objectData ) );
 						break;
 
 					case 'vertexColors':
 						var colorgroup = modelData.resources.colorgroup[ resourceId ];
-						meshes.push( buildVertexColorMesh( colorgroup, triangleProperties, modelData, meshData, textureData ) );
+						meshes.push( buildVertexColorMesh( colorgroup, triangleProperties, modelData, meshData ) );
 						break;
 
 					case 'default':

+ 2 - 2
examples/jsm/loaders/3MFLoader.js

@@ -1096,12 +1096,12 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 					case 'texture':
 						var texture2dgroup = modelData.resources.texture2dgroup[ resourceId ];
-						meshes.push( buildTexturedMesh( texture2dgroup, triangleProperties, modelData, meshData, textureData ) );
+						meshes.push( buildTexturedMesh( texture2dgroup, triangleProperties, modelData, meshData, textureData, objectData ) );
 						break;
 
 					case 'vertexColors':
 						var colorgroup = modelData.resources.colorgroup[ resourceId ];
-						meshes.push( buildVertexColorMesh( colorgroup, triangleProperties, modelData, meshData, textureData ) );
+						meshes.push( buildVertexColorMesh( colorgroup, triangleProperties, modelData, meshData ) );
 						break;
 
 					case 'default':

+ 0 - 13
examples/webgl_geometry_shapes.html

@@ -216,19 +216,6 @@
 					.lineTo( sqLength, 0 )
 					.lineTo( 0, 0 );
 
-
-				// Rectangle
-
-				var rectLength = 120, rectWidth = 40;
-
-				var rectShape = new THREE.Shape()
-					.moveTo( 0, 0 )
-					.lineTo( 0, rectWidth )
-					.lineTo( rectLength, rectWidth )
-					.lineTo( rectLength, 0 )
-					.lineTo( 0, 0 );
-
-
 				// Rounded rectangle
 
 				var roundedRectShape = new THREE.Shape();

+ 1 - 3
examples/webgl_lightprobe_cubecamera.html

@@ -16,8 +16,6 @@
 
 			import * as THREE from '../build/three.module.js';
 
-			import { GUI } from './jsm/libs/dat.gui.module.js';
-
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 			import { LightProbeGenerator } from './jsm/lights/LightProbeGenerator.js';
 
@@ -85,7 +83,7 @@
 
 					lightProbe.copy( LightProbeGenerator.fromRenderTargetCube( renderer, cubeCamera.renderTarget ) );
 
-					scene.add( new THREE.LightProbeHelper(lightProbe, 5) );
+					scene.add( new THREE.LightProbeHelper( lightProbe, 5 ) );
 
 					render();