Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: greggman/twgl.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.3.1
Choose a base ref
...
head repository: greggman/twgl.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a315ee85d8b2ead1e8c7f5972450fdd5ed847b66
Choose a head ref
  • 7 commits
  • 18 files changed
  • 1 contributor

Commits on Mar 17, 2023

  1. update deps

    @greggman
    greggman committed Mar 17, 2023
    Copy the full SHA
    e685cf9 View commit details

Commits on Jun 20, 2023

  1. separate background

    @greggman
    greggman committed Jun 20, 2023
    Copy the full SHA
    835d386 View commit details

Commits on Jul 12, 2023

  1. leave in jsdoc comments in .d.ts file

    @greggman
    greggman committed Jul 12, 2023
    Copy the full SHA
    e1692ce View commit details

  2. bump to 5.4.0

    @greggman
    greggman committed Jul 12, 2023
    Copy the full SHA
    6e9081d View commit details

  3. Changelist

    @greggman
    greggman committed Jul 12, 2023
    Copy the full SHA
    27f0a45 View commit details

  4. build

    @greggman
    greggman committed Jul 12, 2023
    Copy the full SHA
    7029eb7 View commit details

  5. remove analytics

    @greggman
    greggman committed Jul 12, 2023
    Copy the full SHA
    a315ee8 View commit details
4 changes: 4 additions & 0 deletions CHANGELIST.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change List

* 5.4.0

* Keep JSDoc docstrings in .d.ts files

* 5.3.1

* Add missing `drawType` to FullArraySpec
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -393,7 +393,7 @@ module.exports = function(grunt) {
// TypeScript definitions.
let content = fs.readFileSync(`dist/${verDir}/types.d.ts`, {encoding: 'utf8'});
// Remove docstrings (Declarations do not by convention include these)
content = content.replace(/\/\*\*[\s\S]*?\*\/\s*/g, '');
//content = content.replace(/\/\*\*[\s\S]*?\*\/\s*/g, '');
// Docs use "?" to represent an arbitrary type; TS uses "any"
content = content.replace(/\]: \?/g, ']: any');
// Docs use "constructor"; TS expects something more like "Function"
24 changes: 1 addition & 23 deletions build/templates/index.template
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
<link href="/resources/images/twgljs-icon.png" rel="shortcut icon" type="image/png">
</head>
<body>
<canvas id="canvas"></canvas>
<iframe src="examples/background.html"></iframe>
<div id="frame">
<div class="nav">
<ul>
@@ -106,30 +106,8 @@
</style>
<div id="forkongithub"><a href="https://github.com/greggman/twgl.js">Fork me on GitHub</a></div>
</body>
<script id="vs" type="notjs">
attribute vec4 a_position;

uniform mat4 u_matrix;

void main(void) {
gl_Position = u_matrix * a_position;
}
</script>
<script id="fs" type="notjs">
precision mediump float;

uniform vec4 u_color;

void main(void)
{
gl_FragColor = u_color;
}
</script>
<script src="/dist/5.x/twgl-full.min.js"></script>
<script src="/3rdparty/prettify.js"></script>
<script src="/resources/js/background.js"></script>
<script src="/resources/js/index.js"></script>
<script src="//cdn.webglstats.com/stat.js" defer="defer" async="async"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Loading