home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-22 19:36:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

Renamed MeshShaderMaterial => ShaderMaterial

Browse Source
This commit is contained in:
alteredq
2011-09-12 19:17:20 +02:00
parent fe1ed04b02
commit e298ac6814
42 changed files with 173 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/canvas_sandbox.html
+10 -8
View File
@@ -26,6 +26,7 @@
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
<script type="text/javascript" src="../src/core/Object3D.js"></script>
<script type="text/javascript" src="../src/core/Projector.js"></script>
<script type="text/javascript" src="../src/core/Quaternion.js"></script>
<script type="text/javascript" src="../src/core/Vertex.js"></script>
<script type="text/javascript" src="../src/core/Face3.js"></script>
@@ -35,6 +36,7 @@
<script type="text/javascript" src="../src/core/Spline.js"></script>
<script type="text/javascript" src="../src/core/Edge.js"></script>
<script type="text/javascript" src="../src/cameras/Camera.js"></script>
<script type="text/javascript" src="../src/cameras/OrthoCamera.js"></script>
<script type="text/javascript" src="../src/lights/Light.js"></script>
<script type="text/javascript" src="../src/lights/AmbientLight.js"></script>
<script type="text/javascript" src="../src/lights/DirectionalLight.js"></script>
@@ -48,7 +50,7 @@
<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/MeshShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleCanvasMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleDOMMaterial.js"></script>
@@ -66,7 +68,6 @@
<script type="text/javascript" src="../src/scenes/Scene.js"></script>
<script type="text/javascript" src="../src/scenes/Fog.js"></script>
<script type="text/javascript" src="../src/scenes/FogExp2.js"></script>
<script type="text/javascript" src="../src/renderers/Projector.js"></script>
<script type="text/javascript" src="../src/renderers/DOMRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/CanvasRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/SVGRenderer.js"></script>
@@ -85,6 +86,11 @@
<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/ShaderUtils.js"></script>
<script type="text/javascript" src="../src/extras/core/Curve.js"></script>
<script type="text/javascript" src="../src/extras/core/CurvePath.js"></script>
<script type="text/javascript" src="../src/extras/core/Path.js"></script>
<script type="text/javascript" src="../src/extras/core/Shape.js"></script>
<script type="text/javascript" src="../src/extras/core/TextPath.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/cameras/FirstPersonCamera.js"></script>
@@ -93,11 +99,6 @@
<script type="text/javascript" src="../src/extras/cameras/RollCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/TrackballCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Curve.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CurvePath.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Path.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Shape.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TextPath.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CubeGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CylinderGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/ExtrudeGeometry.js"></script>
@@ -109,8 +110,9 @@
<script type="text/javascript" src="../src/extras/geometries/TorusGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnotGeometry.js"></script>
<script type="text/javascript" src="../src/extras/loaders/Loader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/BinaryLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/ColladaLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/SceneLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/UTF8Loader.js"></script>
<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
examples/js/postprocessing/BloomPass.js
+2 -2
View File
@@ -24,7 +24,7 @@ THREE.BloomPass = function( strength, kernelSize, sigma, resolution ) {
this.screenUniforms[ "opacity" ].value = strength;
this.materialScreen = new THREE.MeshShaderMaterial( {
this.materialScreen = new THREE.ShaderMaterial( {
uniforms: this.screenUniforms,
vertexShader: screenShader.vertexShader,
@@ -43,7 +43,7 @@ THREE.BloomPass = function( strength, kernelSize, sigma, resolution ) {
this.convolutionUniforms[ "uImageIncrement" ].value = THREE.BloomPass.blurx;
this.convolutionUniforms[ "cKernel" ].value = THREE.ShaderExtras.buildKernel( sigma );
this.materialConvolution = new THREE.MeshShaderMaterial( {
this.materialConvolution = new THREE.ShaderMaterial( {
uniforms: this.convolutionUniforms,
vertexShader: "#define KERNEL_SIZE " + kernelSize + ".0\n" + convolutionShader.vertexShader,
examples/js/postprocessing/DotScreenPass.js
+1 -1
View File
@@ -14,7 +14,7 @@ THREE.DotScreenPass = function( center, angle, scale ) {
if ( angle !== undefined ) this.uniforms[ "angle"].value = angle;
if ( scale !== undefined ) this.uniforms[ "scale"].value = scale;
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/js/postprocessing/FilmPass.js
+1 -1
View File
@@ -8,7 +8,7 @@ THREE.FilmPass = function( noiseIntensity, scanlinesIntensity, scanlinesCount, g
this.uniforms = THREE.UniformsUtils.clone( shader.uniforms );
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/js/postprocessing/ShaderPass.js
+1 -1
View File
@@ -8,7 +8,7 @@ THREE.ShaderPass = function( shader, textureID ) {
this.uniforms = THREE.UniformsUtils.clone( shader.uniforms );
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/js/postprocessing/TexturePass.js
+1 -1
View File
@@ -11,7 +11,7 @@ THREE.TexturePass = function( texture, opacity ) {
this.uniforms[ "opacity" ].value = ( opacity !== undefined ) ? opacity : 1.0;
this.uniforms[ "tDiffuse" ].texture = texture;
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/webgl_custom_attributes.html
+1 -1
View File
@@ -122,7 +122,7 @@
uniforms.texture.texture.wrapS = uniforms.texture.texture.wrapT = THREE.RepeatWrapping;
var shaderMaterial = new THREE.MeshShaderMaterial( {
var shaderMaterial = new THREE.ShaderMaterial( {
uniforms: uniforms,
attributes: attributes,
examples/webgl_custom_attributes_particles.html
+1 -1
View File
@@ -117,7 +117,7 @@
};
var shaderMaterial = new THREE.MeshShaderMaterial( {
var shaderMaterial = new THREE.ShaderMaterial( {
uniforms: uniforms,
attributes: attributes,
examples/webgl_custom_attributes_particles2.html
+1 -1
View File
@@ -115,7 +115,7 @@
uniforms.texture.texture.wrapS = uniforms.texture.texture.wrapT = THREE.RepeatWrapping;
var shaderMaterial = new THREE.MeshShaderMaterial( {
var shaderMaterial = new THREE.ShaderMaterial( {
uniforms: uniforms,
attributes: attributes,
examples/webgl_custom_attributes_particles3.html
+1 -1
View File
@@ -123,7 +123,7 @@
uniforms.texture.texture.wrapS = uniforms.texture.texture.wrapT = THREE.RepeatWrapping;
var shaderMaterial = new THREE.MeshShaderMaterial( {
var shaderMaterial = new THREE.ShaderMaterial( {
uniforms: uniforms,
attributes: attributes,
examples/webgl_flycamera_earth.html
+1 -1
View File
@@ -138,7 +138,7 @@
uniforms[ "uShininess" ].value = 30;
var parameters = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShader, uniforms: uniforms, lights: true, fog: true };
var materialNormalMap = new THREE.MeshShaderMaterial( parameters );
var materialNormalMap = new THREE.ShaderMaterial( parameters );
// planet
examples/webgl_hdr.html
+13 -17
View File
@@ -43,7 +43,9 @@
<script type="text/javascript" src="js/Stats.js"></script>
<!-- HDR fragment shader -->
<script id="fs-hdr" type="x-shader/x-fragment">
uniform sampler2D tDiffuse;
uniform float exposure;
uniform float brightMax;
@@ -64,8 +66,8 @@
}
void main(void)
{
void main() {
vec4 color = texture2D( tDiffuse, vUv );
color.xyz = decode_pnghdr( color );
@@ -78,18 +80,24 @@
color *= YD;
gl_FragColor = vec4( color.xyz, 1.0 );
}
</script>
<!-- HDR vertex shader -->
<script id="vs-hdr" type="x-shader/x-vertex">
varying vec2 vUv;
void main(void)
{
void main() {
vUv = uv;
gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
}
</script>
@@ -131,7 +139,7 @@
texture.minFilter = THREE.LinearFilter;
texture.magFilter = THREE.NearestFilter;
materialHDR = new THREE.MeshShaderMaterial( {
materialHDR = new THREE.ShaderMaterial( {
uniforms: {
tDiffuse: { type: "t", value: 0, texture: texture },
@@ -208,18 +216,6 @@
}
function is_browser_compatible() {
// WebGL support
try { var test = new Float32Array(1); } catch(e) { return false; }
// Web workers
return !!window.Worker;
}
</script>
</body>
</html>
examples/webgl_materials_cars.html
+3 -3
View File
@@ -198,10 +198,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
examples/webgl_materials_cars_anaglyph.html
+1 -1
View File
@@ -197,7 +197,7 @@
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
examples/webgl_materials_cubemap.html
+7 -14
View File
@@ -17,7 +17,7 @@
a:hover { color: #0080ff; }
canvas { pointer-events:none; z-index:10; }
#log { position:absolute; top:50px; text-align:left; display:block; z-index:100; pointer-events:none; }
#d { text-align:center; margin:1em 0 -7.5em 0; z-index:1000; position:relative; display:block }
.button { background:orange; color:#fff; padding:0.2em 0.5em; cursor:pointer }
.inactive { background:#999; color:#eee }
@@ -34,8 +34,6 @@
<p>Texture by <a href="http://www.humus.name/index.php?page=Textures" target="_blank">Humus</a>
</div>
<pre id="log"></pre>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="js/Detector.js"></script>
@@ -90,11 +88,12 @@
scene.add( pointLight );
// light representation
sphere = new THREE.SphereGeometry( 100, 16, 8 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color:0xffaa00 } ) );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) );
lightMesh.position = pointLight.position;
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
scene.add(lightMesh);
scene.add( lightMesh );
var path = "textures/cube/SwedishRoyalCastle/";
var format = '.jpg';
@@ -114,10 +113,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = reflectionCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = reflectionCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
@@ -213,12 +212,6 @@
}
function log(text) {
var e = document.getElementById("log");
e.innerHTML = text + "<br/>" + e.innerHTML;
}
</script>
</body>
examples/webgl_materials_cubemap_balls_reflection.html
+4 -4
View File
@@ -20,7 +20,7 @@
font-family:Monospace;
font-size:13px;
text-align:center;
z-index:1000;
z-index:1000;
}
a {
@@ -105,10 +105,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
examples/webgl_materials_cubemap_balls_reflection_anaglyph.html
+4 -4
View File
@@ -20,7 +20,7 @@
font-family:Monospace;
font-size:13px;
text-align:center;
z-index:1000;
z-index:1000;
}
a {
@@ -101,10 +101,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
examples/webgl_materials_cubemap_balls_refraction.html
+4 -4
View File
@@ -20,7 +20,7 @@
font-family:Monospace;
font-size:13px;
text-align:center;
z-index:1000;
z-index:1000;
}
a {
@@ -104,10 +104,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
examples/webgl_materials_cubemap_balls_refraction_crosseyed.html
+6 -6
View File
@@ -20,7 +20,7 @@
font-family:Monospace;
font-size:13px;
text-align:center;
z-index:1000;
z-index:1000;
}
a {
@@ -103,10 +103,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
@@ -137,10 +137,10 @@
function onKeyDown ( event ) {
switch( event.keyCode ) {
/* O */
case 79: webglRenderer.separation -= 0.5; break;
/* P */
case 80: webglRenderer.separation += 0.5; break;
examples/webgl_materials_cubemap_escher.html
+7 -16
View File
@@ -15,8 +15,8 @@
}
a { color: #ff0080; text-decoration: none; }
a:hover { color: #0080ff; }
#log { position:absolute; top:50px; text-align:left; display:block; z-index:100; pointer-events:none; }
#d { text-align:center; margin:1em auto -9.0em; z-index:1000; position:relative; display:block;
#d { text-align:center; margin:1em auto -9.0em; z-index:1000; position:relative; display:block;
background:rgba(0,0,0,0.75); padding:0.25em; width:300px; border-radius:10px; -webkit-box-shadow: 0px 0px 10px rgba(0,0,0,0.5) }
#oldie { margin-top:15em !important }
</style>
@@ -29,8 +29,6 @@
<p>Texture by <a href="http://brainwagon.org/2002/12/05/fun-with-environment-maps/" target="_blank">Mark VandeWettering</a>
</div>
<pre id="log"></pre>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="js/Detector.js"></script>
@@ -75,8 +73,8 @@
var r = "textures/cube/Escher/";
var urls = [ r + "px.jpg", r + "nx.jpg",
r + "py.jpg", r + "ny.jpg",
var urls = [ r + "px.jpg", r + "nx.jpg",
r + "py.jpg", r + "ny.jpg",
r + "pz.jpg", r + "nz.jpg" ];
var textureCube = THREE.ImageUtils.loadTextureCube( urls );
@@ -89,10 +87,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
@@ -148,13 +146,6 @@
}
function log(text) {
var e = document.getElementById("log");
e.innerHTML = text + "<br/>" + e.innerHTML;
}
</script>
</body>
examples/webgl_materials_cubemap_refraction.html
+7 -15
View File
@@ -17,8 +17,8 @@
a:hover { color: #0080ff; }
canvas { pointer-events:none; z-index:10; }
#log { position:absolute; top:50px; text-align:left; display:block; z-index:100; pointer-events:none; }
#d { text-align:center; margin:1em auto -9.5em; z-index:200; position:relative; display:block;
#d { text-align:center; margin:1em auto -9.5em; z-index:200; position:relative; display:block;
background:rgba(0,0,0,0.5); padding:0.5em; width:400px; border-radius:15px; -webkit-box-shadow: 0px 0px 10px rgba(0,0,0,0.5) }
#oldie { margin-top:15em !important }
@@ -33,8 +33,6 @@
<p>Texture by <a href="http://www.humus.name/index.php?page=Textures" target="_blank">Humus</a>
</div>
<pre id="log"></pre>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="js/Detector.js"></script>
@@ -99,8 +97,8 @@
var r = "textures/cube/Park3Med/";
var urls = [ r + "px.jpg", r + "nx.jpg",
r + "py.jpg", r + "ny.jpg",
var urls = [ r + "px.jpg", r + "nx.jpg",
r + "py.jpg", r + "ny.jpg",
r + "pz.jpg", r + "nz.jpg" ];
var textureCube = THREE.ImageUtils.loadTextureCube( urls, new THREE.CubeRefractionMapping() );
@@ -111,10 +109,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
@@ -211,12 +209,6 @@
}
function log(text) {
var e = document.getElementById("log");
e.innerHTML = text + "<br/>" + e.innerHTML;
}
</script>
</body>
examples/webgl_materials_normalmap.html
+1 -1
View File
@@ -140,7 +140,7 @@
uniforms[ "uShininess" ].value = shininess;
var parameters = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShader, uniforms: uniforms, lights: true };
var material1 = new THREE.MeshShaderMaterial( parameters );
var material1 = new THREE.ShaderMaterial( parameters );
var material2 = new THREE.MeshPhongMaterial( { color: diffuse, specular: specular, ambient: ambient, shininess: shininess } );
examples/webgl_materials_normalmap2.html
+2 -12
View File
@@ -35,13 +35,10 @@
#vt, #vt a { color:orange; }
.code { }
#log { position:absolute; top:50px; text-align:left; display:block; z-index:100 }
</style>
</head>
<body>
<pre id="log"></pre>
<div id="info">
<a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - webgl normalmap demo.
<a href="http://www.ir-ltd.net/infinite-3d-head-scan-released/" target="_blank">Lee Perry-Smith</a> head.
@@ -115,7 +112,7 @@
var shader = THREE.ShaderUtils.lib[ "normal" ];
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
uniforms[ "tNormal" ].texture = THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
uniforms[ "uNormalScale" ].value = - 0.75;
@@ -132,7 +129,7 @@
uniforms[ "uShininess" ].value = shininess;
var parameters = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShader, uniforms: uniforms, lights: true };
var material = new THREE.MeshShaderMaterial( parameters );
var material = new THREE.ShaderMaterial( parameters );
loader = new THREE.JSONLoader( true );
document.body.appendChild( loader.statusDomElement );
@@ -203,13 +200,6 @@
}
function log( text ) {
var e = document.getElementById("log");
e.innerHTML = text + "<br/>" + e.innerHTML;
}
</script>
</body>
examples/webgl_materials_shaders_fresnel.html
+6 -17
View File
@@ -20,20 +20,16 @@
font-family:Monospace;
font-size:13px;
text-align:center;
z-index:1000;
z-index:1000;
}
a {
color: #ffffff;
}
#log { position:absolute; top:50px; text-align:left; display:block; z-index:100 }
a { color: #ffffff; }
#oldie a { color:#0b0 }
</style>
</head>
<body>
<pre id="log"></pre>
<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - webgl cube Fresnel shader demo. texture by <a href="http://www.humus.name/index.php?page=Textures" target="_blank">Humus</a> </div>
@@ -98,7 +94,7 @@
uniforms["tCube"].texture = textureCube;
var parameters = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShader, uniforms: uniforms };
var material = new THREE.MeshShaderMaterial( parameters );
var material = new THREE.ShaderMaterial( parameters );
for ( var i = 0; i < 500; i ++ ) {
@@ -117,10 +113,10 @@
// Skybox
var shader = THREE.ShaderUtils.lib["cube"];
shader.uniforms["tCube"].texture = textureCube;
var shader = THREE.ShaderUtils.lib[ "cube" ];
shader.uniforms[ "tCube" ].texture = textureCube;
var material = new THREE.MeshShaderMaterial( {
var material = new THREE.ShaderMaterial( {
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
@@ -183,13 +179,6 @@
}
function log( text ) {
var e = document.getElementById("log");
e.innerHTML = text + "<br/>" + e.innerHTML;
}
</script>
</body>
examples/webgl_materials_skin.html
+2 -2
View File
@@ -139,8 +139,8 @@
var parametersUV = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShaderUV, uniforms: uniformsUV, lights: true };
material = new THREE.MeshShaderMaterial( parameters );
var materialUV = new THREE.MeshShaderMaterial( parametersUV );
material = new THREE.ShaderMaterial( parameters );
var materialUV = new THREE.ShaderMaterial( parametersUV );
// LOADER
examples/webgl_particles_shapes.html
+1 -1
View File
@@ -321,7 +321,7 @@
}
var shaderMaterial = new THREE.MeshShaderMaterial( {
var shaderMaterial = new THREE.ShaderMaterial( {
uniforms: uniforms,
attributes: attributes,
examples/webgl_postprocessing.html
+2 -2
View File
@@ -139,7 +139,7 @@
sceneBG = new THREE.Scene();
materialColor = new THREE.MeshShaderMaterial( {
materialColor = new THREE.ShaderMaterial( {
uniforms: { time: { type: "f", value: 0.0 } },
vertexShader: getText( 'vs-generic' ),
@@ -354,7 +354,7 @@
uniforms[ "uShininess" ].value = shininess;
var parameters = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShader, uniforms: uniforms, lights: true };
var mat2 = new THREE.MeshShaderMaterial( parameters );
var mat2 = new THREE.ShaderMaterial( parameters );
mesh = new THREE.Mesh( geometry, mat2 );
mesh.position.set( 0, -50, 0 );
examples/webgl_postprocessing_dof.html
+1 -1
View File
@@ -250,7 +250,7 @@
postprocessing.bokeh_uniforms[ "focus" ].value = 1.1;
postprocessing.bokeh_uniforms[ "aspect" ].value = window.innerWidth / height;
postprocessing.materialBokeh = new THREE.MeshShaderMaterial( {
postprocessing.materialBokeh = new THREE.ShaderMaterial( {
uniforms: postprocessing.bokeh_uniforms,
vertexShader: bokeh_shader.vertexShader,
examples/webgl_rtt.html
+2 -2
View File
@@ -130,7 +130,7 @@
rtTexture = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, { minFilter: THREE.LinearFilter, magFilter: THREE.NearestFilter, format: THREE.RGBFormat } );
material = new THREE.MeshShaderMaterial( {
material = new THREE.ShaderMaterial( {
uniforms: { time: { type: "f", value: 0.0 } },
vertexShader: document.getElementById( 'vertexShader' ).textContent,
@@ -138,7 +138,7 @@
} );
var materialScreen = new THREE.MeshShaderMaterial( {
var materialScreen = new THREE.ShaderMaterial( {
uniforms: { tDiffuse: { type: "t", value: 0, texture: rtTexture } },
vertexShader: document.getElementById( 'vertexShader' ).textContent,
examples/webgl_sandbox.html
+12 -10
View File
@@ -45,6 +45,7 @@
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
<script type="text/javascript" src="../src/core/Object3D.js"></script>
<script type="text/javascript" src="../src/core/Projector.js"></script>
<script type="text/javascript" src="../src/core/Quaternion.js"></script>
<script type="text/javascript" src="../src/core/Vertex.js"></script>
<script type="text/javascript" src="../src/core/Face3.js"></script>
@@ -54,6 +55,7 @@
<script type="text/javascript" src="../src/core/Spline.js"></script>
<script type="text/javascript" src="../src/core/Edge.js"></script>
<script type="text/javascript" src="../src/cameras/Camera.js"></script>
<script type="text/javascript" src="../src/cameras/OrthoCamera.js"></script>
<script type="text/javascript" src="../src/lights/Light.js"></script>
<script type="text/javascript" src="../src/lights/AmbientLight.js"></script>
<script type="text/javascript" src="../src/lights/DirectionalLight.js"></script>
@@ -67,7 +69,7 @@
<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/MeshShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleCanvasMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleDOMMaterial.js"></script>
@@ -85,7 +87,6 @@
<script type="text/javascript" src="../src/scenes/Scene.js"></script>
<script type="text/javascript" src="../src/scenes/Fog.js"></script>
<script type="text/javascript" src="../src/scenes/FogExp2.js"></script>
<script type="text/javascript" src="../src/renderers/Projector.js"></script>
<script type="text/javascript" src="../src/renderers/DOMRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/CanvasRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/SVGRenderer.js"></script>
@@ -104,6 +105,11 @@
<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/ShaderUtils.js"></script>
<script type="text/javascript" src="../src/extras/core/Curve.js"></script>
<script type="text/javascript" src="../src/extras/core/CurvePath.js"></script>
<script type="text/javascript" src="../src/extras/core/Path.js"></script>
<script type="text/javascript" src="../src/extras/core/Shape.js"></script>
<script type="text/javascript" src="../src/extras/core/TextPath.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/cameras/FirstPersonCamera.js"></script>
@@ -112,11 +118,6 @@
<script type="text/javascript" src="../src/extras/cameras/RollCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/TrackballCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Curve.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CurvePath.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Path.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Shape.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TextPath.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CubeGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CylinderGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/ExtrudeGeometry.js"></script>
@@ -128,8 +129,9 @@
<script type="text/javascript" src="../src/extras/geometries/TorusGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnotGeometry.js"></script>
<script type="text/javascript" src="../src/extras/loaders/Loader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/BinaryLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/ColladaLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/SceneLoader.js"></script>
<script type="text/javascript" src="../src/extras/loaders/UTF8Loader.js"></script>
<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
@@ -190,7 +192,7 @@
new THREE.MeshBasicMaterial( { map: texture, fog: false } ),
new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ),
new THREE.MeshBasicMaterial( { map: texture2, envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } ),
new THREE.MeshShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } )
new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } )
/*
new THREE.MeshLambertMaterial( { color: 0xdddddd, shading: THREE.FlatShading } ),
@@ -203,7 +205,7 @@
new THREE.MeshBasicMaterial( { envMap: texture2, fog: false } ),
new THREE.MeshLambertMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ),
new THREE.MeshLambertMaterial( { map: texture2, envMap: ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } ),
new THREE.MeshShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } )
new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } )
*/
];
examples/webgl_shader.html
+3 -3
View File
@@ -32,8 +32,8 @@
</head>
<body>
<div id="container"></div>
<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - shader demo. featuring <a href="http://www.pouet.net/prod.php?which=52761" target="_blank">Monjori by Mic</a></div>
<div id="container"></div>
<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - shader demo. featuring <a href="http://www.pouet.net/prod.php?which=52761" target="_blank">Monjori by Mic</a></div>
<script type="text/javascript" src="../build/Three.js"></script>
@@ -117,7 +117,7 @@
resolution: { type: "v2", value: new THREE.Vector2() }
};
material = new THREE.MeshShaderMaterial( {
material = new THREE.ShaderMaterial( {
uniforms: uniforms,
vertexShader: document.getElementById( 'vertexShader' ).textContent,
examples/webgl_shader2.html
+1 -1
View File
@@ -218,7 +218,7 @@
for( var i = 0; i < params.length; i++ ) {
material = new THREE.MeshShaderMaterial( {
material = new THREE.ShaderMaterial( {
uniforms: params[ i ][ 1 ],
vertexShader: document.getElementById( 'vertexShader' ).textContent,
examples/webgl_shader_lava.html
+1 -1
View File
@@ -163,7 +163,7 @@
var size = 0.65;
material = new THREE.MeshShaderMaterial( {
material = new THREE.ShaderMaterial( {
uniforms: uniforms,
vertexShader: document.getElementById( 'vertexShader' ).textContent,
examples/webgl_shadowmap.html
+1 -1
View File
@@ -143,7 +143,7 @@
var shader = THREE.ShaderExtras[ "screen" ];
var uniforms = new THREE.UniformsUtils.clone( shader.uniforms );
hudMaterial = new THREE.MeshShaderMaterial( { vertexShader: shader.vertexShader, fragmentShader: shader.fragmentShader, uniforms: uniforms } );
hudMaterial = new THREE.ShaderMaterial( { vertexShader: shader.vertexShader, fragmentShader: shader.fragmentShader, uniforms: uniforms } );
var hudGeo = new THREE.PlaneGeometry( SHADOW_MAP_WIDTH / 2, SHADOW_MAP_HEIGHT / 2 );
var hudMesh = new THREE.Mesh( hudGeo, hudMaterial );
examples/webgl_trackballcamera_earth.html
+1 -1
View File
@@ -153,7 +153,7 @@
uniforms[ "uShininess" ].value = 30;
var materialNormalMap = new THREE.MeshShaderMaterial({
var materialNormalMap = new THREE.ShaderMaterial({
fragmentShader: shader.fragmentShader,
vertexShader: shader.vertexShader,
uniforms: uniforms,