Skip to content
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

Jump to bottom

Enable support for gl.FLOAT #166

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Enable support for gl.FLOAT #166

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
df75ff0
Merge pull request #34 from brianchirls/develop
brianchirls Dec 3, 2013
17bea4d
Merge pull request #35 from brianchirls/develop
brianchirls Dec 4, 2013
7c9c641
Merge branch 'develop' - Hot fix
brianchirls Dec 4, 2013
393c132
Merge pull request #39 from brianchirls/develop
brianchirls Jan 15, 2014
422cc74
Merge pull request #52 from brianchirls/develop
brianchirls Apr 8, 2014
3b39bc0
Merge branch 'develop'
brianchirls Apr 8, 2014
3b8394b
Merge pull request #58 from brianchirls/develop
brianchirls May 6, 2014
7c6c9fb
Merge pull request #67 from brianchirls/develop
brianchirls Jul 25, 2014
63bf296
Merge pull request #73 from brianchirls/develop
brianchirls Oct 13, 2014
2fc0553
Merge pull request #74 from brianchirls/develop
brianchirls Oct 26, 2014
513d2b8
Merge pull request #103 from brianchirls/develop
brianchirls Sep 8, 2015
7ea20fd
Merge remote-tracking branch 'upstream/develop' into develop
May 16, 2018
a7a9ad2
enable float type
May 16, 2018
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
13 changes: 8 additions & 5 deletions seriously.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@
status,
useFloat = options === true ? options : (options && options.useFloat);

useFloat = false;//useFloat && !!gl.getExtension('OES_texture_float'); //useFloat is not ready!
useFloat = useFloat && !!gl.getExtension('OES_texture_float');
if (useFloat) {
this.type = gl.FLOAT;
} else {
Expand All @@ -797,8 +797,8 @@
this.texture = gl.createTexture();
gl.bindTexture(gl.TEXTURE_2D, this.texture);
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
this.ownTexture = true;
Expand Down Expand Up @@ -878,8 +878,11 @@
gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer);
gl.bindRenderbuffer(gl.RENDERBUFFER, this.renderBuffer);

//todo: handle float
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
if(this.type === gl.FLOAT){
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.FLOAT, new Float32Array(width * height * 4));
}else{
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
}
gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16, width, height);
gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this.texture, 0);

Expand Down