Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9078d8f
Add functions to enable/disable all layers
Oletus Aug 21, 2019
c0fba5d
Update webgl_layers example to include enable/disable all
Oletus Aug 23, 2019
6b1867e
VSM shadow maps
supereggbert Aug 4, 2019
fff82bd
Examples SkyShader: Fix parameter order
weiserhei Aug 26, 2019
43f0b80
updated blinn-phong to trowbridge-reitz
elalish Aug 26, 2019
aa43b54
updated environment lookup vector
elalish Aug 26, 2019
f3bfd1a
Decouple light probe irradiance from other indirect light sources
WestLangley Aug 27, 2019
74ab5b8
Merge pull request #17358 from elalish/remapRoughness
mrdoob Aug 27, 2019
8fb4334
Fixed extra spaces.
mrdoob Aug 27, 2019
631744b
Updated builds.
mrdoob Aug 27, 2019
94467a2
Fixed clearcoatRoughness camel case.
mrdoob Aug 27, 2019
b043081
Updated builds.
mrdoob Aug 27, 2019
cc942a7
Merge pull request #17359 from WestLangley/dev_ibl_irradiance
mrdoob Aug 27, 2019
941f171
DRACOLoader: Fix remaining calls to removed static methods.
Aug 27, 2019
2ae3501
ShaderChunk: Moved iblIrradiance definition.
mrdoob Aug 27, 2019
4859af4
Updated builds.
mrdoob Aug 27, 2019
7047948
Merge pull request #17365 from donmccurdy/bug-dracoloader-static-usage
mrdoob Aug 27, 2019
a7b2da4
Enables smooth scrolling of docs side-panel on iOS devices
vatro Aug 27, 2019
179564f
Example: Fixed inputs and selects.
mrdoob Aug 27, 2019
3452639
harominze uniforms order
weiserhei Aug 27, 2019
d7b1fdb
Merge pull request #17349 from weiserhei/patch-1
mrdoob Aug 27, 2019
19e1442
Merge pull request #17366 from vatro/dev
mrdoob Aug 27, 2019
87f983d
Merge pull request #17305 from higharc/layers-enable-disable-all
mrdoob Aug 27, 2019
85978c1
Layers: Clean up.
mrdoob Aug 27, 2019
55263f9
Layers.d.ts: Clean up.
mrdoob Aug 27, 2019
3e4cee3
update based in https://github.com/mrdoob/three.js/pull/17358 and htt…
sunag Aug 27, 2019
7c936ea
cleanup
sunag Aug 27, 2019
c2c9d55
Merge pull request #17368 from sunag/dev2-ibl-irradiance-nodes
mrdoob Aug 27, 2019
79f6e56
Merge pull request #17171 from supereggbert/vsm
mrdoob Aug 28, 2019
2686d8f
WebGLShadowMap: Reference vsm shaders directly.
mrdoob Aug 28, 2019
b9418db
Examples: Fixed order.
mrdoob Aug 28, 2019
ce736f5
Examples: Fixed info's buttons.
mrdoob Aug 28, 2019
fa0f6ba
Examples: Moved NodeMaterial examples to nodes subsection.
mrdoob Aug 28, 2019
0bb21aa
Updated builds.
mrdoob Aug 28, 2019
698d53c
Examples: Grouped MeshPhysicalMaterial examples.
mrdoob Aug 28, 2019
c22370c
Improved clearcoat example.
mrdoob Aug 28, 2019
7e0a78b
r108
mrdoob Aug 28, 2019
3b8b2fa
Added tonemapping
WestLangley Aug 29, 2019
c3113b7
Properly group indirect diffuse and indirect specular terms
WestLangley Aug 29, 2019
f8f269e
Merge pull request #17377 from WestLangley/dev_clearcoat_tonemapping
mrdoob Aug 29, 2019
96c59d5
LightningStrike: Make plasma sphere use physical transparency
yomboprime Aug 29, 2019
feb47fa
Merge pull request #17378 from WestLangley/dev_pbr_indirect_specular
mrdoob Aug 29, 2019
1ee9309
Merge pull request #17380 from yomboprime/crystal_plasma
mrdoob Aug 29, 2019
920ce42
Fix depthTexture types in WebGLRenderTarget.d.ts
sam6321 Aug 30, 2019
11c7e50
Merge pull request #17387 from sam6321/patch-1
mrdoob Aug 30, 2019
095ff03
Merge pull request #17389 from gogoend/zh_doc
mrdoob Aug 30, 2019
d8a1530
r109dev
mrdoob Aug 31, 2019
a0caac6
Updated builds.
mrdoob Aug 31, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r107
- [ ] r108
- [ ] ...

