Browse Source

Removed devicePixelRatio from renderers parameters (for simplicity).

Mr.doob 10 years ago
parent
commit
d09baac936

+ 1 - 5
examples/js/renderers/CanvasRenderer.js

@@ -123,11 +123,7 @@ THREE.CanvasRenderer = function ( parameters ) {
 
 
 	this.domElement = _canvas;
 	this.domElement = _canvas;
 
 
-	this.devicePixelRatio = parameters.devicePixelRatio !== undefined
-				 ? parameters.devicePixelRatio
-				 : self.devicePixelRatio !== undefined
-					 ? self.devicePixelRatio
-					 : 1;
+	this.devicePixelRatio = self.devicePixelRatio !== undefined ? self.devicePixelRatio : 1;
 
 
 	this.autoClear = true;
 	this.autoClear = true;
 	this.sortObjects = true;
 	this.sortObjects = true;

+ 3 - 7
examples/js/renderers/WebGLDeferredRenderer.js

@@ -10,12 +10,8 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 	var pixelWidth = parameters.width !== undefined ? parameters.width : 800;
 	var pixelWidth = parameters.width !== undefined ? parameters.width : 800;
 	var pixelHeight = parameters.height !== undefined ? parameters.height : 600;
 	var pixelHeight = parameters.height !== undefined ? parameters.height : 600;
 	var currentScale = parameters.scale !== undefined ? parameters.scale : 1;
 	var currentScale = parameters.scale !== undefined ? parameters.scale : 1;
-    
-	var devicePixelRatio = parameters.devicePixelRatio !== undefined
-		? parameters.devicePixelRatio
-			: self.devicePixelRatio !== undefined
-				? self.devicePixelRatio
-				: 1;
+
+	var devicePixelRatio = self.devicePixelRatio !== undefined ? self.devicePixelRatio : 1;
 
 
 	var fullWidth = pixelWidth * devicePixelRatio;
 	var fullWidth = pixelWidth * devicePixelRatio;
 	var fullHeight = pixelHeight * devicePixelRatio;
 	var fullHeight = pixelHeight * devicePixelRatio;
@@ -31,7 +27,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 
 	if ( this.renderer === undefined ) {
 	if ( this.renderer === undefined ) {
 
 
-		this.renderer = new THREE.WebGLRenderer( { antialias: false, devicePixelRatio : devicePixelRatio } );
+		this.renderer = new THREE.WebGLRenderer( { antialias: false } );
 		this.renderer.setSize( fullWidth, fullHeight );
 		this.renderer.setSize( fullWidth, fullHeight );
 		this.renderer.setClearColor( 0x000000, 0 );
 		this.renderer.setClearColor( 0x000000, 0 );
 
 

+ 1 - 5
src/renderers/WebGLRenderer.js

@@ -42,11 +42,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 	this.domElement = _canvas;
 	this.domElement = _canvas;
 	this.context = null;
 	this.context = null;
-	this.devicePixelRatio = parameters.devicePixelRatio !== undefined
-				 ? parameters.devicePixelRatio
-				 : self.devicePixelRatio !== undefined
-					 ? self.devicePixelRatio
-					 : 1;
+	this.devicePixelRatio = self.devicePixelRatio !== undefined ? self.devicePixelRatio : 1;
 
 
 	// clearing
 	// clearing