Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ce8db7f
almost working 100%
robertleeplummerjr Feb 20, 2018
178d47b
closer to webgl2, still failing some tests when reusing or multiple t…
robertleeplummerjr Feb 25, 2018
fdf547c
getting some help on freenode, so made tests run using cdn's rather t…
robertleeplummerjr Feb 25, 2018
8d0145f
all tests but a couple to do with Floats running on chrome and firefox
robertleeplummerjr Feb 25, 2018
f440841
all tests now online, use `EXT_color_buffer_float`
robertleeplummerjr Feb 25, 2018
c668e16
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Feb 26, 2018
e5d51fd
make and bump version number
robertleeplummerjr Feb 26, 2018
3c2369b
update documentation on Alpha
robertleeplummerjr Feb 26, 2018
9865a4b
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Feb 28, 2018
fd3178c
fix up webgl2
robertleeplummerjr Feb 28, 2018
8ab9457
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Mar 1, 2018
a7fad9c
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Mar 1, 2018
f0d0630
make
robertleeplummerjr Mar 1, 2018
3b839b3
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Mar 1, 2018
42882d7
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Mar 1, 2018
1d99c94
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Mar 3, 2018
c94ee12
merge latest from develop
robertleeplummerjr Mar 3, 2018
bdc0b6b
Merge branch '272-cached-uniform-setting' into 261-webgl2
robertleeplummerjr Mar 6, 2018
504735e
build
robertleeplummerjr Mar 6, 2018
ab7ab17
Merge branch 'develop' into 261-webgl2
robertleeplummerjr Mar 7, 2018
f0970cd
build
robertleeplummerjr Mar 7, 2018
0824151
moving to correct home
robertleeplummerjr Mar 8, 2018
36e4713
moving to correct home
robertleeplummerjr Mar 8, 2018
f84bee2
shrinking webgl2 to only what is needed, this broke a lot, but will r…
robertleeplummerjr Mar 8, 2018
01fa836
making both webgl's play nice together
robertleeplummerjr Mar 8, 2018
ed247f5
first build, getting ready to test
robertleeplummerjr Mar 8, 2018
af7060d
webgl1 and webgl2, together at last, and tested.
robertleeplummerjr Mar 9, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ Note: To animate the rendering, use `requestAnimationFrame` instead of `setTimeo
Currently, if you need alpha do something like enabling `premultipliedAlpha` with your own gl context:
```js
const canvas = DOM.canvas(500, 500);
const gl = canvas.getContext('webgl', { premultipliedAlpha: false });
const gl = canvas.getContext('webgl2', { premultipliedAlpha: false });

const gpu = new GPU({
canvas,
Expand Down
22 changes: 20 additions & 2 deletions bin/gpu-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*
* GPU Accelerated JavaScript
*
* @version 1.0.6
* @date Tue Mar 06 2018 19:26:37 GMT-0500 (EST)
* @version 1.2.0
* @date Thu Mar 08 2018 17:26:16 GMT-0500 (EST)
*
* @license MIT
* The MIT License
Expand Down Expand Up @@ -171,6 +171,24 @@ var UtilsCore = function () {

return webGl;
}


}, {
key: 'initWebGl2',
value: function initWebGl2(canvasObj) {

if (typeof _isCanvasSupported !== 'undefined' || canvasObj === null) {
if (!_isCanvasSupported) {
return null;
}
}

if (!UtilsCore.isCanvas(canvasObj)) {
throw new Error('Invalid canvas object - ' + canvasObj);
}

return canvasObj.getContext('webgl2', UtilsCore.initWebGlDefaultOptions());
}
}]);

return UtilsCore;
Expand Down
6 changes: 3 additions & 3 deletions bin/gpu-core.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading