Skip to content

Commit f79d6e0

Browse files
🔀 Merge branch 'release/1.0.0'
2 parents 906d994 + 8693945 commit f79d6e0

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ coverage
2020
# node-waf configuration
2121
.lock-wscript
2222

23-
# Compiled binary addons (http://nodejs.org/api/addons.html)
24-
build/Release
23+
build
2524

2625
# Dependency directory
2726
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "FilterJS",
33
"description": "Generate textures with JS power!",
4-
"version": "0.0.0",
4+
"version": "1.0.0",
55
"main": "index.html",
66
"dependencies": {
77
"fs-extra": "^6.0.0",

gulpfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,14 @@ const release = gulp.series([build, lint, done => {
194194
flavor: 'normal',
195195
buildType: 'versioned'
196196
});
197-
nw.build().then(done)
197+
nw.build()
198+
.then(() => {
199+
console.log('Binaries done');
200+
done();
201+
})
198202
.catch(function (error) {
199203
console.error(error);
204+
done(error);
200205
});
201206
}]);
202207

src/js/WebGL2.d.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*tslint:disable:interface-name*/
12
interface HTMLCanvasElement {
2-
getContext(contextId: "webgl2" | "experimental-webgl2", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
3-
}
3+
getContext(contextId: 'webgl2' | 'experimental-webgl2', contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
4+
}

src/js/oneShotWebGL.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ class Renderer {
6565
gl.shaderSource(this.vecShader, vectorShader);
6666
gl.compileShader(this.fragShader);
6767
gl.compileShader(this.vecShader);
68-
if (!gl.getShaderParameter(this.fragShader, gl.COMPILE_STATUS) ) {
68+
if (!gl.getShaderParameter(this.fragShader, gl.COMPILE_STATUS)) {
6969
console.error(gl.getShaderInfoLog(this.fragShader));
7070
return null;
7171
}
72-
if (!gl.getShaderParameter(this.vecShader, gl.COMPILE_STATUS) ) {
72+
if (!gl.getShaderParameter(this.vecShader, gl.COMPILE_STATUS)) {
7373
console.error(gl.getShaderInfoLog(this.vecShader));
7474
return null;
7575
}

tslint.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "tslint:recommended",
2+
"extends": "tslint:latest",
33
"linterOptions": {
44
"exclude": ["./src/js/3rdparty/**/*"]
55
},
@@ -24,16 +24,27 @@
2424
}],
2525
"no-angle-bracket-type-assertion": false,
2626
"no-console": {
27+
"severity": "warning",
28+
"options": ["debug", "info", "log", "time", "timeEnd", "trace"]
29+
},
30+
"no-implicit-dependencies": { /* As the app is split into two packages, this will give false positives… kinda */
31+
"severity": "warning"
32+
},
33+
"no-invalid-template-strings": { /* Is used for a reason at oneShotWebGL */
2734
"severity": "warning"
2835
},
36+
"no-misused-new": false, /* Because of buggy tslint */
37+
"no-object-literal-type-assertion": false,
2938
"no-shadowed-variable": {
3039
"severity": "warning"
3140
},
41+
"no-string-literal": false, /* Because of buggy tslint */
3242
"no-var-keyword": false,
3343
"no-var-requires": false,
3444
"object-literal-sort-keys": false,
3545
"one-variable-per-declaration": false,
3646
"ordered-imports": false,
47+
"prefer-for-of": false, /* Because of buggy tslint */
3748
"quotemark": [true, "single"],
3849
"trailing-comma": [
3950
false, {

0 commit comments

Comments
 (0)