Skip to content

Background shader: support texture offset/repeat #15138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2018
Merged

Background shader: support texture offset/repeat #15138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/renderers/shaders/ShaderLib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { UniformsUtils } from './UniformsUtils.js';
import { Vector3 } from '../../math/Vector3.js';
import { UniformsLib } from './UniformsLib.js';
import { Color } from '../../math/Color.js';
import { Matrix3 } from '../../math/Matrix3.js';

/**
* @author alteredq / http://alteredqualia.com/
Expand Down Expand Up @@ -195,6 +196,7 @@ var ShaderLib = {
background: {

uniforms: {
uvTransform: { value: new Matrix3() },
t2D: { value: null },
},

Expand Down
3 changes: 2 additions & 1 deletion src/renderers/shaders/ShaderLib/background_vert.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
varying vec2 vUv;
uniform mat3 uvTransform;

void main() {

vUv = uv;
vUv = ( uvTransform * vec3( uv, 1 ) ).xy;

gl_Position = vec4( position, 1.0 );
gl_Position.z = 1.0;
Expand Down
10 changes: 10 additions & 0 deletions src/renderers/webgl/WebGLBackground.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function WebGLBackground( renderer, state, objects, premultipliedAlpha ) {
boxMesh = new Mesh(
new BoxBufferGeometry( 1, 1, 1 ),
new ShaderMaterial( {
type: 'BackgroundCubeMaterial',
uniforms: UniformsUtils.clone( ShaderLib.cube.uniforms ),
vertexShader: ShaderLib.cube.vertexShader,
fragmentShader: ShaderLib.cube.fragmentShader,
Expand Down Expand Up @@ -83,6 +84,7 @@ function WebGLBackground( renderer, state, objects, premultipliedAlpha ) {
planeMesh = new Mesh(
new PlaneBufferGeometry( 2, 2 ),
new ShaderMaterial( {
type: 'BackgroundMaterial',
uniforms: UniformsUtils.clone( ShaderLib.background.uniforms ),
vertexShader: ShaderLib.background.vertexShader,
fragmentShader: ShaderLib.background.fragmentShader,
Expand All @@ -101,6 +103,14 @@ function WebGLBackground( renderer, state, objects, premultipliedAlpha ) {

planeMesh.material.uniforms.t2D.value = background;

if ( background.matrixAutoUpdate === true ) {

background.updateMatrix();

}

planeMesh.material.uniforms.uvTransform.value.copy( background.matrix );

// push to the pre-sorted opaque render list
renderList.push( planeMesh, planeMesh.geometry, planeMesh.material, 0, null );

Expand Down