Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 4276c9f5 编写于 作者: M Mr.doob
浏览文件
操作

Moved shaders in ShaderUtils.lib into ShaderLib. 

ShaderUtils relied on ShaderChunks so this created troubles when trying to use three-canvas and three-extras. Besides, better to keep a single library of shaders.
上级 08aff320
展开全部 隐藏空白更改
内联 并排
Showing with 780 addition and 838 deletion
docs/api/extras/ShaderUtils.html 已删除 100644 → 0
浏览文件 @ 08aff320
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<script src="../../list.js"></script>
<script src="../../page.js"></script>
<link type="text/css" rel="stylesheet" href="../../page.css" />
</head>
<body>
<h1>[name]</h1>
<div class="desc">todo</div>
<h2>Constructor</h2>
<h3>[name]()</h3>
<h2>Properties</h2>
<h3>.[page:Vector3 todo]</h3>
<h2>Methods</h2>
<h3>.todo( [page:Vector3 todo] )</h3>
<div>
todo — todo<br />
</div>
<h2>Source</h2>
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
</body>
</html>
docs/list.js
浏览文件 @ 4276c9f5
......@@ -132,8 +132,7 @@ var list = {
[ "FontUtils", "api/extras/FontUtils" ],
[ "GeometryUtils", "api/extras/GeometryUtils" ],
[ "ImageUtils", "api/extras/ImageUtils" ],
[ "SceneUtils", "api/extras/SceneUtils" ],
[ "ShaderUtils", "api/extras/ShaderUtils" ]
[ "SceneUtils", "api/extras/SceneUtils" ]
],
"Extras / Animation": [
......
examples/misc_controls_fly.html
浏览文件 @ 4276c9f5
......@@ -117,7 +117,7 @@
var moonTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tNormal" ].value = normalTexture;
......
examples/webgl_loader_ctm.html
浏览文件 @ 4276c9f5
......@@ -188,7 +188,7 @@
var ambient = 0xffffff, diffuse = 0xffffff, specular = 0x0e0e0e, shininess = 50;
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
......
examples/webgl_loader_ctm_materials.html
浏览文件 @ 4276c9f5
......@@ -114,7 +114,7 @@
textureCube = THREE.ImageUtils.loadTextureCube( urls );
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cars.html
浏览文件 @ 4276c9f5
......@@ -191,7 +191,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cars_anaglyph.html
浏览文件 @ 4276c9f5
......@@ -185,7 +185,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cars_parallaxbarrier.html
浏览文件 @ 4276c9f5
......@@ -185,7 +185,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap.html
浏览文件 @ 4276c9f5
......@@ -118,7 +118,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = reflectionCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap_balls_reflection.html
浏览文件 @ 4276c9f5
......@@ -108,7 +108,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap_balls_reflection_anaglyph.html
浏览文件 @ 4276c9f5
......@@ -106,7 +106,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap_balls_refraction.html
浏览文件 @ 4276c9f5
......@@ -107,7 +107,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap_balls_refraction_crosseyed.html
浏览文件 @ 4276c9f5
......@@ -107,7 +107,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap_escher.html
浏览文件 @ 4276c9f5
......@@ -96,7 +96,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_cubemap_refraction.html
浏览文件 @ 4276c9f5
......@@ -111,7 +111,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_materials_normalmap.html
浏览文件 @ 4276c9f5
......@@ -155,7 +155,7 @@
// normal map shader
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "enableAO" ].value = true;
......
examples/webgl_materials_normalmap2.html
浏览文件 @ 4276c9f5
......@@ -122,7 +122,7 @@
var ambient = 0x111111, diffuse = 0xbbbbbb, specular = 0x060606, shininess = 35;
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
......
examples/webgl_materials_shaders_fresnel.html
浏览文件 @ 4276c9f5
......@@ -90,7 +90,7 @@
var textureCube = THREE.ImageUtils.loadTextureCube( urls );
textureCube.format = THREE.RGBFormat;
var shader = THREE.ShaderUtils.lib[ "fresnel" ];
var shader = THREE.ShaderLib[ "fresnel" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tCube" ].value = textureCube;
......@@ -118,7 +118,7 @@
// Skybox
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].value = textureCube;
var material = new THREE.ShaderMaterial( {
......
examples/webgl_postprocessing_advanced.html
浏览文件 @ 4276c9f5
......@@ -330,7 +330,7 @@
var ambient = 0x444444, diffuse = 0x999999, specular = 0x080808, shininess = 20;
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tNormal" ].value = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
......
examples/webgl_shading_physical.html
浏览文件 @ 4276c9f5
......@@ -202,7 +202,7 @@
// MATERIALS
var shader = THREE.ShaderUtils.lib[ "cube" ];
var shader = THREE.ShaderLib[ "cube" ];
shader.uniforms[ "tCube" ].texture = cubeCamera.renderTarget;
shader.uniforms[ "tFlip" ].value = 1;
......
src/extras/ShaderUtils.js 已删除 100644 → 0
浏览文件 @ 08aff320
此差异已折叠。
src/loaders/Loader.js
浏览文件 @ 4276c9f5
......@@ -371,7 +371,7 @@ THREE.Loader.prototype = {
if ( m.mapNormal ) {
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tNormal" ].value = mpars.normalMap;
......
src/loaders/SceneLoader.js
浏览文件 @ 4276c9f5
......@@ -1048,7 +1048,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
if ( matJSON.parameters.normalMap ) {
var shader = THREE.ShaderUtils.lib[ "normal" ];
var shader = THREE.ShaderLib[ "normal2" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
var diffuse = matJSON.parameters.color;
......
src/renderers/WebGLShaders.js
浏览文件 @ 4276c9f5
此差异已折叠。
utils/includes/extras.json
浏览文件 @ 4276c9f5
......@@ -3,7 +3,6 @@
"../src/extras/GeometryUtils.js",
"../src/extras/ImageUtils.js",
"../src/extras/SceneUtils.js",
"../src/extras/ShaderUtils.js",
"../src/extras/FontUtils.js",
"../src/extras/core/Curve.js",
"../src/extras/core/CurvePath.js",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或