##### Browser
Expand Down
143 changes: 127 additions & 16 deletions build/three.js

Large diffs are not rendered by default.

1,389 changes: 696 additions & 693 deletions build/three.min.js

Large diffs are not rendered by default.

144 changes: 127 additions & 17 deletions build/three.module.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion docs/api/en/constants/Renderer.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ <h2>Shadow Types</h2>
THREE.BasicShadowMap
THREE.PCFShadowMap
THREE.PCFSoftShadowMap
THREE.VSMShadowMap
</code>
<p>
These define the WebGLRenderer's [page:WebGLRenderer.shadowMap.type shadowMap.type] property.<br /><br />

[page:constant BasicShadowMap] gives unfiltered shadow maps - fastest, but lowest quality.<br />
[page:constant PCFShadowMap] filters shadow maps using the Percentage-Closer Filtering (PCF) algorithm (default).<br />
[page:constant PCFSoftShadowMap] filters shadow maps using the Percentage-Closer Soft Shadows (PCSS) algorithm.
[page:constant PCFSoftShadowMap] filters shadow maps using the Percentage-Closer Soft Shadows (PCSS) algorithm.<br />
[page:constant VSMShadowMap] filters shadow maps using the Variance Shadow Map (VSM) algorithm.
</p>

<h2>Tone Mapping</h2>
Expand Down
10 changes: 10 additions & 0 deletions docs/api/en/core/Layers.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ <h3>[method:null toggle]( [param:Integer layer] )</h3>
Toggle membership of *layer*.
</p>

<h3>[method:null enableAll]()</h3>
<p>
Add membership to all layers.
</p>

<h3>[method:null disableAll]()</h3>
<p>
Remove membership from all layers.
</p>

<h2>Source</h2>

<p>
Expand Down
13 changes: 8 additions & 5 deletions docs/api/en/lights/shadows/LightShadow.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <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 used as a base class by
Create a new [name]. This is not intended to be called directly - it is used as a base class by
other light shadows.
</p>

Expand All @@ -46,6 +46,12 @@ <h3>[property:WebGLRenderTarget map]</h3>
in shadow. Computed internally during rendering.
</p>

<h3>[property:WebGLRenderTarget mapPass]</h3>
<p>
The distribution map generated using the internal camera; an occlusion is calculated based
on the distribution of depths. 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 />
Expand All @@ -56,7 +62,6 @@ <h3>[property:Vector2 mapSize]</h3>
The default is *( 512, 512 )*.
</p>


<h3>[property:Matrix4 matrix]</h3>
<p>
Model to shadow camera space, to compute location and depth in shadow map. Stored
Expand Down Expand Up @@ -118,8 +123,6 @@ <h3>[method:Object toJSON]()</h3>

<h2>Source</h2>

