Browse Source

Merge pull request #7811 from sunag/dev

fix xy-axis in nodes refraction
Mr.doob 9 years ago
parent
commit
5358138a03

+ 2 - 2
examples/js/nodes/postprocessing/NodePass.js

@@ -6,6 +6,8 @@ THREE.NodePass = function() {
 
 
 	THREE.ShaderPass.call( this );
 	THREE.ShaderPass.call( this );
 
 
+	this.textureID = 'renderTexture';
+
 	this.fragment = new THREE.RawNode( new THREE.ScreenNode() );
 	this.fragment = new THREE.RawNode( new THREE.ScreenNode() );
 
 
 	this.node = new THREE.NodeMaterial();
 	this.node = new THREE.NodeMaterial();
@@ -13,8 +15,6 @@ THREE.NodePass = function() {
 
 
 	this.build();
 	this.build();
 
 
-	this.textureID = 'renderTexture';
-
 };
 };
 
 
 THREE.NodePass.prototype = Object.create( THREE.ShaderPass.prototype );
 THREE.NodePass.prototype = Object.create( THREE.ShaderPass.prototype );

+ 1 - 0
examples/webgl_postprocessing.html

@@ -97,6 +97,7 @@
 				camera.updateProjectionMatrix();
 				camera.updateProjectionMatrix();
 
 
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.setSize( window.innerWidth, window.innerHeight );
+				composer.setSize( window.innerWidth, window.innerHeight );
 
 
 			}
 			}
 
 

+ 1 - 0
examples/webgl_postprocessing_glitch.html

@@ -120,6 +120,7 @@
 				camera.updateProjectionMatrix();
 				camera.updateProjectionMatrix();
 
 
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.setSize( window.innerWidth, window.innerHeight );
+				composer.setSize( window.innerWidth, window.innerHeight );
 
 
 
 
 			}
 			}

+ 2 - 2
examples/webgl_postprocessing_nodes.html

@@ -333,10 +333,10 @@
 						// PASS
 						// PASS
 
 
 						var normal = new THREE.TextureNode( decalNormal );
 						var normal = new THREE.TextureNode( decalNormal );
-						var normalY = new THREE.SwitchNode( normal, 'y' );
+						var normalXY = new THREE.SwitchNode( normal, 'xy' );
 
 
 						var offsetNormal = new THREE.OperatorNode(
 						var offsetNormal = new THREE.OperatorNode(
-							normalY,
+							normalXY,
 							new THREE.FloatNode( .5 ),
 							new THREE.FloatNode( .5 ),
 							THREE.OperatorNode.ADD
 							THREE.OperatorNode.ADD
 						);
 						);