Merge pull request mrdoob#18709 from Mugen87/dev43

Examples: Add possibility to set encoding for Reflector/Refractor.
ariciano · Feb 25, 2020 · cf6f798 · cf6f798
2 parents 44361a9 + 40fed76
commit cf6f798
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/examples/js/objects/Reflector.js b/examples/js/objects/Reflector.js
@@ -18,6 +18,7 @@ THREE.Reflector = function ( geometry, options ) {
 	var clipBias = options.clipBias || 0;
 	var shader = options.shader || THREE.Reflector.ReflectorShader;
 	var recursion = options.recursion !== undefined ? options.recursion : 0;
+	var encoding = options.encoding !== undefined ? options.encoding : THREE.LinearEncoding;
 
 	//
 
@@ -40,7 +41,8 @@ THREE.Reflector = function ( geometry, options ) {
 		minFilter: THREE.LinearFilter,
 		magFilter: THREE.LinearFilter,
 		format: THREE.RGBFormat,
-		stencilBuffer: false
+		stencilBuffer: false,
+		encoding: encoding
 	};
 
 	var renderTarget = new THREE.WebGLRenderTarget( textureWidth, textureHeight, parameters );

diff --git a/examples/js/objects/Refractor.js b/examples/js/objects/Refractor.js
@@ -18,6 +18,7 @@ THREE.Refractor = function ( geometry, options ) {
 	var textureHeight = options.textureHeight || 512;
 	var clipBias = options.clipBias || 0;
 	var shader = options.shader || THREE.Refractor.RefractorShader;
+	var encoding = options.encoding !== undefined ? options.encoding : THREE.LinearEncoding;
 
 	//
 
@@ -36,7 +37,8 @@ THREE.Refractor = function ( geometry, options ) {
 		minFilter: THREE.LinearFilter,
 		magFilter: THREE.LinearFilter,
 		format: THREE.RGBFormat,
-		stencilBuffer: false
+		stencilBuffer: false,
+		encoding: encoding
 	};
 
 	var renderTarget = new THREE.WebGLRenderTarget( textureWidth, textureHeight, parameters );

diff --git a/examples/jsm/objects/Reflector.d.ts b/examples/jsm/objects/Reflector.d.ts
@@ -2,6 +2,7 @@ import {
 	Mesh,
 	BufferGeometry,
 	Color,
+	TextureEncoding,
 	WebGLRenderTarget
 } from '../../../src/Three';
 
@@ -12,6 +13,7 @@ export interface ReflectorOptions {
 	clipBias?: number;
 	shader?: object;
 	recursion?: number;
+	encoding?: TextureEncoding;
 }
 
 export class Reflector extends Mesh {

diff --git a/examples/jsm/objects/Reflector.js b/examples/jsm/objects/Reflector.js
@@ -4,6 +4,7 @@
 
 import {
 	Color,
+	LinearEncoding,
 	LinearFilter,
 	MathUtils,
 	Matrix4,
@@ -34,6 +35,7 @@ var Reflector = function ( geometry, options ) {
 	var clipBias = options.clipBias || 0;
 	var shader = options.shader || Reflector.ReflectorShader;
 	var recursion = options.recursion !== undefined ? options.recursion : 0;
+	var encoding = options.encoding !== undefined ? options.encoding : LinearEncoding;
 
 	//
 
@@ -56,7 +58,8 @@ var Reflector = function ( geometry, options ) {
 		minFilter: LinearFilter,
 		magFilter: LinearFilter,
 		format: RGBFormat,
-		stencilBuffer: false
+		stencilBuffer: false,
+		encoding: encoding
 	};
 
 	var renderTarget = new WebGLRenderTarget( textureWidth, textureHeight, parameters );

diff --git a/examples/jsm/objects/Refractor.d.ts b/examples/jsm/objects/Refractor.d.ts
@@ -2,6 +2,7 @@ import {
 	Mesh,
 	BufferGeometry,
 	Color,
+	TextureEncoding,
 	WebGLRenderTarget
 } from '../../../src/Three';
 
@@ -11,6 +12,7 @@ export interface RefractorOptions {
 	textureHeight?: number;
 	clipBias?: number;
 	shader?: object;
+	encoding?: TextureEncoding;
 }
 
 export class Refractor extends Mesh {

diff --git a/examples/jsm/objects/Refractor.js b/examples/jsm/objects/Refractor.js
@@ -5,6 +5,7 @@
 
 import {
 	Color,
+	LinearEncoding,
 	LinearFilter,
 	MathUtils,
 	Matrix4,
@@ -35,6 +36,7 @@ var Refractor = function ( geometry, options ) {
 	var textureHeight = options.textureHeight || 512;
 	var clipBias = options.clipBias || 0;
 	var shader = options.shader || Refractor.RefractorShader;
+	var encoding = options.encoding !== undefined ? options.encoding : LinearEncoding;
 
 	//
 
@@ -53,7 +55,8 @@ var Refractor = function ( geometry, options ) {
 		minFilter: LinearFilter,
 		magFilter: LinearFilter,
 		format: RGBFormat,
-		stencilBuffer: false
+		stencilBuffer: false,
+		encoding: encoding
 	};
 
 	var renderTarget = new WebGLRenderTarget( textureWidth, textureHeight, parameters );