未验证 提交 f1bac07f 编写于 作者: M Michael Herzog 提交者: GitHub

Merge pull request #16445 from Mugen87/dev30

JSM: Rebuild files.
......@@ -499,7 +499,7 @@ var TrackballControls = function ( object, domElement ) {
function touchstart( event ) {
if ( _this.enabled === false ) return;
event.preventDefault();
switch ( event.touches.length ) {
......
......@@ -1764,7 +1764,12 @@ GLTFExporter.prototype = {
} else {
object.updateMatrix();
if ( object.matrixAutoUpdate ) {
object.updateMatrix();
}
if ( ! equalArray( object.matrix.elements, [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ] ) ) {
gltfNode.matrix = object.matrix.elements;
......
......@@ -933,7 +933,8 @@ var GLTFLoader = ( function () {
for ( var i = 0, il = params.length; i < il; i ++ ) {
target[ params[ i ] ] = source[ params[ i ] ];
var value = source[ params[ i ] ];
target[ params[ i ] ] = value.isColor ? value.clone() : value;
}
......@@ -1391,7 +1392,7 @@ var GLTFLoader = ( function () {
if ( typeof gltfDef.extras === 'object' ) {
object.userData = gltfDef.extras;
Object.assign( object.userData, gltfDef.extras );
} else {
......@@ -3088,6 +3089,7 @@ var GLTFLoader = ( function () {
if ( nodeDef.name !== undefined ) {
node.userData.name = nodeDef.name;
node.name = PropertyBinding.sanitizeNodeName( nodeDef.name );
}
......
......@@ -63,7 +63,7 @@ var ShadowMapViewer = function ( light ) {
//HUD for shadow map
var shader = UnpackDepthRGBAShader;
var uniforms = new UniformsUtils.clone( shader.uniforms );
var uniforms = UniformsUtils.clone( shader.uniforms );
var material = new ShaderMaterial( {
uniforms: uniforms,
vertexShader: shader.vertexShader,
......@@ -109,7 +109,7 @@ var ShadowMapViewer = function ( light ) {
}
function resetPosition () {
function resetPosition() {
scope.position.set( scope.position.x, scope.position.y );
......@@ -187,6 +187,7 @@ var ShadowMapViewer = function ( light ) {
camera.updateProjectionMatrix();
this.update();
}
};
......
......@@ -24,7 +24,7 @@ var files = [
{ path: 'exporters/STLExporter.js', ignoreList: [] },
{ path: 'exporters/TypedGeometryExporter.js', ignoreList: [] },
{ path: 'loaders/BVHLoader.js', ignoreList: [] },
{ path: 'loaders/BVHLoader.js', ignoreList: [ 'Bones' ] },
{ path: 'loaders/PCDLoader.js', ignoreList: [] },
{ path: 'loaders/GLTFLoader.js', ignoreList: [ 'NoSide', 'Matrix2', 'DDSLoader' ] },
{ path: 'loaders/OBJLoader.js', ignoreList: [] },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册