language stringclasses 1 value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2 classes |
|---|---|---|---|---|---|---|---|
Other | mrdoob | three.js | 3f76d21017f2a4c985f4edd44bb87c1eaddb504f.json | remove redundant parameter from WebGLProgram(s) | src/renderers/WebGLRenderer.js | @@ -288,7 +288,7 @@ function WebGLRenderer( parameters ) {
geometries = new WebGLGeometries( _gl, attributes, info );
objects = new WebGLObjects( geometries, info );
morphtargets = new WebGLMorphtargets( _gl );
- programCache = new WebGLPrograms( _this, extensions, capabilities, textures );
+ programCache = new WebGLPrograms( _this, extensions, capabilities );
renderLists = new WebGLRenderLists();
renderStates = new WebGLRenderStates();
| true |
Other | mrdoob | three.js | 3f76d21017f2a4c985f4edd44bb87c1eaddb504f.json | remove redundant parameter from WebGLProgram(s) | src/renderers/webgl/WebGLProgram.d.ts | @@ -3,7 +3,6 @@ import { ShaderMaterial } from './../../materials/ShaderMaterial';
import { WebGLShader } from './WebGLShader';
import { WebGLCapabilities } from './WebGLCapabilities';
import { WebGLExtensions } from './WebGLExtensions';
-import { WebGLTextures } from './WebGLTextures';
import { WebGLUniforms } from './WebGLUniforms';
export class WebGLProgram {
@@ -15,8 +14,7 @@ export class WebGLProgram {
material: ShaderMaterial,
shader: WebGLShader,
parameters: WebGLRendererParameters,
- capabilities: WebGLCapabilities,
- textures: WebGLTextures
+ capabilities: WebGLCapabilities
);
id: number; | true |
Other | mrdoob | three.js | 3f76d21017f2a4c985f4edd44bb87c1eaddb504f.json | remove redundant parameter from WebGLProgram(s) | src/renderers/webgl/WebGLProgram.js | @@ -236,7 +236,7 @@ function unrollLoops( string ) {
}
-function WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities, textures ) {
+function WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities ) {
var gl = renderer.context;
@@ -705,7 +705,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
if ( cachedUniforms === undefined ) {
- cachedUniforms = new WebGLUniforms( gl, program, textures );
+ cachedUniforms = new WebGLUniforms( gl, program );
}
| true |
Other | mrdoob | three.js | 3f76d21017f2a4c985f4edd44bb87c1eaddb504f.json | remove redundant parameter from WebGLProgram(s) | src/renderers/webgl/WebGLPrograms.d.ts | @@ -2,12 +2,11 @@ import { WebGLRenderer } from './../WebGLRenderer';
import { WebGLProgram } from './WebGLProgram';
import { WebGLCapabilities } from './WebGLCapabilities';
import { WebGLExtensions } from './WebGLExtensions';
-import { WebGLTextures } from './WebGLTextures';
import { ShaderMaterial } from './../../materials/ShaderMaterial';
export class WebGLPrograms {
- constructor( renderer: WebGLRenderer, extensions: WebGLExtensions, capabilities: WebGLCapabilities, textures: WebGLTextures );
+ constructor( renderer: WebGLRenderer, extensions: WebGLExtensions, capabilities: WebGLCapabilities );
programs: WebGLProgram[];
| true |
Other | mrdoob | three.js | 3f76d21017f2a4c985f4edd44bb87c1eaddb504f.json | remove redundant parameter from WebGLProgram(s) | src/renderers/webgl/WebGLPrograms.js | @@ -5,7 +5,7 @@
import { BackSide, DoubleSide, CubeUVRefractionMapping, CubeUVReflectionMapping, GammaEncoding, LinearEncoding, ObjectSpaceNormalMap } from '../../constants.js';
import { WebGLProgram } from './WebGLProgram.js';
-function WebGLPrograms( renderer, extensions, capabilities, textures ) {
+function WebGLPrograms( renderer, extensions, capabilities ) {
var programs = [];
@@ -279,7 +279,7 @@ function WebGLPrograms( renderer, extensions, capabilities, textures ) {
if ( program === undefined ) {
- program = new WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities, textures );
+ program = new WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities );
programs.push( program );
} | true |
Other | mrdoob | three.js | 5c97a30a6e4101d7ee19d128a05b7d35ede2f3be.json | move error checking and display | src/renderers/webgl/WebGLProgram.js | @@ -9,6 +9,20 @@ import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, Equirecta
var programIdCount = 0;
+function addLineNumbers( string ) {
+
+ var lines = string.split( '\n' );
+
+ for ( var i = 0; i < lines.length; i ++ ) {
+
+ lines[ i ] = ( i + 1 ) + ': ' + lines[ i ];
+
+ }
+
+ return lines.join( '\n' );
+
+}
+
function getEncodingComponents( encoding ) {
switch ( encoding ) {
@@ -34,6 +48,22 @@ function getEncodingComponents( encoding ) {
}
+function getShaderErrors( gl, shader ) {
+
+ var status = gl.getShaderParameter( shader, gl.COMPILE_STATUS );
+ var source = gl.getShaderSource( shader );
+ var log = gl.getShaderInfoLog( shader ).trim();
+ var type = gl.getShaderParameter( shader, gl.SHADER_TYPE ) === gl.VERTEX_SHADER ? 'vertex' : 'fragment';
+
+ if ( status && log === '' ) return '';
+
+ // --enable-privileged-webgl-extension
+ // console.log( '**' + type + '**', gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( shader ) );
+
+ return 'THREE.WebGLShader: gl.getShaderInfoLog() ' + type + ' ' + log + addLineNumbers( source );
+
+}
+
function getTexelDecodingFunction( functionName, encoding ) {
var components = getEncodingComponents( encoding );
@@ -610,18 +640,17 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
var programLog = gl.getProgramInfoLog( program ).trim();
var vertexLog = gl.getShaderInfoLog( glVertexShader ).trim();
var fragmentLog = gl.getShaderInfoLog( glFragmentShader ).trim();
+ var vertexErrors = getShaderErrors( gl, glVertexShader );
+ var fragmentErrors = getShaderErrors( gl, glFragmentShader );
var runnable = true;
var haveDiagnostics = true;
- // console.log( '**VERTEX**', gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( glVertexShader ) );
- // console.log( '**FRAGMENT**', gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( glFragmentShader ) );
-
if ( gl.getProgramParameter( program, gl.LINK_STATUS ) === false ) {
runnable = false;
- console.error( 'THREE.WebGLProgram: shader error: ', gl.getError(), 'gl.VALIDATE_STATUS', gl.getProgramParameter( program, gl.VALIDATE_STATUS ), 'gl.getProgramInfoLog', programLog, vertexLog, fragmentLog );
+ console.error( 'THREE.WebGLProgram: shader error: ', gl.getError(), 'gl.VALIDATE_STATUS', gl.getProgramParameter( program, gl.VALIDATE_STATUS ), 'gl.getProgramInfoLog', programLog, vertexErrors, fragmentErrors );
} else if ( programLog !== '' ) {
| true |
Other | mrdoob | three.js | 5c97a30a6e4101d7ee19d128a05b7d35ede2f3be.json | move error checking and display | src/renderers/webgl/WebGLShader.js | @@ -2,49 +2,15 @@
* @author mrdoob / http://mrdoob.com/
*/
-function addLineNumbers( string ) {
-
- var lines = string.split( '\n' );
-
- for ( var i = 0; i < lines.length; i ++ ) {
-
- lines[ i ] = ( i + 1 ) + ': ' + lines[ i ];
-
- }
-
- return lines.join( '\n' );
-
-}
-
-function WebGLShader( gl, type, string, debug ) {
+function WebGLShader( gl, type, string ) {
var shader = gl.createShader( type );
gl.shaderSource( shader, string );
gl.compileShader( shader );
- if ( debug === true ) {
-
- if ( gl.getShaderParameter( shader, gl.COMPILE_STATUS ) === false ) {
-
- console.error( 'THREE.WebGLShader: Shader couldn\'t compile.' );
-
- }
-
- if ( gl.getShaderInfoLog( shader ) !== '' ) {
-
- console.warn( 'THREE.WebGLShader: gl.getShaderInfoLog()', type === gl.VERTEX_SHADER ? 'vertex' : 'fragment', gl.getShaderInfoLog( shader ), addLineNumbers( string ) );
-
- }
-
- }
-
- // --enable-privileged-webgl-extension
- // console.log( type, gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( shader ) );
-
return shader;
}
-
export { WebGLShader }; | true |
Other | mrdoob | three.js | 81ac461ae2f4b413455fcf30685d73be38526fc7.json | fix info on example | examples/webgl_postprocessing_unreal_bloom_selective.html | @@ -37,7 +37,7 @@
<div id="container"></div>
<div id="info">
- <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> Click on a box to toggle bloom<br>By <a href="http://github.com/Temdog007" target="_blank" rel="noopener">Temdog007</a>
+ <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> Click on a sphere to toggle bloom<br>By <a href="http://github.com/Temdog007" target="_blank" rel="noopener">Temdog007</a>
</div>
<script src="../build/three.js"></script> | false |
Other | mrdoob | three.js | e78e43f96f6f5f980ea8f7f392ac9023cdb1cc88.json | Add styles for inline code tags | docs/page.css | @@ -92,7 +92,7 @@ body {
table,
pre,
-code {
+code:not(.inline) {
margin-left: -24px;
margin-right: -24px;
margin-top: 20px;
@@ -133,6 +133,13 @@ code {
box-sizing: border-box;
}
+code.inline {
+ display: inline-block;
+ vertical-align: middle;
+ border-radius: 4px;
+ padding: 2px 5px;
+}
+
iframe {
width: 100%;
height: 420px; | false |
Other | mrdoob | three.js | 04b554e8abdab7e3d5494642c84f4cf139be7b0e.json | Prevent pointer events on info div | examples/main.css | @@ -10,6 +10,7 @@ body {
a {
color: #ff0;
text-decoration: none;
+ pointer-events: auto;
}
a:hover {
@@ -36,6 +37,7 @@ canvas {
-webkit-user-select: none;
-ms-user-select: none;
user-select: none;
+ pointer-events: none;
z-index: 1; /* TODO Solve this in HTML */
}
| false |
Other | mrdoob | three.js | 6479be2b6154079618547f3741afb424ff709e4c.json | sync those pages with En doc | docs/api/zh/constants/Textures.html | @@ -84,32 +84,32 @@ <h2>缩小滤镜
Minification Filters</h2>
<code>
THREE.NearestFilter
- THREE.NearestMipMapNearestFilter
- THREE.NearestMipMapLinearFilter
+ THREE.NearestMipmapNearestFilter
+ THREE.NearestMipmapLinearFilter
THREE.LinearFilter
- THREE.LinearMipMapNearestFilter
- THREE.LinearMipMapLinearFilter
- </code>
+ THREE.LinearMipmapNearestFilter
+ THREE.LinearMipmapLinearFilter
+ </code>
<p>
这些常量用于纹理的[page:Texture.minFilter minFilter]属性，它们定义了当被纹理化的像素映射到大于1纹理元素（texel）的区域时，将要使用的纹理缩小函数。<br /><br />
除了[page:constant NearestFilter] 和 [page:constant LinearFilter]，
下面的四个函数也可以用于缩小：<br /><br />
- [page:constant NearestMipMapNearestFilter]选择与被纹理化像素的尺寸最匹配的mipmap，并以[page:constant
+ [page:constant NearestMipmapNearestFilter]选择与被纹理化像素的尺寸最匹配的mipmap，并以[page:constant
NearestFilter]（最靠近像素中心的纹理元素）为标准来生成纹理值。
<br /><br />
- [page:constant NearestMipMapLinearFilter]选择与被纹理化像素的尺寸最接近的两个mipmap，并以[page:constant
+ [page:constant NearestMipmapLinearFilter]选择与被纹理化像素的尺寸最接近的两个mipmap，并以[page:constant
NearestFilter]为标准来从每个mipmap中生成纹理值。最终的纹理值是这两个值的加权平均值。
<br /><br />
- [page:constant LinearMipMapNearestFilter]选择与被纹理化像素的尺寸最匹配的mipmap，并以[page:constant
+ [page:constant LinearMipmapNearestFilter]选择与被纹理化像素的尺寸最匹配的mipmap，并以[page:constant
LinearFilter]（最靠近像素中心的四个纹理元素的加权平均值）为标准来生成纹理值。
<br /><br />
- [page:constant LinearMipMapLinearFilter]是默认值，它选择与被纹理化像素的尺寸最接近的两个mipmap，并以[page:constant
+ [page:constant LinearMipmapLinearFilter]是默认值，它选择与被纹理化像素的尺寸最接近的两个mipmap，并以[page:constant
LinearFilter]为标准来从每个mipmap中生成纹理值。最终的纹理值是这两个值的加权平均值。<br /><br />
请查看示例：[example:webgl_materials_texture_filters materials / texture / filters]。 | true |
Other | mrdoob | three.js | 6479be2b6154079618547f3741afb424ff709e4c.json | sync those pages with En doc | docs/api/zh/core/Geometry.html | @@ -318,7 +318,9 @@ <h3>[method:Geometry scale] ( [param:Float x], [param:Float y], [param:Float z]
</p>
<h3>[method:JSON toJSON] ( )</h3>
- <p> 将 Geometry 对象数据转为 JSON 格式。</p>
+ <p> 将 Geometry 对象转为 JSON 格式。<br />
+ 将几何体转换为 three.js [link:https://github.com/mrdoob/three.js/wiki/JSON-Object-Scene-format-4 JSON Object/Scene format]（three.js JSON 物体/场景格式）。
+ </p>
<h3>[method:Geometry translate] ( [param:Float x], [param:Float y], [param:Float z] )</h3>
<p> | true |
Other | mrdoob | three.js | 6479be2b6154079618547f3741afb424ff709e4c.json | sync those pages with En doc | docs/api/zh/core/InterleavedBufferAttribute.html | @@ -51,7 +51,7 @@ <h3>[property:Integer offset]</h3>
<h3>[property:Boolean normalized]</h3>
<p>
- 默认值为 *true*。
+ 默认值为 *false*。
</p>
<h3>[property:Boolean isInterleavedBufferAttribute]</h3> | true |
Other | mrdoob | three.js | 6479be2b6154079618547f3741afb424ff709e4c.json | sync those pages with En doc | docs/api/zh/core/Object3D.html | @@ -206,6 +206,10 @@ <h3>[method:null applyMatrix]( [param:Matrix4 matrix] )</h3>
<h3>[method:Object3D applyQuaternion]( [param:Quaternion quaternion] )</h3>
<p>对当前物体应用由四元数所表示的变换。</p>
+
+ <h3>[method:this attach]( [param:Object3D object] )</h3>
+ <p>将*object*作为子级来添加到该对象中，同时保持该object的世界变换。</p>
+
<h3>[method:Object3D clone]( [param:Boolean recursive] )</h3>
<p>
recursive —— 如果值为true，则该物体的后代也会被克隆。默认值为true。<br /><br />
@@ -216,7 +220,10 @@ <h3>[method:Object3D clone]( [param:Boolean recursive] )</h3>
<h3>[method:this copy]( [param:Object3D object], [param:Boolean recursive] )</h3>
<p>
recursive —— 如果值为true，则该物体的后代也会被复制。默认值为true。<br /><br />
+
复制给定的对象到这个对象中。
+
+ 请注意，事件监听器和用户定义的回调函数（[page:.onAfterRender] 和 [page:.onBeforeRender]）不会被复制。
</p>
<h3>[method:Object3D getObjectById]( [param:Integer id] )</h3>
@@ -356,12 +363,13 @@ <h3>[method:null setRotationFromQuaternion]( [param:Quaternion q] )</h3>
<p>
q -- 标准化的四元数。<br /><br />
-将所给的四元数复制到[page:.quaternion]中。
+ 将所给的四元数复制到[page:.quaternion]中。
</p>
<h3>[method:null toJSON]( [param:Quaternion q] )</h3>
<p>
- 将这个对象转换为JSON格式。
+ meta -- 包含有元数据的对象，例如该对象的材质、纹理或图片。
+ 将对象转换为 three.js [link:https://github.com/mrdoob/three.js/wiki/JSON-Object-Scene-format-4 JSON Object/Scene format]（three.js JSON 物体/场景格式）。
</p>
<h3>[method:this translateOnAxis]( [param:Vector3 axis], [param:Float distance] )</h3> | true |
Other | mrdoob | three.js | 6479be2b6154079618547f3741afb424ff709e4c.json | sync those pages with En doc | docs/api/zh/core/bufferAttributeTypes/BufferAttributeTypes.html | @@ -31,7 +31,7 @@ <h1>BufferAttribute Types</h1>
<h2>构造函数</h2>
- 所有上述内容都以相同的方式调用。
+ <p>所有上述内容都以相同的方式调用。</p>
<h3>TypedBufferAttribute( [param:Array array], [param:Integer itemSize], [param:Boolean normalized] )</h3>
<p>
array -- 这可以是类型化或非类型化的（普通）数组。它将被转换为指定的类型。<br /><br /> | true |
Other | mrdoob | three.js | 6479be2b6154079618547f3741afb424ff709e4c.json | sync those pages with En doc | docs/api/zh/extras/ShapeUtils.html | @@ -21,7 +21,7 @@ <h2>方法</h2>
<h3>[method:Number area]( contour )</h3>
<p>
- contour -- 2D多边形。<br /><br />
+ contour -- 2D多边形，一个THREE.Vector2()数组。<br /><br />
计算（2D）轮廓多边形的面积。<br /><br />
@@ -39,7 +39,7 @@ <h3>[method:Boolean isClockwise]( pts )</h3>
<h3>[method:Array triangulateShape]( contour, holes )</h3>
<p>
contour -- 2D多边形。<br />
- holes -- 空洞数组<br /><br />
+ holes -- 孔洞数组<br /><br />
由[page:ExtrudeGeometry ExtrudeGeometry]和[page:ShapeGeometry ShapeGeometry]内部使用以计算带孔的形状中的面。
</p> | true |
Other | mrdoob | three.js | ad5030bfccceb56872ef31d8719d2459751385a1.json | fix some grammar in Clock.html | docs/api/zh/core/Clock.html | @@ -11,7 +11,7 @@
<h1>[name]</h1>
<p class="desc">
该对象用于跟踪时间。如果[link:https://developer.mozilla.org/en-US/docs/Web/API/Performance/now performance.now]可用，则
- Clock 对象通过该方法实现，否则通过歉精准的[link:https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Date/now Date.now]实现。
+ Clock 对象通过该方法实现，否则回落到使用略欠精准的[link:https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Date/now Date.now]来实现。
</p>
| false |
Other | mrdoob | three.js | 6e03136b1403dfd383aaf8f71fe335ae784d162f.json | remove unnecessary escape character | examples/webgl_materials_cubemap_mipmaps.html | @@ -30,7 +30,7 @@
init();
animate();
- // load custmized cube texture
+ //load custmized cube texture
async function loadCubeTextureWithMipmaps() {
var path = 'textures/cube/angus/';
@@ -88,10 +88,10 @@
var pendings = [];
loadCubeTextureWithMipmaps().then( function( cubeTexture ) {
- // model
+ //model
var sphere = new THREE.SphereBufferGeometry( 100, 128, 128 );
- // manual mipmaps
+ //manual mipmaps
var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: cubeTexture } );
material.name = 'manual mipmaps';
@@ -111,7 +111,7 @@
material.name = 'auto mipmaps';
var autoCubeTexture = cubeTexture.clone();
- // autoCubeTexture.mipmaps = [];
+ autoCubeTexture.mipmaps = [];
autoCubeTexture.generateMipmaps = true;
autoCubeTexture.needsUpdate = true;
| false |
Other | mrdoob | three.js | 2dd56237b9fe14a03c0abfa67be0b5bfb03328ee.json | Support SpecularGlossiness materials | examples/js/exporters/GLTFExporter.js | @@ -895,7 +895,7 @@ THREE.GLTFExporter.prototype = {
}
- if ( material.isShaderMaterial ) {
+ if ( material.isShaderMaterial && !material.isGLTFSpecularGlossinessMaterial ) {
console.warn( 'GLTFExporter: THREE.ShaderMaterial not supported.' );
return null;
@@ -964,6 +964,36 @@ THREE.GLTFExporter.prototype = {
}
+ if ( material.isGLTFSpecularGlossinessMaterial ) {
+
+ var specularExtensionName = "KHR_materials_pbrSpecularGlossiness";
+ var specularMapDef = material.specularMap ? { index: processTexture( material.specularMap ) } : undefined;
+ var diffuseMapDef = material.map ? { index: processTexture( material.map ) } : undefined;
+ if ( material.specularMap ) {
+
+ applyTextureTransform( specularMapDef, material.specularMap );
+
+ }
+
+ // alpha default is 1, rgb will be overridden
+ var diffuseFactor = [ 1, 1, 1, 1 ];
+ material.color.toArray( diffuseFactor, 0 );
+ // same story for specularFactor
+ var specularFactor = [ 1, 1, 1 ];
+ material.specular.toArray( specularFactor, 0 );
+
+ gltfMaterial.extensions = {};
+ gltfMaterial.extensions[ specularExtensionName ] = {
+ "diffuseFactor": diffuseFactor,
+ "diffuseTexture": diffuseMapDef,
+ "specularFactor": specularFactor,
+ "glossinessFactor": material.glossiness,
+ "specularGlossinessTexture": specularMapDef
+ };
+ extensionsUsed[ specularExtensionName ] = true;
+
+ }
+
// pbrMetallicRoughness.baseColorTexture
if ( material.map ) {
@@ -1004,7 +1034,7 @@ THREE.GLTFExporter.prototype = {
var normalMapDef = { index: processTexture( material.normalMap ) };
- if ( material.normalScale.x !== - 1 ) {
+ if ( material.normalScale && material.normalScale.x !== - 1 ) {
if ( material.normalScale.x !== material.normalScale.y ) {
| false |
Other | mrdoob | three.js | 8578fcce8c582fe17fc05b9daacef07b1d78ce7f.json | fix typo error | src/renderers/webgl/WebGLProgram.js | @@ -42,7 +42,7 @@ function getEncodingComponents( encoding ) {
case GammaEncoding:
return [ 'Gamma', '( value, float( GAMMA_FACTOR ) )' ];
case LogLuvEncoding:
- return [ 'LogLuv', '( value )'];
+ return [ 'LogLuv', '( value )' ];
default:
throw new Error( 'unsupported encoding: ' + encoding );
| false |
Other | mrdoob | three.js | e8078d412d811f17845df00625968abb5b10664d.json | fix typo error | src/renderers/webgl/WebGLTextures.js | @@ -407,7 +407,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
state.texImage2D( _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, cubeImage[ i ].width, cubeImage[ i ].height, 0, glFormat, glType, cubeImage[ i ].data );
- var mipmap
+ var mipmap;
for ( var j = 0; j < mipmaps.length; ++ j ) {
| false |
Other | mrdoob | three.js | 45f1286ef9c9d5cb670eecaae85c15daaf031da6.json | Fix color space conversion for CubeTextureNode
Following up on the update of TextureNode, colors pace fromEncoding has been replaced by fromDecoding. | examples/jsm/nodes/inputs/CubeTextureNode.js | @@ -61,7 +61,7 @@ CubeTextureNode.prototype.generate = function ( builder, output ) {
builder.addContext( context );
this.colorSpace = this.colorSpace || new ColorSpaceNode( new ExpressionNode( '', outputType ) );
- this.colorSpace.fromEncoding( builder.getTextureEncodingFromMap( this.value ) );
+ this.colorSpace.fromDecoding( builder.getTextureEncodingFromMap( this.value ) );
this.colorSpace.input.parse( code );
code = this.colorSpace.build( builder, outputType ); | false |
Other | mrdoob | three.js | 348d6267dec151f8934a73f6aa892767f184e051.json | Update jsm files | examples/jsm/loaders/LWOLoader.js | @@ -3042,6 +3042,8 @@ GeometryParser.prototype = {
}
+ geometry.morphTargetsRelative = false;
+
},
}; | true |
Other | mrdoob | three.js | 348d6267dec151f8934a73f6aa892767f184e051.json | Update jsm files | examples/jsm/loaders/MD2Loader.js | @@ -375,6 +375,7 @@ MD2Loader.prototype = Object.assign( Object.create( Loader.prototype ), {
geometry.morphAttributes.position = morphPositions;
geometry.morphAttributes.normal = morphNormals;
+ geometry.morphTargetsRelative = false;
geometry.animations = AnimationClip.CreateClipsFromMorphTargetSequences( frames, 10 );
| true |
Other | mrdoob | three.js | 348d6267dec151f8934a73f6aa892767f184e051.json | Update jsm files | examples/jsm/loaders/MMDLoader.js | @@ -958,6 +958,7 @@ var MMDLoader = ( function () {
geometry.morphTargets = morphTargets;
geometry.morphAttributes.position = morphPositions;
+ geometry.morphTargetsRelative = false;
geometry.userData.MMD = {
bones: bones, | true |
Other | mrdoob | three.js | 9e4fb7174fdec07e576521d9647819a065537d5a.json | Update js file | examples/js/lines/LineSegments2.js | @@ -1,5 +1,3 @@
-import { Matrix4, Vector3, Line, Math as MathUtils } from "../../../build/three.module.js";
-
/**
* @author WestLangley / http://github.com/WestLangley
*
@@ -58,19 +56,20 @@ THREE.LineSegments2.prototype = Object.assign( Object.create( THREE.Mesh.prototy
raycast: ( function () {
- var start = new Vector4();
- var end = new Vector4();
+ var start = new THREE.Vector4();
+ var end = new THREE.Vector4();
- var ssOrigin = new Vector4();
- var mvMatrix = new Matrix4();
- var line = new Line();
- var closestPoint = new Vector3();
+ var ssOrigin = new THREE.Vector4();
+ var ssOrigin3 = new THREE.Vector3();
+ var mvMatrix = new THREE.Matrix4();
+ var line = new THREE.Line3();
+ var closestPoint = new THREE.Vector3();
return function raycast( raycaster, intersects ) {
if ( raycaster.camera === null ) {
- console.error( 'THREE.LineSegments2: "Raycaster.camera" needs to be set in order to raycast against sprites.' );
+ console.error( 'LineSegments2: "Raycaster.camera" needs to be set in order to raycast against LineSegments2.' );
}
@@ -81,30 +80,30 @@ THREE.LineSegments2.prototype = Object.assign( Object.create( THREE.Mesh.prototy
var geometry = this.geometry;
var material = this.material;
var resolution = material.resolution;
- var lineWidth = material.lineWidth;
+ var lineWidth = material.linewidth;
var instanceStart = geometry.attributes.instanceStart;
var instanceEnd = geometry.attributes.instanceEnd;
// ndc space [ - 0.5, 0.5 ]
- ssOrigin.copy( ray.origin );
+ ray.at( 1, ssOrigin );
ssOrigin.w = 1;
ssOrigin.applyMatrix4( camera.matrixWorldInverse );
ssOrigin.applyMatrix4( projectionMatrix );
ssOrigin.multiplyScalar( 1 / ssOrigin.w );
// screen space
- ssOrigin.x *= resolution.x;
- ssOrigin.y *= resolution.y;
+ ssOrigin.x *= resolution.x / 2;
+ ssOrigin.y *= resolution.y / 2;
ssOrigin.z = 0;
+ ssOrigin3.copy( ssOrigin );
+
var matrixWorld = this.matrixWorld;
mvMatrix.multiplyMatrices( camera.matrixWorldInverse, matrixWorld );
for ( var i = 0, l = instanceStart.count; i < l; i ++ ) {
- // TODO: Maybe have to clip the line based on the camera?
-
start.fromBufferAttribute( instanceStart, i );
end.fromBufferAttribute( instanceEnd, i );
@@ -119,30 +118,30 @@ THREE.LineSegments2.prototype = Object.assign( Object.create( THREE.Mesh.prototy
start.applyMatrix4( projectionMatrix );
end.applyMatrix4( projectionMatrix );
+ // ndc space [ - 1.0, 1.0 ]
+ start.multiplyScalar( 1 / start.w );
+ end.multiplyScalar( 1 / end.w );
+
// segment is behind camera near
- if ( start.z > 0 && end.z > 0 ) {
+ if ( start.z < - 1 && end.z < - 1 ) {
continue;
}
// segment is in front of camera far
- if ( start.z < - 1 && end.z < - 1 ) {
+ if ( start.z > 1 && end.z > 1 ) {
continue;
}
- // ndc space [ - 0.5, 0.5 ]
- start.multiplyScalar( 1 / start.w );
- end.multiplyScalar( 1 / end.w );
-
// screen space
- start.x *= resolution.x;
- start.y *= resolution.y;
+ start.x *= resolution.x / 2;
+ start.y *= resolution.y / 2;
- end.y *= resolution.y;
- end.y *= resolution.y;
+ end.x *= resolution.x / 2;
+ end.y *= resolution.y / 2;
// create 2d segment
line.start.copy( start );
@@ -152,25 +151,25 @@ THREE.LineSegments2.prototype = Object.assign( Object.create( THREE.Mesh.prototy
line.end.z = 0;
// get closest point on ray to segment
- var param = line.closestPointToPointParameter( ssOrigin, true );
+ var param = line.closestPointToPointParameter( ssOrigin3, true );
line.at( param, closestPoint );
// check if the intersection point is within clip space
var zPos = MathUtils.lerp( start.z, end.z, param );
- var isInClipSpace = zPos < 0 && zPos > - 1;
+ var isInClipSpace = zPos >= -1 && zPos <= 1;
- if ( isInClipSpace && ssOrigin.distanceTo( closestPoint ) < lineWidth * 0.5 ) {
+ if ( isInClipSpace && ssOrigin3.distanceTo( closestPoint ) < lineWidth * 0.5 ) {
line.start.fromBufferAttribute( instanceStart, i );
line.end.fromBufferAttribute( instanceEnd, i );
line.start.applyMatrix4( matrixWorld );
line.end.applyMatrix4( matrixWorld );
- var pointOnLine = new Vector3();
+ var pointOnLine = new THREE.Vector3();
line.at( param, pointOnLine );
- var point = new Vector3();
+ var point = new THREE.Vector3();
ray.closestPointToPoint( pointOnLine, point );
intersects.push( { | false |
Other | mrdoob | three.js | 60efde67dc0bec5447be69dc984eb39c0a7ddbf3.json | Fix typo in WebVR.js | examples/js/vr/WebVR.js | @@ -176,7 +176,7 @@ THREE.WEBVR = {
stylizeElement( button );
- navigator.xr.isSessionSupported( 'immersive-vr' ).then( funciton ( supported ) {
+ navigator.xr.isSessionSupported( 'immersive-vr' ).then( function ( supported ) {
if ( supported ) {
| true |
Other | mrdoob | three.js | 60efde67dc0bec5447be69dc984eb39c0a7ddbf3.json | Fix typo in WebVR.js | examples/jsm/vr/WebVR.js | @@ -178,7 +178,7 @@ var WEBVR = {
stylizeElement( button );
- navigator.xr.isSessionSupported( 'immersive-vr' ).then( funciton ( supported ) {
+ navigator.xr.isSessionSupported( 'immersive-vr' ).then( function ( supported ) {
if ( supported ) {
| true |
Other | mrdoob | three.js | 0a99abb80c37669722e396f40cb5768552f26e3e.json | Upgrade dev dependencies. | package-lock.json | @@ -1,6 +1,6 @@
{
"name": "three",
- "version": "0.108.0",
+ "version": "0.109.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -43,9 +43,9 @@
"dev": true
},
"@types/node": {
- "version": "12.7.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz",
- "integrity": "sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==",
+ "version": "12.7.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.11.tgz",
+ "integrity": "sha512-Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==",
"dev": true
},
"@types/webgl2": {
@@ -55,60 +55,59 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.0.0.tgz",
- "integrity": "sha512-Mo45nxTTELODdl7CgpZKJISvLb+Fu64OOO2ZFc2x8sYSnUpFrBUW3H+H/ZGYmEkfnL6VkdtOSxgdt+Av79j0sA==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.3.3.tgz",
+ "integrity": "sha512-12cCbwu5PbQudkq2xCIS/QhB7hCMrsNPXK+vJtqy/zFqtzVkPRGy12O5Yy0gUK086f3VHV/P4a4R4CjMW853pA==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "2.0.0",
- "eslint-utils": "^1.4.0",
+ "@typescript-eslint/experimental-utils": "2.3.3",
+ "eslint-utils": "^1.4.2",
"functional-red-black-tree": "^1.0.1",
"regexpp": "^2.0.1",
- "tsutils": "^3.14.0"
- },
- "dependencies": {
- "eslint-utils": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
- "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
- "dev": true,
- "requires": {
- "eslint-visitor-keys": "^1.0.0"
- }
- }
+ "tsutils": "^3.17.1"
}
},
"@typescript-eslint/experimental-utils": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.0.0.tgz",
- "integrity": "sha512-XGJG6GNBXIEx/mN4eTRypN/EUmsd0VhVGQ1AG+WTgdvjHl0G8vHhVBHrd/5oI6RRYBRnedNymSYWW1HAdivtmg==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.3.3.tgz",
+ "integrity": "sha512-MQ4jKPMTU1ty4TigJCRKFPye2qyQdH8jzIIkceaHgecKFmkNS1hXPqKiZ+mOehkz6+HcN5Nuvwm+frmWZR9tdg==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.3",
- "@typescript-eslint/typescript-estree": "2.0.0",
- "eslint-scope": "^4.0.0"
+ "@typescript-eslint/typescript-estree": "2.3.3",
+ "eslint-scope": "^5.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.0.0.tgz",
- "integrity": "sha512-ibyMBMr0383ZKserIsp67+WnNVoM402HKkxqXGlxEZsXtnGGurbnY90pBO3e0nBUM7chEEOcxUhgw9aPq7fEBA==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.3.3.tgz",
+ "integrity": "sha512-+cV53HuYFeeyrNW8x/rgPmbVrzzp/rpRmwbJnNtwn4K8mroL1BdjxwQh7X9cUHp9rm4BBiEWmD3cSBjKG7d5mw==",
"dev": true,
"requires": {
"@types/eslint-visitor-keys": "^1.0.0",
- "@typescript-eslint/experimental-utils": "2.0.0",
- "@typescript-eslint/typescript-estree": "2.0.0",
- "eslint-visitor-keys": "^1.0.0"
+ "@typescript-eslint/experimental-utils": "2.3.3",
+ "@typescript-eslint/typescript-estree": "2.3.3",
+ "eslint-visitor-keys": "^1.1.0"
+ },
+ "dependencies": {
+ "eslint-visitor-keys": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+ "dev": true
+ }
}
},
"@typescript-eslint/typescript-estree": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.0.0.tgz",
- "integrity": "sha512-NXbmzA3vWrSgavymlzMWNecgNOuiMMp62MO3kI7awZRLRcsA1QrYWo6q08m++uuAGVbXH/prZi2y1AWuhSu63w==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.3.3.tgz",
+ "integrity": "sha512-GkACs12Xp8d/STunNv/iSMYJFQrkrax9vuPZySlgSzoJJtw1cp6tbEw4qsLskQv6vloLrkFJHcTJ0a/yCB5cIA==",
"dev": true,
"requires": {
+ "glob": "^7.1.4",
+ "is-glob": "^4.0.1",
"lodash.unescape": "4.0.1",
- "semver": "^6.2.0"
+ "semver": "^6.3.0"
},
"dependencies": {
"semver": {
@@ -401,13 +400,13 @@
"dev": true
},
"concurrently": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz",
- "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-5.0.0.tgz",
+ "integrity": "sha512-1yDvK8mduTIdxIxV9C60KoiOySUl/lfekpdbI+U5GXaPrgdffEavFa9QZB3vh68oWOpbCC+TuvxXV9YRPMvUrA==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
- "date-fns": "^1.30.1",
+ "date-fns": "^2.0.1",
"lodash": "^4.17.15",
"read-pkg": "^4.0.1",
"rxjs": "^6.5.2",
@@ -443,9 +442,9 @@
}
},
"date-fns": {
- "version": "1.30.1",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
- "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.4.1.tgz",
+ "integrity": "sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw==",
"dev": true
},
"debug": {
@@ -540,9 +539,9 @@
"dev": true
},
"end-of-stream": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
- "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
"dev": true,
"requires": {
"once": "^1.4.0"
@@ -669,9 +668,9 @@
}
},
"eslint-scope": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
- "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+ "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
"dev": true,
"requires": {
"esrecurse": "^4.1.0",
@@ -934,17 +933,17 @@
"dev": true
},
"google-closure-compiler": {
- "version": "20190729.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20190729.0.0.tgz",
- "integrity": "sha512-z+egAPJmOkEgop6ZUjrE+bIOKqbKdx57J+SAGVgq9DAQnr3yVxQ+h9b8PSLcpgzMw/Y0rMCHpM3HkCTE2Y1ePQ==",
+ "version": "20190929.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20190929.0.0.tgz",
+ "integrity": "sha512-psPXU3rfTbx4WsTOxtxCnNQqZdphdH1fS7KbqISJ3Bk1G6WMFapnCUHdnXsFz96i/XrVaTxjwUfrNdoz/F+PsA==",
"dev": true,
"requires": {
"chalk": "2.x",
- "google-closure-compiler-java": "^20190729.0.0",
- "google-closure-compiler-js": "^20190729.0.0",
- "google-closure-compiler-linux": "^20190729.0.0",
- "google-closure-compiler-osx": "^20190729.0.0",
- "google-closure-compiler-windows": "^20190729.0.0",
+ "google-closure-compiler-java": "^20190929.0.0",
+ "google-closure-compiler-js": "^20190929.0.0",
+ "google-closure-compiler-linux": "^20190929.0.0",
+ "google-closure-compiler-osx": "^20190929.0.0",
+ "google-closure-compiler-windows": "^20190929.0.0",
"minimist": "1.x",
"vinyl": "2.x",
"vinyl-sourcemaps-apply": "^0.2.0"
@@ -959,35 +958,35 @@
}
},
"google-closure-compiler-java": {
- "version": "20190729.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20190729.0.0.tgz",
- "integrity": "sha512-SGStZiyasN31tlmKUMMzCNRXTZqeij5N7iEeHSIGOsUdlKw5Zj8VPbaqbCcHvfgpQaUbn29zCTgTYiYFJRkbwA==",
+ "version": "20190929.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20190929.0.0.tgz",
+ "integrity": "sha512-fDThDeix5BDIQrP1ESznDq6VDLxY539JF2Hhm+/+XfgXz/kfxWB6RIcsHF+pI4QdNYEEaUGsE3gvF0bYpesUUQ==",
"dev": true
},
"google-closure-compiler-js": {
- "version": "20190729.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20190729.0.0.tgz",
- "integrity": "sha512-ZDJRK3eiNfKLsO1+uVxHnvB8RTQMLHlJNKouMBcPzPNOAurEFRboHf5nx/0llO+MXVWZDIPhxpbuuD3WnQsprA==",
+ "version": "20190929.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20190929.0.0.tgz",
+ "integrity": "sha512-IB9GJCJPGcSNZWtferd15lA9InUaab9oWPZhJssZN3z/nsHPzV9SqKJLj2oajmcaf2uINhlOIsCVWZwC+AbwVA==",
"dev": true
},
"google-closure-compiler-linux": {
- "version": "20190729.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20190729.0.0.tgz",
- "integrity": "sha512-W4TRrQ1+FrCFu3yn4M0JTWTJCFsqLlBjkliB/xLFuWb5E7XQ8Xe/sPtkmeNzCo+ftd6B/KD7acaH2oMU0brMag==",
+ "version": "20190929.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20190929.0.0.tgz",
+ "integrity": "sha512-gu/H1z7MqC43rXnGGoUyGdb12kTFpkDNw0huKj1ScXNvHgq5fQteicQKd7EpiKOIlMBJbJOKoVFNpU1nrAfNvQ==",
"dev": true,
"optional": true
},
"google-closure-compiler-osx": {
- "version": "20190729.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20190729.0.0.tgz",
- "integrity": "sha512-g3mLUVFD85nRwVyl8X6ywZ14YFP6fo+kXdIvrBGxxUkUU8VbeIgr6GlgtAUS0eZ0WVs2hr5w6kjk7+5kyeBSJg==",
+ "version": "20190929.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20190929.0.0.tgz",
+ "integrity": "sha512-SZbp2BOhwjrJdrShZ4HrtBHOEJyKvOtka47uXyo83AdZMX22EV04z+mQCMFHtBautgG/mCsL8eX75nlMPXzkjg==",
"dev": true,
"optional": true
},
"google-closure-compiler-windows": {
- "version": "20190729.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20190729.0.0.tgz",
- "integrity": "sha512-tzFfu2ixOoAWJUcCsagNFE4o0xHV+LI4cD3AmI36ll2e0NW1aUjDPhiG5TSfAnMIvZwgkikG5tqnPnk8ljauAA==",
+ "version": "20190929.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20190929.0.0.tgz",
+ "integrity": "sha512-b1azZx19cQnYqwof+4KxWcjjOJ88QeDDIvmjCmuAZjXG5UC0os/1cutg0AeK3gZnXAsaQwAh3szy+QGKT6IgWw==",
"dev": true,
"optional": true
},
@@ -1004,9 +1003,9 @@
"dev": true
},
"hosted-git-info": {
- "version": "2.8.4",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
- "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
+ "version": "2.8.5",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
+ "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
"dev": true
},
"htmlparser2": {
@@ -1354,7 +1353,7 @@
},
"mkdirp": {
"version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
@@ -1493,7 +1492,7 @@
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
@@ -1566,7 +1565,7 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
@@ -1817,20 +1816,20 @@
}
},
"rollup": {
- "version": "1.19.4",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.19.4.tgz",
- "integrity": "sha512-G24w409GNj7i/Yam2cQla6qV2k6Nug8bD2DZg9v63QX/cH/dEdbNJg8H4lUm5M1bRpPKRUC465Rm9H51JTKOfQ==",
+ "version": "1.23.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.23.1.tgz",
+ "integrity": "sha512-95C1GZQpr/NIA0kMUQmSjuMDQ45oZfPgDBcN0yZwBG7Kee//m7H68vgIyg+SPuyrTZ5PrXfyLK80OzXeKG5dAA==",
"dev": true,
"requires": {
- "@types/estree": "0.0.39",
- "@types/node": "^12.6.9",
- "acorn": "^6.2.1"
+ "@types/estree": "*",
+ "@types/node": "*",
+ "acorn": "^7.1.0"
},
"dependencies": {
"acorn": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
- "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+ "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
"dev": true
}
}
@@ -2095,7 +2094,7 @@
},
"through": {
"version": "2.3.8",
- "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+ "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
"dev": true
},
@@ -2145,9 +2144,9 @@
"dev": true
},
"typescript": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
- "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
+ "version": "3.6.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz",
+ "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==",
"dev": true
},
"unicode-canonical-property-names-ecmascript": { | true |
Other | mrdoob | three.js | 0a99abb80c37669722e396f40cb5768552f26e3e.json | Upgrade dev dependencies. | package.json | @@ -71,19 +71,19 @@
},
"homepage": "https://threejs.org/",
"devDependencies": {
- "@typescript-eslint/eslint-plugin": "^2.0.0",
- "@typescript-eslint/parser": "^2.0.0",
- "@types/webgl2": "0.0.5",
- "concurrently": "^4.1.2",
+ "@typescript-eslint/eslint-plugin": "^2.3.3",
+ "@typescript-eslint/parser": "^2.3.3",
+ "@types/webgl2": "^0.0.5",
+ "concurrently": "^5.0.0",
"eslint": "^6.2.1",
"eslint-config-mdcs": "^4.2.3",
"eslint-plugin-html": "^6.0.0",
"failonlyreporter": "^1.0.0",
- "google-closure-compiler": "20190729.0.0",
+ "google-closure-compiler": "20190929.0.0",
"http-server": "^0.11.1",
"qunit": "^2.9.2",
- "rollup": "^1.19.4",
- "typescript": "^3.5.3",
+ "rollup": "^1.23.1",
+ "typescript": "^3.6.3",
"rollup-plugin-buble": "^0.19.8"
},
"jspm": { | true |
Other | mrdoob | three.js | 5507b510de8cc85b8318c8bdbd4b64241f4954f0.json | Fix typings for Ray intersects*
According to the [docs](https://threejs.org/docs/#api/en/math/Ray) and after being bitten by this in practice, it looks like these 4 methods can return `null`... so the TS signature is wrong. | src/math/Ray.d.ts | @@ -26,20 +26,20 @@ export class Ray {
optionalPointOnRay?: Vector3,
optionalPointOnSegment?: Vector3
): number;
- intersectSphere( sphere: Sphere, target: Vector3 ): Vector3;
+ intersectSphere( sphere: Sphere, target: Vector3 ): Vector3 | null;
intersectsSphere( sphere: Sphere ): boolean;
distanceToPlane( plane: Plane ): number;
- intersectPlane( plane: Plane, target: Vector3 ): Vector3;
+ intersectPlane( plane: Plane, target: Vector3 ): Vector3 | null;
intersectsPlane( plane: Plane ): boolean;
- intersectBox( box: Box3, target: Vector3 ): Vector3;
+ intersectBox( box: Box3, target: Vector3 ): Vector3 | null;
intersectsBox( box: Box3 ): boolean;
intersectTriangle(
a: Vector3,
b: Vector3,
c: Vector3,
backfaceCulling: boolean,
target: Vector3
- ): Vector3;
+ ): Vector3 | null;
applyMatrix4( matrix4: Matrix4 ): Ray;
equals( ray: Ray ): boolean;
| false |
Other | mrdoob | three.js | 898c14affc264d90801239c3b27a88bf8fd6f691.json | Fix SVGLoader strokes not rendering in Firefox | examples/jsm/loaders/SVGLoader.js | @@ -814,13 +814,13 @@ SVGLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
function clamp( v ) {
- return Math.max( 0, Math.min( 1, v ) );
+ return Math.max( 0, Math.min( 1, parseFloat( v ) ) );
}
function positive( v ) {
- return Math.max( 0, v );
+ return Math.max( 0, parseFloat( v ) );
}
| false |
Other | mrdoob | three.js | 95cba890d318bb0b3f9b9293c71fc3f3f5ae4b3c.json | Add numMultiviewViews to parameters | src/renderers/webgl/WebGLProgram.js | @@ -401,9 +401,6 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
var prefixVertex, prefixFragment;
- var renderTarget = renderer.getRenderTarget();
- var numMultiviewViews = renderTarget && renderTarget.isWebGLMultiviewRenderTarget ? renderTarget.numViews : 0;
-
if ( material.isRawShaderMaterial ) {
prefixVertex = [
@@ -697,14 +694,14 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
// Multiview
- if ( numMultiviewViews > 0 ) {
+ if ( parameters.numMultiviewViews > 0 ) {
prefixVertex = prefixVertex.replace(
'#version 300 es\n',
[
'#version 300 es\n',
'#extension GL_OVR_multiview2 : require',
- 'layout(num_views = ' + numMultiviewViews + ') in;',
+ 'layout(num_views = ' + parameters.numMultiviewViews + ') in;',
'#define VIEW_ID gl_ViewID_OVR'
].join( '\n' )
);
@@ -717,10 +714,10 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
'uniform mat3 normalMatrix;'
].join( '\n' ),
[
- 'uniform mat4 modelViewMatrices[' + numMultiviewViews + '];',
- 'uniform mat4 projectionMatrices[' + numMultiviewViews + '];',
- 'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
- 'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
+ 'uniform mat4 modelViewMatrices[' + parameters.numMultiviewViews + '];',
+ 'uniform mat4 projectionMatrices[' + parameters.numMultiviewViews + '];',
+ 'uniform mat4 viewMatrices[' + parameters.numMultiviewViews + '];',
+ 'uniform mat3 normalMatrices[' + parameters.numMultiviewViews + '];',
'#define modelViewMatrix modelViewMatrices[VIEW_ID]',
'#define projectionMatrix projectionMatrices[VIEW_ID]',
@@ -741,7 +738,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
prefixFragment = prefixFragment.replace(
'uniform mat4 viewMatrix;',
[
- 'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
+ 'uniform mat4 viewMatrices[' + parameters.numMultiviewViews + '];',
'#define viewMatrix viewMatrices[VIEW_ID]'
].join( '\n' )
);
@@ -890,7 +887,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
this.program = program;
this.vertexShader = glVertexShader;
this.fragmentShader = glFragmentShader;
- this.numMultiviewViews = numMultiviewViews;
+ this.numMultiviewViews = parameters.numMultiviewViews;
return this;
| true |
Other | mrdoob | three.js | 95cba890d318bb0b3f9b9293c71fc3f3f5ae4b3c.json | Add numMultiviewViews to parameters | src/renderers/webgl/WebGLPrograms.js | @@ -35,7 +35,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
};
var parameterNames = [
- "precision", "supportsVertexTextures", "instancing",
+ "precision", "supportsVertexTextures", "instancing", "numMultiviewViews",
"map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding",
"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "tangentSpaceNormalMap", "clearcoatNormalMap", "displacementMap", "specularMap",
"roughnessMap", "metalnessMap", "gradientMap",
@@ -138,6 +138,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
}
var currentRenderTarget = renderer.getRenderTarget();
+ var numMultiviewViews = currentRenderTarget && currentRenderTarget.isWebGLMultiviewRenderTarget ? currentRenderTarget.numViews : 0;
var parameters = {
@@ -150,6 +151,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
instancing: object.isInstancedMesh === true,
supportsVertexTextures: vertexTextures,
+ numMultiviewViews: numMultiviewViews,
outputEncoding: getTextureEncodingFromMap( ( ! currentRenderTarget ) ? null : currentRenderTarget.texture, renderer.gammaOutput ),
map: !! material.map,
mapEncoding: getTextureEncodingFromMap( material.map, renderer.gammaInput ), | true |
Other | mrdoob | three.js | f5957f06b5b6699040ada6b1df881e760af1fd53.json | Fix a type description. | examples/jsm/misc/MD2Character.d.ts | @@ -1,9 +1,17 @@
import {
Object3D,
Mesh,
- Texture
+ Texture,
+ AnimationMixer
} from '../../../src/Three';
+export interface MD2PartsConfig {
+ baseUrl: string,
+ body: string,
+ skins: string[],
+ weapons: [string, string][],
+}
+
export class MD2Character {
constructor();
@@ -14,7 +22,13 @@ export class MD2Character {
meshWeapon: Mesh | null;
skinsBody: Texture[];
skinsWeapon: Texture[];
+ weapons: Mesh[];
+ activeAnimation: string | null;
+ mixer: AnimationMixer | null;
+ loadCounter: number;
+ onLoadComplete(): void;
+ loadParts( config: MD2PartsConfig ): void;
setPlaybackRate( rate: number ): void;
setWireframe( wireframeEnabled: boolean ): void;
setSkin( index: number ): void; | false |
Other | mrdoob | three.js | 3d98e76f1d384dacdf28cdd20f474afbbe1d712b.json | remove useless code. | examples/css2d_label.html | @@ -102,7 +102,6 @@
labelRenderer.setSize( window.innerWidth, window.innerHeight );
labelRenderer.domElement.style.position = 'absolute';
labelRenderer.domElement.style.top = '0px';
- labelRenderer.domElement.style.left = '0px';
document.body.appendChild( labelRenderer.domElement );
var controls = new OrbitControls( camera, labelRenderer.domElement ); | true |
Other | mrdoob | three.js | 3d98e76f1d384dacdf28cdd20f474afbbe1d712b.json | remove useless code. | examples/webgl_loader_pdb.html | @@ -114,7 +114,6 @@
labelRenderer.setSize( window.innerWidth, window.innerHeight );
labelRenderer.domElement.style.position = 'absolute';
labelRenderer.domElement.style.top = '0px';
- labelRenderer.domElement.style.left = '0px';
labelRenderer.domElement.style.pointerEvents = 'none';
document.getElementById( 'container' ).appendChild( labelRenderer.domElement );
| true |
Other | mrdoob | three.js | 03189f308bf56b97afe55f70118a593db0cc5495.json | Fix capital letter in SpriteMaterial doc | docs/api/en/materials/SpriteMaterial.html | @@ -29,7 +29,7 @@ <h2>Code Example</h2>
<h2>Examples</h2>
<p>
- [example:webgl_sprites WebGL / sprites]<br />
+ [example:webgl_sprites webGL / sprites]<br />
[example:software_sandbox software / sandbox]<br />
[example:svg_sandbox svg / sandbox]<br />
[example:webgl_materials_cubemap_dynamic webgl / materials / cubemap / dynamic] | false |
Other | mrdoob | three.js | a83e7d6682dedb355c3cef9e8d2c6de2807b260e.json | Fix typo in webgl_materials_translucency.html | examples/webgl_materials_translucency.html | @@ -138,7 +138,7 @@
var ThicknessControls = function () {
- this.distoration = uniforms[ 'thicknessDistortion' ].value;
+ this.distortion = uniforms[ 'thicknessDistortion' ].value;
this.ambient = uniforms[ 'thicknessAmbient' ].value;
this.attenuation = uniforms[ 'thicknessAttenuation' ].value;
this.power = uniforms[ 'thicknessPower' ].value;
@@ -149,9 +149,9 @@
var thicknessControls = new ThicknessControls();
var thicknessFolder = gui.addFolder( 'Thickness Control' );
- thicknessFolder.add( thicknessControls, 'distoration' ).min( 0.01 ).max( 1 ).step( 0.01 ).onChange( function () {
+ thicknessFolder.add( thicknessControls, 'distortion' ).min( 0.01 ).max( 1 ).step( 0.01 ).onChange( function () {
- uniforms[ 'thicknessDistortion' ].value = thicknessControls.distoration;
+ uniforms[ 'thicknessDistortion' ].value = thicknessControls.distortion;
} );
| false |
Other | mrdoob | three.js | 55b733f634283cf087142279918005722b954b75.json | Remove opacity in ShapePath | src/extras/core/ShapePath.js | @@ -13,7 +13,6 @@ function ShapePath() {
this.type = 'ShapePath';
this.color = new Color();
- this.opacity = 1.0;
this.subPaths = [];
this.currentPath = null; | false |
Other | mrdoob | three.js | 88f399263d2718975f94fd5d2ca1cdc30db9e651.json | Remove opacity property | examples/js/loaders/SVGLoader.js | @@ -107,8 +107,6 @@ THREE.SVGLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
}
- path.opacity = style.opacity || 1.0;
-
transformPath( path, currentTransform );
paths.push( path ); | false |
Other | mrdoob | three.js | 5191eb41eadc41fa6d83ae6062b02900da81fd5a.json | Add 2 missing quotes in the en version | docs/manual/en/introduction/Creating-a-scene.html | @@ -20,7 +20,7 @@ <h2>Before we start</h2>
<!DOCTYPE html>
<html>
<head>
- <meta charset=utf-8>
+ <meta charset="utf-8">
<title>My first three.js app</title>
<style>
body { margin: 0; } | false |
Other | mrdoob | three.js | da4e98e357c4cdffb5fca6d1100af03baec1a9f9.json | Add 2 missing quotes in the zh version | docs/manual/zh/introduction/Creating-a-scene.html | @@ -20,7 +20,7 @@ <h2>开始之前</h2>
<!DOCTYPE html>
<html>
<head>
- <meta charset=utf-8>
+ <meta charset="utf-8">
<title>My first three.js app</title>
<style>
body { margin: 0; } | false |
Other | mrdoob | three.js | b51f7f75efde75c580651a54122803ecc81e2f3e.json | update the docs | docs/api/en/lights/shadows/LightShadow.html | @@ -12,60 +12,18 @@
<h1>[name]</h1>
<p class="desc">
- This is used internally by [page:PointLight PointLights] for calculating shadows, and also serves as
- a base class for the other shadow classes.
+ Serves as a base class for the other shadow classes.
</p>
- <h2>Example</h2>
- <p>
- <code>
-//Create a WebGLRenderer and turn on shadows in the renderer
-var renderer = new THREE.WebGLRenderer();
-renderer.shadowMap.enabled = true;
-renderer.shadowMap.type = THREE.PCFSoftShadowMap; // default THREE.PCFShadowMap
-
-//Create a PointLight and turn on shadows for the light
-var light = new THREE.PointLight( 0xffffff, 1, 100 );
-light.position.set( 0, 10, 0 );
-light.castShadow = true; // default false
-scene.add( light );
-
-//Set up shadow properties for the light
-light.shadow.mapSize.width = 512; // default
-light.shadow.mapSize.height = 512; // default
-light.shadow.camera.near = 0.5; // default
-light.shadow.camera.far = 500 // default
-
-//Create a sphere that cast shadows (but does not receive them)
-var sphereGeometry = new THREE.SphereBufferGeometry( 5, 32, 32 );
-var sphereMaterial = new THREE.MeshStandardMaterial( { color: 0xff0000 } );
-var sphere = new THREE.Mesh( sphereGeometry, sphereMaterial );
-sphere.castShadow = true; //default is false
-sphere.receiveShadow = false; //default
-scene.add( sphere );
-
-//Create a plane that receives shadows (but does not cast them)
-var planeGeometry = new THREE.PlaneBufferGeometry( 20, 20, 32, 32 );
-var planeMaterial = new THREE.MeshStandardMaterial( { color: 0x00ff00 } )
-var plane = new THREE.Mesh( planeGeometry, planeMaterial );
-plane.receiveShadow = true;
-scene.add( plane );
-
-//Create a helper for the shadow camera (optional)
-var helper = new THREE.CameraHelper( light.shadow.camera );
-scene.add( helper );
- </code>
- </p>
-
<h2>Constructor</h2>
<h3>[name]( [param:Camera camera] )</h3>
<p>
[page:Camera camera] - the light's view of the world.<br /><br />
- Create a new [name]. This is not intended to be called directly - it is called
- internally by [page:PointLight] or used as a base class by other light shadows.
+ Create a new [name]. This is not intended to be called directly - it is used as a base class by
+ other light shadows.
</p>
<h2>Properties</h2>
@@ -88,7 +46,6 @@ <h3>[property:WebGLRenderTarget map]</h3>
in shadow. Computed internally during rendering.
</p>
-
<h3>[property:Vector2 mapSize]</h3>
<p>
A [Page:Vector2] defining the width and height of the shadow map.<br /><br />
@@ -118,10 +75,35 @@ <h3>[property:Float radius]</h3>
<h2>Methods</h2>
+
+ <h3>[method:Vector2 getFrameExtents]()</h3>
+ <p>
+ Used internally by the renderer to extend the shadow map to contain all viewports
+ </p>
+
+ <h3>[method:null updateMatrices]( [param:Light light], [param:Camera viewCamera], [param:number viewportIndex])</h3>
+ <p>
+ Update the matrices for the camera and shadow, used internally by the renderer.<br /><br />
+
+ light -- the light for which the shadow is being rendered.<br />
+ viewCamera -- the camera view for which the shadow is being rendered.<br />
+ viewportIndex -- calculates the matrix for this viewport
+ </p>
+
+ <h3>[method:Frustum getFrustum]()</h3>
+ <p>
+ Gets the shadow cameras frustum. Used internally by the renderer to cull objects.
+ </p>
+
+ <h3>[method:number getViewportCount]()</h3>
+ <p>
+ Used internally by the renderer to get the number of viewports that need to be rendered for this shadow.
+ </p>
+
<h3>[method:LightShadow copy]( [param:LightShadow source] )</h3>
<p>
Copies value of all the properties from the [page:LightShadow source] to this
- SpotLight.
+ Light.
</p>
<h3>[method:LightShadow clone]()</h3> | true |
Other | mrdoob | three.js | b51f7f75efde75c580651a54122803ecc81e2f3e.json | update the docs | docs/api/en/lights/shadows/PointLightShadow.html | @@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8" />
+ <base href="../../../../" />
+ <script src="list.js"></script>
+ <script src="page.js"></script>
+ <link type="text/css" rel="stylesheet" href="page.css" />
+ </head>
+ <body>
+
+ <h1>[name]</h1>
+
+ <p class="desc">
+ This is used internally by [page:PointLight PointLights] for calculating shadows
+ </p>
+
+
+ <h2>Example</h2>
+ <p>
+ <code>
+//Create a WebGLRenderer and turn on shadows in the renderer
+var renderer = new THREE.WebGLRenderer();
+renderer.shadowMap.enabled = true;
+renderer.shadowMap.type = THREE.PCFSoftShadowMap; // default THREE.PCFShadowMap
+
+//Create a PointLight and turn on shadows for the light
+var light = new THREE.PointLight( 0xffffff, 1, 100 );
+light.position.set( 0, 10, 0 );
+light.castShadow = true; // default false
+scene.add( light );
+
+//Set up shadow properties for the light
+light.shadow.mapSize.width = 512; // default
+light.shadow.mapSize.height = 512; // default
+light.shadow.camera.near = 0.5; // default
+light.shadow.camera.far = 500 // default
+
+//Create a sphere that cast shadows (but does not receive them)
+var sphereGeometry = new THREE.SphereBufferGeometry( 5, 32, 32 );
+var sphereMaterial = new THREE.MeshStandardMaterial( { color: 0xff0000 } );
+var sphere = new THREE.Mesh( sphereGeometry, sphereMaterial );
+sphere.castShadow = true; //default is false
+sphere.receiveShadow = false; //default
+scene.add( sphere );
+
+//Create a plane that receives shadows (but does not cast them)
+var planeGeometry = new THREE.PlaneBufferGeometry( 20, 20, 32, 32 );
+var planeMaterial = new THREE.MeshStandardMaterial( { color: 0x00ff00 } )
+var plane = new THREE.Mesh( planeGeometry, planeMaterial );
+plane.receiveShadow = true;
+scene.add( plane );
+
+//Create a helper for the shadow camera (optional)
+var helper = new THREE.CameraHelper( light.shadow.camera );
+scene.add( helper );
+ </code>
+ </p>
+
+ <h2>Constructor</h2>
+ <h3>[name]( )</h3>
+ <p>
+ Creates a new [name]. This is not intended to be called directly - it is called
+ internally by [page:PointLight].
+ </p>
+
+ <h2>Properties</h2>
+ <p>
+ See the base [page:LightShadow LightShadow] class for common properties.
+ </p>
+
+ <h2>Methods</h2>
+ <p>
+ See the base [page:LightShadow LightShadow] class for common methods.
+ </p>
+
+ <h2>Source</h2>
+
+ [link:https://github.com/mrdoob/three.js/blob/master/src/lights/[name].js src/lights/[name].js]
+ </body>
+</html> | true |
Other | mrdoob | three.js | b51f7f75efde75c580651a54122803ecc81e2f3e.json | update the docs | docs/list.js | @@ -217,8 +217,9 @@ var list = {
},
"Lights / Shadows": {
- "DirectionalLightShadow": "api/en/lights/shadows/DirectionalLightShadow",
"LightShadow": "api/en/lights/shadows/LightShadow",
+ "PointLightShadow": "api/en/lights/shadows/PointLightShadow",
+ "DirectionalLightShadow": "api/en/lights/shadows/DirectionalLightShadow",
"SpotLightShadow": "api/en/lights/shadows/SpotLightShadow"
},
| true |
Other | mrdoob | three.js | aa4b0c845d8161e4fb1b91fcd6a5c1ec05769402.json | fix examples broken by lightShadow change | examples/webgl_shadowmap.html | @@ -79,13 +79,13 @@
var ambient = new THREE.AmbientLight( 0x444444 );
scene.add( ambient );
- light = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI / 2 );
+ light = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI / 5, 0.3 );
light.position.set( 0, 1500, 1000 );
light.target.position.set( 0, 0, 0 );
light.castShadow = true;
-
- light.shadow = new THREE.LightShadow( new THREE.PerspectiveCamera( 50, 1, 1200, 2500 ) );
+ light.shadow.camera.near = 1200;
+ light.shadow.camera.far = 2500;
light.shadow.bias = 0.0001;
light.shadow.mapSize.width = SHADOW_MAP_WIDTH; | true |
Other | mrdoob | three.js | aa4b0c845d8161e4fb1b91fcd6a5c1ec05769402.json | fix examples broken by lightShadow change | examples/webgl_shadowmap_performance.html | @@ -76,14 +76,13 @@
var ambient = new THREE.AmbientLight( 0x444444 );
scene.add( ambient );
- light = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI / 2 );
+ light = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI / 5, 0.3 );
light.position.set( 0, 1500, 1000 );
light.target.position.set( 0, 0, 0 );
light.castShadow = true;
-
- light.shadow = new THREE.LightShadow( new THREE.PerspectiveCamera( 50, 1, 700, FAR ) );
-
+ light.shadow.camera.near = 1200;
+ light.shadow.camera.far = 2500;
light.shadow.bias = 0.0001;
light.shadow.mapSize.width = SHADOW_MAP_WIDTH; | true |
Other | mrdoob | three.js | 0442b430be43b04580abcdcc7cdbbbaed5540c44.json | Add matrix calcs to direction shadow class | src/lights/DirectionalLightShadow.js | @@ -5,15 +5,34 @@ import { OrthographicCamera } from '../cameras/OrthographicCamera.js';
* @author mrdoob / http://mrdoob.com/
*/
-function DirectionalLightShadow( ) {
+function DirectionalLightShadow() {
LightShadow.call( this, new OrthographicCamera( - 5, 5, 5, - 5, 0.5, 500 ) );
}
DirectionalLightShadow.prototype = Object.assign( Object.create( LightShadow.prototype ), {
- constructor: DirectionalLightShadow
+ constructor: DirectionalLightShadow,
+
+ isDirectionalLightShadow: true,
+
+ updateMatrices: function ( light, viewCamera, viewportIndex ) {
+
+ var camera = this.camera,
+ lightPositionWorld = this._lightPositionWorld,
+ lookTarget = this._lookTarget;
+
+ lightPositionWorld.setFromMatrixPosition( light.matrixWorld );
+ camera.position.copy( lightPositionWorld );
+
+ lookTarget.setFromMatrixPosition( light.target.matrixWorld );
+ camera.lookAt( lookTarget );
+ camera.updateMatrixWorld();
+
+ LightShadow.prototype.updateMatrices.call( this, light, viewCamera, viewportIndex );
+
+ }
} );
| false |
Other | mrdoob | three.js | a8179c989653149c4624413197fa691678eb30b9.json | fix texture lod | src/renderers/webgl/WebGLProgram.js | @@ -532,7 +532,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
- parameters.envMap && ( capabilities.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
+ ( ( material.extensions ? material.extensions.shaderTextureLOD : false ) || parameters.envMap ) && ( capabilities.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
'uniform mat4 viewMatrix;',
'uniform vec3 cameraPosition;', | false |
Other | mrdoob | three.js | ae85dbe2e0bbf7835486b56550a3a20e5a36c6bd.json | Update varriable names | src/renderers/shaders/ShaderChunk/logdepthbuf_fragment.glsl.js | @@ -1,15 +1,7 @@
export default /* glsl */`
#if defined( USE_LOGDEPTHBUF ) && defined( USE_LOGDEPTHBUF_EXT )
- if ( skipLogDepth == 1.0 ) {
-
- gl_FragDepthEXT = gl_FragCoord.z;
-
- } else {
-
- gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;
-
- }
+ gl_FragDepthEXT = vIsPerspective == 1.0 ? log2( vFragDepth ) * logDepthBufFC * 0.5 : gl_FragCoord.z;
#endif
`; | true |
Other | mrdoob | three.js | ae85dbe2e0bbf7835486b56550a3a20e5a36c6bd.json | Update varriable names | src/renderers/shaders/ShaderChunk/logdepthbuf_pars_fragment.glsl.js | @@ -3,7 +3,7 @@ export default /* glsl */`
uniform float logDepthBufFC;
varying float vFragDepth;
- varying float skipLogDepth;
+ varying float vIsPerspective;
#endif
`; | true |
Other | mrdoob | three.js | ae85dbe2e0bbf7835486b56550a3a20e5a36c6bd.json | Update varriable names | src/renderers/shaders/ShaderChunk/logdepthbuf_pars_vertex.glsl.js | @@ -4,7 +4,7 @@ export default /* glsl */`
#ifdef USE_LOGDEPTHBUF_EXT
varying float vFragDepth;
- varying float skipLogDepth;
+ varying float vIsPerspective;
#else
| true |
Other | mrdoob | three.js | ae85dbe2e0bbf7835486b56550a3a20e5a36c6bd.json | Update varriable names | src/renderers/shaders/ShaderChunk/logdepthbuf_vertex.glsl.js | @@ -4,7 +4,7 @@ export default /* glsl */`
#ifdef USE_LOGDEPTHBUF_EXT
vFragDepth = 1.0 + gl_Position.w;
- skipLogDepth = isPerspectiveMatrix( projectionMatrix ) ? 0.0 : 1.0;
+ vIsPerspective = float( isPerspectiveMatrix( projectionMatrix ) );
#else
| true |
Other | mrdoob | three.js | 61bf973cbe53f3d44447a699a9d234767468e9c7.json | Fix a type description. | src/animation/KeyframeTrack.d.ts | @@ -13,8 +13,8 @@ export class KeyframeTrack {
);
name: string;
- times: any[];
- values: any[];
+ times: Float32Array;
+ values: Float32Array;
ValueTypeName: string;
TimeBufferType: Float32Array; | false |
Other | mrdoob | three.js | e6312c8a673a293b3a8e8925e14cc1c4146efba7.json | Remove the files from PR | build/three.js | @@ -8458,7 +8458,6 @@
if ( this.roughness !== undefined ) { data.roughness = this.roughness; }
if ( this.metalness !== undefined ) { data.metalness = this.metalness; }
- if ( this.sheen && this.sheen.isColor ) { data.sheen = this.sheen.getHex(); }
if ( this.emissive && this.emissive.isColor ) { data.emissive = this.emissive.getHex(); }
if ( this.emissiveIntensity && this.emissiveIntensity !== 1 ) { data.emissiveIntensity = this.emissiveIntensity; }
@@ -32049,7 +32048,7 @@
this.clearcoat = source.clearcoat;
this.clearcoatRoughness = source.clearcoatRoughness;
-
+
if ( source.sheen ) { this.sheen = ( this.sheen || new Color() ).copy( source.sheen ); }
else { this.sheen = null; }
@@ -34482,7 +34481,6 @@
var itemsLoaded = 0;
var itemsTotal = 0;
var urlModifier = undefined;
- var handlers = [];
// Refer to #5689 for the reason why we don't set .onStart
// in the constructor
@@ -34559,52 +34557,10 @@
this.setURLModifier = function ( transform ) {
urlModifier = transform;
-
- return this;
-
- };
-
- this.addHandler = function ( regex, loader ) {
-
- handlers.push( regex, loader );
-
- return this;
-
- };
-
- this.removeHandler = function ( regex ) {
-
- var index = handlers.indexOf( regex );
-
- if ( index !== - 1 ) {
-
- handlers.splice( index, 2 );
-
- }
-
return this;
};
- this.getHandler = function ( file ) {
-
- for ( var i = 0, l = handlers.length; i < l; i += 2 ) {
-
- var regex = handlers[ i ];
- var loader = handlers[ i + 1 ];
-
- if ( regex.test( file ) ) {
-
- return loader;
-
- }
-
- }
-
- return null;
-
- };
-
}
var DefaultLoadingManager = new LoadingManager();
@@ -34652,6 +34608,41 @@
} );
+ //
+
+ Loader.Handlers = {
+
+ handlers: [],
+
+ add: function ( regex, loader ) {
+
+ this.handlers.push( regex, loader );
+
+ },
+
+ get: function ( file ) {
+
+ var handlers = this.handlers;
+
+ for ( var i = 0, l = handlers.length; i < l; i += 2 ) {
+
+ var regex = handlers[ i ];
+ var loader = handlers[ i + 1 ];
+
+ if ( regex.test( file ) ) {
+
+ return loader;
+
+ }
+
+ }
+
+ return null;
+
+ }
+
+ };
+
/**
* @author mrdoob / http://mrdoob.com/
*/
@@ -38203,7 +38194,6 @@
if ( json.color !== undefined ) { material.color.setHex( json.color ); }
if ( json.roughness !== undefined ) { material.roughness = json.roughness; }
if ( json.metalness !== undefined ) { material.metalness = json.metalness; }
- if ( json.sheen !== undefined ) { material.sheen = (new Color()).setHex( json.sheen ); }
if ( json.emissive !== undefined ) { material.emissive.setHex( json.emissive ); }
if ( json.specular !== undefined ) { material.specular.setHex( json.specular ); }
if ( json.shininess !== undefined ) { material.shininess = json.shininess; }
@@ -46992,22 +46982,6 @@
} );
- Loader.Handlers = {
-
- add: function ( /* regex, loader */ ) {
-
- console.error( 'THREE.Loader: Handlers.add() has been removed. Use LoadingManager.addHandler() instead.' );
-
- },
-
- get: function ( /* file */ ) {
-
- console.error( 'THREE.Loader: Handlers.get() has been removed. Use LoadingManager.getHandler() instead.' );
-
- }
-
- };
-
function XHRLoader( manager ) {
console.warn( 'THREE.XHRLoader has been renamed to THREE.FileLoader.' ); | true |
Other | mrdoob | three.js | e6312c8a673a293b3a8e8925e14cc1c4146efba7.json | Remove the files from PR | build/three.module.js | @@ -8452,7 +8452,6 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
if ( this.roughness !== undefined ) data.roughness = this.roughness;
if ( this.metalness !== undefined ) data.metalness = this.metalness;
- if ( this.sheen && this.sheen.isColor ) data.sheen = this.sheen.getHex();
if ( this.emissive && this.emissive.isColor ) data.emissive = this.emissive.getHex();
if ( this.emissiveIntensity && this.emissiveIntensity !== 1 ) data.emissiveIntensity = this.emissiveIntensity;
@@ -32036,7 +32035,7 @@ MeshPhysicalMaterial.prototype.copy = function ( source ) {
this.clearcoat = source.clearcoat;
this.clearcoatRoughness = source.clearcoatRoughness;
-
+
if ( source.sheen ) this.sheen = ( this.sheen || new Color() ).copy( source.sheen );
else this.sheen = null;
@@ -34469,7 +34468,6 @@ function LoadingManager( onLoad, onProgress, onError ) {
var itemsLoaded = 0;
var itemsTotal = 0;
var urlModifier = undefined;
- var handlers = [];
// Refer to #5689 for the reason why we don't set .onStart
// in the constructor
@@ -34546,52 +34544,10 @@ function LoadingManager( onLoad, onProgress, onError ) {
this.setURLModifier = function ( transform ) {
urlModifier = transform;
-
- return this;
-
- };
-
- this.addHandler = function ( regex, loader ) {
-
- handlers.push( regex, loader );
-
- return this;
-
- };
-
- this.removeHandler = function ( regex ) {
-
- var index = handlers.indexOf( regex );
-
- if ( index !== - 1 ) {
-
- handlers.splice( index, 2 );
-
- }
-
return this;
};
- this.getHandler = function ( file ) {
-
- for ( var i = 0, l = handlers.length; i < l; i += 2 ) {
-
- var regex = handlers[ i ];
- var loader = handlers[ i + 1 ];
-
- if ( regex.test( file ) ) {
-
- return loader;
-
- }
-
- }
-
- return null;
-
- };
-
}
var DefaultLoadingManager = new LoadingManager();
@@ -34639,6 +34595,41 @@ Object.assign( Loader.prototype, {
} );
+//
+
+Loader.Handlers = {
+
+ handlers: [],
+
+ add: function ( regex, loader ) {
+
+ this.handlers.push( regex, loader );
+
+ },
+
+ get: function ( file ) {
+
+ var handlers = this.handlers;
+
+ for ( var i = 0, l = handlers.length; i < l; i += 2 ) {
+
+ var regex = handlers[ i ];
+ var loader = handlers[ i + 1 ];
+
+ if ( regex.test( file ) ) {
+
+ return loader;
+
+ }
+
+ }
+
+ return null;
+
+ }
+
+};
+
/**
* @author mrdoob / http://mrdoob.com/
*/
@@ -38190,7 +38181,6 @@ MaterialLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
if ( json.color !== undefined ) material.color.setHex( json.color );
if ( json.roughness !== undefined ) material.roughness = json.roughness;
if ( json.metalness !== undefined ) material.metalness = json.metalness;
- if ( json.sheen !== undefined ) material.sheen = (new Color()).setHex( json.sheen );
if ( json.emissive !== undefined ) material.emissive.setHex( json.emissive );
if ( json.specular !== undefined ) material.specular.setHex( json.specular );
if ( json.shininess !== undefined ) material.shininess = json.shininess;
@@ -46981,22 +46971,6 @@ Object.assign( Loader.prototype, {
} );
-Loader.Handlers = {
-
- add: function ( /* regex, loader */ ) {
-
- console.error( 'THREE.Loader: Handlers.add() has been removed. Use LoadingManager.addHandler() instead.' );
-
- },
-
- get: function ( /* file */ ) {
-
- console.error( 'THREE.Loader: Handlers.get() has been removed. Use LoadingManager.getHandler() instead.' );
-
- }
-
-};
-
function XHRLoader( manager ) {
console.warn( 'THREE.XHRLoader has been renamed to THREE.FileLoader.' ); | true |
Other | mrdoob | three.js | e6312c8a673a293b3a8e8925e14cc1c4146efba7.json | Remove the files from PR | package-lock.json | @@ -1959,7 +1959,7 @@
"spdx-expression-parse": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
- "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=",
+ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
"dev": true,
"requires": {
"spdx-exceptions": "^2.1.0",
@@ -2264,7 +2264,7 @@
},
"wrap-ansi": {
"version": "2.1.0",
- "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"dev": true,
"requires": { | true |
Other | mrdoob | three.js | c49ed806b54549eaff4824e1b4ad9c6d3537de8f.json | Expose the sheen parameter for Physical Material
in the editor | editor/js/Sidebar.Material.js | @@ -195,6 +195,18 @@ Sidebar.Material = function ( editor ) {
container.add( materialMetalnessRow );
+ // sheen
+
+ var materialSheenRow = new UI.Row();
+ var materialSheenEnabled = new UI.Checkbox( false ).onChange( update );
+ var materialSheen = new UI.Color().setHexValue(0x000000).onChange( update );
+
+ materialSheenRow.add( new UI.Text( strings.getKey( 'sidebar/material/sheen' ) ).setWidth( '90px' ) )
+ materialSheenRow.add( materialSheenEnabled );
+ materialSheenRow.add( materialSheen );
+
+ container.add( materialSheenRow );
+
// emissive
var materialEmissiveRow = new UI.Row();
@@ -636,6 +648,22 @@ Sidebar.Material = function ( editor ) {
}
+ if ( material.sheen !== undefined ) {
+
+ var sheenEnabled = materialSheenEnabled.getValue() === true;
+
+ var sheen = sheenEnabled ? new THREE.Color(materialSheen.getHexValue()) : null;
+
+ editor.execute( new SetMaterialValueCommand( editor, currentObject, 'sheen', sheen, currentMaterialSlot ) );
+
+ }
+
+ if ( material.sheen !== undefined && material.sheen !== null && material.sheen.getHex() !== materialSheen.getHexValue() ) {
+
+ editor.execute( new SetMaterialColorCommand( editor, currentObject, 'sheen', materialSheen.getHexValue(), currentMaterialSlot ) );
+
+ }
+
if ( material.emissive !== undefined && material.emissive.getHex() !== materialEmissive.getHexValue() ) {
editor.execute( new SetMaterialColorCommand( editor, currentObject, 'emissive', materialEmissive.getHexValue(), currentMaterialSlot ) );
@@ -1157,6 +1185,7 @@ Sidebar.Material = function ( editor ) {
'roughness': materialRoughnessRow,
'metalness': materialMetalnessRow,
'emissive': materialEmissiveRow,
+ 'sheen': materialSheenRow,
'specular': materialSpecularRow,
'shininess': materialShininessRow,
'clearcoat': materialClearcoatRow,
@@ -1268,6 +1297,13 @@ Sidebar.Material = function ( editor ) {
materialMetalness.setValue( material.metalness );
}
+
+ if ( material.sheen !== undefined && material.sheen !== null ) {
+
+ materialSheenEnabled.setValue( true );
+ materialSheen.setHexValue( material.sheen.getHexString() );
+
+ }
if ( material.emissive !== undefined ) {
| true |
Other | mrdoob | three.js | c49ed806b54549eaff4824e1b4ad9c6d3537de8f.json | Expose the sheen parameter for Physical Material
in the editor | editor/js/Strings.js | @@ -221,6 +221,7 @@ var Strings = function ( config ) {
'sidebar/material/depthPacking': 'Depth Packing',
'sidebar/material/roughness': 'Roughness',
'sidebar/material/metalness': 'Metalness',
+ 'sidebar/material/sheen': 'Sheen',
'sidebar/material/emissive': 'Emissive',
'sidebar/material/specular': 'Specular',
'sidebar/material/shininess': 'Shininess', | true |
Other | mrdoob | three.js | fe0e7957e3102b96213409408aa8b04b32fa9f33.json | Add removal warning | src/materials/Material.js | @@ -50,6 +50,24 @@ function Material() {
this.stencilZPass = KeepStencilOp;
this.stencilWrite = false;
+ Object.defineProperty( this, 'stencilMask', {
+
+ set: function( value ) {
+
+ console.warn( 'Material.stencilMask has been removed. Use Material.stencilFuncMask instead.' );
+ this.stencilFuncMask = value;
+
+ },
+
+ get: function() {
+
+ console.warn( 'Material.stencilMask has been removed. Use Material.stencilFuncMask instead.' );
+ return this.stencilFuncMask;
+
+ }
+
+ } );
+
this.clippingPlanes = null;
this.clipIntersection = false;
this.clipShadows = false; | false |
Other | mrdoob | three.js | 8e15fb24e1746699c90b73e4b69aea92fbce63fe.json | Fix a spelling error | docs/api/en/materials/Material.html | @@ -278,7 +278,7 @@ <h3>[property:Boolean transparent]</h3>
as transparent objects need special treatment and are rendered after
non-transparent objects. <br />
When set to true, the extent to which the material is transparent is
- controlled by setting it's [page:Float opacity] property. <br />
+ controlled by setting its [page:Float opacity] property. <br />
Default is *false*.
</p>
| false |
Other | mrdoob | three.js | 62fef74709d9e24790927aadbd4d5005a3e2479e.json | Update JSM module | examples/jsm/renderers/SVGRenderer.js | @@ -139,13 +139,13 @@ var SVGRenderer = function () {
}
- function getSvgColor( color, opacity ) {
+ function getSvgColor( color, opacity, asStroke ) {
var arg = Math.floor( color.r * 255 ) + ',' + Math.floor( color.g * 255 ) + ',' + Math.floor( color.b * 255 );
if ( opacity === undefined || opacity === 1 ) return 'rgb(' + arg + ')';
- return 'rgb(' + arg + '); fill-opacity: ' + opacity;
+ return 'rgb(' + arg + ');' + ( asStroke ? 'stroke-opacity' : 'fill-opacity' ) + ':' + opacity;
}
@@ -406,7 +406,7 @@ var SVGRenderer = function () {
if ( material.isLineBasicMaterial ) {
- var style = 'fill:none;stroke:' + getSvgColor( material.color, material.opacity ) + ';stroke-width:' + material.linewidth + ';stroke-linecap:' + material.linecap;
+ var style = 'fill:none;stroke:' + getSvgColor( material.color, material.opacity, true ) + ';stroke-width:' + material.linewidth + ';stroke-linecap:' + material.linecap;
if ( material.isLineDashedMaterial ) {
@@ -466,7 +466,7 @@ var SVGRenderer = function () {
if ( material.wireframe ) {
- style = 'fill:none;stroke:' + getSvgColor( _color, material.opacity ) + ';stroke-width:' + material.wireframeLinewidth + ';stroke-linecap:' + material.wireframeLinecap + ';stroke-linejoin:' + material.wireframeLinejoin;
+ style = 'fill:none;stroke:' + getSvgColor( _color, material.opacity, true ) + ';stroke-width:' + material.wireframeLinewidth + ';stroke-linecap:' + material.wireframeLinecap + ';stroke-linejoin:' + material.wireframeLinejoin;
} else {
| false |
Other | mrdoob | three.js | 7d2aeeee226319d49b9bd5ae03931a69d02fdf08.json | Fix linter error | src/renderers/webgl/WebGLCapabilities.js | @@ -87,7 +87,7 @@ function WebGLCapabilities( gl, extensions, parameters ) {
var maxSamples = isWebGL2 ? gl.getParameter( gl.MAX_SAMPLES ) : 0;
var multiviewExt = extensions.get( 'OVR_multiview2' );
- var multiview = isWebGL2 && ( !! multiviewExt ) && !gl.getContextAttributes().antialias;
+ var multiview = isWebGL2 && ( !! multiviewExt ) && ! gl.getContextAttributes().antialias;
var maxMultiviewViews = multiview ? gl.getParameter( multiviewExt.MAX_VIEWS_OVR ) : 0;
return { | false |
Other | mrdoob | three.js | f1936dc7af6bbcb34725e497f604d77f4039dea8.json | Remove getMaxViews() from Multiview
rename multiview.attachRenderTarget() to attachCamera()
use isWebGLMultiviewRenderTarget instead of instanceof | src/renderers/WebGLRenderer.js | @@ -1181,7 +1181,7 @@ function WebGLRenderer( parameters ) {
if ( capabilities.multiview ) {
- multiview.attachRenderTarget( camera );
+ multiview.attachCamera( camera );
}
| true |
Other | mrdoob | three.js | f1936dc7af6bbcb34725e497f604d77f4039dea8.json | Remove getMaxViews() from Multiview
rename multiview.attachRenderTarget() to attachCamera()
use isWebGLMultiviewRenderTarget instead of instanceof | src/renderers/webgl/WebGLCapabilities.js | @@ -87,7 +87,7 @@ function WebGLCapabilities( gl, extensions, parameters ) {
var maxSamples = isWebGL2 ? gl.getParameter( gl.MAX_SAMPLES ) : 0;
var multiviewExt = extensions.get( 'OVR_multiview2' );
- var multiview = isWebGL2 && ( !! multiviewExt ) && !gl.getContextAttributes().antialias;
+ var multiview = isWebGL2 && ( !! multiviewExt ) && ! gl.getContextAttributes().antialias;
var maxMultiviewViews = multiview ? gl.getParameter( multiviewExt.MAX_VIEWS_OVR ) : 0;
return { | true |
Other | mrdoob | three.js | f1936dc7af6bbcb34725e497f604d77f4039dea8.json | Remove getMaxViews() from Multiview
rename multiview.attachRenderTarget() to attachCamera()
use isWebGLMultiviewRenderTarget instead of instanceof | src/renderers/webgl/WebGLMultiview.js | @@ -20,12 +20,6 @@ function WebGLMultiview( renderer, gl ) {
var renderTarget, currentRenderTarget;
var mat3, mat4, cameraArray, renderSize;
- function getMaxViews() {
-
- return capabilities.maxMultiviewViews;
-
- }
-
function getCameraArray( camera ) {
if ( camera.isArrayCamera ) return camera.cameras;
@@ -130,7 +124,7 @@ function WebGLMultiview( renderer, gl ) {
}
- function attachRenderTarget( camera ) {
+ function attachCamera( camera ) {
if ( ! isMultiviewCompatible( camera ) ) return;
@@ -194,7 +188,9 @@ function WebGLMultiview( renderer, gl ) {
mat3 = [];
cameraArray = [];
- for ( var i = 0; i < getMaxViews(); i ++ ) {
+ var maxViews = capabilities.maxMultiviewViews;
+
+ for ( var i = 0; i < maxViews; i ++ ) {
mat4[ i ] = new Matrix4();
mat3[ i ] = new Matrix3();
@@ -204,7 +200,7 @@ function WebGLMultiview( renderer, gl ) {
}
- this.attachRenderTarget = attachRenderTarget;
+ this.attachCamera = attachCamera;
this.detachRenderTarget = detachRenderTarget;
this.updateCameraProjectionMatricesUniform = updateCameraProjectionMatricesUniform;
this.updateCameraViewMatricesUniform = updateCameraViewMatricesUniform; | true |
Other | mrdoob | three.js | f1936dc7af6bbcb34725e497f604d77f4039dea8.json | Remove getMaxViews() from Multiview
rename multiview.attachRenderTarget() to attachCamera()
use isWebGLMultiviewRenderTarget instead of instanceof | src/renderers/webgl/WebGLProgram.js | @@ -6,7 +6,6 @@ import { WebGLUniforms } from './WebGLUniforms.js';
import { WebGLShader } from './WebGLShader.js';
import { ShaderChunk } from '../shaders/ShaderChunk.js';
import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding, LogLuvEncoding } from '../../constants.js';
-import { WebGLMultiviewRenderTarget } from '../WebGLMultiviewRenderTarget.js';
var programIdCount = 0;
@@ -342,7 +341,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
var prefixVertex, prefixFragment;
var renderTarget = renderer.getRenderTarget();
- var numMultiviewViews = renderTarget instanceof WebGLMultiviewRenderTarget ? renderTarget.numViews : 0;
+ var numMultiviewViews = renderTarget && renderTarget.isWebGLMultiviewRenderTarget ? renderTarget.numViews : 0;
if ( material.isRawShaderMaterial ) {
| true |
Other | mrdoob | three.js | 085ad279fa802ecf34b7b64a50b280ca920a8cf3.json | remove capabilities from WebglGlprogram | src/renderers/webgl/WebGLProgram.js | @@ -371,7 +371,7 @@ function generateEnvMapBlendingDefine( parameters, material ) {
}
-function WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities ) {
+function WebGLProgram( renderer, extensions, code, material, shader, parameters ) {
var gl = renderer.getContext();
@@ -387,7 +387,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
var gammaFactorDefine = ( renderer.gammaFactor > 0 ) ? renderer.gammaFactor : 1.0;
- var customExtensions = capabilities.isWebGL2 ? '' : generateExtensions( material.extensions, parameters, extensions );
+ var customExtensions = parameters.isWebGL2 ? '' : generateExtensions( material.extensions, parameters, extensions );
var customDefines = generateDefines( defines );
@@ -481,7 +481,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
parameters.sizeAttenuation ? '#define USE_SIZEATTENUATION' : '',
parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
- parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
+ parameters.logarithmicDepthBuffer && ( parameters.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
'uniform mat4 modelMatrix;',
'uniform vec3 cameraPosition;',
@@ -614,9 +614,9 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
parameters.physicallyCorrectLights ? '#define PHYSICALLY_CORRECT_LIGHTS' : '',
parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
- parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
+ parameters.logarithmicDepthBuffer && ( parameters.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
- ( ( material.extensions ? material.extensions.shaderTextureLOD : false ) || parameters.envMap ) && ( capabilities.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
+ ( ( material.extensions ? material.extensions.shaderTextureLOD : false ) || parameters.envMap ) && ( parameters.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
'uniform vec3 cameraPosition;',
@@ -660,7 +660,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
vertexShader = unrollLoops( vertexShader );
fragmentShader = unrollLoops( fragmentShader );
- if ( capabilities.isWebGL2 && ! material.isRawShaderMaterial ) {
+ if ( parameters.isWebGL2 && ! material.isRawShaderMaterial ) {
var isGLSL3ShaderMaterial = false;
| true |
Other | mrdoob | three.js | 085ad279fa802ecf34b7b64a50b280ca920a8cf3.json | remove capabilities from WebglGlprogram | src/renderers/webgl/WebGLPrograms.js | @@ -137,6 +137,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
shaderID: shaderID,
precision: precision,
+ isWebGL2: capabilities.isWebGL2,
supportsVertexTextures: capabilities.vertexTextures,
outputEncoding: getTextureEncodingFromMap( ( ! currentRenderTarget ) ? null : currentRenderTarget.texture, renderer.gammaOutput ),
map: !! material.map,
@@ -289,7 +290,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
if ( program === undefined ) {
- program = new WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities );
+ program = new WebGLProgram( renderer, extensions, code, material, shader, parameters );
programs.push( program );
} | true |
Other | mrdoob | three.js | a6df957635e23dec368c7f4e1c59062953e976a7.json | Move tsconfig.lint.json to utils/build/ | package.json | @@ -50,7 +50,7 @@
"dev": "concurrently --names \"ROLLUP,HTTP\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c -w -m inline\" \"http-server -c-1 -p 8080\"",
"dev-test": "concurrently --names \"ROLLUP,ROLLUPTEST,HTTP\" -c \"bgBlue.bold,bgRed.bold,bgGreen.bold\" \"rollup -c -w -m inline\" \"rollup -c test/rollup.unit.config.js -w -m inline\" \"http-server -p 8080\"",
"start": "npm run dev",
- "lint": "eslint src --ext js --ext ts && tsc -p tsconfig.lint.json",
+ "lint": "eslint src --ext js --ext ts && tsc -p utils/build/tsconfig.lint.json",
"test": "npm run build-test && qunit -r failonlyreporter test/unit/three.source.unit.js",
"travis": "npm run lint && npm test"
}, | true |
Other | mrdoob | three.js | a6df957635e23dec368c7f4e1c59062953e976a7.json | Move tsconfig.lint.json to utils/build/ | tsconfig.lint.json | @@ -1,8 +0,0 @@
-{
- "compilerOptions": {
- "noEmit": true,
- },
- // NOTE (from https://www.typescriptlang.org/docs/handbook/tsconfig-json.html):
- // 'If the "files" and "include" are both left unspecified, the compiler defaults to including
- // all TypeScript (.ts, .d.ts and .tsx) files in the containing directory and subdirectories ...'
-} | true |
Other | mrdoob | three.js | a6df957635e23dec368c7f4e1c59062953e976a7.json | Move tsconfig.lint.json to utils/build/ | utils/build/tsconfig.lint.json | @@ -0,0 +1,8 @@
+{
+ "compilerOptions": {
+ "noEmit": true,
+ },
+ "include": [
+ "../../**/*.ts"
+ ]
+} | true |
Other | mrdoob | three.js | 91404cdee0a6300389453e2dae490e8c7d462350.json | add color unittests | test/unit/src/math/Color.tests.js | @@ -29,9 +29,13 @@ export default QUnit.module( 'Maths', () => {
} );
// PUBLIC STUFF
- QUnit.todo( "isColor", ( assert ) => {
+ QUnit.test( "isColor", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Color();
+ assert.ok( a.isColor === true, "Passed!" );
+
+ var b = new Object();
+ assert.ok( ! b.isColor, "Passed!" );
} );
@@ -53,9 +57,13 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "setScalar", ( assert ) => {
+ QUnit.test( "setScalar", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var c = new Color();
+ c.setScalar( 0.5 );
+ assert.ok( c.r == 0.5, "Red: " + c.r );
+ assert.ok( c.g == 0.5, "Green: " + c.g );
+ assert.ok( c.b == 0.5, "Blue: " + c.b );
} );
@@ -64,12 +72,19 @@ export default QUnit.module( 'Maths', () => {
var c = new Color();
c.setHex( 0xFA8072 );
assert.ok( c.getHex() == 0xFA8072, "Hex: " + c.getHex() );
+ assert.ok( c.r == 0xFA / 0xFF, "Red: " + c.r );
+ assert.ok( c.g == 0x80 / 0xFF, "Green: " + c.g );
+ assert.ok( c.b == 0x72 / 0xFF, "Blue: " + c.b );
} );
- QUnit.todo( "setRGB", ( assert ) => {
+ QUnit.test( "setRGB", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var c = new Color();
+ c.setRGB( 0.3, 0.5, 0.7 );
+ assert.ok( c.r == 0.3, "Red: " + c.r );
+ assert.ok( c.g == 0.5, "Green: " + c.g );
+ assert.ok( c.b == 0.7, "Blue: " + c.b );
} );
@@ -86,9 +101,41 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "setStyle", ( assert ) => {
+ QUnit.test( "setStyle", ( assert ) => {
+
+ var a = new Color();
+
+ var b = new Color( 8 / 255, 25 / 255, 178 / 255 );
+ a.setStyle( "rgb(8,25,178)" );
+ assert.ok( a.equals( b ), "Passed" );
- assert.ok( false, "everything's gonna be alright" );
+ b = new Color( 8 / 255, 25 / 255, 178 / 255 );
+ a.setStyle( "rgba(8,25,178,200)" );
+ assert.ok( a.equals( b ), "Passed" );
+
+ var hsl = { h: 0, s: 0, l: 0 };
+ a.setStyle( "hsl(270,50%,75%)" );
+ a.getHSL( hsl );
+ assert.ok( hsl.h == 0.75, "hue: " + hsl.h );
+ assert.ok( hsl.s == 0.5, "saturation: " + hsl.s );
+ assert.ok( hsl.l == 0.75, "lightness: " + hsl.l );
+
+ hsl = { h: 0, s: 0, l: 0 };
+ a.setStyle( "hsl(270,50%,75%,0.5)" );
+ a.getHSL( hsl );
+ assert.ok( hsl.h == 0.75, "hue: " + hsl.h );
+ assert.ok( hsl.s == 0.5, "saturation: " + hsl.s );
+ assert.ok( hsl.l == 0.75, "lightness: " + hsl.l );
+
+ a.setStyle( "#F8A" );
+ assert.ok( a.r == 0xFF / 255, "Red: " + a.r );
+ assert.ok( a.g == 0x88 / 255, "Green: " + a.g );
+ assert.ok( a.b == 0xAA / 255, "Blue: " + a.b );
+
+ a.setStyle( "#F8ABC1" );
+ assert.ok( a.r == 0xF8 / 255, "Red: " + a.r );
+ assert.ok( a.g == 0xAB / 255, "Green: " + a.g );
+ assert.ok( a.b == 0xC1 / 255, "Blue: " + a.b );
} );
@@ -100,9 +147,14 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "copy", ( assert ) => {
+ QUnit.test( "copy", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Color( 'teal' );
+ var b = new Color();
+ b.copy( a );
+ assert.ok( b.r == 0x00 / 255, "Red: " + b.r );
+ assert.ok( b.g == 0x80 / 255, "Green: " + b.g );
+ assert.ok( b.b == 0x80 / 255, "Blue: " + b.b );
} );
@@ -213,9 +265,17 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "addColors", ( assert ) => {
+ QUnit.test( "addColors", ( assert ) => {
+
+ var a = new Color( 0x0000FF );
+ var b = new Color( 0xFF0000 );
+ var c = new Color( 0xFF00FF );
+ var d = new Color();
+
+ d.addColors( a, b );
+
+ assert.ok( d.equals( c ), "Passed" );
- assert.ok( false, "everything's gonna be alright" );
} );
| false |
Other | mrdoob | three.js | 16e079ae125612bd4c0d7e4cc17dd39048c77313.json | add box3 unittests | test/unit/src/math/Box3.tests.js | @@ -54,9 +54,13 @@ export default QUnit.module( 'Maths', () => {
} );
// PUBLIC STUFF
- QUnit.todo( "isBox3", ( assert ) => {
+ QUnit.test( "isBox3", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Box3();
+ assert.ok( a.isBox3 === true, "Passed!" );
+
+ var b = new Sphere();
+ assert.ok( ! b.isBox3, "Passed!" );
} );
@@ -70,9 +74,13 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "setFromArray", ( assert ) => {
+ QUnit.test( "setFromArray", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Box3();
+
+ a.setFromArray( [ 0, 0, 0, 1, 1, 1, 2, 2, 2 ] );
+ assert.ok( a.min.equals( zero3 ), "Passed!" );
+ assert.ok( a.max.equals( two3 ), "Passed!" );
} );
@@ -164,9 +172,19 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "clone", ( assert ) => {
+ QUnit.test( "clone", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+
+ var a = new Box3( zero3.clone(), one3.clone() );
+
+ var b = a.clone();
+ assert.ok( b.min.equals( zero3 ), "Passed!" );
+ assert.ok( b.max.equals( one3 ), "Passed!" );
+
+ a = new Box3();
+ var b = a.clone();
+ assert.ok( b.min.equals( posInf3 ), "Passed!" );
+ assert.ok( b.max.equals( negInf3 ), "Passed!" );
} );
@@ -199,9 +217,20 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "isEmpty", ( assert ) => {
+ QUnit.test( "isEmpty", ( assert ) => {
+
+ var a = new Box3( zero3.clone(), zero3.clone() );
+ assert.ok( ! a.isEmpty(), "Passed!" );
+
+ var a = new Box3( zero3.clone(), one3.clone() );
+ assert.ok( ! a.isEmpty(), "Passed!" );
+
+ var a = new Box3( two3.clone(), one3.clone() );
+ assert.ok( a.isEmpty(), "Passed!" );
+
+ var a = new Box3( posInf3.clone(), negInf3.clone() );
+ assert.ok( a.isEmpty(), "Passed!" );
- assert.ok( false, "everything's gonna be alright" );
} );
@@ -560,9 +589,32 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "equals", ( assert ) => {
+ QUnit.test( "equals", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Box3();
+ var b = new Box3();
+ assert.ok( b.equals( a ), "Passed!" );
+ assert.ok( a.equals( b ), "Passed!" );
+
+ a = new Box3( one3, two3 );
+ b = new Box3( one3, two3 );
+ assert.ok( b.equals( a ), "Passed!" );
+ assert.ok( a.equals( b ), "Passed!" );
+
+ a = new Box3( one3, two3 );
+ b = a.clone();
+ assert.ok( b.equals( a ), "Passed!" );
+ assert.ok( a.equals( b ), "Passed!" );
+
+ a = new Box3( one3, two3 );
+ b = new Box3( one3, one3 );
+ assert.ok( ! b.equals( a ), "Passed!" );
+ assert.ok( ! a.equals( b ), "Passed!" );
+
+ a = new Box3();
+ b = new Box3( one3, one3 );
+ assert.ok( ! b.equals( a ), "Passed!" );
+ assert.ok( ! a.equals( b ), "Passed!" );
} );
| false |
Other | mrdoob | three.js | 0b77e421529e9e63e57b12690917c72c0149112a.json | fix a todo | test/unit/src/math/Box2.tests.js | @@ -82,7 +82,7 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "clone", ( assert ) => {
+ QUnit.test( "clone", ( assert ) => {
var a = new Box2( zero2, zero2 );
@@ -91,7 +91,7 @@ export default QUnit.module( 'Maths', () => {
assert.ok( b.min.equals( zero2 ), "Passed!" );
assert.ok( b.max.equals( zero2 ), "Passed!" );
- a = new Box2( zero2, zero2 );
+ a = new Box2();
var b = a.clone();
assert.ok( b.min.equals( posInf2 ), "Passed!" );
assert.ok( b.max.equals( negInf2 ), "Passed!" ); | false |
Other | mrdoob | three.js | f83ff206161c7d519f7ff360a69225adfa20c852.json | lint it + fix error | test/unit/src/math/Box2.tests.js | @@ -69,16 +69,16 @@ export default QUnit.module( 'Maths', () => {
var a = new Box2();
a.setFromCenterAndSize( zero2, two2 );
- assert.ok(a.min.equals( negOne2 ), "Passed!");
- assert.ok(a.max.equals( one2 ), "Passed!");
+ assert.ok( a.min.equals( negOne2 ), "Passed!" );
+ assert.ok( a.max.equals( one2 ), "Passed!" );
- a.setFromCenterAndSize(one2, two2);
- assert.ok(a.min.equals(zero2), "Passed!");
- assert.ok(a.max.equals(two2), "Passed!");
+ a.setFromCenterAndSize( one2, two2 );
+ assert.ok( a.min.equals( zero2 ), "Passed!" );
+ assert.ok( a.max.equals( two2 ), "Passed!" );
- a.setFromCenterAndSize(zero2, zero2);
- assert.ok(a.min.equals(zero2), "Passed!");
- assert.ok(a.max.equals(zero2), "Passed!");
+ a.setFromCenterAndSize( zero2, zero2 );
+ assert.ok( a.min.equals( zero2 ), "Passed!" );
+ assert.ok( a.max.equals( zero2 ), "Passed!" );
} );
@@ -88,13 +88,13 @@ export default QUnit.module( 'Maths', () => {
var a = new Box2( zero2, zero2 );
var b = a.clone();
- assert.ok(b.min.equals(zero2), "Passed!");
- assert.ok(b.max.equals(zero2), "Passed!");
+ assert.ok( b.min.equals( zero2 ), "Passed!" );
+ assert.ok( b.max.equals( zero2 ), "Passed!" );
- a = new Box2(zero2, zero2);
+ a = new Box2( zero2, zero2 );
var b = a.clone();
- assert.ok(b.min.equals(posInf2), "Passed!");
- assert.ok(b.max.equals(negInf2), "Passed!");
+ assert.ok( b.min.equals( posInf2 ), "Passed!" );
+ assert.ok( b.max.equals( negInf2 ), "Passed!" );
} );
@@ -127,19 +127,19 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.test("isEmpty", (assert) => {
+ QUnit.test( "isEmpty", ( assert ) => {
- var a = new Box2(zero2.clone(), zero2.clone());
- assert.ok(a.isEmpty(), "Passed!");
+ var a = new Box2( zero2.clone(), zero2.clone() );
+ assert.ok( a.isEmpty(), "Passed!" );
- var a = new Box2(zero2.clone(), one2.clone());
- assert.ok(!a.isEmpty(), "Passed!");
+ var a = new Box2( zero2.clone(), one2.clone() );
+ assert.ok( ! a.isEmpty(), "Passed!" );
- var a = new Box2(two2.clone(), one2.clone());
- assert.ok(a.isEmpty(), "Passed!");
+ var a = new Box2( two2.clone(), one2.clone() );
+ assert.ok( a.isEmpty(), "Passed!" );
- var a = new Box2(posInf2.clone(), negInf2.clone());
- assert.ok(a.isEmpty(), "Passed!");
+ var a = new Box2( posInf2.clone(), negInf2.clone() );
+ assert.ok( a.isEmpty(), "Passed!" );
} );
@@ -378,33 +378,33 @@ export default QUnit.module( 'Maths', () => {
var a = new Box2();
var b = new Box2();
- assert.ok(b.equals(a), "Passed!");
- assert.ok(a.equals(b), "Passed!");
+ assert.ok( b.equals( a ), "Passed!" );
+ assert.ok( a.equals( b ), "Passed!" );
- a = new Box2(one2, two2);
- b = new Box2(one2, two2);
- assert.ok(b.equals(a), "Passed!");
- assert.ok(a.equals(b), "Passed!");
+ a = new Box2( one2, two2 );
+ b = new Box2( one2, two2 );
+ assert.ok( b.equals( a ), "Passed!" );
+ assert.ok( a.equals( b ), "Passed!" );
- a = new Box2(one2, two2);
+ a = new Box2( one2, two2 );
b = a.clone();
- assert.ok(b.equals(a), "Passed!");
- assert.ok(a.equals(b), "Passed!");
+ assert.ok( b.equals( a ), "Passed!" );
+ assert.ok( a.equals( b ), "Passed!" );
- a = new Box2(one2, two2);
- b = new Box2(one2, one2);
- assert.ok(!b.equals(a), "Passed!");
- assert.ok(!a.equals(b), "Passed!");
+ a = new Box2( one2, two2 );
+ b = new Box2( one2, one2 );
+ assert.ok( ! b.equals( a ), "Passed!" );
+ assert.ok( ! a.equals( b ), "Passed!" );
a = new Box2();
- b = new Box2(one2, one2);
- assert.ok(!b.equals(a), "Passed!");
- assert.ok(!a.equals(b), "Passed!");
-
- a = new Box2(one2, two2);
- b = new Box2(one2, one2);
- assert.ok(!b.equals(a), "Passed!");
- assert.ok(!a.equals(b), "Passed!");
+ b = new Box2( one2, one2 );
+ assert.ok( ! b.equals( a ), "Passed!" );
+ assert.ok( ! a.equals( b ), "Passed!" );
+
+ a = new Box2( one2, two2 );
+ b = new Box2( one2, one2 );
+ assert.ok( ! b.equals( a ), "Passed!" );
+ assert.ok( ! a.equals( b ), "Passed!" );
} );
| true |
Other | mrdoob | three.js | f83ff206161c7d519f7ff360a69225adfa20c852.json | lint it + fix error | test/unit/src/math/Constants.tests.js | @@ -14,7 +14,7 @@ export const negInf2 = new Vector2( - Infinity, - Infinity );
export const posInf2 = new Vector2( Infinity, Infinity );
-export const negOne2 = new Vector2(-1, -1);
+export const negOne2 = new Vector2( - 1, - 1 );
export const zero2 = new Vector2();
export const one2 = new Vector2( 1, 1 ); | true |
Other | mrdoob | three.js | b0badc4686a52b4ec8bf85084b32d430911e127d.json | add box2 unittests | test/unit/src/math/Box2.tests.js | @@ -9,6 +9,7 @@ import { Vector2 } from '../../../../src/math/Vector2';
import {
negInf2,
posInf2,
+ negOne2,
zero2,
one2,
two2
@@ -63,15 +64,37 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "setFromCenterAndSize", ( assert ) => {
+ QUnit.test( "setFromCenterAndSize", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Box2();
+
+ a.setFromCenterAndSize( zero2, two2 );
+ assert.ok(a.min.equals( negOne2 ), "Passed!");
+ assert.ok(a.max.equals( one2 ), "Passed!");
+
+ a.setFromCenterAndSize(one2, two2);
+ assert.ok(a.min.equals(zero2), "Passed!");
+ assert.ok(a.max.equals(two2), "Passed!");
+
+ a.setFromCenterAndSize(zero2, zero2);
+ assert.ok(a.min.equals(zero2), "Passed!");
+ assert.ok(a.max.equals(zero2), "Passed!");
} );
QUnit.todo( "clone", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+
+ var a = new Box2( zero2, zero2 );
+
+ var b = a.clone();
+ assert.ok(b.min.equals(zero2), "Passed!");
+ assert.ok(b.max.equals(zero2), "Passed!");
+
+ a = new Box2(zero2, zero2);
+ var b = a.clone();
+ assert.ok(b.min.equals(posInf2), "Passed!");
+ assert.ok(b.max.equals(negInf2), "Passed!");
} );
@@ -104,9 +127,19 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "isEmpty", ( assert ) => {
+ QUnit.test("isEmpty", (assert) => {
+
+ var a = new Box2(zero2.clone(), zero2.clone());
+ assert.ok(a.isEmpty(), "Passed!");
+
+ var a = new Box2(zero2.clone(), one2.clone());
+ assert.ok(!a.isEmpty(), "Passed!");
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Box2(two2.clone(), one2.clone());
+ assert.ok(a.isEmpty(), "Passed!");
+
+ var a = new Box2(posInf2.clone(), negInf2.clone());
+ assert.ok(a.isEmpty(), "Passed!");
} );
@@ -340,9 +373,38 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "equals", ( assert ) => {
+ QUnit.test( "equals", ( assert ) => {
+
- assert.ok( false, "everything's gonna be alright" );
+ var a = new Box2();
+ var b = new Box2();
+ assert.ok(b.equals(a), "Passed!");
+ assert.ok(a.equals(b), "Passed!");
+
+ a = new Box2(one2, two2);
+ b = new Box2(one2, two2);
+ assert.ok(b.equals(a), "Passed!");
+ assert.ok(a.equals(b), "Passed!");
+
+ a = new Box2(one2, two2);
+ b = a.clone();
+ assert.ok(b.equals(a), "Passed!");
+ assert.ok(a.equals(b), "Passed!");
+
+ a = new Box2(one2, two2);
+ b = new Box2(one2, one2);
+ assert.ok(!b.equals(a), "Passed!");
+ assert.ok(!a.equals(b), "Passed!");
+
+ a = new Box2();
+ b = new Box2(one2, one2);
+ assert.ok(!b.equals(a), "Passed!");
+ assert.ok(!a.equals(b), "Passed!");
+
+ a = new Box2(one2, two2);
+ b = new Box2(one2, one2);
+ assert.ok(!b.equals(a), "Passed!");
+ assert.ok(!a.equals(b), "Passed!");
} );
| true |
Other | mrdoob | three.js | b0badc4686a52b4ec8bf85084b32d430911e127d.json | add box2 unittests | test/unit/src/math/Constants.tests.js | @@ -13,6 +13,9 @@ export const w = 5;
export const negInf2 = new Vector2( - Infinity, - Infinity );
export const posInf2 = new Vector2( Infinity, Infinity );
+
+export const negOne2 = new Vector2(-1, -1);
+
export const zero2 = new Vector2();
export const one2 = new Vector2( 1, 1 );
export const two2 = new Vector2( 2, 2 ); | true |
Other | mrdoob | three.js | 902ac6a0646547c887450ad8ad0551d629f0072d.json | Remove update flag from public API | src/math/Euler.d.ts | @@ -165,8 +165,8 @@ export class Euler {
set( x: number, y: number, z: number, order?: string ): Euler;
clone(): this;
copy( euler: Euler ): this;
- setFromRotationMatrix( m: Matrix4, order?: string, update?: boolean ): Euler;
- setFromQuaternion( q: Quaternion, order?: string, update?: boolean ): Euler;
+ setFromRotationMatrix( m: Matrix4, order?: string ): Euler;
+ setFromQuaternion( q: Quaternion, order?: string ): Euler;
setFromVector3( v: Vector3, order?: string ): Euler;
reorder( newOrder: string ): Euler;
equals( euler: Euler ): boolean; | true |
Other | mrdoob | three.js | 902ac6a0646547c887450ad8ad0551d629f0072d.json | Remove update flag from public API | src/math/Quaternion.d.ts | @@ -44,7 +44,7 @@ export class Quaternion {
/**
* Sets this quaternion from rotation specified by Euler angles.
*/
- setFromEuler( euler: Euler, update?: boolean ): Quaternion;
+ setFromEuler( euler: Euler ): Quaternion;
/**
* Sets this quaternion from rotation specified by axis and angle. | true |
Other | mrdoob | three.js | 519fe3a30bde7b13b05af08673729db9d12b4db9.json | Add missing functions | src/math/SphericalHarmonics3.d.ts | @@ -17,5 +17,8 @@ export class SphericalHarmonics3 {
fromArray(array: number[]): SphericalHarmonics3;
toArray(): number[];
+ getAt(normal: Vector3, target: Vector3) : Vector3;
+ getIrradianceAt(normal: Vector3, target: Vector3) : Vector3;
+
static getBasisAt(normal: Vector3, shBasis: number[]): void;
}; | false |
Other | mrdoob | three.js | 929fa2a68cddb132dacfbe55502bf655082a0310.json | prevent user-selection of info/dg text | examples/main.css | @@ -32,9 +32,17 @@ canvas {
padding: 10px;
box-sizing: border-box;
text-align: center;
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
z-index: 1; /* TODO Solve this in HTML */
}
.dg.ac {
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
z-index: 2 !important; /* TODO Solve this in HTML */
} | false |
Other | mrdoob | three.js | 0f1732bdcc5bc72b808eb9cbeab3305819ab5a56.json | Add support for Chrome 75 | examples/js/vr/HelioWebXRPolyfill.js | @@ -4,7 +4,8 @@
if ( /(Helio)/g.test( navigator.userAgent ) && "xr" in navigator ) {
- console.log( "Helio WebXR Polyfill (Lumin 0.96.0)" );
+ console.log( "Helio WebXR Polyfill (Lumin 0.97.0)" );
+ const isHelio96 = navigator.userAgent.includes("Chrome/73");
// WebXRManager - XR.supportSession() Polyfill - WebVR.js line 147
@@ -29,10 +30,11 @@ if ( /(Helio)/g.test( navigator.userAgent ) && "xr" in navigator ) {
navigator.xr.requestSession = function ( sessionType ) {
return new Promise( function ( resolve, reject ) {
-
- tempRequestSession( {
+ const sessionType = (isHelio96 ? {
mode: 'immersive-ar' // Force using immersive-ar
- } )
+ } : 'immersive-ar');
+
+ tempRequestSession( sessionType )
.then( function ( session ) {
// WebXRManager - xrFrame.getPose() Polyfill - line 279
@@ -70,18 +72,26 @@ if ( /(Helio)/g.test( navigator.userAgent ) && "xr" in navigator ) {
// WebXRManager - xrFrame.getPose() Polyfill - line 259
+ const tempGetPose = frame.getPose.bind( frame );
+
frame.getPose = function ( targetRaySpace, referenceSpace ) {
- const inputPose = frame.getInputPose(
- targetRaySpace,
- referenceSpace
- );
+ if (isHelio96) {
- inputPose.transform = {
- matrix: inputPose.targetRay.transformMatrix
- };
+ const inputPose = frame.getInputPose(
+ targetRaySpace,
+ referenceSpace
+ );
- return inputPose;
+ inputPose.transform = {
+ matrix: inputPose.targetRay.transformMatrix
+ };
+
+ return inputPose;
+
+ } else {
+ return tempGetPose(targetRaySpace.gripSpace, referenceSpace);
+ }
};
@@ -127,17 +137,21 @@ if ( /(Helio)/g.test( navigator.userAgent ) && "xr" in navigator ) {
// WebXRManager - xrSession.updateRenderState() Polyfill Line 129
- session.updateRenderState = function ( { baseLayer } ) {
+ if (isHelio96) {
+
+ session.updateRenderState = function ( { baseLayer } ) {
- session.baseLayer = baseLayer;
+ session.baseLayer = baseLayer;
- // WebXRManager - xrSession.renderState.baseLayer Polyfill Line 219
+ // WebXRManager - xrSession.renderState.baseLayer Polyfill Line 219
+
+ session.renderState = {
+ baseLayer: baseLayer
+ };
- session.renderState = {
- baseLayer: baseLayer
};
- };
+ }
// WebXRManager - xrSession.requestReferenceSpace() Polyfill Line 130
| false |
Other | mrdoob | three.js | 0dd6593528ba6505565d4bfe38b65b258909b490.json | Add params to SAOPass.d.ts | examples/jsm/postprocessing/SAOPass.d.ts | @@ -13,6 +13,19 @@ import {
import { Pass } from './Pass';
+interface SAOPassParams {
+ output: SAOPass.OUTPUT;
+ saoBias: number;
+ saoIntensity: number;
+ saoScale: number;
+ saoKernelRadius: number;
+ saoMinResolution: number;
+ saoBlur: number;
+ saoBlurRadius: number;
+ saoBlurStdDev: number;
+ saoBlurDepthCutoff: number;
+}
+
export class SAOPass extends Pass {
constructor(scene: Scene, camera: Camera, depthTexture?: boolean, useNormals?: boolean, resolution?: Vector2);
scene: Scene;
@@ -36,7 +49,8 @@ export class SAOPass extends Pass {
materialCopy: ShaderMaterial;
depthCopy: ShaderMaterial;
fsQuad: object;
-
+ params: SAOPassParams;
+
static OUTPUT: {
Default: number;
Beauty: number; | false |
Other | mrdoob | three.js | bfb1c3dd75e7d2d5443959d0503481dc064d8668.json | Fix merge error. | examples/webgl_loader_gltf_extensions.html | @@ -267,7 +267,7 @@
loader = new GLTFLoader();
- var dracoLoader = new THREE.DRACOLoader();
+ var dracoLoader = new DRACOLoader();
dracoLoader.setDecoderPath( 'js/libs/draco/gltf/' )
loader.setDRACOLoader( dracoLoader );
| false |
Other | mrdoob | three.js | 66225408ce42a9fa7dcf735ecbc69e66481d5a62.json | Fix decodeAttribute reference. | examples/js/loaders/DRACOLoader2.js | @@ -472,7 +472,7 @@ THREE.DRACOLoader.DRACOWorker = function () {
var attributeId = attributeIDs[ attributeName ];
var attribute = decoder.GetAttributeByUniqueId( dracoGeometry, attributeId );
- geometry.attributes.push( this.decodeAttribute( draco, decoder, dracoGeometry, attributeName, attributeType, attribute ) );
+ geometry.attributes.push( decodeAttribute( draco, decoder, dracoGeometry, attributeName, attributeType, attribute ) );
}
| false |
Other | mrdoob | three.js | 6bf1339341e99672c37e8b2ba0257d6f47634ec7.json | fix code style | src/objects/InstancedMesh.js | @@ -38,7 +38,7 @@ InstancedMesh.prototype = Object.assign( Object.create( Mesh.prototype ), {
},
// updateMorphTargets: function () {
- //
+ //
// }
} ); | false |
Other | mrdoob | three.js | 98ea34735ce1773131f80ab9398e205853536f62.json | update three.js to support InstancedMesh.raycast | build/three.js | @@ -26961,6 +26961,8 @@
var data = Object3D.prototype.toJSON.call( this, meta );
+ if ( this.autoUpdate === false ) { data.object.autoUpdate = false; }
+
data.object.levels = [];
var levels = this.levels;
@@ -27294,6 +27296,21 @@
* @author mrdoob / http://mrdoob.com/
*/
+ var _inverseMatrix$1 = new Matrix4();
+ var _ray$1 = new Ray();
+ var _sphere$2 = new Sphere();
+
+ var _vA$2 = new Vector3();
+ var _vB$2 = new Vector3();
+ var _vC$2 = new Vector3();
+
+ var _uvA$2 = new Vector2();
+ var _uvB$2 = new Vector2();
+ var _uvC$2 = new Vector2();
+
+ var _intersectionPoint$1 = new Vector3();
+ var _intersectionPointWorld$1 = new Vector3();
+
function InstancedMesh( geometry, material, count ) {
Mesh.call( this, geometry, material );
@@ -27310,18 +27327,294 @@
isInstancedMesh: true,
- raycast: function () {},
+ raycast: function ( raycaster, intersects ) {
+
+ var geometry = this.geometry;
+ var material = this.material;
+ var matrixWorld = this.matrixWorld;
+
+ if ( material === undefined ) { return; }
+
+ for ( var instanceID = 0; instanceID < this.count; instanceID ++ ) {
+
+ //Calculate the world matrix for each instance
+
+ var instanceMatrixWorld = new Matrix4();
+
+ var instanceMatrix = this.getMatrixAt( instanceID );
+
+ instanceMatrixWorld.multiplyMatrices( matrixWorld, instanceMatrix );
+
+ // Checking boundingSphere distance to ray
+
+ if ( geometry.boundingSphere === null ) { geometry.computeBoundingSphere(); }
+
+ _sphere$2.copy( geometry.boundingSphere );
+ _sphere$2.applyMatrix4( instanceMatrixWorld );
+
+ if ( raycaster.ray.intersectsSphere( _sphere$2 ) === false ) { continue; }
+
+ //Transform the ray into the local space of the model
+
+ _inverseMatrix$1.getInverse( instanceMatrixWorld );
+ _ray$1.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$1 );
+
+ // Check boundingBox before continuing
+
+ if ( geometry.boundingBox !== null ) {
+
+ if ( _ray$1.intersectsBox( geometry.boundingBox ) === false ) { continue; }
+
+ }
+
+ var intersection;
+
+ if ( geometry.isBufferGeometry ) {
+
+ var a, b, c;
+ var index = geometry.index;
+ var position = geometry.attributes.position;
+ var uv = geometry.attributes.uv;
+ var uv2 = geometry.attributes.uv2;
+ var groups = geometry.groups;
+ var drawRange = geometry.drawRange;
+ var i, j, il, jl;
+ var group, groupMaterial;
+ var start, end;
+
+ if ( index !== null ) {
+
+ // indexed buffer geometry
+
+ if ( Array.isArray( material ) ) {
+
+ for ( i = 0, il = groups.length; i < il; i ++ ) {
+
+ group = groups[ i ];
+ groupMaterial = material[ group.materialIndex ];
+
+ start = Math.max( group.start, drawRange.start );
+ end = Math.min( ( group.start + group.count ), ( drawRange.start + drawRange.count ) );
+
+ for ( j = start, jl = end; j < jl; j += 3 ) {
+
+ a = index.getX( j );
+ b = index.getX( j + 1 );
+ c = index.getX( j + 2 );
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, groupMaterial, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( j / 3 ); // triangle number in indexed buffer semantics
+ intersection.face.materialIndex = group.materialIndex;
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ } else {
+
+ start = Math.max( 0, drawRange.start );
+ end = Math.min( index.count, ( drawRange.start + drawRange.count ) );
+
+ for ( i = start, il = end; i < il; i += 3 ) {
+
+ a = index.getX( i );
+ b = index.getX( i + 1 );
+ c = index.getX( i + 2 );
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, material, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( i / 3 ); // triangle number in indexed buffer semantics
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ } else if ( position !== undefined ) {
+
+ // non-indexed buffer geometry
+
+ if ( Array.isArray( material ) ) {
+
+ for ( i = 0, il = groups.length; i < il; i ++ ) {
+
+ group = groups[ i ];
+ groupMaterial = material[ group.materialIndex ];
+
+ start = Math.max( group.start, drawRange.start );
+ end = Math.min( ( group.start + group.count ), ( drawRange.start + drawRange.count ) );
+
+ for ( j = start, jl = end; j < jl; j += 3 ) {
+
+ a = j;
+ b = j + 1;
+ c = j + 2;
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, groupMaterial, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( j / 3 ); // triangle number in non-indexed buffer semantics
+ intersection.face.materialIndex = group.materialIndex;
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ } else {
+
+ start = Math.max( 0, drawRange.start );
+ end = Math.min( position.count, ( drawRange.start + drawRange.count ) );
+
+ for ( i = start, il = end; i < il; i += 3 ) {
+
+ a = i;
+ b = i + 1;
+ c = i + 2;
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, material, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( i / 3 ); // triangle number in non-indexed buffer semantics
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+
+
+
+ }
+
+ },
+
+ getMatrixAt: function ( index ) {
+
+ var matrix = new Matrix4();
+
+ matrix.fromArray( this.instanceMatrix.array, index * 16 );
+
+ return matrix;
+
+ },
setMatrixAt: function ( index, matrix ) {
matrix.toArray( this.instanceMatrix.array, index * 16 );
},
- updateMorphTargets: function () {}
+ updateMorphTargets: function () {
+
+ }
} );
+ function checkIntersection$1( object, matrixWorld, material, raycaster, ray, pA, pB, pC, point ) {
+
+ var intersect;
+
+ if ( material.side === BackSide ) {
+
+ intersect = ray.intersectTriangle( pC, pB, pA, true, point );
+
+ } else {
+
+ intersect = ray.intersectTriangle( pA, pB, pC, material.side !== DoubleSide, point );
+
+ }
+
+ if ( intersect === null ) { return null; }
+
+ _intersectionPointWorld$1.copy( point );
+ _intersectionPointWorld$1.applyMatrix4( matrixWorld );
+
+ var distance = raycaster.ray.origin.distanceTo( _intersectionPointWorld$1 );
+
+ if ( distance < raycaster.near || distance > raycaster.far ) { return null; }
+
+ return {
+ distance: distance,
+ point: _intersectionPointWorld$1.clone(),
+ object: object
+ };
+
+ }
+
+ function checkBufferGeometryIntersection$1( object, matrixWorld, material, raycaster, ray, position, uv, uv2, a, b, c ) {
+
+ _vA$2.fromBufferAttribute( position, a );
+ _vB$2.fromBufferAttribute( position, b );
+ _vC$2.fromBufferAttribute( position, c );
+
+ var intersection = checkIntersection$1( object, matrixWorld, material, raycaster, ray, _vA$2, _vB$2, _vC$2, _intersectionPoint$1 );
+
+ if ( intersection ) {
+
+ if ( uv ) {
+
+ _uvA$2.fromBufferAttribute( uv, a );
+ _uvB$2.fromBufferAttribute( uv, b );
+ _uvC$2.fromBufferAttribute( uv, c );
+
+ intersection.uv = Triangle.getUV( _intersectionPoint$1, _vA$2, _vB$2, _vC$2, _uvA$2, _uvB$2, _uvC$2, new Vector2() );
+
+ }
+
+ if ( uv2 ) {
+
+ _uvA$2.fromBufferAttribute( uv2, a );
+ _uvB$2.fromBufferAttribute( uv2, b );
+ _uvC$2.fromBufferAttribute( uv2, c );
+
+ intersection.uv2 = Triangle.getUV( _intersectionPoint$1, _vA$2, _vB$2, _vC$2, _uvA$2, _uvB$2, _uvC$2, new Vector2() );
+
+ }
+
+ var face = new Face3( a, b, c );
+ Triangle.getNormal( _vA$2, _vB$2, _vC$2, face.normal );
+
+ intersection.face = face;
+
+ }
+
+ return intersection;
+
+ }
+
/**
* @author mrdoob / http://mrdoob.com/
* @author alteredq / http://alteredqualia.com/
@@ -27377,9 +27670,9 @@
var _start = new Vector3();
var _end = new Vector3();
- var _inverseMatrix$1 = new Matrix4();
- var _ray$1 = new Ray();
- var _sphere$2 = new Sphere();
+ var _inverseMatrix$2 = new Matrix4();
+ var _ray$2 = new Ray();
+ var _sphere$3 = new Sphere();
function Line( geometry, material, mode ) {
@@ -27466,16 +27759,16 @@
if ( geometry.boundingSphere === null ) { geometry.computeBoundingSphere(); }
- _sphere$2.copy( geometry.boundingSphere );
- _sphere$2.applyMatrix4( matrixWorld );
- _sphere$2.radius += precision;
+ _sphere$3.copy( geometry.boundingSphere );
+ _sphere$3.applyMatrix4( matrixWorld );
+ _sphere$3.radius += precision;
- if ( raycaster.ray.intersectsSphere( _sphere$2 ) === false ) { return; }
+ if ( raycaster.ray.intersectsSphere( _sphere$3 ) === false ) { return; }
//
- _inverseMatrix$1.getInverse( matrixWorld );
- _ray$1.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$1 );
+ _inverseMatrix$2.getInverse( matrixWorld );
+ _ray$2.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$2 );
var localPrecision = precision / ( ( this.scale.x + this.scale.y + this.scale.z ) / 3 );
var localPrecisionSq = localPrecision * localPrecision;
@@ -27504,7 +27797,7 @@
vStart.fromArray( positions, a * 3 );
vEnd.fromArray( positions, b * 3 );
- var distSq = _ray$1.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
+ var distSq = _ray$2.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
if ( distSq > localPrecisionSq ) { continue; }
@@ -27536,7 +27829,7 @@
vStart.fromArray( positions, 3 * i );
vEnd.fromArray( positions, 3 * i + 3 );
- var distSq = _ray$1.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
+ var distSq = _ray$2.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
if ( distSq > localPrecisionSq ) { continue; }
@@ -27570,7 +27863,7 @@
for ( var i = 0; i < nbVertices - 1; i += step ) {
- var distSq = _ray$1.distanceSqToSegment( vertices[ i ], vertices[ i + 1 ], interRay, interSegment );
+ var distSq = _ray$2.distanceSqToSegment( vertices[ i ], vertices[ i + 1 ], interRay, interSegment );
if ( distSq > localPrecisionSq ) { continue; }
@@ -27768,9 +28061,9 @@
* @author alteredq / http://alteredqualia.com/
*/
- var _inverseMatrix$2 = new Matrix4();
- var _ray$2 = new Ray();
- var _sphere$3 = new Sphere();
+ var _inverseMatrix$3 = new Matrix4();
+ var _ray$3 = new Ray();
+ var _sphere$4 = new Sphere();
var _position$1 = new Vector3();
function Points( geometry, material ) {
@@ -27802,16 +28095,16 @@
if ( geometry.boundingSphere === null ) { geometry.computeBoundingSphere(); }
- _sphere$3.copy( geometry.boundingSphere );
- _sphere$3.applyMatrix4( matrixWorld );
- _sphere$3.radius += threshold;
+ _sphere$4.copy( geometry.boundingSphere );
+ _sphere$4.applyMatrix4( matrixWorld );
+ _sphere$4.radius += threshold;
- if ( raycaster.ray.intersectsSphere( _sphere$3 ) === false ) { return; }
+ if ( raycaster.ray.intersectsSphere( _sphere$4 ) === false ) { return; }
//
- _inverseMatrix$2.getInverse( matrixWorld );
- _ray$2.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$2 );
+ _inverseMatrix$3.getInverse( matrixWorld );
+ _ray$3.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$3 );
var localThreshold = threshold / ( ( this.scale.x + this.scale.y + this.scale.z ) / 3 );
var localThresholdSq = localThreshold * localThreshold;
@@ -27918,13 +28211,13 @@
function testPoint( point, index, localThresholdSq, matrixWorld, raycaster, intersects, object ) {
- var rayPointDistanceSq = _ray$2.distanceSqToPoint( point );
+ var rayPointDistanceSq = _ray$3.distanceSqToPoint( point );
if ( rayPointDistanceSq < localThresholdSq ) {
var intersectPoint = new Vector3();
- _ray$2.closestPointToPoint( point, intersectPoint );
+ _ray$3.closestPointToPoint( point, intersectPoint );
intersectPoint.applyMatrix4( matrixWorld );
var distance = raycaster.ray.origin.distanceTo( intersectPoint );
@@ -35496,6 +35789,8 @@
var regex = handlers[ i ];
var loader = handlers[ i + 1 ];
+ if ( regex.global ) { regex.lastIndex = 0; } // see #17920
+
if ( regex.test( file ) ) {
return loader;
@@ -40534,6 +40829,8 @@
if ( data.type === 'LOD' ) {
+ if ( data.autoUpdate !== undefined ) { object.autoUpdate = data.autoUpdate; }
+
var levels = data.levels;
for ( var l = 0; l < levels.length; l ++ ) { | true |
Other | mrdoob | three.js | 98ea34735ce1773131f80ab9398e205853536f62.json | update three.js to support InstancedMesh.raycast | build/three.module.js | @@ -26953,6 +26953,8 @@ LOD.prototype = Object.assign( Object.create( Object3D.prototype ), {
var data = Object3D.prototype.toJSON.call( this, meta );
+ if ( this.autoUpdate === false ) data.object.autoUpdate = false;
+
data.object.levels = [];
var levels = this.levels;
@@ -27286,6 +27288,21 @@ Bone.prototype = Object.assign( Object.create( Object3D.prototype ), {
* @author mrdoob / http://mrdoob.com/
*/
+var _inverseMatrix$1 = new Matrix4();
+var _ray$1 = new Ray();
+var _sphere$2 = new Sphere();
+
+var _vA$2 = new Vector3();
+var _vB$2 = new Vector3();
+var _vC$2 = new Vector3();
+
+var _uvA$2 = new Vector2();
+var _uvB$2 = new Vector2();
+var _uvC$2 = new Vector2();
+
+var _intersectionPoint$1 = new Vector3();
+var _intersectionPointWorld$1 = new Vector3();
+
function InstancedMesh( geometry, material, count ) {
Mesh.call( this, geometry, material );
@@ -27302,18 +27319,294 @@ InstancedMesh.prototype = Object.assign( Object.create( Mesh.prototype ), {
isInstancedMesh: true,
- raycast: function () {},
+ raycast: function ( raycaster, intersects ) {
+
+ var geometry = this.geometry;
+ var material = this.material;
+ var matrixWorld = this.matrixWorld;
+
+ if ( material === undefined ) return;
+
+ for ( var instanceID = 0; instanceID < this.count; instanceID ++ ) {
+
+ //Calculate the world matrix for each instance
+
+ var instanceMatrixWorld = new Matrix4();
+
+ var instanceMatrix = this.getMatrixAt( instanceID );
+
+ instanceMatrixWorld.multiplyMatrices( matrixWorld, instanceMatrix );
+
+ // Checking boundingSphere distance to ray
+
+ if ( geometry.boundingSphere === null ) geometry.computeBoundingSphere();
+
+ _sphere$2.copy( geometry.boundingSphere );
+ _sphere$2.applyMatrix4( instanceMatrixWorld );
+
+ if ( raycaster.ray.intersectsSphere( _sphere$2 ) === false ) continue;
+
+ //Transform the ray into the local space of the model
+
+ _inverseMatrix$1.getInverse( instanceMatrixWorld );
+ _ray$1.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$1 );
+
+ // Check boundingBox before continuing
+
+ if ( geometry.boundingBox !== null ) {
+
+ if ( _ray$1.intersectsBox( geometry.boundingBox ) === false ) continue;
+
+ }
+
+ var intersection;
+
+ if ( geometry.isBufferGeometry ) {
+
+ var a, b, c;
+ var index = geometry.index;
+ var position = geometry.attributes.position;
+ var uv = geometry.attributes.uv;
+ var uv2 = geometry.attributes.uv2;
+ var groups = geometry.groups;
+ var drawRange = geometry.drawRange;
+ var i, j, il, jl;
+ var group, groupMaterial;
+ var start, end;
+
+ if ( index !== null ) {
+
+ // indexed buffer geometry
+
+ if ( Array.isArray( material ) ) {
+
+ for ( i = 0, il = groups.length; i < il; i ++ ) {
+
+ group = groups[ i ];
+ groupMaterial = material[ group.materialIndex ];
+
+ start = Math.max( group.start, drawRange.start );
+ end = Math.min( ( group.start + group.count ), ( drawRange.start + drawRange.count ) );
+
+ for ( j = start, jl = end; j < jl; j += 3 ) {
+
+ a = index.getX( j );
+ b = index.getX( j + 1 );
+ c = index.getX( j + 2 );
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, groupMaterial, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( j / 3 ); // triangle number in indexed buffer semantics
+ intersection.face.materialIndex = group.materialIndex;
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ } else {
+
+ start = Math.max( 0, drawRange.start );
+ end = Math.min( index.count, ( drawRange.start + drawRange.count ) );
+
+ for ( i = start, il = end; i < il; i += 3 ) {
+
+ a = index.getX( i );
+ b = index.getX( i + 1 );
+ c = index.getX( i + 2 );
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, material, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( i / 3 ); // triangle number in indexed buffer semantics
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ } else if ( position !== undefined ) {
+
+ // non-indexed buffer geometry
+
+ if ( Array.isArray( material ) ) {
+
+ for ( i = 0, il = groups.length; i < il; i ++ ) {
+
+ group = groups[ i ];
+ groupMaterial = material[ group.materialIndex ];
+
+ start = Math.max( group.start, drawRange.start );
+ end = Math.min( ( group.start + group.count ), ( drawRange.start + drawRange.count ) );
+
+ for ( j = start, jl = end; j < jl; j += 3 ) {
+
+ a = j;
+ b = j + 1;
+ c = j + 2;
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, groupMaterial, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( j / 3 ); // triangle number in non-indexed buffer semantics
+ intersection.face.materialIndex = group.materialIndex;
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ } else {
+
+ start = Math.max( 0, drawRange.start );
+ end = Math.min( position.count, ( drawRange.start + drawRange.count ) );
+
+ for ( i = start, il = end; i < il; i += 3 ) {
+
+ a = i;
+ b = i + 1;
+ c = i + 2;
+
+ intersection = checkBufferGeometryIntersection$1( this, instanceMatrixWorld, material, raycaster, _ray$1, position, uv, uv2, a, b, c );
+
+ if ( intersection ) {
+
+ intersection.faceIndex = Math.floor( i / 3 ); // triangle number in non-indexed buffer semantics
+
+ intersection.instanceID = instanceID;
+
+ intersects.push( intersection );
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+
+
+
+ }
+
+ },
+
+ getMatrixAt: function ( index ) {
+
+ var matrix = new Matrix4();
+
+ matrix.fromArray( this.instanceMatrix.array, index * 16 );
+
+ return matrix;
+
+ },
setMatrixAt: function ( index, matrix ) {
matrix.toArray( this.instanceMatrix.array, index * 16 );
},
- updateMorphTargets: function () {}
+ updateMorphTargets: function () {
+
+ }
} );
+function checkIntersection$1( object, matrixWorld, material, raycaster, ray, pA, pB, pC, point ) {
+
+ var intersect;
+
+ if ( material.side === BackSide ) {
+
+ intersect = ray.intersectTriangle( pC, pB, pA, true, point );
+
+ } else {
+
+ intersect = ray.intersectTriangle( pA, pB, pC, material.side !== DoubleSide, point );
+
+ }
+
+ if ( intersect === null ) return null;
+
+ _intersectionPointWorld$1.copy( point );
+ _intersectionPointWorld$1.applyMatrix4( matrixWorld );
+
+ var distance = raycaster.ray.origin.distanceTo( _intersectionPointWorld$1 );
+
+ if ( distance < raycaster.near || distance > raycaster.far ) return null;
+
+ return {
+ distance: distance,
+ point: _intersectionPointWorld$1.clone(),
+ object: object
+ };
+
+}
+
+function checkBufferGeometryIntersection$1( object, matrixWorld, material, raycaster, ray, position, uv, uv2, a, b, c ) {
+
+ _vA$2.fromBufferAttribute( position, a );
+ _vB$2.fromBufferAttribute( position, b );
+ _vC$2.fromBufferAttribute( position, c );
+
+ var intersection = checkIntersection$1( object, matrixWorld, material, raycaster, ray, _vA$2, _vB$2, _vC$2, _intersectionPoint$1 );
+
+ if ( intersection ) {
+
+ if ( uv ) {
+
+ _uvA$2.fromBufferAttribute( uv, a );
+ _uvB$2.fromBufferAttribute( uv, b );
+ _uvC$2.fromBufferAttribute( uv, c );
+
+ intersection.uv = Triangle.getUV( _intersectionPoint$1, _vA$2, _vB$2, _vC$2, _uvA$2, _uvB$2, _uvC$2, new Vector2() );
+
+ }
+
+ if ( uv2 ) {
+
+ _uvA$2.fromBufferAttribute( uv2, a );
+ _uvB$2.fromBufferAttribute( uv2, b );
+ _uvC$2.fromBufferAttribute( uv2, c );
+
+ intersection.uv2 = Triangle.getUV( _intersectionPoint$1, _vA$2, _vB$2, _vC$2, _uvA$2, _uvB$2, _uvC$2, new Vector2() );
+
+ }
+
+ var face = new Face3( a, b, c );
+ Triangle.getNormal( _vA$2, _vB$2, _vC$2, face.normal );
+
+ intersection.face = face;
+
+ }
+
+ return intersection;
+
+}
+
/**
* @author mrdoob / http://mrdoob.com/
* @author alteredq / http://alteredqualia.com/
@@ -27369,9 +27662,9 @@ LineBasicMaterial.prototype.copy = function ( source ) {
var _start = new Vector3();
var _end = new Vector3();
-var _inverseMatrix$1 = new Matrix4();
-var _ray$1 = new Ray();
-var _sphere$2 = new Sphere();
+var _inverseMatrix$2 = new Matrix4();
+var _ray$2 = new Ray();
+var _sphere$3 = new Sphere();
function Line( geometry, material, mode ) {
@@ -27458,16 +27751,16 @@ Line.prototype = Object.assign( Object.create( Object3D.prototype ), {
if ( geometry.boundingSphere === null ) geometry.computeBoundingSphere();
- _sphere$2.copy( geometry.boundingSphere );
- _sphere$2.applyMatrix4( matrixWorld );
- _sphere$2.radius += precision;
+ _sphere$3.copy( geometry.boundingSphere );
+ _sphere$3.applyMatrix4( matrixWorld );
+ _sphere$3.radius += precision;
- if ( raycaster.ray.intersectsSphere( _sphere$2 ) === false ) return;
+ if ( raycaster.ray.intersectsSphere( _sphere$3 ) === false ) return;
//
- _inverseMatrix$1.getInverse( matrixWorld );
- _ray$1.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$1 );
+ _inverseMatrix$2.getInverse( matrixWorld );
+ _ray$2.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$2 );
var localPrecision = precision / ( ( this.scale.x + this.scale.y + this.scale.z ) / 3 );
var localPrecisionSq = localPrecision * localPrecision;
@@ -27496,7 +27789,7 @@ Line.prototype = Object.assign( Object.create( Object3D.prototype ), {
vStart.fromArray( positions, a * 3 );
vEnd.fromArray( positions, b * 3 );
- var distSq = _ray$1.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
+ var distSq = _ray$2.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
if ( distSq > localPrecisionSq ) continue;
@@ -27528,7 +27821,7 @@ Line.prototype = Object.assign( Object.create( Object3D.prototype ), {
vStart.fromArray( positions, 3 * i );
vEnd.fromArray( positions, 3 * i + 3 );
- var distSq = _ray$1.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
+ var distSq = _ray$2.distanceSqToSegment( vStart, vEnd, interRay, interSegment );
if ( distSq > localPrecisionSq ) continue;
@@ -27562,7 +27855,7 @@ Line.prototype = Object.assign( Object.create( Object3D.prototype ), {
for ( var i = 0; i < nbVertices - 1; i += step ) {
- var distSq = _ray$1.distanceSqToSegment( vertices[ i ], vertices[ i + 1 ], interRay, interSegment );
+ var distSq = _ray$2.distanceSqToSegment( vertices[ i ], vertices[ i + 1 ], interRay, interSegment );
if ( distSq > localPrecisionSq ) continue;
@@ -27760,9 +28053,9 @@ PointsMaterial.prototype.copy = function ( source ) {
* @author alteredq / http://alteredqualia.com/
*/
-var _inverseMatrix$2 = new Matrix4();
-var _ray$2 = new Ray();
-var _sphere$3 = new Sphere();
+var _inverseMatrix$3 = new Matrix4();
+var _ray$3 = new Ray();
+var _sphere$4 = new Sphere();
var _position$1 = new Vector3();
function Points( geometry, material ) {
@@ -27794,16 +28087,16 @@ Points.prototype = Object.assign( Object.create( Object3D.prototype ), {
if ( geometry.boundingSphere === null ) geometry.computeBoundingSphere();
- _sphere$3.copy( geometry.boundingSphere );
- _sphere$3.applyMatrix4( matrixWorld );
- _sphere$3.radius += threshold;
+ _sphere$4.copy( geometry.boundingSphere );
+ _sphere$4.applyMatrix4( matrixWorld );
+ _sphere$4.radius += threshold;
- if ( raycaster.ray.intersectsSphere( _sphere$3 ) === false ) return;
+ if ( raycaster.ray.intersectsSphere( _sphere$4 ) === false ) return;
//
- _inverseMatrix$2.getInverse( matrixWorld );
- _ray$2.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$2 );
+ _inverseMatrix$3.getInverse( matrixWorld );
+ _ray$3.copy( raycaster.ray ).applyMatrix4( _inverseMatrix$3 );
var localThreshold = threshold / ( ( this.scale.x + this.scale.y + this.scale.z ) / 3 );
var localThresholdSq = localThreshold * localThreshold;
@@ -27910,13 +28203,13 @@ Points.prototype = Object.assign( Object.create( Object3D.prototype ), {
function testPoint( point, index, localThresholdSq, matrixWorld, raycaster, intersects, object ) {
- var rayPointDistanceSq = _ray$2.distanceSqToPoint( point );
+ var rayPointDistanceSq = _ray$3.distanceSqToPoint( point );
if ( rayPointDistanceSq < localThresholdSq ) {
var intersectPoint = new Vector3();
- _ray$2.closestPointToPoint( point, intersectPoint );
+ _ray$3.closestPointToPoint( point, intersectPoint );
intersectPoint.applyMatrix4( matrixWorld );
var distance = raycaster.ray.origin.distanceTo( intersectPoint );
@@ -35488,6 +35781,8 @@ function LoadingManager( onLoad, onProgress, onError ) {
var regex = handlers[ i ];
var loader = handlers[ i + 1 ];
+ if ( regex.global ) regex.lastIndex = 0; // see #17920
+
if ( regex.test( file ) ) {
return loader;
@@ -40526,6 +40821,8 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
if ( data.type === 'LOD' ) {
+ if ( data.autoUpdate !== undefined ) object.autoUpdate = data.autoUpdate;
+
var levels = data.levels;
for ( var l = 0; l < levels.length; l ++ ) { | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Box2.html | @@ -174,7 +174,8 @@ <h3>[method:Box2 set]( [param:Vector2 min], [param:Vector2 max] )</h3>
[page:Vector2 min] - (required ) [page:Vector2] representing the lower (x, y) boundary of the box. <br>
[page:Vector2 max] - (required) [page:Vector2] representing the upper (x, y) boundary of the box. <br /><br />
- Sets the lower and upper (x, y) boundaries of this box.
+ Sets the lower and upper (x, y) boundaries of this box.<br>
+ Please note that this method only copies the values from the given objects.
</p>
<h3>[method:Box2 setFromCenterAndSize]( [param:Vector2 center], [param:Vector2 size] )</h3> | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Box3.html | @@ -247,7 +247,8 @@ <h3>[method:Box3 set]( [param:Vector3 min], [param:Vector3 max] )</h3>
[page:Vector3 min] - [page:Vector3] representing the lower (x, y, z) boundary of the box.<br />
[page:Vector3 max] - [page:Vector3] representing the lower upper (x, y, z) boundary of the box.<br /><br />
- Sets the lower and upper (x, y, z) boundaries of this box.
+ Sets the lower and upper (x, y, z) boundaries of this box.<br>
+ Please note that this method only copies the values from the given objects.
</p>
<h3>[method:Box3 setFromArray]( [param:Array array] ) [param:Box3 this]</h3> | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Frustum.html | @@ -91,7 +91,8 @@ <h3>[method:Boolean intersectsSprite]( [param:Sprite sprite] )</h3>
<h3>[method:Frustum set]( [param:Plane p0], [param:Plane p1], [param:Plane p2], [param:Plane p3], [param:Plane p4], [param:Plane p5] )</h3>
<p>
- Sets the current frustum from the passed planes. No plane order is implicitely implied.
+ Sets the current frustum from the passed planes. No plane order is implicitely implied.<br>
+ Please note that this method only copies the values from the given objects.
</p>
<h3>[method:Frustum setFromMatrix]( [param:Matrix4 matrix] )</h3> | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Line3.html | @@ -113,7 +113,8 @@ <h3>[method:Line3 set]( [param:Vector3 start], [param:Vector3 end] )</h3>
[page:Vector3 start] - set the [page:.start start point] of the line.<br />
[page:Vector3 end] - set the [page:.end end point] of the line.<br /><br />
- Sets the start and end values by copying the provided vectors.
+ Sets the start and end values by copying the provided vectors.<br>
+ Please note that this method only copies the values from the given objects.
</p>
<h2>Source</h2> | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Plane.html | @@ -130,7 +130,8 @@ <h3>[method:Plane set]( [param:Vector3 normal], [param:Float constant] )</h3>
[page:Vector3 normal] - a unit length [page:Vector3] defining the normal of the plane.<br />
[page:Float constant] - the signed distance from the origin to the plane. Default is *0*.<br /><br />
- Sets the plane's [page:.normal normal] and [page:.constant constant] properties.
+ Sets the plane's [page:.normal normal] and [page:.constant constant] properties.<br>
+ Please note that this method only copies the values from the given normal.
</p>
<h3>[method:Plane setComponents]( [param:Float x], [param:Float y], [param:Float z], [param:Float w] )</h3> | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Ray.html | @@ -202,7 +202,8 @@ <h3>[method:Ray set]( [param:Vector3 origin], [param:Vector3 direction] )</h3>
properly.<br /><br />
Copy the parameters to the [page:.origin origin] and [page:.direction direction] properties
- of this ray.
+ of this ray.<br>
+ Please note that this method only copies the values from the given objects.
</p>
| true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Sphere.html | @@ -114,7 +114,8 @@ <h3>[method:Sphere set]( [param:Vector3 center], [param:Float radius] )</h3>
[page:Vector3 center] - center of the sphere.<br />
[page:Float radius] - radius of the sphere.<br /><br />
- Sets the [page:.center center] and [page:.radius radius] properties of this sphere.
+ Sets the [page:.center center] and [page:.radius radius] properties of this sphere.<br>
+ Please note that this method only copies the values from the given center.
</p>
<h3>[method:Sphere setFromPoints]( [param:Array points], [param:Vector3 optionalCenter] )</h3> | true |
Other | mrdoob | three.js | 611410c2df3976050bfaeedb3ae493da0748b3f7.json | Document the copy behavior of .set in math classes
As mentioned in #17738, math classes keep the arguments passed in their
constructor as references, but when they provide a .set() method,
that one only copies the values from the passed objects.
This behavior is now documented in the relevant classes. | docs/api/en/math/Triangle.html | @@ -123,7 +123,8 @@ <h3>[method:Boolean intersectsBox]( [param:Box3 box] )</h3>
<h3>[method:Triangle set]( [param:Vector3 a], [param:Vector3 b], [param:Vector3 c] ) [param:Triangle this]</h3>
<p>
- Sets the triangle's [page:.a a], [page:.b b] and [page:.c c] properties to the passed [page:vector3 vector3s].
+ Sets the triangle's [page:.a a], [page:.b b] and [page:.c c] properties to the passed [page:vector3 vector3s].<br>
+ Please note that this method only copies the values from the given objects.
</p>
<h3>[method:Triangle setFromPointsAndIndices]( [param:Array points], [param:Integer i0], [param:Integer i1], [param:Integer i2] ) [param:Triangle this]</h3> | true |
Other | mrdoob | three.js | 247b93f14e3f883ec285c0ba76264ec3286c85a8.json | fix RGBAToDepth artefacts | src/renderers/shaders/ShaderChunk/packing.glsl.js | @@ -22,7 +22,7 @@ vec4 packDepthToRGBA( const in float v ) {
}
float unpackRGBAToDepth( const in vec4 v ) {
- return dot( v, UnpackFactors );
+ return dot( floor( v * 255.0 + 0.5 ) / 255.0, UnpackFactors );
}
vec4 encodeHalfRGBA ( vec2 v ) { | false |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.