Skip to content

Commit 2231d8c

Browse files
mrdoobmrdoob
committed
r74 (bis)
1 parent cd0a384 commit 2231d8c

32 files changed

+1812
-562
lines changed

‎build/three.js

Lines changed: 34 additions & 29 deletions
Large diffs are not rendered by default.

‎build/three.min.js

Lines changed: 294 additions & 294 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/lights/DirectionalLight.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ <h3>[property:Float intensity]</h3>
6363
Default — *1.0*.
6464
</div>
6565

66-
<h3>[property:Boolean onlyShadow]</h3>
67-
<div>
68-
If set to *true* light will only cast shadow but not contribute any lighting (as if *intensity* was 0 but cheaper to compute).<br />
69-
Default — *false*.
70-
</div>
71-
7266
<h3>[property:Boolean castShadow]</h3>
7367
<div>
7468
If set to true light will cast dynamic shadows. Warning: This is expensive and requires tweaking to get shadows looking right.<br />

‎docs/api/lights/SpotLight.html

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<h1>[name]</h1>
1414

1515
<div class="desc">A point light that can cast shadow in one direction.</div>
16-
16+
1717
<div class="desc">Affects objects using [page:MeshLambertMaterial] or [page:MeshPhongMaterial].</div>
1818

1919

@@ -24,7 +24,7 @@ <h2>Example</h2>
2424
<div>[example:webgl_materials_cubemap_dynamic materials / cubemap / dynamic ]</div>
2525
<div>[example:webgl_morphtargets_md2 morphtargets / md2 ]</div>
2626
<div>[example:webgl_shading_physical shading / physical ]</div>
27-
27+
2828
<code>
2929
// white spotlight shining from the side, casting shadow
3030

@@ -73,50 +73,44 @@ <h3>[property:Object3D target]</h3>
7373
Default position — *(0,0,0)*.<br />
7474
*Note*: Currently for target property to work properly, it must be part of the [page:Scene scene], e.g. this will help: <code>scene.add( light.target )</code>
7575
</div>
76-
76+
7777
<h3>[property:Float intensity]</h3>
7878
<div>
7979
Light's intensity.<br />
8080
Default — *1.0*.
8181
</div>
82-
82+
8383
<h3>[property:Float distance]</h3>
8484
<div>
8585
If non-zero, light will attenuate linearly from maximum intensity at light *position* down to zero at *distance*.<br />
8686
Default — *0.0*.
8787
</div>
88-
88+
8989
<h3>[property:Float angle]</h3>
9090
<div>
9191
Maximum extent of the spotlight, in radians, from its direction. Should be no more than *Math.PI/2*.<br />
9292
Default — *Math.PI/3*.
9393
</div>
94-
94+
9595
<h3>[property:Float exponent]</h3>
9696
<div>
9797
Rapidity of the falloff of light from its target direction. A lower value spreads out the light, while a higher
9898
focuses it towards the center.<br />
9999
Default — *10.0*.
100100
</div>
101-
101+
102102
<h3>[property:Float decay]</h3>
103103
<div>
104104
The amount the light dims along the distance of the light<br />
105105
Default — *1*.
106106
</div>
107-
107+
108108
<h3>[property:Boolean castShadow]</h3>
109109
<div>
110110
If set to *true* light will cast dynamic shadows. *Warning*: This is expensive and requires tweaking to get shadows looking right.<br />
111111
Default — *false*.
112112
</div>
113-
114-
<h3>[property:Boolean onlyShadow]</h3>
115-
<div>
116-
If set to *true* light will only cast shadow but not contribute any lighting (as if *intensity* was 0 but cheaper to compute).<br />
117-
Default — *false*.
118-
</div>
119-
113+
120114
<h3>[property:Float shadowCameraNear]</h3>
121115
<div>
122116
Perspective shadow camera frustum <em>near</em> parameter.<br />
@@ -134,13 +128,13 @@ <h3>[property:Float shadowCameraFov]</h3>
134128
Perspective shadow camera frustum <em>field of view</em> parameter.<br />
135129
Default — *50*.
136130
</div>
137-
131+
138132
<h3>[property:Boolean shadowCameraVisible]</h3>
139133
<div>
140134
Show debug shadow camera frustum.<br />
141135
Default — *false*.
142136
</div>
143-
137+
144138
<h3>[property:Float shadowBias]</h3>
145139
<div>
146140
Shadow map bias, how much to add or subtract from the normalized depth when deciding whether a surface is in shadow.<br />
@@ -158,34 +152,34 @@ <h3>[property:Integer shadowMapHeight]</h3>
158152
Shadow map texture height in pixels.<br />
159153
Default — *512*.
160154
</div>
161-
155+
162156
<h3>[property:Vector2 shadowMapSize]</h3>
163157
<div>
164158
The shadowMapWidth and shadowMapHeight stored in a [page:Vector2 THREE.Vector2]. Set internally during rendering.
165-
</div>
159+
</div>
166160

167161
<h3>[property:PerspectiveCamera shadowCamera]</h3>
168162
<div>
169163
The shadow's view of the world. Computed internally during rendering from the shadowCamera* settings.
170-
</div>
164+
</div>
171165

