Skip to content

Commit

Permalink
🔀 Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
CosmoMyzrailGorynych committed Jan 24, 2019
2 parents 906d994 + 8693945 commit f79d6e0
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ coverage
# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
build

# Dependency directory
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FilterJS",
"description": "Generate textures with JS power!",
"version": "0.0.0",
"version": "1.0.0",
"main": "index.html",
"dependencies": {
"fs-extra": "^6.0.0",
Expand Down
7 changes: 6 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,14 @@ const release = gulp.series([build, lint, done => {
flavor: 'normal',
buildType: 'versioned'
});
nw.build().then(done)
nw.build()
.then(() => {
console.log('Binaries done');
done();
})
.catch(function (error) {
console.error(error);
done(error);
});
}]);

Expand Down
5 changes: 3 additions & 2 deletions src/js/WebGL2.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*tslint:disable:interface-name*/
interface HTMLCanvasElement {
getContext(contextId: "webgl2" | "experimental-webgl2", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
}
getContext(contextId: 'webgl2' | 'experimental-webgl2', contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
}
4 changes: 2 additions & 2 deletions src/js/oneShotWebGL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ class Renderer {
gl.shaderSource(this.vecShader, vectorShader);
gl.compileShader(this.fragShader);
gl.compileShader(this.vecShader);
if (!gl.getShaderParameter(this.fragShader, gl.COMPILE_STATUS) ) {
if (!gl.getShaderParameter(this.fragShader, gl.COMPILE_STATUS)) {
console.error(gl.getShaderInfoLog(this.fragShader));
return null;
}
if (!gl.getShaderParameter(this.vecShader, gl.COMPILE_STATUS) ) {
if (!gl.getShaderParameter(this.vecShader, gl.COMPILE_STATUS)) {
console.error(gl.getShaderInfoLog(this.vecShader));
return null;
}
Expand Down
13 changes: 12 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tslint:recommended",
"extends": "tslint:latest",
"linterOptions": {
"exclude": ["./src/js/3rdparty/**/*"]
},
Expand All @@ -24,16 +24,27 @@
}],
"no-angle-bracket-type-assertion": false,
"no-console": {
"severity": "warning",
"options": ["debug", "info", "log", "time", "timeEnd", "trace"]
},
"no-implicit-dependencies": { /* As the app is split into two packages, this will give false positives… kinda */
"severity": "warning"
},
"no-invalid-template-strings": { /* Is used for a reason at oneShotWebGL */
"severity": "warning"
},
"no-misused-new": false, /* Because of buggy tslint */
"no-object-literal-type-assertion": false,
"no-shadowed-variable": {
"severity": "warning"
},
"no-string-literal": false, /* Because of buggy tslint */
"no-var-keyword": false,
"no-var-requires": false,
"object-literal-sort-keys": false,
"one-variable-per-declaration": false,
"ordered-imports": false,
"prefer-for-of": false, /* Because of buggy tslint */
"quotemark": [true, "single"],
"trailing-comma": [
false, {
Expand Down

0 comments on commit f79d6e0

Please sign in to comment.