<p>
[link:https://github.com/mrdoob/three.js/blob/master/src/lights/[name].js src/lights/[name].js]
</p>
[link:https://github.com/mrdoob/three.js/blob/master/src/lights/[name].js src/lights/[name].js]
</body>
</html>
2 changes: 1 addition & 1 deletion docs/api/en/renderers/WebGLRenderer.html
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ <h3>[property:Boolean shadowMap.needsUpdate]</h3>

<h3>[property:Integer shadowMap.type]</h3>
<p>Defines shadow map type (unfiltered, percentage close filtering, percentage close filtering with bilinear filtering in shader)</p>
<p>Options are THREE.BasicShadowMap, THREE.PCFShadowMap (default) and THREE.PCFSoftShadowMap. See [page:Renderer Renderer constants] for details.</p>
<p>Options are THREE.BasicShadowMap, THREE.PCFShadowMap (default), THREE.PCFSoftShadowMap and THREE.VSMShadowMap. See [page:Renderer Renderer constants] for details.</p>

<h3>[property:Boolean sortObjects]</h3>
<p>
Expand Down
5 changes: 3 additions & 2 deletions editor/js/Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ var Loader = function ( editor ) {

var contents = event.target.result;

THREE.DRACOLoader.setDecoderPath( '../examples/js/libs/draco/gltf/' );
var dracoLoader = new THREE.DRACOLoader();
dracoLoader.setDecoderPath( '../examples/js/libs/draco/gltf/' );

var loader = new THREE.GLTFLoader();
loader.setDRACOLoader( new THREE.DRACOLoader() );
loader.setDRACOLoader( dracoLoader );
loader.parse( contents, '', function ( result ) {

var scene = result.scene;
Expand Down
2 changes: 1 addition & 1 deletion editor/sw.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// r107
// r108

const staticAssets = [
'./',
Expand Down
9 changes: 5 additions & 4 deletions examples/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ var files = {
"webgl_materials_bumpmap_skin",
"webgl_materials_cars",
"webgl_materials_channels",
"webgl_materials_clearcoat_normalmap",
"webgl_materials_compile",
"webgl_materials_cubemap",
"webgl_materials_cubemap_balls_reflection",
"webgl_materials_cubemap_balls_refraction",
Expand All @@ -164,9 +162,11 @@ var files = {
"webgl_materials_normalmap",
"webgl_materials_normalmap_object_space",
"webgl_materials_parallaxmap",
"webgl_materials_physical_clearcoat",
"webgl_materials_physical_sheen",
"webgl_materials_physical_transparency",
"webgl_materials_reflectivity",
"webgl_materials_shaders_fresnel",
"webgl_materials_sheen",
"webgl_materials_skin",
"webgl_materials_standard",
"webgl_materials_texture_anisotropy",
Expand All @@ -176,7 +176,6 @@ var files = {
"webgl_materials_texture_partialupdate",
"webgl_materials_texture_rotation",
"webgl_materials_translucency",
"webgl_materials_transparency",
"webgl_materials_variations_basic",
"webgl_materials_variations_lambert",
"webgl_materials_variations_phong",
Expand Down Expand Up @@ -232,6 +231,7 @@ var files = {
"webgl_shadowmap_performance",
"webgl_shadowmap_pointlight",
"webgl_shadowmap_viewer",
"webgl_shadowmap_vsm",
"webgl_shadowmesh",
"webgl_skinning_simple",
"webgl_sprites",
Expand All @@ -246,6 +246,7 @@ var files = {
],
"webgl / nodes": [
"webgl_loader_nodes",
"webgl_materials_compile",
"webgl_materials_envmaps_hdr_nodes",
"webgl_materials_envmaps_pmrem_nodes",
"webgl_materials_nodes",
Expand Down
4 changes: 2 additions & 2 deletions examples/js/libs/draco/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Each file is provided in two variations:
Either variation may be used with `THREE.DRACOLoader`:

```js
THREE.DRACOLoader.setDecoderPath('path/to/decoders/');
THREE.DRACOLoader.setDecoderConfig({type: 'js'}); // (Optional) Override detection of WASM support.
var dracoLoader = new THREE.DRACOLoader();
dracoLoader.setDecoderPath('path/to/decoders/');
dracoLoader.setDecoderConfig({type: 'js'}); // (Optional) Override detection of WASM support.
```

Further [documentation on GitHub](https://github.com/google/draco/tree/master/javascript/example#static-loading-javascript-decoder).
Expand Down
7 changes: 1 addition & 6 deletions examples/jsm/nodes/Nodes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ export * from './math/CondNode';
export * from './procedural/NoiseNode';
export * from './procedural/CheckerNode';

// bsdfs

export * from './bsdfs/BlinnShininessExponentNode';
export * from './bsdfs/BlinnExponentToRoughnessNode';
export * from './bsdfs/RoughnessToBlinnExponentNode';

// misc

export * from './misc/TextureCubeUVNode';
Expand All @@ -79,6 +73,7 @@ export * from './utils/TimerNode';
export * from './utils/VelocityNode';
export * from './utils/UVTransformNode';
export * from './utils/MaxMIPLevelNode';
export * from './utils/SpecularMIPLevelNode';
export * from './utils/ColorSpaceNode';

// effects
Expand Down
7 changes: 1 addition & 6 deletions examples/jsm/nodes/Nodes.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ export { CondNode } from './math/CondNode.js';
export { NoiseNode } from './procedural/NoiseNode.js';
export { CheckerNode } from './procedural/CheckerNode.js';

// bsdfs

export { BlinnShininessExponentNode } from './bsdfs/BlinnShininessExponentNode.js';
export { BlinnExponentToRoughnessNode } from './bsdfs/BlinnExponentToRoughnessNode.js';
export { RoughnessToBlinnExponentNode } from './bsdfs/RoughnessToBlinnExponentNode.js';

// misc

export { TextureCubeUVNode } from './misc/TextureCubeUVNode.js';
Expand All @@ -81,6 +75,7 @@ export { TimerNode } from './utils/TimerNode.js';
export { VelocityNode } from './utils/VelocityNode.js';
export { UVTransformNode } from './utils/UVTransformNode.js';
export { MaxMIPLevelNode } from './utils/MaxMIPLevelNode.js';
export { SpecularMIPLevelNode } from './utils/SpecularMIPLevelNode.js';
export { ColorSpaceNode } from './utils/ColorSpaceNode.js';
export { SubSlotNode } from './utils/SubSlotNode.js';

Expand Down
13 changes: 12 additions & 1 deletion examples/jsm/nodes/accessors/ReflectNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,22 @@ ReflectNode.prototype.generate = function ( builder, output ) {
case ReflectNode.VECTOR:

var viewNormalNode = builder.context.viewNormal || new NormalNode();
var roughnessNode = builder.context.roughness;

var viewNormal = viewNormalNode.build( builder, 'v3' );
var viewPosition = new PositionNode( PositionNode.VIEW ).build( builder, 'v3' );
var roughness = roughnessNode ? roughnessNode.build( builder, 'f' ) : undefined;

var code = `inverseTransformDirection( reflect( -normalize( ${viewPosition} ), ${viewNormal} ), viewMatrix )`;
var method = `reflect( -normalize( ${viewPosition} ), ${viewNormal} )`;

if ( viewNormalNode && roughness ) {

// Mixing the reflection with the normal is more accurate and keeps rough objects from gathering light from behind their tangent plane.
method = `normalize( mix( ${method}, ${viewNormal}, ${roughness} * ${roughness} ) )`;

}

var code = `inverseTransformDirection( ${method}, viewMatrix )`;

if ( isUnique ) {

Expand Down
13 changes: 0 additions & 13 deletions examples/jsm/nodes/bsdfs/BlinnExponentToRoughnessNode.d.ts

This file was deleted.

52 changes: 0 additions & 52 deletions examples/jsm/nodes/bsdfs/BlinnExponentToRoughnessNode.js

This file was deleted.

10 changes: 0 additions & 10 deletions examples/jsm/nodes/bsdfs/BlinnShininessExponentNode.d.ts

This file was deleted.

31 changes: 0 additions & 31 deletions examples/jsm/nodes/bsdfs/BlinnShininessExponentNode.js

This file was deleted.

Loading