Skip to content

T
three.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

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

提交 5e74c741 编写于 作者: A alteredq
浏览文件
操作

Retired MeshCubeMaterial: replaced it with MeshShaderMaterial "cube" defined in ShaderUtils. 

Instant performance boost in all cube mapping demos ;)

With panoramas there were insane amounts of unnecessary computations done in fragment shader - basically every pixel on the screen was computing the whole ubershader - ouch ouch ouch!

This was the lowest hanging fruit, still some more performance can be gained by removing other stuff from ubershader.

Big thanks to mrdoob for starting to question sanity of ubershader ;)
上级 3faf6566
展开全部 隐藏空白更改
内联 并排
Showing with 211 addition and 315 deletion
build/Three.js
浏览文件 @ 5e74c741
此差异已折叠。
build/ThreeDebug.js
浏览文件 @ 5e74c741
此差异已折叠。
build/ThreeExtras.js
浏览文件 @ 5e74c741
此差异已折叠。
examples/materials_cars.html
浏览文件 @ 5e74c741
......@@ -54,12 +54,7 @@
<div id="log"></div>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
<script type="text/javascript" src="../build/ThreeExtras.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......
examples/materials_cubemap.html
浏览文件 @ 5e74c741
......@@ -34,14 +34,7 @@
<pre id="log"></pre>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Plane.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../build/ThreeExtras.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......
examples/materials_cubemap_balls_reflection.html
浏览文件 @ 5e74c741
......@@ -32,14 +32,7 @@
<body>
<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - webgl cube reflection demo. skybox by <a href="http://ict.debevec.org/~debevec/" target="_blank">Paul Debevec</a></div>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Plane.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../build/ThreeExtras.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......
examples/materials_cubemap_balls_refraction.html
浏览文件 @ 5e74c741
......@@ -32,14 +32,7 @@
<body>
<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - webgl cube refraction demo. skybox by <a href="http://www.zfight.com/" target="_blank">Jochum Skoglund</a></div>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Plane.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../build/ThreeExtras.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......
examples/materials_cubemap_escher.html
浏览文件 @ 5e74c741
......@@ -30,13 +30,7 @@
<pre id="log"></pre>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Plane.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../build/ThreeExtras.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......
examples/materials_cubemap_refraction.html
浏览文件 @ 5e74c741
......@@ -33,14 +33,7 @@
<pre id="log"></pre>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Plane.js"></script>
<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../build/ThreeExtras.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......
examples/materials_shaders_fresnel.html
浏览文件 @ 5e74c741
......@@ -113,8 +113,7 @@
scene.addObject( mesh );
}
//SceneUtils.addPanoramaCubeWebGL( sceneCube, 100000, textureCube );
SceneUtils.addPanoramaCubeWebGL2( sceneCube, 100000, textureCube );
SceneUtils.addPanoramaCubeWebGL( sceneCube, 100000, textureCube );
webglRenderer = new THREE.WebGLRenderer( scene );
webglRenderer.setSize( window.innerWidth, window.innerHeight );
......
examples/uqbiquity_test.html
浏览文件 @ 5e74c741
......@@ -48,7 +48,6 @@
<script type="text/javascript" src="../src/materials/MeshDepthMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshNormalMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshFaceMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshCubeMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleCircleMaterial.js"></script>
......
examples/webglrenderer2_sandbox.html
浏览文件 @ 5e74c741
......@@ -70,7 +70,6 @@
<script type="text/javascript" src="../src/materials/MeshDepthMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshNormalMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshFaceMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshCubeMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleCircleMaterial.js"></script>
......
src/extras/SceneUtils.js
浏览文件 @ 5e74c741
......@@ -14,20 +14,9 @@ var SceneUtils = {
return mesh;
},
addPanoramaCubeWebGL: function ( scene, size, textureCube ) {
var material = new THREE.MeshCubeMaterial( { env_map: textureCube } ),
mesh = new THREE.Mesh( new Cube( size, size, size, 1, 1, null, true ), material );
scene.addObject( mesh );
return mesh;
},
},
addPanoramaCubeWebGL2: function ( scene, size, textureCube ) {
addPanoramaCubeWebGL: function ( scene, size, textureCube ) {
var shader = ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
......
src/materials/MeshCubeMaterial.js 已删除 100644 → 0
浏览文件 @ 3faf6566
/**
* @author alteredq / http://alteredqualia.com/
*
* parameters = {
* env_map: new THREE.TextureCube( [posx, negx, posy, negy, posz, negz] ),
* }
*/
THREE.MeshCubeMaterial = function ( parameters ) {
this.id = THREE.MeshCubeMaterial.value ++;
this.env_map = null;
this.blending = THREE.NormalBlending;
if ( parameters ) {
if ( parameters.env_map !== undefined ) this.env_map = parameters.env_map;
}
this.toString = function () {
return 'THREE.MeshCubeMaterial( ' +
'id: ' + this.id + '<br/>' +
'env_map: ' + this.env_map + ' )';
};
}
THREE.MeshCubeMaterialCounter = { value: 0 };
src/renderers/WebGLRenderer.js
浏览文件 @ 5e74c741
......@@ -31,7 +31,7 @@ THREE.WebGLRenderer = function ( scene ) {
// ubershader material constants
BASIC = 0, LAMBERT = 1, PHONG = 2, DEPTH = 3, NORMAL = 4, CUBE = 5,
BASIC = 0, LAMBERT = 1, PHONG = 2, DEPTH = 3, NORMAL = 4,
// heuristics to create shader parameters according to lights in the scene
// (not to blow over maxLights budget)
......@@ -496,12 +496,6 @@ THREE.WebGLRenderer = function ( scene ) {
_gl.uniform1i( program.uniforms.material, BASIC );
} else if ( material instanceof THREE.MeshCubeMaterial ) {
_gl.uniform1i( program.uniforms.material, CUBE );
envMap = material.env_map;
}
if ( mMap ) {
......@@ -930,7 +924,7 @@ THREE.WebGLRenderer = function ( scene ) {
maxDirLights ? "#define MAX_DIR_LIGHTS " + maxDirLights : "",
maxPointLights ? "#define MAX_POINT_LIGHTS " + maxPointLights : "",
"uniform int material;", // 0 - Basic, 1 - Lambert, 2 - Phong, 3 - Depth, 4 - Normal, 5 - Cube
"uniform int material;", // 0 - Basic, 1 - Lambert, 2 - Phong, 3 - Depth, 4 - Normal
"uniform bool enableMap;",
"uniform bool enableCubeMap;",
......@@ -991,16 +985,9 @@ THREE.WebGLRenderer = function ( scene ) {
"}",
// Cube
"if ( material == 5 ) { ",
"vec3 wPos = cameraPosition - vViewPosition;",
"gl_FragColor = textureCube( tCube, vec3( -wPos.x, wPos.yz ) );",
// Normals
"} else if ( material == 4 ) { ",
"if ( material == 4 ) { ",
"gl_FragColor = vec4( 0.5 * normalize( vNormal ) + 0.5, mOpacity );",
......
utils/build.py
浏览文件 @ 5e74c741
......@@ -43,7 +43,6 @@ COMMON_FILES = [
'materials/MeshDepthMaterial.js',
'materials/MeshNormalMaterial.js',
'materials/MeshFaceMaterial.js',
'materials/MeshCubeMaterial.js',
'materials/MeshShaderMaterial.js',
'materials/ParticleBasicMaterial.js',
'materials/ParticleCircleMaterial.js',
......@@ -230,7 +229,6 @@ WEBGL_FILES = [
'materials/MeshDepthMaterial.js',
'materials/MeshNormalMaterial.js',
'materials/MeshFaceMaterial.js',
'materials/MeshCubeMaterial.js',
'materials/MeshShaderMaterial.js',
'materials/ParticleBasicMaterial.js',
'materials/ParticleCircleMaterial.js',
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或