Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] dev from mrdoob:dev #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 20, 2025
+9 −7
Merged

[pull] dev from mrdoob:dev #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa5da93
fixed scenegraph example typo (#31289)
MeirArani Jun 20, 2025
1c78abf
WebGLPrograms: Fix cache key with gradient maps. (#31292)
Mugen87 Jun 20, 2025
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 manual/en/scenegraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h1>Scene Graph</h1>
represents light that emanates from a single point.</p>
<pre class="prettyprint showlinemods notranslate lang-js" translate="no">{
const color = 0xFFFFFF;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight(color, intensity);
scene.add(light);
}
Expand Down
2 changes: 1 addition & 1 deletion manual/examples/scenegraph-sun-earth-moon-axes-grids.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
{

const color = 0xFFFFFF;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight( color, intensity );
scene.add( light );

Expand Down
2 changes: 1 addition & 1 deletion manual/fr/scenegraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ <h1>Graphe de scène</h1>
représente la lumière qui émane d'un point unique.</p>
<pre class="prettyprint showlinemods notranslate lang-js" translate="no">{
const color = 0xFFFFFF;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight(color, intensity);
scene.add(light);
}
Expand Down
2 changes: 1 addition & 1 deletion manual/ja/scenegraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h1>のシーングラフ</h1>
一点から発せられる明かりというのが、とりあえずの簡単な説明です。</p>
<pre class="prettyprint showlinemods notranslate lang-js" translate="no">{
const color = 0xFFFFFF;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight(color, intensity);
scene.add(light);
}
Expand Down
2 changes: 1 addition & 1 deletion manual/ko/scenegraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ <h1>씬 그래프(Scene graph)</h1>
정도로 알아둡시다.</p>
<pre class="prettyprint showlinemods notranslate lang-js" translate="no">{
const color = 0xFFFFFF;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight(color, intensity);
scene.add(light);
}
Expand Down
2 changes: 1 addition & 1 deletion manual/ru/scenegraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ <h1>Граф сцены </h1>
представляет собой точечный источник света.</p>
<pre class="prettyprint showlinemods notranslate lang-js" translate="no">{
const color = 0xFFFFFF;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight(color, intensity);
scene.add(light);
}
Expand Down
2 changes: 1 addition & 1 deletion manual/zh/scenegraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h1>场景图</h1>
<p>我们也在场景的中心放置了一个点光源（point light）。稍后我们会介绍更多关于点光源的细节，但现在简单地说，点光源代表从一个点向各个方向发射的光源。</p>
<pre class="prettyprint showlinemods notranslate lang-js" translate="no">{
const color = 0xffffff;
const intensity = 3;
const intensity = 500;
const light = new THREE.PointLight(color, intensity);
scene.add(light);
}
Expand Down
2 changes: 2 additions & 0 deletions src/renderers/webgl/WebGLPrograms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,8 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
_programLayers.enable( 20 );
if ( parameters.batchingColor )
_programLayers.enable( 21 );
if ( parameters.gradientMap )
_programLayers.enable( 22 );

array.push( _programLayers.mask );
_programLayers.disableAll();
Expand Down