Skip to content

Added GL.Shader.fromURL(vsURL, fsURL) and GL.create({canvas: myCanvas}) #10

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

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Added GL.Shader.fromURL(vsURL, fsURL) and GL.create({canvas: myCanvas}) #10

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
05ca858
GL.create now allows specifying the canvas width and height in option…
toaarnio Oct 1, 2012
53b450b
Merge remote-tracking branch 'upstream/master'
toaarnio Oct 1, 2012
0d81862
Added GL.Shader.fromURL(vsURL, fsURL), using synchronous XMLHttpRequest
toaarnio Oct 1, 2012
4461cf6
GL.create() now allows passing in a pre-existing canvas in options
toaarnio Oct 16, 2012
8c9352b
default canvas size 800x600 added back in
toaarnio Oct 16, 2012
7ca1b34
Added a gl.onresize() callback, called when resizing the window in fu…
toaarnio Oct 31, 2012
d02b419
the depth buffer attachment is now optional in texture.drawTo()
toaarnio Oct 31, 2012
63f3cc0
Added mousewheel event support, gl.onmousewheel
toaarnio Nov 16, 2012
9da5fc4
added factory method Shader.from(vsURLorID, fsURLorID) that tries to …
toaarnio Nov 20, 2012
3e89bb4
Shader.from() failed with an obscure error message if shader compilat…
toaarnio Dec 7, 2012
af6900e
touch event handling
toaarnio Dec 7, 2012
dd458da
XHR GET now appends a random query string to the URI to avoid obsolet…
Jun 11, 2013
3bfc770
Mouse and touch events now correctly positioned also if the GL canvas…
Jun 11, 2013
e09559d
Merge branch 'master' of https://github.com/toaarnio/lightgl.js
Jun 11, 2013
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
Prev Previous commit
Next Next commit
default canvas size 800x600 added back in
  • Loading branch information
@toaarnio
toaarnio committed Oct 16, 2012
commit 8c9352bc9b99f812cb34b0be01e350c61378c6eb
7 changes: 6 additions & 1 deletion src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ var GL = {
// canvas.
create: function(options) {
options = options || {};
var canvas = options.canvas || document.createElement('canvas');
var canvas = options.canvas;
if (!canvas) {
canvas = document.createElement('canvas');
canvas.width = options.width || 800;
canvas.height = options.height || 600;
}
if (!('alpha' in options)) options.alpha = false;
try { gl = canvas.getContext('webgl', options); } catch (e) {}
try { gl = gl || canvas.getContext('experimental-webgl', options); } catch (e) {}
Expand Down