172166
<h3>[property:Matrix4 shadowMatrix]</h3>
173167
<div>
174168
Model to shadow camera space, to compute location and depth in shadow map. Computed internally during rendering.
175-
</div>
169+
</div>
176170

177171
<h3>[property:WebGLRenderTarget shadowMap]</h3>
178172
<div>
179173
The depth map generated using the shadowCamera; a location beyond a pixel's depth is in shadow. Computed internally during rendering.
180-
</div>
174+
</div>
181175

182-
<h2>Methods</h2>
176+
<h2>Methods</h2>
183177
<h3>[method:SpotLight clone]()</h3>
184178
<div>
185179
<br />
186180
It returns a clone of SpotLight.
187181
</div>
188-
182+
189183
<h3>[method:JSON toJSON]()</h3>
190184
<div>
191185
Return SpotLight data in JSON format.

‎editor/js/Menubar.Add.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,9 @@ Menubar.Add = function ( editor ) {
324324
var intensity = 1;
325325
var distance = 0;
326326
var angle = Math.PI * 0.1;
327-
var exponent = 10;
327+
var penumbra = 0;
328328

329-
var light = new THREE.SpotLight( color, intensity, distance, angle, exponent );
329+
var light = new THREE.SpotLight( color, intensity, distance, angle, penumbra );
330330
light.name = 'SpotLight ' + ( ++ lightCount );
331331
light.target.name = 'SpotLight ' + ( lightCount ) + ' Target';
332332

‎editor/js/Sidebar.Object.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ Sidebar.Object = function ( editor ) {
224224

225225
container.add( objectAngleRow );
226226

227-
// exponent
227+
// penumrba
228228

229-
var objectExponentRow = new UI.Row();
230-
var objectExponent = new UI.Number().setRange( 0, Infinity ).onChange( update );
229+
var objectPenumbraRow = new UI.Row();
230+
var objectPenumbra = new UI.Number().setRange( 0, 1 ).onChange( update );
231231

232-
objectExponentRow.add( new UI.Text( 'Exponent' ).setWidth( '90px' ) );
233-
objectExponentRow.add( objectExponent );
232+
objectPenumbraRow.add( new UI.Text( 'Penumbra' ).setWidth( '90px' ) );
233+
objectPenumbraRow.add( objectPenumbra );
234234

235-
container.add( objectExponentRow );
235+
container.add( objectPenumbraRow );
236236

237237
// decay
238238

@@ -444,9 +444,9 @@ Sidebar.Object = function ( editor ) {
444444

445445
}
446446

447-
if ( object.exponent !== undefined && Math.abs( object.exponent - objectExponent.getValue() ) >= 0.01 ) {
447+
if ( object.penumbra !== undefined && Math.abs( object.penumbra - objectPenumbra.getValue() ) >= 0.01 ) {
448448

449-
editor.execute( new SetValueCommand( object, 'exponent', objectExponent.getValue() ) );
449+
editor.execute( new SetValueCommand( object, 'penumbra', objectPenumbra.getValue() ) );
450450

451451
}
452452

@@ -520,7 +520,7 @@ Sidebar.Object = function ( editor ) {
520520
'groundColor': objectGroundColorRow,
521521
'distance' : objectDistanceRow,
522522
'angle' : objectAngleRow,
523-
'exponent' : objectExponentRow,
523+
'penumbra' : objectPenumbraRow,
524524
'decay' : objectDecayRow,
525525
'castShadow' : objectShadowRow,
526526
'receiveShadow' : objectReceiveShadow,
@@ -679,9 +679,9 @@ Sidebar.Object = function ( editor ) {
679679

680680
}
681681

682-
if ( object.exponent !== undefined ) {
682+
if ( object.penumbra !== undefined ) {
683683

684-
objectExponent.setValue( object.exponent );
684+
objectPenumbra.setValue( object.penumbra );
685685

686686
}
687687

‎editor/js/Storage.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ var Storage = function () {
77
var indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
88

99
if ( indexedDB === undefined ) {
10+
1011
console.warn( 'Storage: IndexedDB not available.' );
1112
return { init: function () {}, get: function () {}, set: function () {}, clear: function () {} };
13+
1214
}
1315

1416
var name = 'threejs-editor';
@@ -89,6 +91,6 @@ var Storage = function () {
8991

9092
}
9193

92-
}
94+
};
9395

9496
};

‎examples/files.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ var files = {
178178
"webgl_postprocessing_godrays",
179179
"webgl_postprocessing_masking",
180180
"webgl_postprocessing_nodes",
181+
"webgl_postprocessing_smaa",
181182
"webgl_postprocessing_ssao",
182183
"webgl_raycast_texture",
183184
"webgl_read_float_buffer",
@@ -229,7 +230,8 @@ var files = {
229230
],
230231
"webvr": [
231232
"webvr_cubes",
232-
"webvr_video"
233+
"webvr_video",
234+
"webvr_stereo_pano"
233235
],
234236
"css3d": [
235237
"css3d_molecules",

0 commit comments

Comments
 (0)